Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(auth):auth sdk add GetListByAccountAsync、GetSecurityTokenAsync #166

Merged
merged 5 commits into from
Jul 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/BasicAbility/Masa.Contrib.BasicAbility.Auth/AuthClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ 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; }
Expand All @@ -23,5 +24,7 @@ public AuthClient(ICallerProvider callerProvider, IMultiEnvironmentUserContext u
public IPermissionService PermissionService { get; }

public IProjectService ProjectService { get; }

public IOssService OssService { get; }
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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<SecurityTokenModel> GetSecurityTokenAsync()
{
var requestUri = $"api/oss/GetSecurityToken";
return await _callerProvider.GetAsync<SecurityTokenModel>(requestUri) ?? throw new UserFriendlyException("Unknown exception, contact the administrator");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,11 @@ public async Task<bool> DisableUserAsync(DisableUserModel user)
var requestUri = $"api/user/disable";
return await _callerProvider.PutAsync<bool>(requestUri, user);
}

public async Task<List<UserSimpleModel>> GetListByAccountAsync(IEnumerable<string> accounts)
{
var requestUri = $"api/user/GetListByAccount";
return await _callerProvider.GetAsync<object, List<UserSimpleModel>>(requestUri, new { accounts }) ?? new();
}
}

21 changes: 21 additions & 0 deletions test/Masa.Contrib.BasicAbility.Auth.Tests/SsoServiceTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// 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<ICallerProvider>();
callerProvider.Setup(provider => provider.GetAsync<SecurityTokenModel>(requestUri, default)).ReturnsAsync(data).Verifiable();
var ossService = new OssService(callerProvider.Object);
var result = await ossService.GetSecurityTokenAsync();
callerProvider.Verify(provider => provider.GetAsync<SecurityTokenModel>(requestUri, default), Times.Once);
Assert.IsTrue(result is not null);
}
}
19 changes: 18 additions & 1 deletion test/Masa.Contrib.BasicAbility.Auth.Tests/UserServiceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,25 @@ public async Task TestObjectSaveUserSystemDataAsync(string systemId)
await userService.SaveUserSystemDataAsync(systemId, value);
callerProvider.Verify(provider => provider.PostAsync<object>(requestUri, It.IsAny<object>(), true, default), Times.Once);
}
}

[TestMethod]
public async Task TestGetListByAccountAsync()
{
var data = new List<UserSimpleModel>()
{
new UserSimpleModel(Guid.NewGuid(), "account", "displayName")
};
var accounts = new List<string> { "account" };
var requestUri = $"api/user/GetListByAccount";
var callerProvider = new Mock<ICallerProvider>();
callerProvider.Setup(provider => provider.GetAsync<object, List<UserSimpleModel>>(requestUri, It.IsAny<object>(), default)).ReturnsAsync(data).Verifiable();
var userContext = new Mock<IUserContext>();
var userService = new UserService(callerProvider.Object, userContext.Object);
var result = await userService.GetListByAccountAsync(accounts);
callerProvider.Verify(provider => provider.GetAsync<object, List<UserSimpleModel>>(requestUri, It.IsAny<object>(), default), Times.Once);
Assert.IsTrue(result.Count == 1);
}
}

class SystemData
{
Expand Down