Minor service updates (#132)

* Minor updates to the connection service processing request logic. Marked several methods that weren't previously marked as virtual so they can be overriden. * Bump version of the other related packages.
trinsic-id · Apr 2, 2019 · 09e7979 · 09e7979
1 parent bb802e1
commit 09e7979
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 26 deletions.
diff --git a/src/AgentFramework.AspNetCore/AgentFramework.AspNetCore.csproj b/src/AgentFramework.AspNetCore/AgentFramework.AspNetCore.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>3.0.0</Version>
-    <AssemblyVersion>3.0.0</AssemblyVersion>
-    <FileVersion>3.0.0</FileVersion>
+    <Version>3.0.1</Version>
+    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <FileVersion>3.0.1</FileVersion>
     <Description>ASP.NET Core support for Agent Framework</Description>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\AgentFramework.AspNetCore.xml</DocumentationFile>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

diff --git a/src/AgentFramework.Core.Handlers/AgentFramework.Core.Handlers.csproj b/src/AgentFramework.Core.Handlers/AgentFramework.Core.Handlers.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>3.0.0</Version>
-    <AssemblyVersion>3.0.0</AssemblyVersion>
-    <FileVersion>3.0.0</FileVersion>
+    <Version>3.0.1</Version>
+    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <FileVersion>3.0.1</FileVersion>
     <Description>Support for extending AgentFramework using message handlers</Description>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\AgentFramework.Core.Handlers.xml</DocumentationFile>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

diff --git a/src/AgentFramework.Core/AgentFramework.Core.csproj b/src/AgentFramework.Core/AgentFramework.Core.csproj
@@ -9,9 +9,9 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>.NET Core tools for building agent services</Description>
-    <Version>3.0.0</Version>
-    <AssemblyVersion>3.0.0</AssemblyVersion>
-    <FileVersion>3.0.0</FileVersion>
+    <Version>3.0.1</Version>
+    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <FileVersion>3.0.1</FileVersion>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\AgentFramework.Core.xml</DocumentationFile>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>

diff --git a/src/AgentFramework.Core/Runtime/DefaultConnectionService.cs b/src/AgentFramework.Core/Runtime/DefaultConnectionService.cs
@@ -177,7 +177,7 @@ public async Task RevokeInvitationAsync(IAgentContext agentContext, string invit
         }
 
         /// <inheritdoc />
-        public async Task<string> ProcessRequestAsync(IAgentContext agentContext, ConnectionRequestMessage request)
+        public virtual async Task<string> ProcessRequestAsync(IAgentContext agentContext, ConnectionRequestMessage request)
         {
             Logger.LogInformation(LoggingEvents.ProcessConnectionRequest, "Did {0}", request.Connection.Did);
 
@@ -197,12 +197,15 @@ public async Task<string> ProcessRequestAsync(IAgentContext agentContext, Connec
 
             agentContext.Connection.SetTag(TagConstants.LastThreadId, request.Id);
 
-            agentContext.Connection.Alias = new ConnectionAlias
-            {
-                Name = request.Label,
-                ImageUrl = request.ImageUrl
-            };
+            if (agentContext.Connection.Alias == null)
+                agentContext.Connection.Alias = new ConnectionAlias();
 
+            if (!string.IsNullOrEmpty(request.Label) && string.IsNullOrEmpty(agentContext.Connection.Alias.Name))
+                agentContext.Connection.Alias.Name = request.Label;
+
+            if (!string.IsNullOrEmpty(request.ImageUrl) && string.IsNullOrEmpty(agentContext.Connection.Alias.ImageUrl))
+                agentContext.Connection.Alias.ImageUrl = request.ImageUrl;
+
             if (!agentContext.Connection.MultiPartyInvitation)
             {
                 await agentContext.Connection.TriggerAsync(ConnectionTrigger.InvitationAccept);
@@ -237,7 +240,7 @@ public async Task<string> ProcessRequestAsync(IAgentContext agentContext, Connec
         }
 
         /// <inheritdoc />
-        public async Task<string> ProcessResponseAsync(IAgentContext agentContext, ConnectionResponseMessage response)
+        public virtual async Task<string> ProcessResponseAsync(IAgentContext agentContext, ConnectionResponseMessage response)
         {
             Logger.LogInformation(LoggingEvents.AcceptConnectionResponse, "To {1}", agentContext.Connection.MyDid);
 

diff --git a/src/AgentFramework.Core/Runtime/DefaultMessageService.cs b/src/AgentFramework.Core/Runtime/DefaultMessageService.cs
@@ -42,7 +42,7 @@ public DefaultMessageService(
         }
 
         /// <inheritdoc />
-        public async Task<byte[]> PrepareAsync(Wallet wallet, AgentMessage message, string recipientKey, string[] routingKeys = null, string senderKey = null)
+        public virtual async Task<byte[]> PrepareAsync(Wallet wallet, AgentMessage message, string recipientKey, string[] routingKeys = null, string senderKey = null)
         {
             if (message == null) throw new ArgumentNullException(nameof(message));
             if (senderKey == null) throw new ArgumentNullException(nameof(senderKey));

diff --git a/src/AgentFramework.Core/Runtime/DefaultPoolService.cs b/src/AgentFramework.Core/Runtime/DefaultPoolService.cs
@@ -22,7 +22,7 @@ public virtual async Task<Pool> GetPoolAsync(string poolName, int protocolVersio
         }
 
         /// <inheritdoc />
-        public async Task<Pool> GetPoolAsync(string poolName)
+        public virtual async Task<Pool> GetPoolAsync(string poolName)
         {
             if (Pools.TryGetValue(poolName, out var pool))
             {

diff --git a/src/AgentFramework.Core/Runtime/DefaultProvisioningService.cs b/src/AgentFramework.Core/Runtime/DefaultProvisioningService.cs
@@ -104,7 +104,7 @@ record = await GetProvisioningAsync(wallet);
         }
 
         /// <inheritdoc />
-        public async Task ProvisionAgentAsync(ProvisioningConfiguration configuration)
+        public virtual async Task ProvisionAgentAsync(ProvisioningConfiguration configuration)
         {
             if (configuration == null)
                 throw new ArgumentNullException(nameof(configuration));
@@ -175,7 +175,7 @@ public async Task ProvisionAgentAsync(ProvisioningConfiguration configuration)
         }
 
         /// <inheritdoc />
-        public async Task UpdateEndpointAsync(Wallet wallet, AgentEndpoint endpoint)
+        public virtual async Task UpdateEndpointAsync(Wallet wallet, AgentEndpoint endpoint)
         {
             var record = await GetProvisioningAsync(wallet);
             record.Endpoint = endpoint;

diff --git a/src/AgentFramework.Core/Runtime/DefaultTailsService.cs b/src/AgentFramework.Core/Runtime/DefaultTailsService.cs
@@ -40,7 +40,7 @@ public DefaultTailsService(
         }
 
         /// <inheritdoc />
-        public async Task<BlobStorageReader> OpenTailsAsync(string filename)
+        public virtual async Task<BlobStorageReader> OpenTailsAsync(string filename)
         {
             var baseDir = EnvironmentUtils.GetTailsPath();
 
@@ -62,7 +62,7 @@ public async Task<BlobStorageReader> OpenTailsAsync(string filename)
         }
 
         /// <inheritdoc />
-        public async Task<BlobStorageWriter> CreateTailsAsync()
+        public virtual async Task<BlobStorageWriter> CreateTailsAsync()
         {
             var tailsWriterConfig = new
             {
@@ -75,7 +75,7 @@ public async Task<BlobStorageWriter> CreateTailsAsync()
         }
 
         /// <inheritdoc />
-        public async Task<string> EnsureTailsExistsAsync(Pool pool, string revocationRegistryId)
+        public virtual async Task<string> EnsureTailsExistsAsync(Pool pool, string revocationRegistryId)
         {
             var revocationRegistry =
                 await LedgerService.LookupRevocationRegistryDefinitionAsync(pool, revocationRegistryId);

diff --git a/src/AgentFramework.TestHarness/AgentFramework.TestHarness.csproj b/src/AgentFramework.TestHarness/AgentFramework.TestHarness.csproj
@@ -5,9 +5,9 @@
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>A Test Harness for testing AgentFramework</Description>
-    <Version>3.0.0</Version>
-    <AssemblyVersion>3.0.0</AssemblyVersion>
-    <FileVersion>3.0.0</FileVersion>
+    <Version>3.0.1</Version>
+    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <FileVersion>3.0.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>