Fix compilation error

Author: ankushbindlish2

src/Graph.Rbac/Version1_6.20190326/ActiveDirectory/ActiveDirectoryClient.cs

@@ -260,7 +260,7 @@ public List<PSADObject> ListUserGroups(string principal)
         public List<PSADObject> GetObjectsByObjectId(List<string> objectIds)
         {
             List<PSADObject> result = new List<PSADObject>();
-            IPage<AADObject> adObjects;
+            IPage<DirectoryObject> adObjects;
             int objectIdBatchCount;
             for(int i=0; i<objectIds.Count; i+=1000)
             {
@@ -354,7 +354,7 @@ public void RemoveGroup(string groupObjectId)
 
         public IEnumerable<PSADObject> GetGroupMembers(ADObjectFilterOptions options, ulong first = ulong.MaxValue, ulong skip = 0)
         {
-            return new GenericPageEnumerable<AADObject>(
+            return new GenericPageEnumerable<DirectoryObject>(
                 delegate ()
                 {
                     return GraphClient.Groups.GetGroupMembers(options.Id);
@@ -450,7 +450,7 @@ public PSADApplication CreateApplication(CreatePSApplicationParameters createPar
             {
                 if (ce.Response.StatusCode == HttpStatusCode.Forbidden)
                 {
-                    AADObject currentUser = GraphClient.Objects.GetCurrentUser();
+                    User currentUser = GraphClient.SignedInUser.Get();
                     if (currentUser != null && string.Equals(currentUser.UserType, "Guest", StringComparison.InvariantCultureIgnoreCase))
                     {
                         throw new InvalidOperationException(ProjectResources.CreateApplicationNotAllowedGuestUser);
@@ -815,7 +815,7 @@ public PSADServicePrincipal CreateServicePrincipal(CreatePSServicePrincipalParam
             {
                 if (ce.Response.StatusCode == HttpStatusCode.Forbidden)
                 {
-                    AADObject currentUser = GraphClient.Objects.GetCurrentUser();
+                    User currentUser = GraphClient.SignedInUser.Get();
                     if (currentUser != null && string.Equals(currentUser.UserType, "Guest", StringComparison.InvariantCultureIgnoreCase))
                     {
                         throw new InvalidOperationException(ProjectResources.CreateServicePrincipalNotAllowedGuestUser);

src/Graph.Rbac/Version1_6.20190326/ActiveDirectory/ActiveDirectoryClientExtensions.cs

@@ -48,56 +48,49 @@ public static PSADObject AssignObjectId(PSADObject adObj, string objectId)
             return adObj;
         }
 
-        public static PSADObject ToPSADObject(this AADObject obj)
+        public static PSADObject ToPSADObject(this DirectoryObject obj)
         {
             if (obj == null) throw new ArgumentNullException();
 
-            if (obj.ObjectType == typeof(User).Name)
+            if (obj is User user)
             {
                 var adUser = new PSADUser()
                 {
-                    DisplayName = obj.DisplayName,
-                    UserPrincipalName = obj.UserPrincipalName
+                    DisplayName = user.DisplayName,
+                    UserPrincipalName = user.UserPrincipalName
                 };
 
                 return AssignObjectId(adUser, obj.ObjectId);
             }
-            else if (obj.ObjectType == "Group")
+            else if (obj is ADGroup group)
             {
                 var adGroup = new PSADGroup()
                 {
-                    DisplayName = obj.DisplayName,
-                    SecurityEnabled = obj.SecurityEnabled,
-                    MailNickname = obj.Mail
+                    DisplayName = group.DisplayName,
+                    SecurityEnabled = group.SecurityEnabled,
+                    MailNickname = group.Mail
                 };
                 return AssignObjectId(adGroup, obj.ObjectId);
             }
-            else if (obj.ObjectType == typeof(ServicePrincipal).Name)
+            else if (obj is ServicePrincipal servicePrincipal)
             {
                 var adSp = new PSADServicePrincipal()
                 {
-                    DisplayName = obj.DisplayName,
-                    ServicePrincipalNames = obj.ServicePrincipalNames.ToArray()
+                    DisplayName = servicePrincipal.DisplayName,
+                    ServicePrincipalNames = servicePrincipal.ServicePrincipalNames.ToArray()
                 };
 
                 return AssignObjectId(adSp, obj.ObjectId);
             }
-            else
-            {
-                var adObj = new PSADObject()
-                {
-                    DisplayName = obj.DisplayName,
-                };
 
-                return AssignObjectId(adObj, obj.ObjectId);
-            }
+            throw new NotSupportedException($"{obj.GetType()}");
         }
 
-        public static PSADObject ToPSADGroup(this AADObject obj)
+        public static PSADObject ToPSADGroup(this DirectoryObject obj)
         {
             var adObj = new PSADObject()
             {
-                DisplayName = obj.DisplayName,
+                DisplayName = (obj as ADGroup).DisplayName,
             };
 
             return AssignObjectId(adObj, obj.ObjectId);