From f54ca688d454aab797e5460ba83bd75e6a169c8a Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Wed, 14 Oct 2020 08:58:36 -0500 Subject: [PATCH] [SSO] New user provision flow jslib update (3bf322a -> d84d6da) (#1429) * Updated import/constructors * Update jslib (3bf322a -> d84d6da) --- jslib | 2 +- src/popup/accounts/set-password.component.ts | 9 ++++++--- src/popup/accounts/two-factor.component.ts | 9 ++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/jslib b/jslib index 9e9795fd85..d84d6da7f7 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 9e9795fd855d643459a9205c5299bfbf887d4985 +Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203 diff --git a/src/popup/accounts/set-password.component.ts b/src/popup/accounts/set-password.component.ts index 85a71ee99a..295ded430f 100644 --- a/src/popup/accounts/set-password.component.ts +++ b/src/popup/accounts/set-password.component.ts @@ -1,6 +1,9 @@ import { Component } from '@angular/core'; -import { Router } from '@angular/router'; +import { + ActivatedRoute, + Router, +} from '@angular/router'; import { ApiService } from 'jslib/abstractions/api.service'; import { CryptoService } from 'jslib/abstractions/crypto.service'; @@ -25,9 +28,9 @@ export class SetPasswordComponent extends BaseSetPasswordComponent { cryptoService: CryptoService, messagingService: MessagingService, userService: UserService, passwordGenerationService: PasswordGenerationService, platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router, - syncService: SyncService) { + syncService: SyncService, route: ActivatedRoute) { super(i18nService, cryptoService, messagingService, userService, passwordGenerationService, - platformUtilsService, policyService, router, apiService, syncService); + platformUtilsService, policyService, router, apiService, syncService, route); } get masterPasswordScoreWidth() { diff --git a/src/popup/accounts/two-factor.component.ts b/src/popup/accounts/two-factor.component.ts index 9e3aae9fc8..194d6c137d 100644 --- a/src/popup/accounts/two-factor.component.ts +++ b/src/popup/accounts/two-factor.component.ts @@ -4,7 +4,10 @@ import { NgZone, } from '@angular/core'; -import { Router } from '@angular/router'; +import { + ActivatedRoute, + Router, +} from '@angular/router'; import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; @@ -38,9 +41,9 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { environmentService: EnvironmentService, private ngZone: NgZone, private broadcasterService: BroadcasterService, private changeDetectorRef: ChangeDetectorRef, private popupUtilsService: PopupUtilsService, stateService: StateService, - storageService: StorageService) { + storageService: StorageService, route: ActivatedRoute) { super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService, - stateService, storageService); + stateService, storageService, route); super.onSuccessfulLogin = () => { return syncService.fullSync(true); };