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.

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

Feature(sdk-auth): sdk auth login #316

Merged
merged 3 commits into from
Oct 31, 2022
Merged

Feature(sdk-auth): sdk auth login #316

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d79fd54
feat(login):add login model
wuweilaiya Oct 27, 2022
6449617
Merge branch 'main' into feat-sdk-auth-login
wuweilaiya Oct 31, 2022
7ae464f
refactor code
wuweilaiya Oct 31, 2022
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
15 changes: 15 additions & 0 deletions ...ingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TokenModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;

public class TokenModel
{
public string AccessToken { get; set; }

public string IdentityToken { get; set; }

public string RefreshToken { get; set; }

public int ExpiresIn { get; set; }
}
10 changes: 8 additions & 2 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 @@ -221,7 +221,7 @@ public async Task<bool> UpdatePhoneNumberAsync(UpdateUserPhoneNumberModel user)
return await _caller.PostAsync<UserModel>(requestUri, login);
}

public async Task<string> LoginByPhoneNumberFromSsoAsync(string address, LoginByPhoneNumberFromSso login)
public async Task<TokenModel> LoginByPhoneNumberFromSsoAsync(string address, LoginByPhoneNumberFromSso login)
{
using var client = new HttpClient();
var disco = await client.GetDiscoveryDocumentAsync(address);
Expand All @@ -242,7 +242,13 @@ public async Task<string> LoginByPhoneNumberFromSsoAsync(string address, LoginBy
if (tokenResponse.IsError)
throw new UserFriendlyException(tokenResponse.Error);

return tokenResponse.AccessToken;
return new TokenModel
{
AccessToken = tokenResponse.AccessToken,
IdentityToken = tokenResponse.IdentityToken,
RefreshToken = tokenResponse.RefreshToken,
ExpiresIn = tokenResponse.ExpiresIn,
};
}

public async Task RemoveUserRolesAsync(RemoveUserRolesModel user)
Expand Down