Fix merge issue for DenyAssignments

cormacpayne · cormacpayne · commit 7fd5dab1eb7f · 2019-01-11T09:45:48.000-08:00
diff --git a/src/Resources/Resources/Models.Authorization/AuthorizationClientExtensions.cs b/src/Resources/Resources/Models.Authorization/AuthorizationClientExtensions.cs
@@ -214,7 +214,7 @@ private static IEnumerable<PSPrincipal> ToPSPrincipals(this IEnumerable<Principa
                 }
                 else
                 {
-                    var adObject = adObjects.SingleOrDefault(o => string.Equals(o.Id, p.Id)) ?? new PSADObject() { Id = p.Id };
+                    var adObject = adObjects.SingleOrDefault(o => o.Id == pid.ToString()) ?? new PSADObject() { Id = pid.ToString() };
 
                     if ((adObject is PSADUser)
                         || (adObject is PSADGroup)

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ private static IEnumerable<PSPrincipal> ToPSPrincipals(this IEnumerable<Principa`
`214`	`214`	`}`
`215`	`215`	`else`
`216`	`216`	`{`
`217`		`- var adObject = adObjects.SingleOrDefault(o => string.Equals(o.Id, p.Id)) ?? new PSADObject() { Id = p.Id };`
	`217`	`+ var adObject = adObjects.SingleOrDefault(o => o.Id == pid.ToString()) ?? new PSADObject() { Id = pid.ToString() };`
`218`	`218`
`219`	`219`	`if ((adObject is PSADUser)`
`220`	`220`	`\|\| (adObject is PSADGroup)`