add launchSsoBrowser to extension template
This commit is contained in:
parent
4df7712c13
commit
b7996183bf
|
@ -147,32 +147,13 @@
|
||||||
{{ "continue" | i18n }}
|
{{ "continue" | i18n }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- TODO-rr-bw: Figma shows no Login with Passkey option on browser? -->
|
<!-- TODO-rr-bw: Figma shows no Login with Passkey option on browser. Is that intentional? -->
|
||||||
<!-- Link to Login with Passkey page -->
|
|
||||||
<!-- <div class="tw-text-center">{{ "or" | i18n }}</div>
|
|
||||||
<a
|
|
||||||
bitButton
|
|
||||||
block
|
|
||||||
linkType="primary"
|
|
||||||
routerLink="/login-with-passkey"
|
|
||||||
(mousedown)="$event.preventDefault()"
|
|
||||||
>
|
|
||||||
<i class="bwi bwi-passkey tw-mr-1"></i>
|
|
||||||
{{ "logInWithPasskey" | i18n }}
|
|
||||||
</a> -->
|
|
||||||
|
|
||||||
<!-- Link to Login with SSO page -->
|
<!-- Button to Login with SSO -->
|
||||||
<a
|
<button type="button" bitButton block buttonType="secondary" (click)="launchSsoBrowser()">
|
||||||
bitButton
|
|
||||||
block
|
|
||||||
buttonType="secondary"
|
|
||||||
routerLink="/sso"
|
|
||||||
[queryParams]="{ email: formGroup.value.email }"
|
|
||||||
(click)="saveEmailSettings()"
|
|
||||||
>
|
|
||||||
<i class="bwi bwi-provider tw-mr-1"></i>
|
<i class="bwi bwi-provider tw-mr-1"></i>
|
||||||
{{ "useSingleSignOn" | i18n }}
|
{{ "useSingleSignOn" | i18n }}
|
||||||
</a>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
|
|
|
@ -16,12 +16,14 @@ import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.d
|
||||||
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
|
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
|
||||||
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
|
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
|
||||||
import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
|
import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
|
||||||
|
import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
|
||||||
import { CaptchaIFrame } from "@bitwarden/common/auth/captcha-iframe";
|
import { CaptchaIFrame } from "@bitwarden/common/auth/captcha-iframe";
|
||||||
import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
|
import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
|
||||||
import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
|
import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
|
||||||
import { ClientType } from "@bitwarden/common/enums";
|
import { ClientType } from "@bitwarden/common/enums";
|
||||||
import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
|
import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
|
||||||
import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
|
import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
|
||||||
|
import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
|
||||||
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
|
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
|
||||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||||
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
|
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
|
||||||
|
@ -38,6 +40,7 @@ import {
|
||||||
IconButtonModule,
|
IconButtonModule,
|
||||||
ToastService,
|
ToastService,
|
||||||
} from "@bitwarden/components";
|
} from "@bitwarden/components";
|
||||||
|
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
|
||||||
|
|
||||||
import { AnonLayoutWrapperDataService } from "../anon-layout/anon-layout-wrapper-data.service";
|
import { AnonLayoutWrapperDataService } from "../anon-layout/anon-layout-wrapper-data.service";
|
||||||
import { WaveIcon } from "../icons";
|
import { WaveIcon } from "../icons";
|
||||||
|
@ -117,6 +120,7 @@ export class LoginComponent implements OnInit, OnDestroy {
|
||||||
private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
|
private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
|
||||||
private appIdService: AppIdService,
|
private appIdService: AppIdService,
|
||||||
private broadcasterService: BroadcasterService,
|
private broadcasterService: BroadcasterService,
|
||||||
|
private cryptoFunctionService: CryptoFunctionService,
|
||||||
private devicesApiService: DevicesApiServiceAbstraction,
|
private devicesApiService: DevicesApiServiceAbstraction,
|
||||||
private environmentService: EnvironmentService,
|
private environmentService: EnvironmentService,
|
||||||
private formBuilder: FormBuilder,
|
private formBuilder: FormBuilder,
|
||||||
|
@ -126,11 +130,13 @@ export class LoginComponent implements OnInit, OnDestroy {
|
||||||
private loginStrategyService: LoginStrategyServiceAbstraction,
|
private loginStrategyService: LoginStrategyServiceAbstraction,
|
||||||
private messagingService: MessagingService,
|
private messagingService: MessagingService,
|
||||||
private ngZone: NgZone,
|
private ngZone: NgZone,
|
||||||
|
private passwordGenerationService: PasswordGenerationServiceAbstraction,
|
||||||
private passwordStrengthService: PasswordStrengthServiceAbstraction,
|
private passwordStrengthService: PasswordStrengthServiceAbstraction,
|
||||||
private platformUtilsService: PlatformUtilsService,
|
private platformUtilsService: PlatformUtilsService,
|
||||||
private policyService: InternalPolicyService,
|
private policyService: InternalPolicyService,
|
||||||
private registerRouteService: RegisterRouteService,
|
private registerRouteService: RegisterRouteService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
|
private ssoLoginService: SsoLoginServiceAbstraction,
|
||||||
private syncService: SyncService,
|
private syncService: SyncService,
|
||||||
private toastService: ToastService,
|
private toastService: ToastService,
|
||||||
) {
|
) {
|
||||||
|
@ -279,6 +285,53 @@ export class LoginComponent implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected async launchSsoBrowser() {
|
||||||
|
// Save off email for SSO
|
||||||
|
await this.ssoLoginService.setSsoEmail(this.formGroup.value.email);
|
||||||
|
|
||||||
|
// Generate necessary sso params
|
||||||
|
const passwordOptions: any = {
|
||||||
|
type: "password",
|
||||||
|
length: 64,
|
||||||
|
uppercase: true,
|
||||||
|
lowercase: true,
|
||||||
|
numbers: true,
|
||||||
|
special: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
const state =
|
||||||
|
(await this.passwordGenerationService.generatePassword(passwordOptions)) +
|
||||||
|
":clientId=browser";
|
||||||
|
const codeVerifier = await this.passwordGenerationService.generatePassword(passwordOptions);
|
||||||
|
const codeVerifierHash = await this.cryptoFunctionService.hash(codeVerifier, "sha256");
|
||||||
|
const codeChallenge = Utils.fromBufferToUrlB64(codeVerifierHash);
|
||||||
|
|
||||||
|
await this.ssoLoginService.setCodeVerifier(codeVerifier);
|
||||||
|
await this.ssoLoginService.setSsoState(state);
|
||||||
|
|
||||||
|
const env = await firstValueFrom(this.environmentService.environment$);
|
||||||
|
let url = env.getWebVaultUrl();
|
||||||
|
if (url == null) {
|
||||||
|
url = "https://vault.bitwarden.com";
|
||||||
|
}
|
||||||
|
|
||||||
|
const redirectUri = url + "/sso-connector.html";
|
||||||
|
|
||||||
|
// Launch browser
|
||||||
|
this.platformUtilsService.launchUri(
|
||||||
|
url +
|
||||||
|
"/#/sso?clientId=browser" +
|
||||||
|
"&redirectUri=" +
|
||||||
|
encodeURIComponent(redirectUri) +
|
||||||
|
"&state=" +
|
||||||
|
state +
|
||||||
|
"&codeChallenge=" +
|
||||||
|
codeChallenge +
|
||||||
|
"&email=" +
|
||||||
|
encodeURIComponent(this.formGroup.controls.email.value),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
protected async goAfterLogIn(userId: UserId): Promise<void> {
|
protected async goAfterLogIn(userId: UserId): Promise<void> {
|
||||||
const masterPassword = this.formGroup.value.masterPassword;
|
const masterPassword = this.formGroup.value.masterPassword;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue