Merge pull request #54 from drasticactions/develop

Code flow into main...

+semver: breaking

.github/workflows/nuget.yml

@@ -6,9 +6,9 @@ name: Nuget
 on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
-    branches: [ "main", release-*, develop-* ]
+    branches: [ "main", release-*, develop ]
   pull_request:
-    branches: [ "main", release-*, develop-* ]
+    branches: [ "main", release-*, develop ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

GitVersion.yml

@@ -1,3 +1,4 @@
 workflow: GitFlow/v1
+commit-message-incrementing: MergeMessageOnly
 assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{CommitsSinceVersionSource ?? 0}'
 assembly-informational-format: '{Major}.{Minor}.{Patch}.{CommitsSinceVersionSource ?? 0}-{BranchName}-{Sha}'

src/FishyFlip/ATProtocol.cs

@@ -228,8 +228,7 @@ public async Task<string> GenerateOAuth2AuthenticationUrlAsync(string clientId,
             throw new OAuth2Exception("Proof key is required for OAuth2 sessions.");
         }
 
-        await oAuth2SessionManager.StartSessionAsync(session, clientId, instanceUrl);
-        return await Task.FromResult<Session?>(oAuth2SessionManager.Session);
+        return (await oAuth2SessionManager.StartSessionAsync(session, clientId, instanceUrl)).Session;
     }
 
     /// <summary>

src/FishyFlip/FishyFlip.csproj

@@ -17,10 +17,6 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
-		<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
-		<PackageReference Include="MSTest.TestFramework" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
 		<PackageReference Include="IpfsShipyard.Ipfs.Core" />
 		<PackageReference Include="PeterO.Cbor" />

src/FishyFlip/OAuth2SessionManager.cs

@@ -64,7 +64,7 @@ public OAuth2SessionManager(ATProtocol protocol)
     /// <param name="cancellationToken">Cancellation Token.</param>
     /// <exception cref="OAuth2Exception">Thrown if missing OAuth2 information.</exception>
     /// <returns>Task.</returns>
-    public Task StartSessionAsync(AuthSession session, string clientId, string? instanceUrl = default, CancellationToken cancellationToken = default)
+    public Task<AuthSession> StartSessionAsync(AuthSession session, string clientId, string? instanceUrl = default, CancellationToken cancellationToken = default)
     {
         instanceUrl ??= Constants.Urls.ATProtoServer.SocialApi;
         var options = new OidcClientOptions
@@ -96,7 +96,7 @@ public Task StartSessionAsync(AuthSession session, string clientId, string? inst
         this.delegatingHandler.TokenRefreshed += this.DelegatingHandler_TokenRefreshed;
 
         this.SetSession(session.Session);
-        return Task.CompletedTask;
+        return Task.FromResult(session);
     }
 
     /// <summary>
@@ -242,12 +242,12 @@ public void Dispose()
         var refreshResult = await this.oidcClient.RefreshTokenAsync(this.session!.RefreshJwt, backChannelParameters: null, scope: null, cancellationToken: cancellationToken);
         if (refreshResult.IsError)
         {
-            this.logger?.LogError($"Failed to refresh token: {refreshResult.Error} {refreshResult.ErrorDescription}");
+            throw new OAuth2Exception($"Failed to refresh token: {refreshResult.Error} {refreshResult.ErrorDescription}");
         }
 
         if (this.session is null)
         {
-            throw new NullReferenceException("Session should not be null if RefreshToken handler is enabled");
+            throw new OAuth2Exception("Session should not be null if RefreshToken handler is enabled");
         }
 
         lock (this.session)
@@ -287,6 +287,16 @@ private void DelegatingHandler_TokenRefreshed(object? sender, TokenRefreshedEven
             throw new NullReferenceException("Session should not be null if RefreshToken handler is enabled");
         }
 
+        if (string.IsNullOrEmpty(e.RefreshToken))
+        {
+            throw new OAuth2Exception("RefreshToken is null or empty.");
+        }
+
+        if (string.IsNullOrEmpty(e.AccessToken))
+        {
+            throw new OAuth2Exception("AccessToken is null or empty.");
+        }
+
         lock (this.session)
         {
             this.session = new Session(this.session.Did, this.session.DidDoc, this.session.Handle, null, e.AccessToken, e.RefreshToken);

src/FishyFlip/Tools/HttpClientExtensions.cs

@@ -337,6 +337,7 @@ private static async Task<ATError> CreateError(HttpResponseMessage message, Json
         ErrorDetail? detail = default;
         if (string.IsNullOrEmpty(response))
         {
+            detail = new ErrorDetail("HTTP Error", message.ReasonPhrase ?? string.Empty);
             atError = new ATError((int)message.StatusCode, detail);
         }
         else