diff --git a/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/AuthClient.cs b/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/AuthClient.cs index 5e7cb98cf..79af2f22c 100644 --- a/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/AuthClient.cs +++ b/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/AuthClient.cs @@ -12,7 +12,6 @@ public AuthClient(ICallerProvider callerProvider, IMultiEnvironmentUserContext u TeamService = new TeamService(callerProvider, userContext); ProjectService = new ProjectService(callerProvider, userContext); PermissionService = new PermissionService(callerProvider, userContext); - OssService = new OssService(callerProvider); } public IUserService UserService { get; } @@ -24,7 +23,5 @@ public AuthClient(ICallerProvider callerProvider, IMultiEnvironmentUserContext u public IPermissionService PermissionService { get; } public IProjectService ProjectService { get; } - - public IOssService OssService { get; } } diff --git a/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/OssService.cs b/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/OssService.cs deleted file mode 100644 index 6cd8c1ef6..000000000 --- a/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/OssService.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) MASA Stack All rights reserved. -// Licensed under the MIT License. See LICENSE.txt in the project root for license information. - -namespace Masa.Contrib.BasicAbility.Auth.Service; - -public class OssService : IOssService -{ - readonly ICallerProvider _callerProvider; - - public OssService(ICallerProvider callerProvider) - { - _callerProvider = callerProvider; - } - - public async Task GetSecurityTokenAsync() - { - var requestUri = $"api/oss/GetSecurityToken"; - return await _callerProvider.GetAsync(requestUri) ?? throw new UserFriendlyException("Unknown exception, contact the administrator"); - } -} diff --git a/src/BuildingBlocks/MASA.BuildingBlocks b/src/BuildingBlocks/MASA.BuildingBlocks index 93f01d9b9..1c3f57d31 160000 --- a/src/BuildingBlocks/MASA.BuildingBlocks +++ b/src/BuildingBlocks/MASA.BuildingBlocks @@ -1 +1 @@ -Subproject commit 93f01d9b938245f1ff11645745847122f5c39887 +Subproject commit 1c3f57d3168a7cb0c4f4e1b87cf10811778ddd11 diff --git a/test/Masa.Contrib.BasicAbility.Auth.Tests/SsoServiceTest.cs b/test/Masa.Contrib.BasicAbility.Auth.Tests/SsoServiceTest.cs deleted file mode 100644 index 7c853059c..000000000 --- a/test/Masa.Contrib.BasicAbility.Auth.Tests/SsoServiceTest.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) MASA Stack All rights reserved. -// Licensed under the MIT License. See LICENSE.txt in the project root for license information. - -namespace Masa.Contrib.BasicAbility.Auth.Tests; - -[TestClass] -public class SsoServiceTest -{ - [TestMethod] - public async Task GetSecurityTokenAsync() - { - var data = new SecurityTokenModel("region", "accessKeyId", "accessKeySecret", "stsToken", "bucket"); - var requestUri = $"api/oss/GetSecurityToken"; - var callerProvider = new Mock(); - callerProvider.Setup(provider => provider.GetAsync(requestUri, default)).ReturnsAsync(data).Verifiable(); - var ossService = new OssService(callerProvider.Object); - var result = await ossService.GetSecurityTokenAsync(); - callerProvider.Verify(provider => provider.GetAsync(requestUri, default), Times.Once); - Assert.IsTrue(result is not null); - } -}