Added method SetCustomClaim(const AName: string; const AValue: TValue…

…) to the IJOSEProducerBuilder interface
paolo-rossi · Jul 9, 2022 · 2480e0b · 2480e0b
1 parent 44c54d9
commit 2480e0b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Source/Common/JOSE.Types.JSON.pas b/Source/Common/JOSE.Types.JSON.pas
@@ -49,8 +49,6 @@   EJSONConversionException = class(Exception);
   TJSONArray = System.JSON.TJSONArray;
 
   TJSONUtils = class
-  private
-    class procedure SetJSONRttiValue(const AName: string; const AValue: TValue; AJSON: TJSONObject); overload;
   public
     class function ToJSON(AJSONValue: TJSONValue): string; static;
     class function CheckPair(const AName: string; AJSON: TJSONObject): Boolean;
@@ -62,6 +60,7 @@   TJSONUtils = class
     class function GetJSONValueAsEpoch(const AName: string; AJSON: TJSONObject): TDateTime;
 
     class procedure SetJSONValue(const AName: string; AValue: TJSONValue; AJSON: TJSONObject); overload;
+    class procedure SetJSONRttiValue(const AName: string; const AValue: TValue; AJSON: TJSONObject); overload;
     class procedure SetJSONValueFrom<T>(const AName: string; const AValue: T; AJSON: TJSONObject);
 
     class procedure RemoveJSONNode(const AName: string; AJSON: TJSONObject);

diff --git a/Source/JOSE/JOSE.Core.JWT.pas b/Source/JOSE/JOSE.Core.JWT.pas
@@ -111,6 +111,7 @@   TJWTClaims = class(TJOSEBase)
   public
     constructor Create; virtual;
 
+    procedure SetClaim(const AName: string; const AValue: TValue);
     procedure SetClaimOfType<T>(const AName: string; const AValue: T);
     function GenerateJWTId(ANumberOfBytes: Integer = 16): string;
 
@@ -221,6 +222,11 @@ destructor TJWT.Destroy;
 
 { TJWTClaims }
 
+procedure TJWTClaims.SetClaim(const AName: string; const AValue: TValue);
+begin
+  TJSONUtils.SetJSONRttiValue(AName, AValue, FJSON);
+end;
+
 procedure TJWTClaims.SetClaimOfType<T>(const AName: string; const AValue: T);
 begin
   AddPairOfType<T>(AName, AValue);

diff --git a/Source/JOSE/JOSE.Producer.pas b/Source/JOSE/JOSE.Producer.pas
@@ -25,6 +25,7 @@ interface
 
 uses
   System.SysUtils,
+  System.Rtti,
   JOSE.Types.Bytes,
   JOSE.Core.Base,
   JOSE.Core.Parts,
@@ -67,6 +68,7 @@   TJOSEProducer = class(TInterfacedObject, IJOSEProducer)
     function SetJWTId(const AValue: string): IJOSEProducerBuilder;
     function SetNotBefore(AValue: TDateTime): IJOSEProducerBuilder;
     function SetSubject(const AValue: string): IJOSEProducerBuilder;
+    function SetCustomClaim(const AName: string; const AValue: TValue): IJOSEProducerBuilder;
 
     function SetKey(const AKey: TJOSEBytes): IJOSEProducerBuilder;
     function SetKeyPair(const APublicKey, APrivateKey: TJOSEBytes): IJOSEProducerBuilder;
@@ -97,6 +99,7 @@   TJOSEProducerBuilder = class(TInterfacedObject, IJOSEProducerBuilder)
     function SetJWTId(const AValue: string): IJOSEProducerBuilder;
     function SetNotBefore(AValue: TDateTime): IJOSEProducerBuilder;
     function SetSubject(const AValue: string): IJOSEProducerBuilder;
+    function SetCustomClaim(const AName: string; const AValue: TValue): IJOSEProducerBuilder;
 
     function SetKey(const AKey: TJOSEBytes): IJOSEProducerBuilder;
     function SetKeyPair(const APublicKey, APrivateKey: TJOSEBytes): IJOSEProducerBuilder;
@@ -217,6 +220,12 @@ function TJOSEProducerBuilder.SetAudience(const AValue: TArray<string>): IJOSEPr
   Result := Self;
 end;
 
+function TJOSEProducerBuilder.SetCustomClaim(const AName: string; const AValue: TValue): IJOSEProducerBuilder;
+begin
+  GetJWT.Claims.SetClaim(AName, AValue);
+  Result := Self;
+end;
+
 function TJOSEProducerBuilder.SetExpiration(AValue: TDateTime): IJOSEProducerBuilder;
 begin
   GetJWT.Claims.Expiration := AValue;