Merge branch 'develop'

umbraco · Dec 19, 2024 · 757b2b9 · 757b2b9
2 parents c03ace4 + e038755
commit 757b2b9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 26 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" IsImplicitlyDefined="true" />
-    <PackageReference Include="Umbraco.Code" Version="2.0.0" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Umbraco.Code" Version="2.2.0" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 

diff --git a/examples/Umbraco.AuthorizedServices.TestSite/Umbraco.AuthorizedServices.TestSite.csproj b/examples/Umbraco.AuthorizedServices.TestSite/Umbraco.AuthorizedServices.TestSite.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Umbraco.Cms" Version="15.0.0" />
+    <PackageReference Include="Umbraco.Cms" Version="15.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" />
   </ItemGroup>
 

diff --git a/src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceAuthorizer.cs b/src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceAuthorizer.cs
@@ -74,18 +74,18 @@ public async Task<AuthorizationResult> AuthorizeOAuth1ServiceAsync(string servic
     public async Task<AuthorizationResult> GenerateOAuth1RequestTokenAsync(string serviceAlias, string url)
     {
         HttpResponseMessage response = await AuthorizationRequestSender.SendOAuth1RequestForRequestToken(url);
+        var responseContent = await response.Content.ReadAsStringAsync();
         if (response.IsSuccessStatusCode)
         {
-            var responseContent = await response.Content.ReadAsStringAsync();
             return AuthorizationResult.AsSuccess(responseContent);
         }
         else
         {
             throw new AuthorizedServiceHttpException(
-                $"Error response retrieving request token for '{serviceAlias}'.",
+                $"Error response retrieving request token for '{serviceAlias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",
                 response.StatusCode,
                 response.ReasonPhrase,
-                await response.Content.ReadAsStringAsync());
+                responseContent);
         }
     }
 
@@ -97,16 +97,17 @@ private async Task<AuthorizationResult> SendRequest(ServiceDetail serviceDetail,
                     ? await AuthorizationRequestSender.SendOAuth2ExchangeRequest(serviceDetail, parameters)
                     : await AuthorizationRequestSender.SendOAuth2Request(serviceDetail, parameters));
 
+        var responseContent = await response.Content.ReadAsStringAsync();
         if (response.IsSuccessStatusCode)
         {
             if (serviceDetail.AuthenticationMethod == AuthenticationMethod.OAuth1)
             {
-                OAuth1Token token = await CreateOAuth1TokenFromResponse(response);
+                OAuth1Token token = CreateOAuth1TokenFromResponse(responseContent);
                 await StoreOAuth1Token(serviceDetail.Alias, token);
             }
             else
             {
-                OAuth2Token token = await CreateOAuth2TokenFromResponse(serviceDetail, response);
+                OAuth2Token token = CreateOAuth2TokenFromResponse(serviceDetail, responseContent);
                 await StoreOAuth2Token(serviceDetail.Alias, token);
             }
 
@@ -115,10 +116,10 @@ private async Task<AuthorizationResult> SendRequest(ServiceDetail serviceDetail,
         else
         {
             throw new AuthorizedServiceHttpException(
-                $"Error response from token request to '{serviceDetail.Alias}'.",
+                $"Error response from token request to '{serviceDetail.Alias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",
                 response.StatusCode,
                 response.ReasonPhrase,
-                await response.Content.ReadAsStringAsync());
+                responseContent);
         }
     }
 }
diff --git a/src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceBase.cs b/src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceBase.cs
@@ -47,17 +47,11 @@ public AuthorizedServiceBase(
 
     protected ServiceDetail GetServiceDetail(string serviceAlias) => _serviceDetailOptions.Get(serviceAlias);
 
-    protected async Task<OAuth2Token> CreateOAuth2TokenFromResponse(ServiceDetail serviceDetail, HttpResponseMessage response)
-    {
-        var responseContent = await response.Content.ReadAsStringAsync();
-        return _tokenFactory.CreateFromOAuth2ResponseContent(responseContent, serviceDetail);
-    }
+    protected OAuth1Token CreateOAuth1TokenFromResponse(string responseContent) =>
+        _tokenFactory.CreateFromOAuth1ResponseContent(responseContent);
 
-    protected async Task<OAuth1Token> CreateOAuth1TokenFromResponse(HttpResponseMessage response)
-    {
-        var responseContent = await response.Content.ReadAsStringAsync();
-        return _tokenFactory.CreateFromOAuth1ResponseContent(responseContent);
-    }
+    protected OAuth2Token CreateOAuth2TokenFromResponse(ServiceDetail serviceDetail, string responseContent) =>
+        _tokenFactory.CreateFromOAuth2ResponseContent(responseContent, serviceDetail);
 
     protected async Task<OAuth2Token?> GetStoredToken(string serviceAlias) => await OAuth2TokenStorage.GetTokenAsync(serviceAlias);
 

diff --git a/src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceCaller.cs b/src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceCaller.cs
@@ -288,19 +288,20 @@ private async Task<OAuth2Token> EnsureAccessToken(ServiceDetail serviceDetail, O
         Dictionary<string, string> parameters = _refreshTokenParametersBuilder.BuildParameters(serviceDetail, refreshToken);
 
         HttpResponseMessage response = await AuthorizationRequestSender.SendOAuth2Request(serviceDetail, parameters);
+        var responseContent = await response.Content.ReadAsStringAsync();
         if (response.IsSuccessStatusCode)
         {
-            OAuth2Token token = await CreateOAuth2TokenFromResponse(serviceDetail, response);
+            OAuth2Token token = CreateOAuth2TokenFromResponse(serviceDetail, responseContent);
             await StoreOAuth2Token(serviceDetail.Alias, token);
             return token;
         }
         else
         {
             throw new AuthorizedServiceHttpException(
-                $"Error response from refresh token request to '{serviceDetail.Alias}'.",
+                $"Error response from refresh token request to '{serviceDetail.Alias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",
                 response.StatusCode,
                 response.ReasonPhrase,
-                await response.Content.ReadAsStringAsync());
+                responseContent);
         }
     }
 
@@ -323,19 +324,20 @@ private async Task<OAuth2Token> EnsureExchangeAccessToken(ServiceDetail serviceD
         Dictionary<string, string> parameters = _exchangeTokenParametersBuilder.BuildParameters(serviceDetail, accessToken);
 
         HttpResponseMessage response = await AuthorizationRequestSender.SendOAuth2ExchangeRequest(serviceDetail, parameters);
+        var responseContent = await response.Content.ReadAsStringAsync();
         if (response.IsSuccessStatusCode)
         {
-            OAuth2Token token = await CreateOAuth2TokenFromResponse(serviceDetail, response);
+            OAuth2Token token = CreateOAuth2TokenFromResponse(serviceDetail, responseContent);
             await StoreOAuth2Token(serviceAlias, token);
             return token;
         }
         else
         {
             throw new AuthorizedServiceHttpException(
-                $"Error response from exchange access token request to '{serviceAlias}'.",
+                $"Error response from exchange access token request to '{serviceDetail.Alias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",
                 response.StatusCode,
                 response.ReasonPhrase,
-                await response.Content.ReadAsStringAsync());
+                responseContent);
         }
     }
 

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "15.1.0",
+  "version": "15.1.1",
   "assemblyVersion": {
     "precision": "build"
   },