.NET: Always send metadata; don't fail if auth token not present (#829)

trinsic-id · Jul 5, 2022 · da6609d · da6609d
1 parent 51be399
commit da6609d
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 19 deletions.
diff --git a/dotnet/Trinsic/AccountService.cs b/dotnet/Trinsic/AccountService.cs
@@ -47,7 +47,7 @@ internal AccountService(ITokenProvider tokenProvider, IOptions<ServiceOptions> o
     /// <returns></returns>
     public async Task<string> SignInAsync(SignInRequest request) {
         if (string.IsNullOrWhiteSpace(request.EcosystemId)) request.EcosystemId = Options.DefaultEcosystem;
-        var response = await Client.SignInAsync(request);
+        var response = await Client.SignInAsync(request, await BuildMetadataAsync(request));
 
         var authToken = Base64Url.Encode(response.Profile.ToByteArray());
 
@@ -65,7 +65,7 @@ internal AccountService(ITokenProvider tokenProvider, IOptions<ServiceOptions> o
     /// <returns></returns>
     public string SignIn(SignInRequest request) {
         if (string.IsNullOrWhiteSpace(request.EcosystemId)) request.EcosystemId = Options.DefaultEcosystem;
-        var response = Client.SignIn(request);
+        var response = Client.SignIn(request, BuildMetadata(request));
 
         var authToken = Base64Url.Encode(response.Profile.ToByteArray());
 
@@ -127,7 +127,7 @@ internal AccountService(ITokenProvider tokenProvider, IOptions<ServiceOptions> o
         if (string.IsNullOrWhiteSpace(request.EcosystemId))
             request.EcosystemId = Options.DefaultEcosystem;
 
-        var response = await Client.LoginAsync(request);
+        var response = await Client.LoginAsync(request, await BuildMetadataAsync(request));
 
         if (response.ResponseCase == LoginResponse.ResponseOneofCase.Profile)
         {
@@ -146,7 +146,7 @@ internal AccountService(ITokenProvider tokenProvider, IOptions<ServiceOptions> o
         if (string.IsNullOrWhiteSpace(request.EcosystemId))
             request.EcosystemId = Options.DefaultEcosystem;
 
-        var response = Client.Login(request);
+        var response = Client.Login(request, BuildMetadata(request));
 
         return response;
     }
@@ -169,7 +169,7 @@ internal AccountService(ITokenProvider tokenProvider, IOptions<ServiceOptions> o
             ConfirmationCodeHashed = hashed.Digest
         };
 
-        var response = await Client.LoginConfirmAsync(request);
+        var response = await Client.LoginConfirmAsync(request, await BuildMetadataAsync(request));
 
         if (response?.Profile == null)
             return null;
@@ -202,7 +202,7 @@ internal AccountService(ITokenProvider tokenProvider, IOptions<ServiceOptions> o
             ConfirmationCodeHashed = hashed.Digest
         };
 
-        var response = Client.LoginConfirm(request);
+        var response = Client.LoginConfirm(request, BuildMetadata(request));
 
         if (response?.Profile == null)
             return null;

diff --git a/dotnet/Trinsic/ProviderService.cs b/dotnet/Trinsic/ProviderService.cs
@@ -37,10 +37,7 @@ internal ProviderService(ITokenProvider tokenProvider, IOptions<ServiceOptions>
     public async Task<(Ecosystem ecosystem, string authToken)> CreateEcosystemAsync(CreateEcosystemRequest request) {
         request.Details ??= new();
 
-        var response = !string.IsNullOrWhiteSpace(request.Name) || !string.IsNullOrWhiteSpace(request.Details?.Email)
-            ? await Client.CreateEcosystemAsync(request, await BuildMetadataAsync(request))
-            : await Client.CreateEcosystemAsync(request);
-
+        var response = await Client.CreateEcosystemAsync(request, await BuildMetadataAsync(request));
         var authToken = Base64Url.Encode(response.Profile.ToByteArray());
 
         if (!response.Profile.Protection?.Enabled ?? true)
@@ -59,9 +56,7 @@ internal ProviderService(ITokenProvider tokenProvider, IOptions<ServiceOptions>
     public (Ecosystem ecosystem, string authToken) CreateEcosystem(CreateEcosystemRequest request) {
         request.Details ??= new();
 
-        var response = !string.IsNullOrWhiteSpace(request.Name) || !string.IsNullOrWhiteSpace(request.Details?.Email)
-            ? Client.CreateEcosystem(request, BuildMetadata(request))
-            : Client.CreateEcosystem(request);
+        var response = Client.CreateEcosystem(request, BuildMetadata(request));
         var authToken = Base64Url.Encode(response.Profile.ToByteArray());
 
         if (!response.Profile.Protection?.Enabled ?? true)

diff --git a/dotnet/Trinsic/ServiceBase.cs b/dotnet/Trinsic/ServiceBase.cs
@@ -79,12 +79,17 @@ public abstract class ServiceBase
         var authToken = string.IsNullOrWhiteSpace(Options.AuthToken)
             ? await TokenProvider.GetAsync()
             : Options.AuthToken;
-        if (authToken is null) throw new("Cannot call authenticated endpoint before signing in");
+
+        // Return empty metadata if no auth token
+        if (authToken is null)
+        {
+            return new();
+        }
 
         var profile = AccountProfile.Parser.ParseFrom(Base64Url.DecodeBytes(authToken));
 
         return new() {
-            {"Authorization", await _securityProvider.GetAuthHeaderAsync(profile, request)}
+            { "Authorization", await _securityProvider.GetAuthHeaderAsync(profile, request) }
         };
     }
 
@@ -93,15 +98,20 @@ public abstract class ServiceBase
     /// </summary>
     /// <returns></returns>
     protected Metadata BuildMetadata(IMessage request) {
-        var authToken = string.IsNullOrWhiteSpace(Options.AuthToken) 
-            ? TokenProvider.Get() 
+        var authToken = string.IsNullOrWhiteSpace(Options.AuthToken)
+            ? TokenProvider.Get()
             : Options.AuthToken;
-        if (authToken is null) throw new("Cannot call authenticated endpoint before signing in");
+
+        // Return empty metadata if no auth token
+        if (authToken is null)
+        {
+            return new();
+        }
 
         var profile = AccountProfile.Parser.ParseFrom(Base64Url.DecodeBytes(authToken));
 
         return new() {
-            {"Authorization", _securityProvider.GetAuthHeader(profile, request)}
+            { "Authorization", _securityProvider.GetAuthHeader(profile, request) }
         };
     }
 }
diff --git a/dotnet/Trinsic/Trinsic.xml b/dotnet/Trinsic/Trinsic.xml