From be95ee93285d25e7fcb9a1529a1ae26f0c1ad1a3 Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Wed, 14 Oct 2020 08:58:23 -0500 Subject: [PATCH] [SSO] New user provision flow jslib update (f0dc38b -> d84d6da) (#570) * Updated import/constructors * Update jslib from f0dc38b -> d84d6da --- jslib | 2 +- src/app/accounts/set-password.component.ts | 9 ++++++--- src/app/accounts/two-factor.component.ts | 9 ++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/jslib b/jslib index f30d6f80270..d84d6da7f77 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit f30d6f8027055507abfdefd1eeb5d9aab25cc601 +Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203 diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts index 85a71ee99a0..295ded430fa 100644 --- a/src/app/accounts/set-password.component.ts +++ b/src/app/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/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts index 8e9033793d9..9b46187f453 100644 --- a/src/app/accounts/two-factor.component.ts +++ b/src/app/accounts/two-factor.component.ts @@ -5,7 +5,10 @@ import { ViewContainerRef, } from '@angular/core'; -import { Router } from '@angular/router'; +import { + ActivatedRoute, + Router, +} from '@angular/router'; import { TwoFactorOptionsComponent } from './two-factor-options.component'; @@ -36,9 +39,9 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { i18nService: I18nService, apiService: ApiService, platformUtilsService: PlatformUtilsService, syncService: SyncService, environmentService: EnvironmentService, private componentFactoryResolver: ComponentFactoryResolver, - stateService: StateService, storageService: StorageService) { + stateService: StateService, storageService: StorageService, route: ActivatedRoute) { super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService, - stateService, storageService); + stateService, storageService, route); super.onSuccessfulLogin = () => { return syncService.fullSync(true); };