Align with latest REST API (#21)

* Update REST API client
* Support creation of super admin clients
* Improve launch settings for local debugging

Author: ChristopherMann

src/Eryph.IdentityClient.Commands/BuiltInRoles.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Eryph.IdentityClient.Commands;
+
+public static class BuiltInRoles
+{
+    public static readonly string SuperAdmin = "e5e83176-7543-4d01-baea-08a00ea064a6";
+}

src/Eryph.IdentityClient.Commands/CreatedClient.cs

@@ -8,6 +8,8 @@ public class CreatedClient
     {
         public string Id { get; set; }
 
+        public string TenantId { get; set; }
+
         public string Name { get; set; }
 
         public string Description { get; set; }
@@ -17,6 +19,5 @@ public class CreatedClient
         public string[] AllowedScopes { get; set; }
 
         public string PrivateKey { get; set; }
-
     }
-}
+}

src/Eryph.IdentityClient.Commands/Eryph.IdentityClient.Commands.csproj

@@ -19,11 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
-  <ItemGroup>
-
     <ProjectReference Include="..\Eryph.IdentityClient\Eryph.IdentityClient.csproj" />
   </ItemGroup>
 

src/Eryph.IdentityClient.Commands/NewEryphClientCommand.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Management.Automation;
 using Eryph.IdentityClient.Models;
 using JetBrains.Annotations;
@@ -7,7 +8,7 @@ namespace Eryph.IdentityClient.Commands
 {
     [PublicAPI]
     [Cmdlet(VerbsCommon.New, "EryphClient", DefaultParameterSetName = "create")]
-    [OutputType(typeof(CreatedClient), typeof(Client), ParameterSetName = new[] {"create", "createAndSave"})]
+    [OutputType(typeof(CreatedClient))]
     public class NewEryphClientCommand : IdentityCmdLet
     {
         [Parameter(
@@ -42,8 +43,15 @@ public class NewEryphClientCommand : IdentityCmdLet
         [Parameter(
             ParameterSetName = "createAndSave",
             ValueFromPipelineByPropertyName = true)]
-        public string Description { get; set; }
+        public SwitchParameter IsSuperAdmin { get; set; }
 
+        [Parameter(
+            ParameterSetName = "create",
+            ValueFromPipelineByPropertyName = true)]
+        [Parameter(
+            ParameterSetName = "createAndSave",
+            ValueFromPipelineByPropertyName = true)]
+        public string Description { get; set; }
 
         [Parameter(
             ParameterSetName = "createAndSave")]
@@ -59,17 +67,14 @@ protected override void ProcessRecord()
             var identityClient = Factory.CreateClientsClient();
             foreach (var name in Name)
             {
-                var eryphClient = new Client
+                var newClient = new NewClientRequestBody(
+                    name: name,
+                    allowedScopes: AllowedScopes)
                 {
-                    Name = name
+                    Roles = IsSuperAdmin ? [BuiltInRoles.SuperAdmin] : null,
                 };
-                foreach (var allowedScope in AllowedScopes)
-                {
-                    eryphClient.AllowedScopes.Add(allowedScope);
 
-                }
-
-                var response = identityClient.Create(eryphClient);
+                var response = identityClient.Create(newClient);
                 if (!response.HasValue)
                     return;
 
@@ -84,35 +89,17 @@ protected override void ProcessRecord()
 
                     var script = InvokeCommand.NewScriptBlock(cmd);
                     script.Invoke(result.Key);
-
-                    eryphClient = new Client
-                    {
-                        Id = result.Id,
-                        Name = result.Name,
-                        TenantId = result.TenantId,
-                    };
-
-                    foreach (var allowedScope in result.AllowedScopes)
-                    {
-                        eryphClient.AllowedScopes.Add(allowedScope);
-                    }
-
-                    WriteObject(eryphClient);
                 }
-                else
-                    WriteObject(new CreatedClient
-                    {
-                        Id = result.Id,
-                        Name = result.Name,
-                        AllowedScopes = result.AllowedScopes.ToArray(),
-                        IdentityProvider = clientCredentials.IdentityProvider,
-                        PrivateKey = result.Key
-                    });
-
-
 
+                WriteObject(new CreatedClient
+                {
+                    Id = result.Id,
+                    Name = result.Name,
+                    AllowedScopes = result.AllowedScopes.ToArray(),
+                    IdentityProvider = clientCredentials.IdentityProvider,
+                    PrivateKey = AddToConfiguration ? null : result.Key
+                });
             }
         }
-
     }
-}
+}

