Skip to content

Feat/update auth sdk #643

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jul 10, 2023
Merged

Feat/update auth sdk #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ffbedcf
feat:update auth sdk and sso model
MayueCif Jul 7, 2023
ad83725
feat:updatej appsettings
MayueCif Jul 7, 2023
a15c535
fix:code smell
MayueCif Jul 7, 2023
9edb6b4
fix:code smell
MayueCif Jul 7, 2023
a37ccaa
Merge branch 'main' into feat/update_auth_sdk
MayueCif Jul 10, 2023
398e183
fix:GetSystemListDataAsync T
MayueCif Jul 10, 2023
1758574
fix:test error
MayueCif Jul 10, 2023
292d4cc
fix:code smell
MayueCif Jul 10, 2023
78cc783
fix:code smell
MayueCif Jul 10, 2023
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
2 changes: 1 addition & 1 deletion src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public interface IUserService

Task<T?> GetSystemDataAsync<T>(Guid userId, string systemId);

Task<Dictionary<Guid, T>> GetSystemListDataAsync<T>(IEnumerable<Guid> userIds, string systemId);
Task<Dictionary<Guid, T?>> GetSystemListDataAsync<T>(IEnumerable<Guid> userIds, string systemId);

Task<bool> DisableAsync(DisableUserModel user);

Expand Down
6 changes: 3 additions & 3 deletions src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,11 @@ public async Task UpsertSystemDataAsync<T>(string systemId, T data)
return dataList.FirstOrDefault().Value ?? default;
}

public async Task<Dictionary<Guid, T>> GetSystemListDataAsync<T>(IEnumerable<Guid> userIds, string systemId)
public async Task<Dictionary<Guid, T?>> GetSystemListDataAsync<T>(IEnumerable<Guid> userIds, string systemId)
{
var requestUri = $"api/user/systemData/byIds";
var data = await _caller.PostAsync<Dictionary<Guid, T>>(requestUri, new GetSystemDataModel { UserIds = userIds.ToList(), SystemId = systemId }) ?? new();
return data;
var data = await _caller.PostAsync<Dictionary<Guid, string>>(requestUri, new GetSystemDataModel { UserIds = userIds.ToList(), SystemId = systemId }) ?? new();
return data.ToDictionary(d => d.Key, d => typeof(T) == typeof(string) ? (T)(object)d.Value : JsonSerializer.Deserialize<T?>(d.Value));
}

public async Task<bool> DisableAsync(DisableUserModel user)
Expand Down
28 changes: 4 additions & 24 deletions src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,8 @@ public async Task TestIntGetUserSystemDataAsync(string systemId)
var data = 1;
var requestUri = $"api/user/systemData/byIds";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<Dictionary<Guid, int>>(requestUri, It.IsAny<GetSystemDataModel>(), default))
.ReturnsAsync(new Dictionary<Guid, int>() { { userId, data } }).Verifiable();
caller.Setup(provider => provider.PostAsync<Dictionary<Guid, string>>(requestUri, It.IsAny<GetSystemDataModel>(), default))
.ReturnsAsync(new Dictionary<Guid, string>() { { userId, data.ToString() } }).Verifiable();
var userContext = new Mock<IUserContext>();
userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
var userService = GetUserService(caller, userContext);
Expand All @@ -506,35 +506,15 @@ public async Task TestObjectGetUserSystemDataAsync(string systemId)
};
var requestUri = $"api/user/systemData/byIds";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<Dictionary<Guid, SystemData>>(requestUri, It.IsAny<GetSystemDataModel>(), default))
.ReturnsAsync(new Dictionary<Guid, SystemData>() { { userId, data } }).Verifiable();
caller.Setup(provider => provider.PostAsync<Dictionary<Guid, string>>(requestUri, It.IsAny<GetSystemDataModel>(), default))
.ReturnsAsync(new Dictionary<Guid, string>() { { userId, JsonSerializer.Serialize(data) } }).Verifiable();
var userContext = new Mock<IUserContext>();
userContext.Setup(user => user.GetUserId<Guid>()).Returns(userId).Verifiable();
var userService = GetUserService(caller, userContext);
var result = await userService.GetSystemDataAsync<SystemData>(systemId);
Assert.IsTrue(result is not null);
}

[TestMethod]
[DataRow("masa-auth")]
public async Task TestGetUserSystemDataAsync(string systemId)
{
var userIds = new List<Guid> { Guid.NewGuid() };
var data = new SystemData
{
Name = "name",
Value = "value"
};
var requestUri = $"api/user/systemData/byIds";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.GetAsync<object, string>(requestUri, new { userIds = string.Join(',', userIds), systemId }, default))
.ReturnsAsync(JsonSerializer.Serialize(data)).Verifiable();
var userContext = new Mock<IUserContext>();
var userService = GetUserService(caller, userContext);
var result = await userService.GetSystemListDataAsync<SystemData>(userIds, systemId);
Assert.IsTrue(result is not null);
}

[TestMethod]
[DataRow("masa-auth")]
public async Task TestIntUpsertSystemDataAsync(string systemId)
Expand Down