Merge pull request #333 from neuroglia-io/fix-produce-event-activity

- Fixed the ProduceEventProcessor to publish the event using the newly added PublishEvent context method 
- Fixed the ProduceEventProcessor to publish the event using the newly added PublishEvent context method
- Fixed the OAuth2TokenManager to convert token request properties to snake case

Author: cdavernas

src/apis/runtime/Synapse.Apis.Runtime.Core/Services/ISynapseRuntimeApi.cs

@@ -16,6 +16,7 @@
  */
 using Neuroglia.Serialization;
 using ServerlessWorkflow.Sdk.Models;
+using Synapse.Integration.Commands.Events;
 using Synapse.Integration.Commands.Generic;
 using Synapse.Integration.Commands.WorkflowActivities;
 using Synapse.Integration.Commands.WorkflowInstances;
@@ -76,6 +77,15 @@ public interface ISynapseRuntimeApi
         [OperationContract]
         Task SetCorrelationMappingAsync(V1SetWorkflowInstanceCorrelationMappingCommand command, CancellationToken cancellationToken = default);
 
+        /// <summary>
+        /// Publishes the specified <see cref="V1Event"/>
+        /// </summary>
+        /// <param name="command">The object that describes the command to execute</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/></param>
+        /// <returns>A new awaitable <see cref="Task"/></returns>
+        [OperationContract]
+        Task PublishEventAsync(V1PublishEventCommand command, CancellationToken cancellationToken = default);
+
         /// <summary>
         /// Gets all the activities (including non-operative ones) of the specified workflow instance
         /// </summary>

src/apis/runtime/Synapse.Apis.Runtime.Grpc.Client/Services/ISynapseGrpcRuntimeApi.cs

@@ -19,6 +19,7 @@
 using ProtoBuf.Grpc;
 using ServerlessWorkflow.Sdk.Models;
 using Synapse.Apis.Runtime.Grpc.Models;
+using Synapse.Integration.Commands.Events;
 using Synapse.Integration.Commands.WorkflowActivities;
 using Synapse.Integration.Commands.WorkflowInstances;
 using Synapse.Integration.Models;
@@ -80,6 +81,15 @@ public interface ISynapseGrpcRuntimeApi
         [OperationContract]
         Task<GrpcApiResult<V1WorkflowInstance>> SetCorrelationMappingAsync(V1SetWorkflowInstanceCorrelationMappingCommand command, CallContext context = default);
 
+        /// <summary>
+        /// Publishes the specified <see cref="V1Event"/>
+        /// </summary>
+        /// <param name="command">The object that describes the command to execute</param>
+        /// <param name="context">The current <see cref="CallContext"/></param>
+        /// <returns>A new awaitable <see cref="Task"/></returns>
+        [OperationContract]
+        Task<GrpcApiResult> PublishEventAsync(V1PublishEventCommand command, CallContext context = default);
+
         /// <summary>
         /// Gets the activities (including non-operative ones) of the specified workflow instance
         /// </summary>

src/apis/runtime/Synapse.Apis.Runtime.Grpc.Client/Services/SynapseGrpcRuntimeApiClient.cs

@@ -18,6 +18,7 @@
 using Microsoft.Extensions.Logging;
 using Neuroglia;
 using Neuroglia.Serialization;
+using Synapse.Integration.Commands.Events;
 using Synapse.Integration.Commands.Generic;
 using Synapse.Integration.Commands.WorkflowActivities;
 using Synapse.Integration.Commands.WorkflowInstances;
