Merge pull request #73 from userfront/dev-574-635-fixes

DEV-574 DEV-635 small bug fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@userfront/toolkit",
-  "version": "1.0.0",
+  "version": "1.0.1-alpha.1",
   "description": "Bindings and components for authentication with Userfront with React, Vue, other frameworks, and plain JS + HTML",
   "type": "module",
   "directories": {

package/src/forms/UniversalForm.jsx

@@ -396,7 +396,7 @@ const componentForStep = (state) => {
           isLoading: true,
         },
       };
-    case "password.showPasswordSuccess":
+    case "password.showPasswordSet":
       return {
         title: strings[type].done,
         Component: Success,

package/src/models/views/setUpTotp.ts

@@ -89,9 +89,10 @@ const setUpTotpConfig: AuthMachineConfig = {
             cond: "secondFactorRequiredFromView",
           },
           // We're signed in.
-          // Core JS redirects as appropriate here.
+          // Instruct CoreJS to redirect as appropriate here
           // Show the "verified" view in case we don't redirect.
           {
+            actions: "redirectIfLoggedIn",
             target: "showTotpSetupComplete",
           },
         ],

package/src/services/userfront.ts

@@ -14,6 +14,7 @@ declare module "@userfront/core" {
 }
 
 let singleton = Userfront;
+let isSingletonOverridden = false;
 
 /**
  * Override the Userfront singleton imported from @userfront/core with an object of your choice.
@@ -22,6 +23,7 @@ let singleton = Userfront;
  */
 export const overrideUserfrontSingleton = (newSingleton: any) => {
   singleton = newSingleton as typeof Userfront;
+  isSingletonOverridden = true;
 };
 
 // A type with the keys of all functions in Type
@@ -110,7 +112,21 @@ export const callUserfront = async ({ method, args = [] }: CallUserfront) => {
     return Promise.reject();
   }
   try {
-    return await (<any>_method)(...args);
+    const res = await (<any>_method)(...args);
+    // Workaround to avoid flickering when CoreJS redirects:
+    // wait for the current iteration of the event loop to finish,
+    // and for the async task queue to finish,
+    // and for the NEXT event loop cycle to finish,
+    // then return.
+    // TODO DEV-658 fix this in a nicer and more reliable way
+    if (isSingletonOverridden) {
+      // Don't wait if we've overridden the CoreJS singleton,
+      // i.e. mocked it out for tests.
+      return res;
+    }
+    return new Promise((resolve) => {
+      setTimeout(() => resolve(res), 1);
+    });
   } catch (err: any) {
     console.warn(
       `Method ${method} on Userfront object threw. Error: ${err.message}`