Merge pull request #11 from eryph-org/pull/api_update

update identity api

Author: fw2568

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

@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eryph.ClientRuntime.Powershell" Version="0.4.0" />
+    <PackageReference Include="Eryph.ClientRuntime.Powershell" Version="0.4.1" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Eryph.ClientRuntime.Authentication" Version="0.4.0" />
+    <PackageReference Include="Eryph.ClientRuntime.Authentication" Version="0.4.1" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>

src/Eryph.IdentityClient.Commands/NewEryphClientCommand.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Management.Automation;
+using System.Management.Automation.Runspaces;
 using Eryph.IdentityClient.Models;
 using JetBrains.Annotations;
 
@@ -70,10 +71,13 @@ protected override void ProcessRecord()
                     if (AddToConfiguration)
                     {
                         var asDefault = !AsDefault ? "" : " -AsDefault";
-                       InvokeCommand.InvokeScript(
-                            $@"$args[0] | New-EryphClientCredentials -Id ""{result.Id}"" -IdentityEndpoint ""{clientCredentials.IdentityProvider}"" -Configuration ""{clientCredentials.Configuration}"" | Add-EryphClientConfiguration -Name ""{result.Name}""{asDefault}",
-                            result.Key);
 
+                        var cmd =
+                            $@"$args[0] | New-EryphClientCredentials -Id ""{result.Id}"" -IdentityEndpoint ""{clientCredentials.IdentityProvider}"" -Configuration ""{clientCredentials.Configuration}""| Add-EryphClientConfiguration -Name ""{result.Name}""{asDefault}";
+
+                        var script = InvokeCommand.NewScriptBlock(cmd);
+                        script.Invoke(result.Key);
+                        
                         WriteObject(new Client(result.Id, result.Name, result.Description, result.AllowedScopes));
                     }
                     else

src/Eryph.IdentityClient.Commands/SetEryphClientCommand.cs

@@ -1,4 +1,5 @@
-using System.Management.Automation;
+using System;
+using System.Management.Automation;
 using Eryph.IdentityClient.Models;
 using JetBrains.Annotations;
 
@@ -33,10 +34,20 @@ protected override void ProcessRecord()
             {
                 foreach (var id in Id)
                 {
+                    var client =
+                        identityClient.Clients.Get(id);
+
+                    if(AllowedScopes != null)
+                        client.AllowedScopes = AllowedScopes;
+
+                    if(Name != null)
+                        client.Name = Name;
+
+                    if (Description != null)
+                        client.Description = Description;
+
+                    WriteObject(identityClient.Clients.Update(id, client));
 
-                    WriteObject(identityClient.Clients.UpdateWithHttpMessagesAsync(id, 
-                        new Client(null, Name, Description, AllowedScopes)).GetAwaiter().GetResult().Body);
-                    
                 }
 
             }

src/Eryph.IdentityClient/Eryph.IdentityClient.csproj

@@ -13,7 +13,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Eryph.ClientRuntime" Version="0.4.0" />
+    <PackageReference Include="Eryph.ClientRuntime" Version="0.4.1" />
   </ItemGroup>
 
 </Project>

src/Eryph.IdentityClient/Generated/ClientsOperations.cs

@@ -52,6 +52,12 @@ public static partial class ClientsOperationsExtensions
                 }
             }
 
+            /// <summary>
+            /// Lists clients
+            /// </summary>
+            /// <remarks>
+            /// Lists clients
+            /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
@@ -60,6 +66,12 @@ public static Eryph.ClientRuntime.IPage<Client> List(this IClientsOperations ope
                 return operations.ListAsync().GetAwaiter().GetResult();
             }
 
