Merge remote-tracking branch 'origin/support/10.x' into develop

AndyButland · AndyButland · commit e038755a5506 · 2024-12-19T09:53:34.000+01:00
# Conflicts:
#	examples/Umbraco.AuthorizedServices.TestSite/Umbraco.AuthorizedServices.TestSite.csproj
#	version.json
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"
   },

Original file line number	Diff line number	Diff line change
`@@ -74,18 +74,18 @@ public async Task<AuthorizationResult> AuthorizeOAuth1ServiceAsync(string servic`
`74`	`74`	`public async Task<AuthorizationResult> GenerateOAuth1RequestTokenAsync(string serviceAlias, string url)`
`75`	`75`	`{`
`76`	`76`	`HttpResponseMessage response = await AuthorizationRequestSender.SendOAuth1RequestForRequestToken(url);`
	`77`	`+ var responseContent = await response.Content.ReadAsStringAsync();`
`77`	`78`	`if (response.IsSuccessStatusCode)`
`78`	`79`	`{`
`79`		`- var responseContent = await response.Content.ReadAsStringAsync();`
`80`	`80`	`return AuthorizationResult.AsSuccess(responseContent);`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
`84`	`84`	`throw new AuthorizedServiceHttpException(`
`85`		`- $"Error response retrieving request token for '{serviceAlias}'.",`
	`85`	`+ $"Error response retrieving request token for '{serviceAlias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",`
`86`	`86`	`response.StatusCode,`
`87`	`87`	`response.ReasonPhrase,`
`88`		`- await response.Content.ReadAsStringAsync());`
	`88`	`+ responseContent);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`@@ -97,16 +97,17 @@ private async Task<AuthorizationResult> SendRequest(ServiceDetail serviceDetail,`
`97`	`97`	`? await AuthorizationRequestSender.SendOAuth2ExchangeRequest(serviceDetail, parameters)`
`98`	`98`	`: await AuthorizationRequestSender.SendOAuth2Request(serviceDetail, parameters));`
`99`	`99`
	`100`	`+ var responseContent = await response.Content.ReadAsStringAsync();`
`100`	`101`	`if (response.IsSuccessStatusCode)`
`101`	`102`	`{`
`102`	`103`	`if (serviceDetail.AuthenticationMethod == AuthenticationMethod.OAuth1)`
`103`	`104`	`{`
`104`		`- OAuth1Token token = await CreateOAuth1TokenFromResponse(response);`
	`105`	`+ OAuth1Token token = CreateOAuth1TokenFromResponse(responseContent);`
`105`	`106`	`await StoreOAuth1Token(serviceDetail.Alias, token);`
`106`	`107`	`}`
`107`	`108`	`else`
`108`	`109`	`{`
`109`		`- OAuth2Token token = await CreateOAuth2TokenFromResponse(serviceDetail, response);`
	`110`	`+ OAuth2Token token = CreateOAuth2TokenFromResponse(serviceDetail, responseContent);`
`110`	`111`	`await StoreOAuth2Token(serviceDetail.Alias, token);`
`111`	`112`	`}`
`112`	`113`
`@@ -115,10 +116,10 @@ private async Task<AuthorizationResult> SendRequest(ServiceDetail serviceDetail,`
`115`	`116`	`else`
`116`	`117`	`{`
`117`	`118`	`throw new AuthorizedServiceHttpException(`
`118`		`- $"Error response from token request to '{serviceDetail.Alias}'.",`
	`119`	`+ $"Error response from token request to '{serviceDetail.Alias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",`
`119`	`120`	`response.StatusCode,`
`120`	`121`	`response.ReasonPhrase,`
`121`		`- await response.Content.ReadAsStringAsync());`
	`122`	`+ responseContent);`
`122`	`123`	`}`
`123`	`124`	`}`
`124`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,19 +288,20 @@ private async Task<OAuth2Token> EnsureAccessToken(ServiceDetail serviceDetail, O`
`288`	`288`	`Dictionary<string, string> parameters = _refreshTokenParametersBuilder.BuildParameters(serviceDetail, refreshToken);`
`289`	`289`
`290`	`290`	`HttpResponseMessage response = await AuthorizationRequestSender.SendOAuth2Request(serviceDetail, parameters);`
	`291`	`+ var responseContent = await response.Content.ReadAsStringAsync();`
`291`	`292`	`if (response.IsSuccessStatusCode)`
`292`	`293`	`{`
`293`		`- OAuth2Token token = await CreateOAuth2TokenFromResponse(serviceDetail, response);`
	`294`	`+ OAuth2Token token = CreateOAuth2TokenFromResponse(serviceDetail, responseContent);`
`294`	`295`	`await StoreOAuth2Token(serviceDetail.Alias, token);`
`295`	`296`	`return token;`
`296`	`297`	`}`
`297`	`298`	`else`
`298`	`299`	`{`
`299`	`300`	`throw new AuthorizedServiceHttpException(`
`300`		`- $"Error response from refresh token request to '{serviceDetail.Alias}'.",`
	`301`	`+ $"Error response from refresh token request to '{serviceDetail.Alias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",`
`301`	`302`	`response.StatusCode,`
`302`	`303`	`response.ReasonPhrase,`
`303`		`- await response.Content.ReadAsStringAsync());`
	`304`	`+ responseContent);`
`304`	`305`	`}`
`305`	`306`	`}`
`306`	`307`
`@@ -323,19 +324,20 @@ private async Task<OAuth2Token> EnsureExchangeAccessToken(ServiceDetail serviceD`
`323`	`324`	`Dictionary<string, string> parameters = _exchangeTokenParametersBuilder.BuildParameters(serviceDetail, accessToken);`
`324`	`325`
`325`	`326`	`HttpResponseMessage response = await AuthorizationRequestSender.SendOAuth2ExchangeRequest(serviceDetail, parameters);`
	`327`	`+ var responseContent = await response.Content.ReadAsStringAsync();`
`326`	`328`	`if (response.IsSuccessStatusCode)`
`327`	`329`	`{`
`328`		`- OAuth2Token token = await CreateOAuth2TokenFromResponse(serviceDetail, response);`
	`330`	`+ OAuth2Token token = CreateOAuth2TokenFromResponse(serviceDetail, responseContent);`
`329`	`331`	`await StoreOAuth2Token(serviceAlias, token);`
`330`	`332`	`return token;`
`331`	`333`	`}`
`332`	`334`	`else`
`333`	`335`	`{`
`334`	`336`	`throw new AuthorizedServiceHttpException(`
`335`		`- $"Error response from exchange access token request to '{serviceAlias}'.",`
	`337`	`+ $"Error response from exchange access token request to '{serviceDetail.Alias}'. Status: {response.StatusCode}. Reason: {response.ReasonPhrase}. Content: {responseContent}.",`
`336`	`338`	`response.StatusCode,`
`337`	`339`	`response.ReasonPhrase,`
`338`		`- await response.Content.ReadAsStringAsync());`
	`340`	`+ responseContent);`
`339`	`341`	`}`
`340`	`342`	`}`
`341`	`343`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "15.1.0",`
	`3`	`+ "version": "15.1.1",`
`4`	`4`	`"assemblyVersion": {`
`5`	`5`	`"precision": "build"`
`6`	`6`	`},`