fix(Sdk): Fixed the IOAuth2AthenticationBuilder and implementation to reflect latest changes made to the OAuth2AuthenticationProperties

Author: cdavernas

src/ServerlessWorkflow.Sdk.UnitTests/Resources/workflows/operation.json

@@ -34,7 +34,7 @@
       "type": "operation",
       "actions": [
         {
-          "name": "Function",
+          "name": "Function1",
           "functionRef": {
             "refName": "Function",
             "arguments": {
@@ -43,7 +43,7 @@
           }
         },
         {
-          "name": "Function",
+          "name": "Function2",
           "eventRef": {
             "triggerEventRef": "ProducedEvent",
             "resultEventRef": "ConsumedEvent"

src/ServerlessWorkflow.Sdk/Models/OAuth2AuthenticationProperties.cs

@@ -114,13 +114,13 @@ public class OAuth2AuthenticationProperties
         public virtual string? SubjectToken { get; set; }
 
         /// <summary>
-        /// Gets/sets an identifier, as described in Section 3, that indicates the type of the security token in the "subject_token" parameter.
+        /// Gets/sets an identifie 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(Name = "subject_token_type", Order = 10)]
-        public virtual string? SubjectTokenType { get; set; }
+        public virtual OAuth2TokenType? SubjectTokenType { get; set; }
 
         /// <summary>
         /// 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.
@@ -138,7 +138,7 @@ public class OAuth2AuthenticationProperties
         [System.Text.Json.Serialization.JsonPropertyName("actor_token_type")]
         [ProtoMember(11)]
         [DataMember(Name = "actor_token_type", Order = 11)]
-        public virtual string? ActorTokenType { get; set; }
+        public virtual OAuth2TokenType? ActorTokenType { get; set; }
 
     }
 

src/ServerlessWorkflow.Sdk/OAuth2TokenType.cs

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021-Present The Serverless Workflow Specification Authors
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace ServerlessWorkflow.Sdk
+{
+    /// <summary>
+    /// Enumerates all supported token types
+    /// </summary>
+    [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.StringEnumConverterFactory))]
+    public enum OAuth2TokenType
+    {
+        /// <summary>
+        /// Indicates an access token
+        /// </summary>
+        [EnumMember(Value = "urn:ietf:params:oauth:token-type:access_token")]
+        AccessToken,
+        /// <summary>
+        /// Indicates an identity token
+        /// </summary>
+        [EnumMember(Value = "urn:ietf:params:oauth:token-type:id_token")]
+        IdentityToken
+    }
+
+}

src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.xml

@@ -83,25 +83,20 @@ public interface IOAuth2AuthenticationBuilder
         IOAuth2AuthenticationBuilder UseAudiences(params string[] audiences);
 
         /// <summary>
-        /// Configures the <see cref="AuthenticationDefinition"/> to exchange the specified subject token when requesting an access token
+        /// Configures 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>
-        /// <param name="token">The token to exchange</param>
+        /// <param name="tokenType">The type of the specified token</param>
+        /// <param name="token">The subject token</param>
         /// <returns>The configured <see cref="IOAuth2AuthenticationBuilder"/></returns>
-        IOAuth2AuthenticationBuilder WithSubjectToken(string token);
+        IOAuth2AuthenticationBuilder WithSubjectToken(OAuth2TokenType tokenType, string token);
 
         /// <summary>
-        /// Configures the <see cref="AuthenticationDefinition"/> to impersonate the specified user
+        /// Configures the 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>
-        /// <param name="subject">The subject of the user to impersonate</param>
+        /// <param name="tokenType">The type of the specified token</param>
+        /// <param name="token">The actor token</param>
         /// <returns>The configured <see cref="IOAuth2AuthenticationBuilder"/></returns>
-        IOAuth2AuthenticationBuilder WithRequestedSubject(string subject);
-
-        /// <summary>
-        /// Configures the <see cref="AuthenticationDefinition"/> to exchange an access token with a new one from the specified issuer
-        /// </summary>
-        /// <param name="issuer">The issuer to exchnage the token with</param>
-        /// <returns>The configured <see cref="IOAuth2AuthenticationBuilder"/></returns>
-        IOAuth2AuthenticationBuilder WithRequestedIssuer(string issuer);
+        IOAuth2AuthenticationBuilder WithActorToken(OAuth2TokenType tokenType, string token);
 
     }
 

