Skip to content

Commit effcaf3

Browse files
committed
Removed unnecessary parameters and registrations.
1 parent ba8c2a4 commit effcaf3

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

src/Umbraco.AuthorizedServices/AuthorizedServicesComposer.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,5 @@ private static void RegisterServices(IUmbracoBuilder builder)
6262
builder.Services.AddUnique<IKeyStorage, DatabaseKeyStorage>();
6363

6464
builder.Services.AddSingleton<JsonSerializerFactory>();
65-
66-
builder.Services.AddHttpContextAccessor();
6765
}
6866
}

src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceCaller.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Azure.Core;
2-
using Microsoft.AspNetCore.Http;
31
using Microsoft.Extensions.Logging;
42
using Microsoft.Extensions.Options;
53
using Umbraco.AuthorizedServices.Configuration;
@@ -17,11 +15,9 @@ internal sealed class AuthorizedServiceCaller : AuthorizedServiceBase, IAuthoriz
1715
{
1816
private readonly IHttpClientFactory _httpClientFactory;
1917
private readonly JsonSerializerFactory _jsonSerializerFactory;
20-
private readonly IAuthorizationUrlBuilder _authorizationUrlBuilder;
2118
private readonly IAuthorizedRequestBuilder _authorizedRequestBuilder;
2219
private readonly IRefreshTokenParametersBuilder _refreshTokenParametersBuilder;
2320
private readonly IExchangeTokenParametersBuilder _exchangeTokenParametersBuilder;
24-
private readonly IHttpContextAccessor _httpContextAccessor;
2521

2622
public AuthorizedServiceCaller(
2723
AppCaches appCaches,
@@ -34,20 +30,16 @@ public AuthorizedServiceCaller(
3430
IOptionsMonitor<ServiceDetail> serviceDetailOptions,
3531
IHttpClientFactory httpClientFactory,
3632
JsonSerializerFactory jsonSerializerFactory,
37-
IAuthorizationUrlBuilder authorizationUrlBuilder,
3833
IAuthorizedRequestBuilder authorizedRequestBuilder,
3934
IRefreshTokenParametersBuilder refreshTokenParametersBuilder,
40-
IExchangeTokenParametersBuilder exchangeTokenParametersBuilder,
41-
IHttpContextAccessor httpContextAccessor)
35+
IExchangeTokenParametersBuilder exchangeTokenParametersBuilder)
4236
: base(appCaches, tokenFactory, oauth2TokenStorage, oauth1TokenStorage, keyStorage, authorizationRequestSender, logger, serviceDetailOptions)
4337
{
4438
_httpClientFactory = httpClientFactory;
4539
_jsonSerializerFactory = jsonSerializerFactory;
46-
_authorizationUrlBuilder = authorizationUrlBuilder;
4740
_authorizedRequestBuilder = authorizedRequestBuilder;
4841
_refreshTokenParametersBuilder = refreshTokenParametersBuilder;
4942
_exchangeTokenParametersBuilder = exchangeTokenParametersBuilder;
50-
_httpContextAccessor = httpContextAccessor;
5143
}
5244

5345
public async Task<Attempt<EmptyResponse?>> SendRequestAsync(string serviceAlias, string path, HttpMethod httpMethod)

tests/Umbraco.AuthorizedServices.Tests/Services/AuthorizedServiceCallerTests.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ private AuthorizedServiceCaller CreateService(
304304
bool withConfiguredApiKey = false)
305305
{
306306
var authorizationRequestSenderMock = new Mock<IAuthorizationRequestSender>();
307-
var authorizationUrlBuilderMock = new Mock<IAuthorizationUrlBuilder>();
308-
var httpContextAccessorMock = new Mock<IHttpContextAccessor>();
309307

310308
// Setup refresh token response.
311309
var httpResponseMessage = new HttpResponseMessage
@@ -331,11 +329,9 @@ private AuthorizedServiceCaller CreateService(
331329
optionsMonitorServiceDetailMock.Object,
332330
new TestHttpClientFactory(statusCode, responseContent),
333331
factory,
334-
authorizationUrlBuilderMock.Object,
335332
new AuthorizedRequestBuilder(factory),
336333
new RefreshTokenParametersBuilder(),
337-
new ExchangeTokenParametersBuilder(),
338-
httpContextAccessorMock.Object);
334+
new ExchangeTokenParametersBuilder());
339335
}
340336

341337
private class TestHttpClientFactory : IHttpClientFactory

0 commit comments

Comments
 (0)