mirror of
https://github.com/bitwarden/browser
synced 2025-12-13 14:53:33 +00:00
fix(LoginComp + LoginStrategies): [Auth/PM-18654] Refreshed UI - Desktop TDE JIT provisioned user creation errors with missing org SSO id (#13619)
* PM-18654 - State Service & Login Strategy Refactor - move env seeding into login strategy so that new accounts always load w/ the correct environment * PM-18654 - SSO Comp - just use user id from auth result * PM-18654 - Config Service - (1) don't allow cascading calls to the renewConfig by using a private promise (2) Replace shareReplay with share configured with manual timer * PM-18654 - LoginComponents - detail issue and possible fix * PM-18654 - DesktopLoginV1Comp - use correct destroy hook * PM-18654 - LoginComp - clean up no longer correct comment * PM-18654 - New Device Verification Component - Remove unused PasswordLoginStrategy dependency * PM-18654 - Browser Home Component - fix qParam logic * PM-18654 - DefaultConfigService - revert changes as they aren't necessary to fix the bug. * PM-18654 - DefaultConfigService - remove commented code * PM-18654 - LoginStrategy - add comment * PM-18654 - Fix login strat tests
This commit is contained in:
@@ -427,7 +427,6 @@ export class SsoComponent implements OnInit {
|
||||
);
|
||||
this.formPromise = this.loginStrategyService.logIn(credentials);
|
||||
const authResult = await this.formPromise;
|
||||
|
||||
if (authResult.requiresTwoFactor) {
|
||||
return await this.handleTwoFactorRequired(orgSsoIdentifier);
|
||||
}
|
||||
@@ -441,9 +440,10 @@ export class SsoComponent implements OnInit {
|
||||
// - Browser SSO on extension open
|
||||
// Note: you cannot set this in state before 2FA b/c there won't be an account in state.
|
||||
|
||||
// Grabbing the active user id right before making the state set to ensure it exists.
|
||||
const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
|
||||
await this.ssoLoginService.setActiveUserOrganizationSsoIdentifier(orgSsoIdentifier, userId);
|
||||
await this.ssoLoginService.setActiveUserOrganizationSsoIdentifier(
|
||||
orgSsoIdentifier,
|
||||
authResult.userId,
|
||||
);
|
||||
|
||||
// must come after 2fa check since user decryption options aren't available if 2fa is required
|
||||
const userDecryptionOpts = await firstValueFrom(
|
||||
|
||||
Reference in New Issue
Block a user