From a001ac72b5c352dbfef2d5371b1ace5410fad57f Mon Sep 17 00:00:00 2001
From: "Carlos J. Muentes" <42616259+cmuentes@users.noreply.github.com>
Date: Wed, 6 Apr 2022 10:46:35 -0400
Subject: [PATCH] Adding IIFE for obtaining master password

---
 src/app/settings/organizations.component.ts | 34 ++++++++++-----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/app/settings/organizations.component.ts b/src/app/settings/organizations.component.ts
index c3a7aa26..1f672db6 100644
--- a/src/app/settings/organizations.component.ts
+++ b/src/app/settings/organizations.component.ts
@@ -15,8 +15,6 @@ import { Organization } from "jslib-common/models/domain/organization";
 import { Policy } from "jslib-common/models/domain/policy";
 import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest";
 
-
-
 import { MasterPasswordEnrollmentComponent } from "./master-password-enrollment.component";
 
 @Component({
@@ -199,21 +197,21 @@ export class OrganizationsComponent implements OnInit {
   }
 
   private async getMasterPassword(): Promise<string> {
-    let passwordHash = null;
-
-    const [modal] = await this.modalService.openViewRef(
-      MasterPasswordEnrollmentComponent,
-      this.confirmMasterPasswordModalRef,
-      (comp) => {
-        comp.passwordEnrollmentTitle = "passwordResetEnrollment";
-        comp.passwordEnrollmentDescription = "passwordResetEnrollmentDescription";
-        comp.requestBuilt.subscribe((val) => {
-          modal.close();
-          passwordHash = val.masterPasswordHash;
-        });
-      }
-    );
-
-    return passwordHash;
+    return new Promise((resolve, reject) => {
+      (async () => {
+        const [modal] = await this.modalService.openViewRef(
+          MasterPasswordEnrollmentComponent,
+          this.confirmMasterPasswordModalRef,
+          (comp) => {
+            comp.passwordEnrollmentTitle = "passwordResetEnrollment";
+            comp.passwordEnrollmentDescription = "passwordResetEnrollmentDescription";
+            comp.requestBuilt.subscribe((val) => {
+              modal.close();
+              resolve(val.masterPasswordHash);
+            });
+          }
+        );
+      })();
+    });
   }
 }