@@ -87,11 +88,17 @@ public virtual async Task<V1WorkflowInstance> StartAsync(string workflowInstance
         public virtual async Task<V1Event?> ConsumeOrBeginCorrelateEventAsync(V1ConsumeWorkflowInstancePendingEventCommand command, CancellationToken cancellationToken = default)
         {
             var result = await this.RuntimeApi.ConsumeOrBeginCorrelateEventAsync(command, cancellationToken);
-            if (!result.Succeeded)
-                throw new OperationResultException(new OperationResult(result.Code, result.Errors?.Select(e => new Neuroglia.Error(e.Code, e.Message))?.ToArray()));
+            if (!result.Succeeded) throw new OperationResultException(new OperationResult(result.Code, result.Errors?.Select(e => new Neuroglia.Error(e.Code, e.Message))?.ToArray()));
             return result.Data!;
         }
 
+        /// <inheritdoc/>
+        public virtual async Task PublishEventAsync(V1PublishEventCommand command, CancellationToken cancellationToken = default)
+        {
+            var result = await this.RuntimeApi.PublishEventAsync(command, cancellationToken);
+            if (!result.Succeeded) throw new OperationResultException(new OperationResult(result.Code, result.Errors?.Select(e => new Neuroglia.Error(e.Code, e.Message))?.ToArray()));
+        }
+
         /// <inheritdoc/>
         public virtual async Task<List<V1WorkflowActivity>> GetActivitiesAsync(string workflowInstanceId, CancellationToken cancellationToken = default)
         {

src/apis/runtime/Synapse.Apis.Runtime.Grpc/Services/SynapseGrpcRuntimeApi.cs

@@ -22,6 +22,7 @@
 using ProtoBuf.Grpc;
 using Synapse.Apis.Runtime.Grpc.Models;
 using Synapse.Infrastructure.Services;
+using Synapse.Integration.Commands.Events;
 using Synapse.Integration.Commands.WorkflowActivities;
 using Synapse.Integration.Commands.WorkflowInstances;
 using Synapse.Integration.Models;
@@ -103,6 +104,12 @@ public virtual async Task<GrpcApiResult<V1WorkflowInstance>> StartAsync(string w
             return GrpcApiResult.CreateFor(await this.Mediator.ExecuteAsync(Mapper.Map<Application.Commands.WorkflowInstances.V1ConsumeOrBeginCorrelateEventCommand>(command), context.CancellationToken));
         }
 
+        /// <inheritdoc/>
+        public virtual async Task<GrpcApiResult> PublishEventAsync(V1PublishEventCommand command, CallContext context = default)
+        {
+            return GrpcApiResult.CreateFor(await this.Mediator.ExecuteAsync(Mapper.Map<Application.Commands.Events.V1PublishEventCommand>(command), context.CancellationToken));
+        }
+
         /// <inheritdoc/>
         public virtual async Task<GrpcApiResult<bool>> TryCorrelateAsync(V1TryCorrelateWorkflowInstanceCommand command, CallContext context = default)
         {

src/apis/runtime/Synapse.Apis.Runtime.Ipc.Client/Services/SynapseIpcRuntimeApiClient.cs

@@ -4,6 +4,7 @@
 using Neuroglia.Mediation;
 using Neuroglia.Serialization;
 using Synapse.Infrastructure.Services;
+using Synapse.Integration.Commands.Events;
 using Synapse.Integration.Commands.WorkflowActivities;
 using Synapse.Integration.Commands.WorkflowInstances;
 using Synapse.Integration.Models;
@@ -93,6 +94,13 @@ public virtual async Task<V1WorkflowInstance> StartAsync(string workflowInstance
             return await this.Mediator.ExecuteAndUnwrapAsync(this.Mapper.Map<Application.Commands.WorkflowInstances.V1ConsumeOrBeginCorrelateEventCommand>(command), cancellationToken);
         }
 
+        /// <inheritdoc/>
+        public virtual async Task PublishEventAsync(V1PublishEventCommand command, CancellationToken cancellationToken = default)
+        {
+            if (command == null) throw new ArgumentNullException(nameof(command));
+            await this.Mediator.ExecuteAndUnwrapAsync(this.Mapper.Map<Application.Commands.Events.V1PublishEventCommand>(command), cancellationToken);
+        }
+
         /// <inheritdoc/>
         public virtual async Task<List<V1WorkflowActivity>> GetActivitiesAsync(string workflowInstanceId, CancellationToken cancellationToken = default)
         {

src/apps/Synapse.Server/appsettings.json

@@ -14,7 +14,7 @@
   },
   "CloudEvents": {
     "Sink": {
-      "Uri": "https://webhook.site/0d0f64a9-fc21-49bb-a2a9-e230929dcc0f"
+      "Uri": "https://webhook.site/2e78793f-69a5-4ef6-8fdf-d467a9d6f1c6"
     }
   }
 }

src/apps/Synapse.Worker/Services/IWorkflowRuntimeContext.cs

@@ -59,6 +59,14 @@ public interface IWorkflowRuntimeContext
         /// <returns>The secret with the specified name</returns>
         Task<T> GetSecretAsync<T>(string secret, CancellationToken cancellationToken = default);
 
+        /// <summary>
+        /// Publishes the specified <see cref="V1Event"/>
+        /// </summary>
+        /// <param name="e">The <see cref="V1Event"/> to publish</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/></param>
+        /// <returns>A new awaitable <see cref="Task"/></returns>
+        Task PublishEventAsync(V1Event e, CancellationToken cancellationToken = default);
+
     }
 
 }

