1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00

[SSO] Add set-password loading placeholder (#626)

* Preparing for new jslib // removed resetMasterPassword variable // Added sync service

* initial commit of loading set password

* Update jslib (e55528e -> 700e945)

* center justify text

* Reverted testing data
This commit is contained in:
Vincent Salucci
2020-08-28 08:56:51 -05:00
committed by GitHub
parent fa11382c08
commit b251e1f73c
3 changed files with 12 additions and 26 deletions

View File

@@ -5,10 +5,7 @@ import {
ViewContainerRef,
} from '@angular/core';
import {
ActivatedRoute,
Router,
} from '@angular/router';
import { Router } from '@angular/router';
import { TwoFactorOptionsComponent } from './two-factor-options.component';
@@ -37,25 +34,12 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
i18nService: I18nService, apiService: ApiService,
platformUtilsService: PlatformUtilsService, stateService: StateService,
environmentService: EnvironmentService, private componentFactoryResolver: ComponentFactoryResolver,
storageService: StorageService, private route: ActivatedRoute) {
storageService: StorageService) {
super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService,
stateService, storageService);
this.onSuccessfulLoginNavigate = this.goAfterLogIn;
}
async ngOnInit() {
const queryParamsSub = this.route.queryParams.subscribe((qParams) => {
if (qParams.resetMasterPassword != null) {
this.resetMasterPassword = qParams.resetMasterPassword;
}
if (queryParamsSub != null) {
queryParamsSub.unsubscribe();
}
});
super.ngOnInit();
}
anotherMethod() {
const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
const modal = this.twoFactorOptionsModal.createComponent(factory).instance;
@@ -82,11 +66,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
await this.stateService.remove('loginRedirect');
} else {
this.router.navigate([this.successRoute], {
queryParams: {
resetMasterPassword: this.resetMasterPassword,
},
});
this.router.navigate([this.successRoute]);
}
}
}