Merge pull request #343 from jaliyaudagedara/fix/use-of-correction-authentication-properties

cdavernas · web-flow · commit bb4d95ba1eed · 2023-03-24T13:11:48.000+01:00
fix(Worker/Dashboard): Use of correction authentication properties
diff --git a/src/apps/Synapse.Worker/Services/Processors/FunctionProcessor.cs b/src/apps/Synapse.Worker/Services/Processors/FunctionProcessor.cs
@@ -93,10 +93,15 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
                     };
                 }
                 this.Authentication = auth;
-                if (this.Authentication != null) this.Authorization = await AuthorizationInfo.CreateAsync(this.ServiceProvider, this.Authentication, cancellationToken);
+                if (this.Authentication != null)
+                {
+                    this.Authorization = await AuthorizationInfo.CreateAsync(this.ServiceProvider, this.Authentication, cancellationToken);
+                }
             }
             else
+            {
                 throw new NullReferenceException($"Failed to find the authentication definition with name '{this.Function.AuthRef}'");
+            }
         }
     }
 
@@ -106,7 +111,10 @@ protected override async Task OnNextAsync(IV1WorkflowActivityIntegrationEvent e,
         if (e is V1WorkflowActivityCompletedIntegrationEvent completedEvent)
         {
             var output = completedEvent.Output.ToObject();
-            if (this.Action.ActionDataFilter != null) output = await this.Context.FilterOutputAsync(this.Action, output!, this.Authorization, cancellationToken);
+            if (this.Action.ActionDataFilter != null)
+            {
+                output = await this.Context.FilterOutputAsync(this.Action, output!, this.Authorization, cancellationToken);
+            }
             await base.OnNextAsync(new V1WorkflowActivityCompletedIntegrationEvent(this.Activity.Id, output), cancellationToken);
         }
         else
diff --git a/src/dashboard/Synapse.Dashboard/Features/Workflows/WorkflowEditor/AuthenticationEditor.razor b/src/dashboard/Synapse.Dashboard/Features/Workflows/WorkflowEditor/AuthenticationEditor.razor
@@ -16,7 +16,7 @@
 
 @namespace Synapse.Dashboard
 
-@if(authentication != null)
+@if (authentication != null)
 {
     <table class="table table-striped">
         <tbody>
@@ -30,7 +30,7 @@
                 <td>
                     <select class="form-select bg-secondary text-white"
                     @onchange="async e => await OnAuthenticationSchemeChangedAsync(EnumHelper.Parse<AuthenticationScheme>((string)e.Value!))">
-                        @foreach(var scheme in Enum.GetValues<AuthenticationScheme>())
+                        @foreach (var scheme in Enum.GetValues<AuthenticationScheme>())
                         {
                             var schemeStr = @EnumHelper.Stringify(scheme);
                             <option value="@schemeStr" selected="@(authentication.Scheme == scheme)">@schemeStr</option>
@@ -59,13 +59,13 @@
                     </td>
                 </Header>
                 <Body>
-                    @if(!useSecretBasedProperties)
+                    @if (!useSecretBasedProperties)
                     {
                         <td colspan="3">
                             @switch (authentication.Scheme)
                             {
                                 case AuthenticationScheme.Basic:
-                                    if(authentication.Properties is not BasicAuthenticationProperties basic)
+                                    if (authentication.Properties is not BasicAuthenticationProperties basic)
                                     {
                                         basic = new();
                                         authentication.Properties = basic;
@@ -86,7 +86,7 @@
                                     </table>
                                     break;
                                 case AuthenticationScheme.Bearer:
-                                    if(authentication.Properties is not BearerAuthenticationProperties bearer)
+                                    if (authentication.Properties is not BearerAuthenticationProperties bearer)
                                     {
                                         bearer = new();
                                         authentication.Properties = bearer;
@@ -102,7 +102,7 @@
                                     </table>
                                     break;
                                 case AuthenticationScheme.OAuth2:
-                                    if(authentication.Properties is not OAuth2AuthenticationProperties oauth2)
+                                    if (authentication.Properties is not OAuth2AuthenticationProperties oauth2)
                                     {
                                         oauth2 = new();
                                         authentication.Properties = oauth2;
@@ -147,7 +147,7 @@
         if (Authentication == null)
             return;
         this.useSecretBasedProperties = !useSecretBasedProperties;
-        if(!this.useSecretBasedProperties)
+        if (!this.useSecretBasedProperties)
             return;
         this.Authentication.SecretRef = "undefined";
         await this.OnChange.InvokeAsync(this.Authentication);
@@ -166,7 +166,7 @@
             {
                 AuthenticationScheme.Basic => new BasicAuthenticationProperties(),
                 AuthenticationScheme.Bearer => new BearerAuthenticationProperties(),
-                AuthenticationScheme.OAuth2 => new BearerAuthenticationProperties(),
+                AuthenticationScheme.OAuth2 => new OAuth2AuthenticationProperties(),
                 _ => throw new NotSupportedException($"The specified {nameof(AuthenticationScheme)} '{a.Scheme}' is not supported")
             };
         });

Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,15 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke`
`93`	`93`	`};`
`94`	`94`	`}`
`95`	`95`	`this.Authentication = auth;`
`96`		`- if (this.Authentication != null) this.Authorization = await AuthorizationInfo.CreateAsync(this.ServiceProvider, this.Authentication, cancellationToken);`
	`96`	`+ if (this.Authentication != null)`
	`97`	`+ {`
	`98`	`+ this.Authorization = await AuthorizationInfo.CreateAsync(this.ServiceProvider, this.Authentication, cancellationToken);`
	`99`	`+ }`
`97`	`100`	`}`
`98`	`101`	`else`
	`102`	`+ {`
`99`	`103`	`throw new NullReferenceException($"Failed to find the authentication definition with name '{this.Function.AuthRef}'");`
	`104`	`+ }`
`100`	`105`	`}`
`101`	`106`	`}`
`102`	`107`
`@@ -106,7 +111,10 @@ protected override async Task OnNextAsync(IV1WorkflowActivityIntegrationEvent e,`
`106`	`111`	`if (e is V1WorkflowActivityCompletedIntegrationEvent completedEvent)`
`107`	`112`	`{`
`108`	`113`	`var output = completedEvent.Output.ToObject();`
`109`		`- if (this.Action.ActionDataFilter != null) output = await this.Context.FilterOutputAsync(this.Action, output!, this.Authorization, cancellationToken);`
	`114`	`+ if (this.Action.ActionDataFilter != null)`
	`115`	`+ {`
	`116`	`+ output = await this.Context.FilterOutputAsync(this.Action, output!, this.Authorization, cancellationToken);`
	`117`	`+ }`
`110`	`118`	`await base.OnNextAsync(new V1WorkflowActivityCompletedIntegrationEvent(this.Activity.Id, output), cancellationToken);`
`111`	`119`	`}`
`112`	`120`	`else`