src/Eryph.IdentityClient.Commands/Properties/launchSettings.json

@@ -7,6 +7,11 @@
       "commandName": "Executable",
       "executablePath": "powershell.exe",
       "commandLineArgs": "-NoProfile -NoExit -Command \"Import-Module $(TargetPath)\""
+    },
+    "Run in Powershell Core": {
+      "commandName": "Executable",
+      "executablePath": "pwsh.exe",
+      "commandLineArgs": "-NoProfile -NoExit -Command \"Import-Module $(TargetPath)\""
     }
   }
 }

src/Eryph.IdentityClient.Commands/SetEryphClientCommand.cs

@@ -34,33 +34,12 @@ protected override void ProcessRecord()
             {
                 foreach (var id in Id)
                 {
-                    var client =
-                        identityClient.Get(id)?.Value;
-
-                    if (client == null)
-                        return;
-
-                    if (AllowedScopes != null)
-                    {
-                        client.AllowedScopes.Clear();
-                        foreach (var scope in AllowedScopes)
-                            client.AllowedScopes.Add(scope);
-                    }
-
-                    if(Name != null)
-                        client.Name = Name;
-
-
-                    var response = identityClient.Update(id, client);
+                    var response = identityClient.Update(
+                        id,
+                        new UpdateClientRequestBody(Name, AllowedScopes));
                     WriteObject(response.Value);
-
                 }
-
             }
         }
-
     }
-
-
-    // This class controls our dependency resolution
-}
+}

src/Eryph.IdentityClient/Generated/ClientsClient.cs

@@ -40,11 +40,10 @@ internal ClientsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipelin
             _pipeline = pipeline;
         }
 
-        /// <summary> Creates a new client. </summary>
-        /// <param name="body"> The <see cref="Client"/> to use. </param>
+        /// <summary> Create a new client. </summary>
+        /// <param name="body"> The <see cref="NewClientRequestBody"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <remarks> Creates a client. </remarks>
-        public virtual async Task<Response<ClientWithSecret>> CreateAsync(Client body = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<ClientWithSecret>> CreateAsync(NewClientRequestBody body = null, CancellationToken cancellationToken = default)
         {
             using var scope = _clientDiagnostics.CreateScope("ClientsClient.Create");
             scope.Start();
@@ -59,11 +58,10 @@ public virtual async Task<Response<ClientWithSecret>> CreateAsync(Client body =
             }
         }
 
-        /// <summary> Creates a new client. </summary>
-        /// <param name="body"> The <see cref="Client"/> to use. </param>
+        /// <summary> Create a new client. </summary>
+        /// <param name="body"> The <see cref="NewClientRequestBody"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <remarks> Creates a client. </remarks>
-        public virtual Response<ClientWithSecret> Create(Client body = null, CancellationToken cancellationToken = default)
+        public virtual Response<ClientWithSecret> Create(NewClientRequestBody body = null, CancellationToken cancellationToken = default)
         {
             using var scope = _clientDiagnostics.CreateScope("ClientsClient.Create");
             scope.Start();
@@ -78,7 +76,7 @@ public virtual Response<ClientWithSecret> Create(Client body = null, Cancellatio
             }
         }
 
-        /// <summary> Deletes a client. </summary>
+        /// <summary> Delete a client. </summary>
         /// <param name="id"> The <see cref="string"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string id, CancellationToken cancellationToken = default)
@@ -96,7 +94,7 @@ public virtual async Task<Response> DeleteAsync(string id, CancellationToken can
             }
         }
 
