RoleAssignment fixes

Author: shuagarw

src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj

@@ -165,9 +165,6 @@
     <Compile Include="Models.Authorization\FilterRoleAssignmentsOptions.cs" />
     <Compile Include="Models.ActiveDirectory\ActiveDirectoryClient.cs" />
     <Compile Include="Models.Authorization\AuthorizationClientExtensions.cs" />
-    <Compile Include="Models.Authorization\PSGroupRoleAssignment.cs" />
-    <Compile Include="Models.Authorization\PSServiceRoleAssignment.cs" />
-    <Compile Include="Models.Authorization\PSUserRoleAssignment.cs" />
     <Compile Include="Models.Authorization\PSRoleAssignment.cs" />
     <Compile Include="Models.Authorization\PSRoleDefinition.cs" />
     <Compile Include="Models.Authorization\PSPermission.cs" />

src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs

@@ -5,7 +5,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, softwareF
+// Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and

src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ParameterSet.cs

@@ -22,16 +22,14 @@ internal static class ParameterSet
 
         public const string SPN = "SPNParameterSet";
 
+        public const string SignInName = "SignInNameParameterSet";
+
         public const string SearchString = "SearchStringParameterSet";
 
         public const string ObjectId = "ObjectIdParameterSet";
 
         public const string Scope = "ScopeParameterSet";
 
-        public const string ScopeWithMail = "ScopeWithMailParameterSet";
-
-        public const string ScopeWithUPN = "ScopeWithUPNParameterSet";
-
         public const string ScopeWithSPN = "ScopeWithSPNParameterSet";
 
         public const string ScopeWithSignInName = "ScopeWithSignInNameParameterSet";
@@ -40,19 +38,13 @@ internal static class ParameterSet
 
         public const string ResourceGroup = "ResourceGroupParameterSet";
 
-        public const string ResourceGroupWithMail = "ResourceGroupWithMailParameterSet";
-
-        public const string ResourceGroupWithUPN = "ResourceGroupWithUPNParameterSet";
-
         public const string ResourceGroupWithSPN = "ResourceGroupWithSPNParameterSet";
 
         public const string ResourceGroupWithObjectId = "ResourceGroupWithObjectIdParameterSet";
 
-        public const string Resource = "ResourceParameterSet";
-
-        public const string ResourceWithMail = "ResourceWithMailParameterSet";
+        public const string ResourceGroupWithSignInName = "ResourceGroupWithSignInNameParameterSet";
 
-        public const string ResourceWithUPN = "ResourceWithUPNParameterSet";
+        public const string Resource = "ResourceParameterSet";
 
         public const string ResourceWithSPN = "ResourceWithSPNParameterSet";
 

src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClientExtensions.cs

@@ -67,9 +67,9 @@ public static IEnumerable<PSRoleAssignment> ToPSRoleAssignments(this IEnumerable
                 {
                     psAssignments.Add(new PSRoleAssignment()
                     {
-                        RoleAssignmentId = assignment.Name.ToString(),
+                        RoleAssignmentId = assignment.Id,
                         DisplayName = adObject.DisplayName,
-                        RoleDefinitionId = roleDefinition.Id, //*****check 
+                        RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(),
                         RoleDefinitionName = roleDefinition.Name,
                         Scope = assignment.Properties.Scope,
                         SignInName = ((PSADUser)adObject).SignInName,
@@ -81,9 +81,9 @@ public static IEnumerable<PSRoleAssignment> ToPSRoleAssignments(this IEnumerable
                 {
                     psAssignments.Add(new PSRoleAssignment()
                     {
-                        RoleAssignmentId = assignment.Name.ToString(),
+                        RoleAssignmentId = assignment.Id,
                         DisplayName = adObject.DisplayName,
-                        RoleDefinitionId = roleDefinition.Id, //*****check 
+                        RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(),
                         RoleDefinitionName = roleDefinition.Name,
                         Scope = assignment.Properties.Scope,
                         ObjectId = adObject.Id,
@@ -94,9 +94,9 @@ public static IEnumerable<PSRoleAssignment> ToPSRoleAssignments(this IEnumerable
                 {
                     psAssignments.Add(new PSRoleAssignment()
                     {
-                        RoleAssignmentId = assignment.Name.ToString(),
+                        RoleAssignmentId = assignment.Id,
                         DisplayName = adObject.DisplayName,
-                        RoleDefinitionId = roleDefinition.Id, //*****check 
+                        RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(),
                         RoleDefinitionName = roleDefinition.Name,
                         Scope = assignment.Properties.Scope,
                         ObjectId = adObject.Id,
@@ -107,9 +107,9 @@ public static IEnumerable<PSRoleAssignment> ToPSRoleAssignments(this IEnumerable
                 {
                     psAssignments.Add(new PSRoleAssignment()
                     {
-                        RoleAssignmentId = assignment.Name.ToString(),
+                        RoleAssignmentId = assignment.Id,
                         DisplayName = adObject.DisplayName,
-                        RoleDefinitionId = roleDefinition.Id, //*****check 
+                        RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(),
                         RoleDefinitionName = roleDefinition.Name,
                         Scope = assignment.Properties.Scope,
                         ObjectId = adObject.Id,
@@ -129,8 +129,13 @@ public static PSRoleAssignment ToPSRoleAssignment(this ClassicAdministrator clas
                 RoleDefinitionName = classicAdministrator.Properties.Role,
                 DisplayName = classicAdministrator.Properties.EmailAddress,
                 Scope = "/subscriptions/" + currentSubscriptionId,
-                Actions = new List<string>() {"*"}
+                ObjectType = "User"
             };
         }
+
+        private static string GuidFromFullyQualifiedId(this string Id)
+        {
+            return Id.TrimEnd('/').Substring(Id.LastIndexOf('/') + 1);
+        }
     }
 }