Bug Fix #61: Fix Decommission/Recommission Device
Checks to ensure a device domain id is valid before interacting with AD.
This commit is contained in:
@@ -88,7 +88,7 @@ namespace Disco.BI.Extensions
|
|||||||
d.DecommissionReason = Reason;
|
d.DecommissionReason = Reason;
|
||||||
|
|
||||||
// Disable AD Account
|
// Disable AD Account
|
||||||
if (d.DeviceDomainId != null)
|
if (ActiveDirectory.IsValidDomainAccountId(d.DeviceDomainId))
|
||||||
{
|
{
|
||||||
var adAccount = d.ActiveDirectoryAccount();
|
var adAccount = d.ActiveDirectoryAccount();
|
||||||
if (adAccount != null && !adAccount.IsCriticalSystemObject)
|
if (adAccount != null && !adAccount.IsCriticalSystemObject)
|
||||||
@@ -115,7 +115,7 @@ namespace Disco.BI.Extensions
|
|||||||
d.DecommissionReason = null;
|
d.DecommissionReason = null;
|
||||||
|
|
||||||
// Enable AD Account
|
// Enable AD Account
|
||||||
if (d.DeviceDomainId != null)
|
if (ActiveDirectory.IsValidDomainAccountId(d.DeviceDomainId))
|
||||||
{
|
{
|
||||||
var adAccount = d.ActiveDirectoryAccount();
|
var adAccount = d.ActiveDirectoryAccount();
|
||||||
if (adAccount != null && !adAccount.IsCriticalSystemObject)
|
if (adAccount != null && !adAccount.IsCriticalSystemObject)
|
||||||
|
|||||||
Reference in New Issue
Block a user