fix(Sdk): Fixed serialization of OAUTH2 properties to expected snake case by decorating its properties with the appropriate attributes

fix(Sdk): Fixed the OAuth2GrantType enum by replacing string equivalencies with the proper OAUTH2 values

Author: cdavernas

src/ServerlessWorkflow.Sdk/Models/OAuth2AuthenticationProperties.cs

@@ -33,83 +33,112 @@ public class OAuth2AuthenticationProperties
         /// <summary>
         /// Gets/sets the OAuth2 grant type to use
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("grant_type")]
+        [System.Text.Json.Serialization.JsonPropertyName("grant_type")]
         [ProtoMember(1)]
-        [DataMember(Order = 1)]
+        [DataMember(Name= "grant_type", Order = 1)]
         public virtual OAuth2GrantType GrantType { get; set; }
 
         /// <summary>
         /// Gets/sets the uri of the OAuth2 authority to use to generate an access token
         /// </summary>
         [Required]
-        [Newtonsoft.Json.JsonRequired]
+        [Newtonsoft.Json.JsonRequired, Newtonsoft.Json.JsonProperty("authority")]
+        [System.Text.Json.Serialization.JsonPropertyName("authority")]
         [ProtoMember(2, IsRequired = true)]
-        [DataMember(Order = 2, IsRequired = true)]
+        [DataMember(Name = "authority", Order = 2, IsRequired = true)]
         public virtual Uri Authority { get; set; } = null!;
 
         /// <summary>
         /// Gets/sets the id of the OAuth2 client to use
         /// </summary>
         [Required]
-        [Newtonsoft.Json.JsonRequired]
+        [Newtonsoft.Json.JsonRequired, Newtonsoft.Json.JsonProperty("client_id")]
+        [System.Text.Json.Serialization.JsonPropertyName("client_id")]
         [ProtoMember(3, IsRequired = true)]
-        [DataMember(Order = 3, IsRequired = true)]
+        [DataMember(Name = "client_id", Order = 3, IsRequired = true)]
         public virtual string ClientId { get; set; } = null!;
 
         /// <summary>
         /// Gets/sets the secret of the non-public OAuth2 client to use. Required when <see cref="GrantType"/> has been set to <see cref="OAuth2GrantType.TokenExchange"/>
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("client_secret")]
+        [System.Text.Json.Serialization.JsonPropertyName("client_secret")]
         [ProtoMember(4)]
-        [DataMember(Order = 4)]
+        [DataMember(Name = "client_secret", Order = 4)]
         public virtual string? ClientSecret { get; set; }
 
         /// <summary>
         /// Gets/sets the username to use when authenticating
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("username")]
+        [System.Text.Json.Serialization.JsonPropertyName("username")]
         [ProtoMember(5)]
-        [DataMember(Order = 5)]
+        [DataMember(Name = "username", Order = 5)]
         public virtual string? Username { get; set; }
 
         /// <summary>
         /// Gets/sets the password to use when authenticating
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("password")]
+        [System.Text.Json.Serialization.JsonPropertyName("password")]
         [ProtoMember(6)]
-        [DataMember(Order = 6)]
+        [DataMember(Name = "password", Order = 6)]
         public virtual string? Password { get; set; }
 
         /// <summary>
-        /// Gets/sets a <see cref="List{T}"/> containing the authorized scopes of the resulting token
+        /// Gets/sets a space-separated list containing the authorized scopes to request
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("scope")]
+        [System.Text.Json.Serialization.JsonPropertyName("scope")]
         [ProtoMember(7)]
-        [DataMember(Order = 7)]
-        public virtual List<string>? Scopes { get; set; }
+        [DataMember(Name = "scope", Order = 7)]
+        public virtual string? Scope { get; set; }
 
         /// <summary>
-        /// Gets/sets a <see cref="List{T}"/> containing the authorized audiences of the resulting token
+        /// Gets/sets a space-separated list containing the authorized audiences of the resulting token
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("audience")]
+        [System.Text.Json.Serialization.JsonPropertyName("audience")]
         [ProtoMember(8)]
-        [DataMember(Order = 8)]
-        public virtual List<string>? Audiences { get; set; }
+        [DataMember(Name = "audience", Order = 8)]
+        public virtual string? Audience { get; set; }
 
         /// <summary>