src/apps/Synapse.Worker/Services/OAuth2TokenManager.cs

@@ -15,6 +15,7 @@
  *
  */
 
+using GraphQL.Client.Abstractions.Utilities;
 using IdentityModel.Client;
 
 namespace Synapse.Worker.Services
@@ -68,7 +69,7 @@ public virtual async Task<OAuth2Token> GetTokenAsync(OAuth2AuthenticationPropert
             var tokenKey = $"{oauthProperties.ClientId}@{oauthProperties.Authority}";
             var json = await this.JsonSerializer.SerializeAsync(oauthProperties, cancellationToken);
             var properties = await this.JsonSerializer.DeserializeAsync<Dictionary<string, string>>(json, cancellationToken);
-            properties = properties.Where(kvp => !string.IsNullOrWhiteSpace(kvp.Value)).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+            properties = properties.Where(kvp => !string.IsNullOrWhiteSpace(kvp.Value)).ToDictionary(kvp => kvp.Key.ToSnakeCase(), kvp => kvp.Value);
             properties.Remove("authority");
             if(this.Tokens.TryGetValue(tokenKey, out var token)
                 && token != null)

src/apps/Synapse.Worker/Services/Processors/ProduceEventProcessor.cs

@@ -15,7 +15,6 @@
  *
  */
 
-using CloudNative.CloudEvents;
 using Synapse.Integration.Events.WorkflowActivities;
 using System.Net.Mime;
 
@@ -67,13 +66,14 @@ protected override async Task ProcessAsync(CancellationToken cancellationToken)
         {
             try
             {
-                var e = new CloudEvent()
+                var e = new V1Event()
                 {
                     Id = Guid.NewGuid().ToString(),
                     Type = this.EventDefinition.Type,
                     Source = new(this.EventDefinition.Source!),
                     DataContentType = MediaTypeNames.Application.Json,
-                    Data = this.Activity.Input
+                    Data = this.Activity.Input,
+                    ExtensionAttributes = new()
                 };
                 if(this.EventDefinition.Correlations != null)
                 {
@@ -91,10 +91,12 @@ protected override async Task ProcessAsync(CancellationToken cancellationToken)
                                 value = (await this.Context.EvaluateAsync(value, await this.Context.Workflow.GetActivityStateDataAsync(this.Activity, cancellationToken), cancellationToken)!)!.ToString();
                             await this.Context.Workflow.SetCorrelationMappingAsync(correlation.ContextAttributeName, value!, cancellationToken);
                         }
-                        e.SetAttributeFromString(correlation.ContextAttributeName, value!);
+                        e.ExtensionAttributes.Add(correlation.ContextAttributeName, Dynamic.FromObject(value));
                     }
                 }
-                this.IntegrationEventBus.OutboundStream.OnNext(e);
+
+                await this.Context.PublishEventAsync(e, cancellationToken);
+
                 await this.OnNextAsync(new V1WorkflowActivityCompletedIntegrationEvent(this.Activity.Id, this.Activity.Input), cancellationToken);
                 await this.OnCompletedAsync(cancellationToken);
             }

src/apps/Synapse.Worker/Services/WorkflowRuntimeContext.cs

@@ -171,6 +171,13 @@ public virtual async Task<T> GetSecretAsync<T>(string secret, CancellationToken
             };
         }
 
+        /// <inheritdoc/>
+        public virtual async Task PublishEventAsync(V1Event e, CancellationToken cancellationToken = default)
+        {
+            if (e == null) throw new ArgumentNullException(nameof(e));
+            await this.RuntimeApi.PublishEventAsync(new() { Event = e }, cancellationToken);
+        }
+
         /// <summary>
         /// Builds the runtime expression arguments
         /// </summary>