mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 10:28:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

pass OrgId to SSO login while using CME (#1646)

Browse source
This commit is contained in:
Jake Fink 2021-11-16 09:34:26 -05:00 committed by GitHub
parent 13869b5a1b
commit 3ee80beda8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/App/Pages/Accounts/LoginSsoPageViewModel.cs
View file

@ -139,7 +139,7 @@ namespace Bit.App.Pages
var code = GetResultCode(authResult, state); var code = GetResultCode(authResult, state);
if (!string.IsNullOrEmpty(code)) if (!string.IsNullOrEmpty(code))
{ {
await LogIn(code, codeVerifier, redirectUri); await LogIn(code, codeVerifier, redirectUri, OrgIdentifier);
} }
else else
{ {
@ -164,11 +164,11 @@ namespace Bit.App.Pages
return code; return code;
} }
private async Task LogIn(string code, string codeVerifier, string redirectUri) private async Task LogIn(string code, string codeVerifier, string redirectUri, string orgId)
{ {
try try
{ {
var response = await _authService.LogInSsoAsync(code, codeVerifier, redirectUri); var response = await _authService.LogInSsoAsync(code, codeVerifier, redirectUri, orgId);
await AppHelpers.ResetInvalidUnlockAttemptsAsync(); await AppHelpers.ResetInvalidUnlockAttemptsAsync();
if (RememberOrgIdentifier) if (RememberOrgIdentifier)
{ {

2
src/Core/Abstractions/IAuthService.cs
View file

@ -22,7 +22,7 @@ namespace Bit.Core.Abstractions
bool AuthingWithPassword(); bool AuthingWithPassword();
List<TwoFactorProvider> GetSupportedTwoFactorProviders(); List<TwoFactorProvider> GetSupportedTwoFactorProviders();
Task<AuthResult> LogInAsync(string email, string masterPassword, string captchaToken); Task<AuthResult> LogInAsync(string email, string masterPassword, string captchaToken);
Task<AuthResult> LogInSsoAsync(string code, string codeVerifier, string redirectUrl); Task<AuthResult> LogInSsoAsync(string code, string codeVerifier, string redirectUrl, string orgId);
Task<AuthResult> LogInCompleteAsync(string email, string masterPassword, TwoFactorProviderType twoFactorProvider, string twoFactorToken, bool? remember = null); Task<AuthResult> LogInCompleteAsync(string email, string masterPassword, TwoFactorProviderType twoFactorProvider, string twoFactorToken, bool? remember = null);
Task<AuthResult> LogInTwoFactorAsync(TwoFactorProviderType twoFactorProvider, string twoFactorToken, bool? remember = null); Task<AuthResult> LogInTwoFactorAsync(TwoFactorProviderType twoFactorProvider, string twoFactorToken, bool? remember = null);
void LogOut(Action callback); void LogOut(Action callback);

4
src/Core/Services/AuthService.cs
View file

@ -136,10 +136,10 @@ namespace Bit.Core.Services
null, captchaToken); null, captchaToken);
} }
public async Task<AuthResult> LogInSsoAsync(string code, string codeVerifier, string redirectUrl) public async Task<AuthResult> LogInSsoAsync(string code, string codeVerifier, string redirectUrl, string orgId)
{ {
SelectedTwoFactorProviderType = null; SelectedTwoFactorProviderType = null;
return await LogInHelperAsync(null, null, null, code, codeVerifier, redirectUrl, null, null, null, null); return await LogInHelperAsync(null, null, null, code, codeVerifier, redirectUrl, null, orgId: orgId);
} }
public Task<AuthResult> LogInTwoFactorAsync(TwoFactorProviderType twoFactorProvider, string twoFactorToken, public Task<AuthResult> LogInTwoFactorAsync(TwoFactorProviderType twoFactorProvider, string twoFactorToken,