-        /// Gets/sets the token to exchange for Impersonation
+        /// Gets/sets the token that represents the identity of the party on behalf of whom the request is being made.Typically, the subject of this token will be the subject of the security token issued in response to the request.
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("subject_token")]
+        [System.Text.Json.Serialization.JsonPropertyName("subject_token")]
         [ProtoMember(9)]
-        [DataMember(Order = 9)]
+        [DataMember(Name = "subject_token", Order = 9)]
         public virtual string? SubjectToken { get; set; }
 
         /// <summary>
-        /// Gets/sets the requested subject for Impersonation and Direct Naked Impersonation, which can be the id or the username of the user to impersonate
+        /// Gets/sets an identifier, as described in Section 3, that indicates the type of the security token in the "subject_token" parameter.
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("subject_token_type")]
+        [System.Text.Json.Serialization.JsonPropertyName("subject_token_type")]
         [ProtoMember(10)]
-        [DataMember(Order = 10)]
-        public virtual string? RequestedSubject { get; set; }
+        [DataMember(Name = "subject_token_type", Order = 10)]
+        public virtual string? SubjectTokenType { get; set; }
 
         /// <summary>
-        /// Gets/sets the issuer that must generate a new token in return for the exchanged one
+        /// Gets/sets a token that represents the identity of the acting party.Typically, this will be the party that is authorized to use the requested security token and act on behalf of the subject.
         /// </summary>
+        [Newtonsoft.Json.JsonProperty("actor_token")]
+        [System.Text.Json.Serialization.JsonPropertyName("actor_token")]
         [ProtoMember(11)]
-        [DataMember(Order = 11)]
-        public virtual string? RequestedIssuer { get; set; }
+        [DataMember(Name = "actor_token", Order = 11)]
+        public virtual string? ActorToken { get; set; }
+
+        /// <summary>
+        /// Gets/sets an identifier, as described in Section 3, that indicates the type of the security token in the "actor_token" parameter. This is REQUIRED when the "actor_token" parameter is present in the request but MUST NOT be included otherwise.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty("actor_token_type")]
+        [System.Text.Json.Serialization.JsonPropertyName("actor_token_type")]
+        [ProtoMember(11)]
+        [DataMember(Name = "actor_token_type", Order = 11)]
+        public virtual string? ActorTokenType { get; set; }
 
     }
 

src/ServerlessWorkflow.Sdk/OAuth2GrantType.cs

@@ -32,12 +32,12 @@ public enum OAuth2GrantType
         /// <summary>
         /// Indicates the <see href="https://datatracker.ietf.org/doc/html/rfc6749#section-4.4">client credentials grant type</see>
         /// </summary>
-        [EnumMember(Value = "clientCredentials")]
+        [EnumMember(Value = "client_credentials")]
         ClientCredentials,
         /// <summary>
         /// Indicates the <see href="https://datatracker.ietf.org/doc/html/rfc8693">token exchange grant type</see>
         /// </summary>
-        [EnumMember(Value = "tokenExchange")]
+        [EnumMember(Value = "urn:ietf:params:oauth:grant-type:token-exchange")]
         TokenExchange
     }
 

src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj

@@ -4,9 +4,9 @@
     <TargetFramework>net6.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <NeutralLanguage>en</NeutralLanguage>
-    <AssemblyVersion>0.8.1.10</AssemblyVersion>
-    <FileVersion>0.8.1.10</FileVersion>
-    <Version>0.8.1.10</Version>
+    <AssemblyVersion>0.8.1.11</AssemblyVersion>
+    <FileVersion>0.8.1.11</FileVersion>
+    <Version>0.8.1.11</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>

src/ServerlessWorkflow.Sdk/Services/FluentBuilders/OAuth2AuthenticationBuilder.cs

@@ -52,7 +52,7 @@ public virtual IOAuth2AuthenticationBuilder UseAudiences(params string[] audienc
         {
             if (audiences == null)
                 throw new ArgumentNullException(nameof(audiences));
-            this.Properties.Audiences = audiences.ToList();
+            this.Properties.Audience = audiences.ToList();
             return this;
         }
 
@@ -68,7 +68,7 @@ public virtual IOAuth2AuthenticationBuilder UseScopes(params string[] scopes)
         {
             if (scopes == null)
                 throw new ArgumentNullException(nameof(scopes));
-            this.Properties.Audiences = scopes.ToList();
+            this.Properties.Audience = scopes.ToList();
             return this;
         }