Ticket #878 : WIP

Author: habarthierry-hue

src/IdServer/SimpleIdServer.IdServer.Domains/Client.cs

@@ -24,7 +24,9 @@ public class Client : ITranslatable, IEquatable<Client>
     {
         [JsonPropertyName(OAuthClientParameters.Id)]
         public string Id { get; set; }
-        public string ClientSecret { get; set; } = null!;
+        [JsonIgnore]
+        public string ClientSecret { get; set; } = "";
+        [JsonIgnore]
         public DateTime? ClientSecretExpirationTime { get; set; }
         [JsonPropertyName(OAuthClientParameters.Source)]
         public string? Source { get; set; }
@@ -615,7 +617,7 @@ public ClientSecret PlainSecret
         {
             get
             {
-                return Secrets.SingleOrDefault(s => s.Alg == HashAlgs.PLAINTEXT && !s.IsExpired);
+                return Secrets.SingleOrDefault(s => s.Alg == HashAlgs.PLAINTEXT && !s.IsInactive);
             }
         }
 
@@ -738,6 +740,12 @@ public JsonObject Serialize(string baseUrl)
         {
             var result = JsonSerializer.SerializeToNode(this).AsObject();
             result.Add(OAuthClientParameters.RegistrationClientUri, $"{baseUrl}/{ClientId}");
+            var plainSecret = Secrets.SingleOrDefault(s => s.Alg == HashAlgs.PLAINTEXT && !s.IsInactive);
+            if(plainSecret != null)
+            {
+                result.Add(OAuthClientParameters.ClientSecret, plainSecret.Value);
+            }
+
             return result;
         }
     }

src/IdServer/SimpleIdServer.IdServer.Domains/ClientSecret.cs

@@ -1,7 +1,9 @@
 // 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.DTOs;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace SimpleIdServer.IdServer.Domains;
 
@@ -26,42 +28,56 @@ public class ClientSecret
         (HashAlgs.PLAINTEXT, (string pwd) => pwd)
     };
 
+    [JsonPropertyName(ClientSecretNames.Id)]
     public string Id
     {
         get; set;
     }
 
+    [JsonPropertyName(ClientSecretNames.Value)]
     public string Value
     {
         get; set;
     }
 
+    [JsonPropertyName(ClientSecretNames.Alg)]
     public HashAlgs Alg
     {
         get; set;
     }
 
+    [JsonPropertyName(ClientSecretNames.ExpirationDateTime)]
     public DateTime? ExpirationDateTime
     {
         get; set;
     }
 
+    [JsonPropertyName(ClientSecretNames.CreateDateTime)]
     public DateTime CreateDateTime
     {
         get; set;
     }
 
+    [JsonPropertyName(ClientSecretNames.IsActive)]
     public bool IsActive
     {
         get; set;
     } = true;
 
+    public bool IsInactive
+    {
+        get
+        {
+            return !IsActive || IsExpired;
+        }
+    }
+
     public bool IsExpired
     {
         get
         {
             if (ExpirationDateTime.HasValue == false) return false;
-            return ExpirationDateTime.Value < DateTime.UtcNow && IsActive;
+            return ExpirationDateTime.Value < DateTime.UtcNow;
         }
     }
 

src/IdServer/SimpleIdServer.IdServer.Domains/DTOs/ClientSecretNames.cs

@@ -10,4 +10,7 @@ public class ClientSecretNames
     public const string Alg = "alg";
     public const string Value = "value";
     public const string Id = "id";
+    public const string ExpirationDateTime = "expiration_date_time";
+    public const string CreateDateTime = "create_date_time";
+    public const string IsActive = "is_active";
 }

src/IdServer/SimpleIdServer.IdServer.Domains/DTOs/OAuthClientParameters.cs

@@ -8,6 +8,7 @@ public class OAuthClientParameters
         public const string IsPublic = "is_public";
         public const string ClientId = "client_id";
         public const string ClientType = "client_type";
+        public const string ClientSecret = "client_secret";
         public const string ClientSecrets = "client_secrets";
         public const string ClientIdIssuedAt = "client_id_issued_at";
         public const string RegistrationAccessToken = "registration_access_token";