-        /// <summary> Deletes a client. </summary>
+        /// <summary> Delete a client. </summary>
         /// <param name="id"> The <see cref="string"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string id, CancellationToken cancellationToken = default)
@@ -150,11 +148,11 @@ public virtual Response<Client> Get(string id, CancellationToken cancellationTok
             }
         }
 
-        /// <summary> Updates a client. </summary>
+        /// <summary> Update a client. </summary>
         /// <param name="id"> The <see cref="string"/> to use. </param>
-        /// <param name="body"> The <see cref="Client"/> to use. </param>
+        /// <param name="body"> The <see cref="UpdateClientRequestBody"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<Client>> UpdateAsync(string id, Client body, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<Client>> UpdateAsync(string id, UpdateClientRequestBody body, CancellationToken cancellationToken = default)
         {
             using var scope = _clientDiagnostics.CreateScope("ClientsClient.Update");
             scope.Start();
@@ -169,11 +167,11 @@ public virtual async Task<Response<Client>> UpdateAsync(string id, Client body,
             }
         }
 
-        /// <summary> Updates a client. </summary>
+        /// <summary> Update a client. </summary>
         /// <param name="id"> The <see cref="string"/> to use. </param>
-        /// <param name="body"> The <see cref="Client"/> to use. </param>
+        /// <param name="body"> The <see cref="UpdateClientRequestBody"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<Client> Update(string id, Client body, CancellationToken cancellationToken = default)
+        public virtual Response<Client> Update(string id, UpdateClientRequestBody body, CancellationToken cancellationToken = default)
         {
             using var scope = _clientDiagnostics.CreateScope("ClientsClient.Update");
             scope.Start();
@@ -188,7 +186,7 @@ public virtual Response<Client> Update(string id, Client body, CancellationToken
             }
         }
 
-        /// <summary> Updates a client key. </summary>
+        /// <summary> Create or replace the client key. </summary>
         /// <param name="id"> The <see cref="string"/> to use. </param>
         /// <param name="body"> The <see cref="NewClientKeyRequestBody"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
@@ -207,7 +205,7 @@ public virtual async Task<Response<ClientWithSecret>> NewKeyAsync(string id, New
             }
         }
 
-        /// <summary> Updates a client key. </summary>
+        /// <summary> Create or replace the client key. </summary>
         /// <param name="id"> The <see cref="string"/> to use. </param>
         /// <param name="body"> The <see cref="NewClientKeyRequestBody"/> to use. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
@@ -226,22 +224,20 @@ public virtual Response<ClientWithSecret> NewKey(string id, NewClientKeyRequestB
             }
         }
 
-        /// <summary> Lists clients. </summary>
+        /// <summary> List all clients. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual AsyncPageable<Client> ListAsync(CancellationToken cancellationToken = default)
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => RestClient.CreateListRequest();
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => RestClient.CreateListNextPageRequest(nextLink);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, Client.DeserializeClient, _clientDiagnostics, _pipeline, "ClientsClient.List", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, null, Client.DeserializeClient, _clientDiagnostics, _pipeline, "ClientsClient.List", "value", null, cancellationToken);
         }
 
-        /// <summary> Lists clients. </summary>
+        /// <summary> List all clients. </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Pageable<Client> List(CancellationToken cancellationToken = default)
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => RestClient.CreateListRequest();
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => RestClient.CreateListNextPageRequest(nextLink);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, Client.DeserializeClient, _clientDiagnostics, _pipeline, "ClientsClient.List", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, null, Client.DeserializeClient, _clientDiagnostics, _pipeline, "ClientsClient.List", "value", null, cancellationToken);
         }
     }
 }