Can update the client type

Author: habarthierry-hue

src/IdServer/SimpleIdServer.IdServer.Website/Pages/Client/Client.razor

@@ -19,11 +19,13 @@
             <RadzenBreadCrumbItem Path="@urlHelper.GetUrl("/clients")" Text="@Global.ClientsTitle" />
             <RadzenBreadCrumbItem Text="@Global.ClientDetailsTitle" />
         </RadzenBreadCrumb>
-
         <RadzenText class="mt-3 mb-3 no-margin" Text="@clientState.Value.Client.ClientId" TextStyle="TextStyle.DisplayH3" />
 
         <div class="mb-1">
-            <RadzenBadge Text="@(clientState.Value.Client.ClientType == null ? string.Empty : Enum.GetName(typeof(ClientTypes), clientState.Value.Client.ClientType.Value))" IsPill="true" />
+            <div>
+                <RadzenLabel>@Global.Type</RadzenLabel>
+                <RadzenDropDown TValue="SimpleIdServer.IdServer.Domains.ClientTypes" Value=@clientState.Value.Client.ClientType Change=@HandleClientTypeChanged Data="@ClientTypes" ValueProperty="Type" TextProperty="Name" />
+            </div>
             @if(clientState.Value.Client.IsPublic)
             {                
                 <RadzenBadge style="margin-left: 5px;" Text="@Global.PublicClient" IsPill="true" />
@@ -82,6 +84,7 @@
     public string? action { get; set; } = null;
 
     int selectedIndex = 0;
+    List<ClientTypeRecord> ClientTypes { get; set; } = new List<ClientTypeRecord>();
 
     protected override void OnAfterRender(bool firstRender)
     {
@@ -100,11 +103,37 @@
             StateHasChanged();
         });
         dispatcher.Dispatch(new GetClientAction { Id = id });
+        ClientTypes = Enum.GetValues(typeof(ClientTypes))
+            .Cast<ClientTypes>()
+            .Select(c => new ClientTypeRecord
+            {
+                Name = c.ToString(),
+                Type = c
+            })
+            .OrderBy(c => c.Name)
+            .ToList();
     }
 
     void OnChange(int index)
     {
         var rec = mappingActionNameToIndex.Single(kvp => kvp.Value == index);
         navigationManager.NavigateTo(urlHelper.GetUrl($"/clients/{System.Web.HttpUtility.UrlEncode(id)}/{rec.Key}"));
     }
+
+    void HandleClientTypeChanged(object obj)
+    {
+        if(obj == null || clientState.Value.Client == null)
+        {
+            return;
+        }
+
+        var clientType = (ClientTypes)obj;
+        dispatcher.Dispatch(new UpdateClientTypeAction { Id = clientState.Value.Client.Id, ClientType = clientType });
+    }
+
+    record ClientTypeRecord
+    {
+        public string Name { get; set; }
+        public ClientTypes Type { get; set; }
+    }
 }

src/IdServer/SimpleIdServer.IdServer.Website/Stores/ClientStore/ClientEffects.cs

@@ -808,6 +808,28 @@ public async Task Handle(DeleteClientSecretsAction act, IDispatcher dispatcher)
         });
     }
 
+    [EffectMethod]
+    public async Task Handle(UpdateClientTypeAction act, IDispatcher dispatcher)
+    {
+        var baseUrl = await GetClientsUrl();
+        var httpClient = await _websiteHttpClientFactory.Build();
+        var requestMessage = new HttpRequestMessage
+        {
+            RequestUri = new Uri($"{baseUrl}/{act.Id}/type"),
+            Method = HttpMethod.Put,
+            Content = new StringContent(JsonSerializer.Serialize(new UpdateClientTypeRequest
+            {
+                ClientType = act.ClientType
+            }), Encoding.UTF8, "application/json")
+        };
+        await httpClient.SendAsync(requestMessage);
+        dispatcher.Dispatch(new UpdateClientTypeSuccessAction
+        {
+            ClientType = act.ClientType,
+            Id = act.Id
+        });
+    }
+
     private async Task CreateClient(Client client, IDispatcher dispatcher, ClientTypes clientType, PemResult pemResult = null, string jsonWebKey = null)
     {
         var baseUrl = await GetClientsUrl();
@@ -1429,4 +1451,30 @@ public List<ClientSecret> Secrets
     {
         get; set;
     }
+}
+
+public class UpdateClientTypeAction
+{
+    public string Id
+    {
+        get; set;
+    }
+
+    public ClientTypes ClientType
+    {
+        get; set;
+    }
+}
+
+public class UpdateClientTypeSuccessAction
+{
+    public string Id
+    {
+        get; set;
+    }
+
+    public ClientTypes ClientType
+    {
+        get; set;
+    }
 }

src/IdServer/SimpleIdServer.IdServer.Website/Stores/ClientStore/ClientReducers.cs

@@ -10,6 +10,7 @@
 using SimpleIdServer.IdServer.Helpers.Models;
 using SimpleIdServer.IdServer.Saml.Idp.Extensions;
 using SimpleIdServer.IdServer.Website.Stores.ScopeStore;
