From 03f575f66fbc30013484bdca14e9896271af787f Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Mon, 23 Nov 2020 09:12:12 -0600
Subject: [PATCH] [Bug] Update 2fa navigate action to pass along Org Identifier
 (#714)

* Add identifer in 2fa navigate action

* Update jslib (6563dcc -> d9d13bb)

* fixed breaking changes from jslib update
---
 jslib                                    | 2 +-
 src/app/accounts/two-factor.component.ts | 6 +++++-
 src/app/services/services.module.ts      | 2 +-
 src/services/webPlatformUtils.service.ts | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/jslib b/jslib
index 6563dccf3b4..d9d13bbf0e2 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 6563dccf3b444c6f2ea97efe913eaccf9d9fd502
+Subproject commit d9d13bbf0e2b5b6d93459f3eca22c65c00543716
diff --git a/src/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts
index 5fe0ed89a88..02b2c4d80a9 100644
--- a/src/app/accounts/two-factor.component.ts
+++ b/src/app/accounts/two-factor.component.ts
@@ -69,7 +69,11 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
                 this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
                 await this.stateService.remove('loginRedirect');
             } else {
-                this.router.navigate([this.successRoute]);
+                this.router.navigate([this.successRoute], {
+                    queryParams: {
+                        identifier: this.identifier,
+                    },
+                });
             }
         }
     }
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index e8e22d06af2..092af73aad0 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -95,7 +95,7 @@ const secureStorageService: StorageServiceAbstraction = new MemoryStorageService
 const cryptoFunctionService: CryptoFunctionServiceAbstraction = new WebCryptoFunctionService(window,
     platformUtilsService);
 const cryptoService = new CryptoService(storageService,
-    platformUtilsService.isDev() ? storageService : secureStorageService, cryptoFunctionService);
+    platformUtilsService.isDev() ? storageService : secureStorageService, cryptoFunctionService, platformUtilsService);
 const tokenService = new TokenService(storageService);
 const appIdService = new AppIdService(storageService);
 const apiService = new ApiService(tokenService, platformUtilsService,
diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts
index 0435725dfd8..76e972584a2 100644
--- a/src/services/webPlatformUtils.service.ts
+++ b/src/services/webPlatformUtils.service.ts
@@ -281,4 +281,8 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
     authenticateBiometric() {
         return Promise.resolve(false);
     }
+
+    supportsSecureStorage() {
+        return true;
+    }
 }