src/ServerlessWorkflow.Sdk/Services/FluentBuilders/Interfaces/IOAuth2AuthenticationBuilder.cs

@@ -52,7 +52,7 @@ public virtual IOAuth2AuthenticationBuilder UseAudiences(params string[] audienc
         {
             if (audiences == null)
                 throw new ArgumentNullException(nameof(audiences));
-            this.Properties.Audience = audiences.ToList();
+            this.Properties.Audience = string.Join(" ", audiences);
             return this;
         }
 
@@ -68,7 +68,7 @@ public virtual IOAuth2AuthenticationBuilder UseScopes(params string[] scopes)
         {
             if (scopes == null)
                 throw new ArgumentNullException(nameof(scopes));
-            this.Properties.Audience = scopes.ToList();
+            this.Properties.Audience = string.Join(" ", scopes);
             return this;
         }
 
@@ -100,47 +100,40 @@ public virtual IOAuth2AuthenticationBuilder WithClientSecret(string clientSecret
         }
 
         /// <inheritdoc/>
-        public virtual IOAuth2AuthenticationBuilder WithPassword(string password)
-        {
-            if (string.IsNullOrWhiteSpace(password))
-                throw new ArgumentNullException(nameof(password));
-            this.Properties.Password = password;
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public virtual IOAuth2AuthenticationBuilder WithRequestedIssuer(string issuer)
+        public virtual IOAuth2AuthenticationBuilder WithUserName(string username)
         {
-            if (string.IsNullOrWhiteSpace(issuer))
-                throw new ArgumentNullException(nameof(issuer));
-            this.Properties.RequestedIssuer = issuer;
+            if (string.IsNullOrWhiteSpace(username))
+                throw new ArgumentNullException(nameof(username));
+            this.Properties.Username = username;
             return this;
         }
 
         /// <inheritdoc/>
-        public virtual IOAuth2AuthenticationBuilder WithRequestedSubject(string subject)
+        public virtual IOAuth2AuthenticationBuilder WithPassword(string password)
         {
-            if (string.IsNullOrWhiteSpace(subject))
-                throw new ArgumentNullException(nameof(subject));
-            this.Properties.RequestedSubject = subject;
+            if (string.IsNullOrWhiteSpace(password))
+                throw new ArgumentNullException(nameof(password));
+            this.Properties.Password = password;
             return this;
         }
 
         /// <inheritdoc/>
-        public virtual IOAuth2AuthenticationBuilder WithSubjectToken(string token)
+        public virtual IOAuth2AuthenticationBuilder WithSubjectToken(OAuth2TokenType tokenType, string token)
         {
             if (string.IsNullOrWhiteSpace(token))
                 throw new ArgumentNullException(nameof(token));
+            this.Properties.SubjectTokenType = tokenType;
             this.Properties.SubjectToken = token;
             return this;
         }
 
         /// <inheritdoc/>
-        public virtual IOAuth2AuthenticationBuilder WithUserName(string username)
+        public virtual IOAuth2AuthenticationBuilder WithActorToken(OAuth2TokenType tokenType, string token)
         {
-            if (string.IsNullOrWhiteSpace(username))
-                throw new ArgumentNullException(nameof(username));
-            this.Properties.Username = username;
+            if (string.IsNullOrWhiteSpace(token))
+                throw new ArgumentNullException(nameof(token));
+            this.Properties.ActorTokenType = tokenType;
+            this.Properties.ActorToken = token;
             return this;
         }