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

[PM-3382] User cannot select Email as a secondary 2FA option following SSO (#2719)

Browse source 
* [PM-3382] Update mobile client to receive and use SsoEmail2faSessionToken

* [PM-3382] Fix null 2fa email with local email on MP login.
This commit is contained in:
André Bispo 2023-09-06 10:26:11 +01:00 committed by GitHub
parent 6d4792bc24
commit f21fae7fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/App/Pages/Accounts/TwoFactorPageViewModel.cs
View file

@ -466,7 +466,8 @@ namespace Bit.App.Pages
{ {
Email = _authService.Email, Email = _authService.Email,
MasterPasswordHash = _authService.MasterPasswordHash, MasterPasswordHash = _authService.MasterPasswordHash,
DeviceIdentifier = await _appIdService.GetAppIdAsync() DeviceIdentifier = await _appIdService.GetAppIdAsync(),
SsoEmail2FaSessionToken = _authService.SsoEmail2FaSessionToken
}; };
await _apiService.PostTwoFactorEmailAsync(request); await _apiService.PostTwoFactorEmailAsync(request);
if (showLoading) if (showLoading)

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

@ -15,6 +15,7 @@ namespace Bit.Core.Abstractions
string Code { get; set; } string Code { get; set; }
string CodeVerifier { get; set; } string CodeVerifier { get; set; }
string SsoRedirectUrl { get; set; } string SsoRedirectUrl { get; set; }
string SsoEmail2FaSessionToken { get; set; }
TwoFactorProviderType? SelectedTwoFactorProviderType { get; set; } TwoFactorProviderType? SelectedTwoFactorProviderType { get; set; }
Dictionary<TwoFactorProviderType, TwoFactorProvider> TwoFactorProviders { get; set; } Dictionary<TwoFactorProviderType, TwoFactorProvider> TwoFactorProviders { get; set; }
Dictionary<TwoFactorProviderType, Dictionary<string, object>> TwoFactorProvidersData { get; set; } Dictionary<TwoFactorProviderType, Dictionary<string, object>> TwoFactorProvidersData { get; set; }

1
src/Core/Models/Request/TwoFactorEmailRequest.cs
View file

@ -5,5 +5,6 @@
public string Email { get; set; } public string Email { get; set; }
public string MasterPasswordHash { get; set; } public string MasterPasswordHash { get; set; }
public string DeviceIdentifier { get; set; } public string DeviceIdentifier { get; set; }
public string SsoEmail2FaSessionToken { get; set; }
} }
} }

2
src/Core/Models/Response/IdentityTwoFactorResponse.cs
View file

@ -12,5 +12,7 @@ namespace Bit.Core.Models.Response
public MasterPasswordPolicyOptions MasterPasswordPolicy { get; set; } public MasterPasswordPolicyOptions MasterPasswordPolicy { get; set; }
[JsonProperty("CaptchaBypassToken")] [JsonProperty("CaptchaBypassToken")]
public string CaptchaToken { get; set; } public string CaptchaToken { get; set; }
public string SsoEmail2faSessionToken { get; set; }
public string Email { get; set; }
} }
} }

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

@ -124,6 +124,7 @@ namespace Bit.Core.Services
public string Code { get; set; } public string Code { get; set; }
public string CodeVerifier { get; set; } public string CodeVerifier { get; set; }
public string SsoRedirectUrl { get; set; } public string SsoRedirectUrl { get; set; }
public string SsoEmail2FaSessionToken { get; set; }
public Dictionary<TwoFactorProviderType, TwoFactorProvider> TwoFactorProviders { get; set; } public Dictionary<TwoFactorProviderType, TwoFactorProvider> TwoFactorProviders { get; set; }
public Dictionary<TwoFactorProviderType, Dictionary<string, object>> TwoFactorProvidersData { get; set; } public Dictionary<TwoFactorProviderType, Dictionary<string, object>> TwoFactorProvidersData { get; set; }
public TwoFactorProviderType? SelectedTwoFactorProviderType { get; set; } public TwoFactorProviderType? SelectedTwoFactorProviderType { get; set; }
@ -457,20 +458,21 @@ namespace Bit.Core.Services
if (result.TwoFactor) if (result.TwoFactor)
{ {
// Two factor required. // Two factor required.
Email = email; Email = response.TwoFactorResponse.Email ?? email;
MasterPasswordHash = hashedPassword; MasterPasswordHash = hashedPassword;
LocalMasterPasswordHash = localHashedPassword; LocalMasterPasswordHash = localHashedPassword;
AuthRequestId = authRequestId; AuthRequestId = authRequestId;
Code = code; Code = code;
CodeVerifier = codeVerifier; CodeVerifier = codeVerifier;
SsoRedirectUrl = redirectUrl; SsoRedirectUrl = redirectUrl;
SsoEmail2FaSessionToken = response.TwoFactorResponse.SsoEmail2faSessionToken;
_masterKey = _setCryptoKeys ? masterKey : null; _masterKey = _setCryptoKeys ? masterKey : null;
_userKey = userKey2FA; _userKey = userKey2FA;
TwoFactorProvidersData = response.TwoFactorResponse.TwoFactorProviders2; TwoFactorProvidersData = response.TwoFactorResponse.TwoFactorProviders2;
result.TwoFactorProviders = response.TwoFactorResponse.TwoFactorProviders2; result.TwoFactorProviders = response.TwoFactorResponse.TwoFactorProviders2;
CaptchaToken = response.TwoFactorResponse.CaptchaToken; CaptchaToken = response.TwoFactorResponse.CaptchaToken;
_masterPasswordPolicy = response.TwoFactorResponse.MasterPasswordPolicy; _masterPasswordPolicy = response.TwoFactorResponse.MasterPasswordPolicy;
await _tokenService.ClearTwoFactorTokenAsync(email); await _tokenService.ClearTwoFactorTokenAsync(Email);
return result; return result;
} }