Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-22 11:45:59 +01:00
Code Issues Projects Releases Wiki Activity

Tools/pm 4440 replace lastpass sso dialog (#7608)

Browse Source 
* Initial implementation of simple dialog

* Updating buttons and dialog type

* Set the cancel text normally

* Removing the lastpass sso dialog component
This commit is contained in:
Tom 2024-01-22 11:05:31 -05:00 committed by GitHub
parent 0bcb45ed5c
commit ec7c3878c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/importer/src/components/lastpass/dialog/index.ts
View File

@ -1,3 +1,2 @@
export { LastPassAwaitSSODialogComponent } from "./lastpass-await-sso-dialog.component";
export { LastPassMultifactorPromptComponent } from "./lastpass-multifactor-prompt.component";
export { LastPassPasswordPromptComponent } from "./lastpass-password-prompt.component";

14
libs/importer/src/components/lastpass/dialog/lastpass-await-sso-dialog.component.html
View File

@ -1,14 +0,0 @@
<bit-simple-dialog>
<div bitDialogIcon>
<i class="bwi bwi-key bwi-2x tw-text-warning" aria-hidden="true"></i>
</div>
<span bitDialogTitle>{{ "awaitingSSO" | i18n }}</span>
<span bitDialogContent>
{{ "awaitingSSODesc" | i18n }}
</span>
<ng-container bitDialogFooter>
<button bitButton type="button" buttonType="secondary" [bitDialogClose]="true">
{{ "cancel" | i18n }}
</button>
</ng-container>
</bit-simple-dialog>

15
libs/importer/src/components/lastpass/dialog/lastpass-await-sso-dialog.component.ts
View File

@ -1,15 +0,0 @@
import { Component } from "@angular/core";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
@Component({
templateUrl: "lastpass-await-sso-dialog.component.html",
standalone: true,
imports: [JslibModule, ButtonModule, DialogModule],
})
export class LastPassAwaitSSODialogComponent {
static open(dialogService: DialogService) {
return dialogService.open<boolean>(LastPassAwaitSSODialogComponent);
}
}

12
libs/importer/src/components/lastpass/lastpass-direct-import.service.ts
View File

@ -8,6 +8,7 @@ import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.ser
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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
@ -16,7 +17,6 @@ import { DialogService } from "../../../../components/src/dialog";
import { ClientInfo, Vault } from "../../importers/lastpass/access";
import { FederatedUserContext } from "../../importers/lastpass/access/models";
import { LastPassAwaitSSODialogComponent } from "./dialog/lastpass-await-sso-dialog.component";
import { LastPassPasswordPromptComponent } from "./dialog/lastpass-password-prompt.component";
import { LastPassDirectImportUIService } from "./lastpass-direct-import-ui.service";
@ -42,6 +42,7 @@ export class LastPassDirectImportService {
private broadcasterService: BroadcasterService,
private ngZone: NgZone,
private dialogService: DialogService,
private i18nService: I18nService,
) {
this.vault = new Vault(this.cryptoFunctionService, this.tokenService);
@ -96,7 +97,14 @@ export class LastPassDirectImportService {
const request = await this.createOidcSigninRequest(email);
this.platformUtilsService.launchUri(request.url);
const cancelDialogRef = LastPassAwaitSSODialogComponent.open(this.dialogService);
const cancelDialogRef = this.dialogService.openSimpleDialogRef({
title: this.i18nService.t("awaitingSSO"),
content: this.i18nService.t("awaitingSSODesc"),
type: "warning",
icon: "bwi-key",
acceptButtonText: this.i18nService.t("cancel"),
cancelButtonText: null,
});
const cancelled = firstValueFrom(cancelDialogRef.closed).then((_didCancel) => {
throw Error("SSO auth cancelled");
});