+using System.Xml;
 
 namespace SimpleIdServer.IdServer.Website.Stores.ClientStore
 {
@@ -108,6 +109,28 @@ public static SearchClientsState ReduceToggleAllClientSelectionAction(SearchClie
             };
         }
 
+        [ReducerMethod]
+        public static SearchClientsState ReduceUpdateClientTypeSuccessAction(SearchClientsState state, UpdateClientTypeSuccessAction act)
+        {
+            if(state.Clients == null)
+            {
+                return state;
+            }
+
+            var clients = state.Clients;
+            var selectedClient = clients.SingleOrDefault(c => c.Value.Id == act.Id);
+            if(selectedClient != null)
+            {
+                selectedClient.Value.ClientType = act.ClientType;
+            }
+
+            return state with
+            {
+                IsLoading = false,
+                Clients = clients
+            };
+        }
+
         #endregion
 
         #region AddClientState
@@ -225,6 +248,18 @@ public static UpdateClientState ReduceUpdateAdvancedClientSettingsSuccessAction(
             IsUpdating = false
         };
 
+        [ReducerMethod]
+        public static UpdateClientState ReduceUpdateClientTypeAction(UpdateClientState state, UpdateClientTypeAction act) => state with
+        {
+            IsUpdating = true
+        };
+
+        [ReducerMethod]
+        public static UpdateClientState ReduceUpdateClientTypeSuccessAction(UpdateClientState state, UpdateClientTypeSuccessAction act) => state with
+        {
+            IsUpdating = false
+        };
+
         #endregion
 
         #region ClientState
@@ -368,6 +403,24 @@ public static ClientState ReduceUpdateAdvancedClientSettingsSuccessAction(Client
             };
         }
 
+        [ReducerMethod]
+        public static ClientState ReduceUpdateClientTypeAction(ClientState state, UpdateClientTypeAction act) => state with
+        {
+            IsLoading = true
+        };
+
+        [ReducerMethod]
+        public static ClientState ReduceUpdateClientTypeSuccessAction(ClientState state, UpdateClientTypeSuccessAction act)
+        {
+            var client = state.Client;
+            client.ClientType = act.ClientType;
+            return state with
+            {
+                Client = client,
+                IsLoading = false
+            };
+        }
+
         #endregion
 
         #region ClientScopesState

src/IdServer/SimpleIdServer.IdServer/Api/Clients/ClientsController.cs

@@ -782,6 +782,35 @@ await _busControl.Publish(new AddClientRoleFailureEvent
         }
     }
 
+    [HttpPut]
+    public async Task<IActionResult> UpdateClientType([FromRoute] string prefix, string id, [FromBody] UpdateClientTypeRequest request, CancellationToken cancellationToken)
+    {
+        prefix = prefix ?? Constants.DefaultRealm;
+        try
+        {
+            using (var transaction = _transactionBuilder.Build())
+            {
+                await CheckAccessToken(prefix, DefaultScopes.Clients.Name);
+                var result = await _clientRepository.GetById(prefix, id, cancellationToken);
+                if (result == null)
+                {
+                    throw new OAuthException(HttpStatusCode.NotFound, ErrorCodes.NOT_FOUND, string.Format(Global.UnknownClient, id));
+                }
+
+                result.ClientType = request.ClientType;
+                result.UpdateDateTime = DateTime.UtcNow;
+                _clientRepository.Update(result);
+                await transaction.Commit(cancellationToken);
+                return new NoContentResult();
+            }
+        }
+        catch (OAuthException ex)
+        {
+            _logger.LogError(ex.ToString());
+            return BuildError(ex);
+        }
+    }
+
     [HttpPut]
     public async Task<IActionResult> UpdateRealms([FromRoute] string prefix, string id, [FromBody] UpdateClientRealmsRequest request, CancellationToken cancellationToken)
     {

src/IdServer/SimpleIdServer.IdServer/Api/Clients/UpdateClientTypeRequest.cs

@@ -0,0 +1,13 @@
+// Copyright (c) SimpleIdServer. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+using SimpleIdServer.IdServer.Domains;
+
+namespace SimpleIdServer.IdServer.Api.Clients;
+
+public class UpdateClientTypeRequest
+{
+    public ClientTypes ClientType
+    {
+        get; set;
+    }
+}

src/IdServer/SimpleIdServer.IdServer/WebApplicationExtensions.cs

@@ -581,6 +581,9 @@ public static WebApplication UseSid(this WebApplication webApplication, bool coo
         webApplication.SidMapControllerRoute("RemoveClientSecret",
             pattern: (usePrefix ? "{prefix}/" : string.Empty) + DefaultEndpoints.Clients + "/{id}/secrets/{secretId}",
             defaults: new { controller = "Clients", action = "RemoveSecret" });
+        webApplication.SidMapControllerRoute("UpdateClientType",
+            pattern: (usePrefix ? "{prefix}/" : string.Empty) + DefaultEndpoints.Clients + "/{id}/type",
+            defaults: new { controller = "Clients", action = "UpdateClientType" });
 
 
         webApplication.SidMapControllerRoute("getActiveTemplate",