+            /// <summary>
+            /// Lists clients
+            /// </summary>
+            /// <remarks>
+            /// Lists clients
+            /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
@@ -85,9 +97,9 @@ public static Eryph.ClientRuntime.IPage<Client> List(this IClientsOperations ope
             /// </param>
             /// <param name='id'>
             /// </param>
-            public static ProblemDetails Delete(this IClientsOperations operations, string id)
+            public static void Delete(this IClientsOperations operations, string id)
             {
-                return operations.DeleteAsync(id).GetAwaiter().GetResult();
+                operations.DeleteAsync(id).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -104,12 +116,9 @@ public static ProblemDetails Delete(this IClientsOperations operations, string i
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProblemDetails> DeleteAsync(this IClientsOperations operations, string id, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task DeleteAsync(this IClientsOperations operations, string id, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.DeleteWithHttpMessagesAsync(id, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
+                (await operations.DeleteWithHttpMessagesAsync(id, null, cancellationToken).ConfigureAwait(false)).Dispose();
             }
 
             /// <summary>
@@ -123,7 +132,7 @@ public static ProblemDetails Delete(this IClientsOperations operations, string i
             /// </param>
             /// <param name='id'>
             /// </param>
-            public static object Get(this IClientsOperations operations, string id)
+            public static Client Get(this IClientsOperations operations, string id)
             {
                 return operations.GetAsync(id).GetAwaiter().GetResult();
             }
@@ -142,7 +151,7 @@ public static object Get(this IClientsOperations operations, string id)
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<object> GetAsync(this IClientsOperations operations, string id, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Client> GetAsync(this IClientsOperations operations, string id, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetWithHttpMessagesAsync(id, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -163,7 +172,7 @@ public static object Get(this IClientsOperations operations, string id)
             /// </param>
             /// <param name='body'>
             /// </param>
-            public static object Update(this IClientsOperations operations, string id, Client body = default(Client))
+            public static Client Update(this IClientsOperations operations, string id, Client body = default(Client))
             {
                 return operations.UpdateAsync(id, body).GetAwaiter().GetResult();
             }
@@ -184,7 +193,7 @@ public static object Get(this IClientsOperations operations, string id)
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<object> UpdateAsync(this IClientsOperations operations, string id, Client body = default(Client), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Client> UpdateAsync(this IClientsOperations operations, string id, Client body = default(Client), CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.UpdateWithHttpMessagesAsync(id, body, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -193,26 +202,26 @@ public static object Get(this IClientsOperations operations, string id)
             }
 
             /// <summary>
-            /// Updates a client
+            /// Updates a client key
             /// </summary>
             /// <remarks>
-            /// Updates a client
+            /// Updates a client key
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='id'>
             /// </param>
-            public static object Update1(this IClientsOperations operations, string id)
+            public static ClientWithSecrets NewKey(this IClientsOperations operations, string id)
             {
-                return operations.Update1Async(id).GetAwaiter().GetResult();
+                return operations.NewKeyAsync(id).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Updates a client
+            /// Updates a client key
             /// </summary>
             /// <remarks>
-            /// Updates a client
+            /// Updates a client key
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -222,14 +231,20 @@ public static object Update1(this IClientsOperations operations, string id)
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<object> Update1Async(this IClientsOperations operations, string id, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ClientWithSecrets> NewKeyAsync(this IClientsOperations operations, string id, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.Update1WithHttpMessagesAsync(id, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.NewKeyWithHttpMessagesAsync(id, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
+            /// <summary>
+            /// Lists clients
+            /// </summary>
+            /// <remarks>
+            /// Lists clients
+            /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
@@ -241,6 +256,12 @@ public static Eryph.ClientRuntime.IPage<Client> ListNext(this IClientsOperations
                 return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
+            /// <summary>
+            /// Lists clients
+            /// </summary>
+            /// <remarks>
+            /// Lists clients
+            /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>

src/Eryph.IdentityClient/Generated/ClientsOperationsExtensions.cs

@@ -16,7 +16,7 @@ namespace Eryph.IdentityClient
     using System.Net.Http;
 
     /// <summary>
-    /// Haipa Identity Api
+    /// Eryph Identity Api
     /// </summary>
     public partial class EryphIdentityClient : ServiceClient<EryphIdentityClient>, IEryphIdentityClient, IEryphClient
     {
@@ -299,7 +299,7 @@ public EryphIdentityClient(System.Uri baseUri, ServiceClientCredentials credenti
         private void Initialize()
         {
             Clients = new ClientsOperations(this);
-            BaseUri = new System.Uri("https://localhost:62189/identity");
+            BaseUri = new System.Uri("https://localhost:53065/identity");
             AcceptLanguage = "en-US";
             GenerateClientRequestId = true;
             SerializationSettings = new JsonSerializerSettings

src/Eryph.IdentityClient/Generated/EryphIdentityClient.cs

@@ -37,6 +37,12 @@ public partial interface IClientsOperations
         /// Thrown when unable to deserialize the response
         /// </exception>
         Task<Eryph.ClientRuntime.EryphOperationResponse<ClientWithSecrets>> CreateWithHttpMessagesAsync(Client body = default(Client), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists clients
+        /// </summary>
+        /// <remarks>
+        /// Lists clients
+        /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -67,13 +73,10 @@ public partial interface IClientsOperations
         /// <exception cref="Eryph.ClientRuntime.ApiServiceException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<Eryph.ClientRuntime.EryphOperationResponse<ProblemDetails>> DeleteWithHttpMessagesAsync(string id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<Eryph.ClientRuntime.EryphOperationResponse> DeleteWithHttpMessagesAsync(string id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get a client
         /// </summary>
@@ -97,7 +100,7 @@ public partial interface IClientsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<Eryph.ClientRuntime.EryphOperationResponse<object>> GetWithHttpMessagesAsync(string id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<Eryph.ClientRuntime.EryphOperationResponse<Client>> GetWithHttpMessagesAsync(string id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Updates a client
         /// </summary>
@@ -123,12 +126,12 @@ public partial interface IClientsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<Eryph.ClientRuntime.EryphOperationResponse<object>> UpdateWithHttpMessagesAsync(string id, Client body = default(Client), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<Eryph.ClientRuntime.EryphOperationResponse<Client>> UpdateWithHttpMessagesAsync(string id, Client body = default(Client), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Updates a client
+        /// Updates a client key
         /// </summary>
         /// <remarks>
-        /// Updates a client
+        /// Updates a client key
         /// </remarks>
         /// <param name='id'>
         /// </param>
@@ -147,7 +150,13 @@ public partial interface IClientsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<Eryph.ClientRuntime.EryphOperationResponse<object>> Update1WithHttpMessagesAsync(string id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<Eryph.ClientRuntime.EryphOperationResponse<ClientWithSecrets>> NewKeyWithHttpMessagesAsync(string id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists clients
+        /// </summary>
+        /// <remarks>
+        /// Lists clients
+        /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
         /// </param>

src/Eryph.IdentityClient/Generated/IClientsOperations.cs

@@ -10,7 +10,7 @@ namespace Eryph.IdentityClient
     using Newtonsoft.Json;
 
     /// <summary>
-    /// Haipa Identity Api
+    /// Eryph Identity Api
     /// </summary>
     public partial interface IEryphIdentityClient : System.IDisposable
     {

src/Eryph.IdentityClient/Generated/IEryphIdentityClient.cs

@@ -23,7 +23,7 @@ public Client()
         /// <summary>
         /// Initializes a new instance of the Client class.
         /// </summary>
-        /// <param name="id">Unique identifier for a haipa client
+        /// <param name="id">Unique identifier for a eryph client
         /// Only characters a-z, A-Z, numbers 0-9 and hyphens are
         /// allowed.</param>
         /// <param name="name">human readable name of client, for example email
@@ -45,7 +45,7 @@ public Client()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets unique identifier for a haipa client
+        /// Gets or sets unique identifier for a eryph client
         /// Only characters a-z, A-Z, numbers 0-9 and hyphens are allowed.
         /// </summary>
         [JsonProperty(PropertyName = "id")]