Resolve signIn promise when sign in has completed (#227)

iTwin · Dec 14, 2023 · 833e9d6 · 833e9d6
1 parent cd4c148
commit 833e9d6
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 28 deletions.
diff --git a/change/@itwin-electron-authorization-cb30a53e-3752-4c76-829e-b7017135452b.json b/change/@itwin-electron-authorization-cb30a53e-3752-4c76-829e-b7017135452b.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Resolve ElectronRendererAuthorization signIn when sign in has completed and reject if an error occurs.",
+  "packageName": "@itwin/electron-authorization",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/electron/src/main/Client.ts b/packages/electron/src/main/Client.ts
@@ -398,40 +398,47 @@ export class ElectronMainAuthorization implements AuthorizationClient {
     // Setup a notifier to obtain the result of authorization
     const notifier = new AuthorizationNotifier();
     authorizationHandler.setAuthorizationNotifier(notifier);
-    notifier.setAuthorizationListener(
-      async (
-        authRequest: AuthorizationRequest,
-        authResponse: AuthorizationResponse | null,
-        authError: AuthorizationError | null
-      ) => {
-        Logger.logTrace(
-          loggerCategory,
-          "Authorization listener invoked",
-          () => ({ authRequest, authResponse, authError })
-        );
 
-        const tokenResponse = await this._onAuthorizationResponse(
-          authRequest,
-          authResponse,
-          authError
-        );
-        authorizationEvents.onAuthorizationResponseCompleted.raiseEvent(
-          authError ? authError : undefined
-        );
-
-        if (tokenResponse)
-          // await this.saveRefreshToken(tokenResponse);
-          await this.processTokenResponse(tokenResponse);
-        else
-          await this.clearTokenCache();
-      }
-    );
+    const tokenRequestCompleted = new Promise<void>((finished, reject) => {
+      notifier.setAuthorizationListener(
+        async (
+          authRequest: AuthorizationRequest,
+          authResponse: AuthorizationResponse | null,
+          authError: AuthorizationError | null
+        ) => {
+          Logger.logTrace(
+            loggerCategory,
+            "Authorization listener invoked",
+            () => ({ authRequest, authResponse, authError })
+          );
+
+          const tokenResponse = await this._onAuthorizationResponse(
+            authRequest,
+            authResponse,
+            authError
+          ).catch((e) => reject(e));
+
+          authorizationEvents.onAuthorizationResponseCompleted.raiseEvent(
+            authError ? authError : undefined
+          );
+
+          if (tokenResponse)
+            await this.processTokenResponse(tokenResponse);
+          else
+            await this.clearTokenCache();
+
+          finished();
+        }
+      );
+    });
 
     // Start the signin
     await authorizationHandler.performAuthorizationRequest(
       this._configuration,
       authorizationRequest
     );
+
+    return tokenRequestCompleted;
   }
 
   /**

diff --git a/packages/electron/src/renderer/Client.ts b/packages/electron/src/renderer/Client.ts
@@ -105,7 +105,11 @@ export class ElectronRendererAuthorization implements AuthorizationClient {
     });
   }
 
-  /** Called to start the sign-in process. Subscribe to onAccessTokenChanged to be notified when sign-in completes */
+  /**
+   * Called to start the sign-in process.
+   * Resolves when sign-in completes, rejects if sign-in fails.
+   * Subscribe to `onAccessTokenChanged` to be notified when a token is available.
+   */
   public async signIn(): Promise<void> {
     await this._ipcAuthAPI.signIn();
   }