refactor: test fixes

supertokens · May 16, 2024 · 666d30b · 666d30b
1 parent 91ff48b
commit 666d30b
Show file tree

Hide file tree

Showing 28 changed files with 412 additions and 720 deletions.
diff --git a/lib/build/emailpasswordprebuiltui.js b/lib/build/emailpasswordprebuiltui.js
diff --git a/lib/build/index2.js b/lib/build/index2.js
diff --git a/lib/build/recipe/emailpassword/prebuiltui.d.ts b/lib/build/recipe/emailpassword/prebuiltui.d.ts
diff --git a/lib/build/recipe/passwordless/components/features/mfa/index.d.ts b/lib/build/recipe/passwordless/components/features/mfa/index.d.ts
diff --git a/lib/build/recipe/thirdparty/index.d.ts b/lib/build/recipe/thirdparty/index.d.ts
diff --git a/lib/ts/recipe/authRecipe/components/feature/authPage/authPage.tsx b/lib/ts/recipe/authRecipe/components/feature/authPage/authPage.tsx
@@ -39,7 +39,7 @@ import AuthPageThemeWrapper from "../../theme/authPage";
 
 import type AuthRecipe from "../../..";
 import type { TranslationStore } from "../../../../../translation/translationHelpers";
-import type { Navigate, PartialAuthComponent, UserContext } from "../../../../../types";
+import type { AuthComponent, Navigate, PartialAuthComponent, UserContext } from "../../../../../types";
 import type { GetLoginMethodsResponseNormalized } from "../../../../multitenancy/types";
 import type { RecipeRouter } from "../../../../recipeRouter";
 import type { AuthPageThemeProps } from "../../../types";
@@ -102,7 +102,7 @@ const AuthPageInner: React.FC<AuthPageProps> = (props) => {
         GetLoginMethodsResponseNormalized | undefined
     >(undefined);
     const [error, setError] = useState<string | undefined>(errorFromQS);
-    const [sessionLoadedAndDidNotExist, setSessionLoadedAndDidNotExist] = useState(false);
+    const [sessionLoadedAndNotRedirecting, setSessionLoadedAndNotRedirecting] = useState(false);
     const st = SuperTokens.getInstanceOrThrow();
     const [factorList, setFactorList] = useState<string[] | undefined>(props.factors);
     const [isSignUp, setIsSignUp] = useState<boolean>(props.isSignUp ?? isSignUpFromQS ?? st.defaultToSignUp);
@@ -131,7 +131,7 @@ const AuthPageInner: React.FC<AuthPageProps> = (props) => {
     }, [loadedDynamicLoginMethods, setLoadedDynamicLoginMethods]);
 
     useEffect(() => {
-        if (sessionLoadedAndDidNotExist) {
+        if (sessionLoadedAndNotRedirecting) {
             return;
         }
 
@@ -155,9 +155,11 @@ const AuthPageInner: React.FC<AuthPageProps> = (props) => {
                             props.navigate
                         )
                         .catch(rethrowInRender);
+                } else {
+                    setSessionLoadedAndNotRedirecting(true);
                 }
             } else {
-                setSessionLoadedAndDidNotExist(true);
+                setSessionLoadedAndNotRedirecting(true);
             }
         }
     }, [sessionContext.loading]);
@@ -181,7 +183,7 @@ const AuthPageInner: React.FC<AuthPageProps> = (props) => {
         }
 
         if (
-            sessionLoadedAndDidNotExist &&
+            sessionLoadedAndNotRedirecting &&
             (loadedDynamicLoginMethods !== undefined || !SuperTokens.usesDynamicLoginMethods)
         ) {
             void buildAndSetChildProps(
@@ -201,7 +203,7 @@ const AuthPageInner: React.FC<AuthPageProps> = (props) => {
             abortCtl.abort();
         };
     }, [
-        sessionLoadedAndDidNotExist,
+        sessionLoadedAndNotRedirecting,
         rebuildReqCount,
         setRebuildReqCount,
         props.preBuiltUIList,
@@ -323,7 +325,7 @@ async function buildAndSetChildProps(
 
     const isSignUp = hasSeparateSignUpView && isSignUpState;
 
-    const authComps = [];
+    const authComps: AuthComponent[] = [];
 
     for (const ui of recipeRouters) {
         authComps.push(...ui.getAuthComponents());

diff --git a/lib/ts/recipe/emailpassword/prebuiltui.tsx b/lib/ts/recipe/emailpassword/prebuiltui.tsx
@@ -134,9 +134,7 @@ export class EmailPasswordPreBuiltUI extends RecipeRouter {
         return;
     }
 
-    static SignInFeature = SignInFeature;
     static SignInTheme = SignInTheme;
-    static SignUpFeature = SignUpFeature;
     static SignUpTheme = SignUpTheme;
 
     static ResetPasswordUsingToken = (prop: FeatureBaseProps<{ userContext?: UserContext }>) =>
@@ -147,4 +145,9 @@ export class EmailPasswordPreBuiltUI extends RecipeRouter {
 
 const ResetPasswordUsingToken = EmailPasswordPreBuiltUI.ResetPasswordUsingToken;
 
-export { ResetPasswordUsingToken, ResetPasswordUsingTokenThemeWrapper as ResetPasswordUsingTokenTheme };
+export {
+    ResetPasswordUsingToken,
+    SignInTheme,
+    SignUpTheme,
+    ResetPasswordUsingTokenThemeWrapper as ResetPasswordUsingTokenTheme,
+};
diff --git a/lib/ts/recipe/passwordless/components/features/mfa/index.tsx b/lib/ts/recipe/passwordless/components/features/mfa/index.tsx
@@ -50,7 +50,7 @@ import type Recipe from "../../../recipe";
 import type { AdditionalLoginAttemptInfoProperties, ComponentOverrideMap, MFAChildProps } from "../../../types";
 import type { MFAAction, MFAState, NormalisedConfig } from "../../../types";
 import type { RecipeInterface } from "supertokens-web-js/recipe/passwordless";
-import type { PasswordlessFlowType } from "supertokens-web-js/recipe/thirdpartypasswordless";
+import type { PasswordlessFlowType } from "supertokens-web-js/recipe/passwordless/types";
 
 export const useFeatureReducer = (): [MFAState, React.Dispatch<MFAAction>] => {
     return React.useReducer(

diff --git a/lib/ts/recipe/thirdparty/index.ts b/lib/ts/recipe/thirdparty/index.ts
@@ -41,8 +41,7 @@ import { UserInput, GetRedirectionURLContext, PreAPIHookContext, OnHandleEventCo
 import { redirectToThirdPartyLogin as UtilsRedirectToThirdPartyLogin } from "./utils";
 
 import type { UserContext } from "../../types";
-import type { StateObject } from "supertokens-web-js/recipe/thirdparty";
-import type { RecipeFunctionOptions } from "supertokens-web-js/recipe/thirdpartyemailpassword";
+import type { StateObject, RecipeFunctionOptions } from "supertokens-web-js/recipe/thirdparty";
 import type { User } from "supertokens-web-js/types";
 
 export default class Wrapper {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -98,7 +98,7 @@
     "peerDependencies": {
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0",
-        "supertokens-web-js": "^0.11.0"
+        "supertokens-web-js": "github:supertokens/supertokens-web-js#feat/remove_combo_recipes"
     },
     "scripts": {
         "init": "bash ./init.sh",

diff --git a/test/constants.js b/test/constants.js
@@ -33,6 +33,7 @@ export const SEND_VERIFY_EMAIL_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/u
 export const VERIFY_EMAIL_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/user/email/verify`;
 export const SIGN_IN_UP_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/signinup`;
 export const CREATE_CODE_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/signinup/code`;
+export const CONSUME_CODE_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/signinup/code/consume`;
 export const CREATE_TOTP_DEVICE_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/totp/device`;
 export const GET_AUTH_URL_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/authorisationurl`;
 export const LOGIN_METHODS_API = `${TEST_APPLICATION_SERVER_BASE_URL}/auth/loginmethods`;

diff --git a/test/end-to-end/mfa.factorscreen.otp.test.js b/test/end-to-end/mfa.factorscreen.otp.test.js
@@ -35,7 +35,13 @@ import {
     setAccountLinkingConfig,
 } from "../helpers";
 import fetch from "isomorphic-fetch";
-import { CREATE_CODE_API, CREATE_TOTP_DEVICE_API, MFA_INFO_API, SOMETHING_WENT_WRONG_ERROR } from "../constants";
+import {
+    CONSUME_CODE_API,
+    CREATE_CODE_API,
+    CREATE_TOTP_DEVICE_API,
+    MFA_INFO_API,
+    SOMETHING_WENT_WRONG_ERROR,
+} from "../constants";
 
 import { TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL } from "../constants";
 import { getTestPhoneNumber } from "../exampleTestHelpers";
@@ -328,6 +334,89 @@ describe("SuperTokens SignIn w/ MFA", function () {
                     }
                 });
 
+                it("should handle consumeCode restart flow error", async () => {
+                    await setMFAInfo({
+                        requirements: [factorId],
+                        alreadySetup: [factorId],
+                        allowedToSetup: [factorId],
+                    });
+
+                    await page.setRequestInterception(true);
+                    const requestHandler = (request) => {
+                        if (request.url() === CONSUME_CODE_API && request.method() === "POST") {
+                            return request.respond({
+                                status: 200,
+                                headers: {
+                                    "access-control-allow-origin": TEST_CLIENT_BASE_URL,
+                                    "access-control-allow-credentials": "true",
+                                },
+                                body: JSON.stringify({
+                                    status: "RESTART_FLOW_ERROR",
+                                }),
+                            });
+                        }
+
+                        return request.continue();
+                    };
+                    page.on("request", requestHandler);
+                    try {
+                        await tryEmailPasswordSignIn(page, email);
+
+                        await completeOTP(page);
+
+                        await waitForAccessDenied(page);
+                    } finally {
+                        page.off("request", requestHandler);
+                        await page.setRequestInterception(false);
+                    }
+                });
+
+                it("should handle consumeCode restart flow error when setting up factor", async () => {
+                    await setMFAInfo({
+                        requirements: [factorId],
+                        alreadySetup: [],
+                        allowedToSetup: [factorId],
+                        noContacts: true,
+                    });
+
+                    await page.setRequestInterception(true);
+                    const requestHandler = (request) => {
+                        if (request.url() === CONSUME_CODE_API && request.method() === "POST") {
+                            return request.respond({
+                                status: 200,
+                                headers: {
+                                    "access-control-allow-origin": TEST_CLIENT_BASE_URL,
+                                    "access-control-allow-credentials": "true",
+                                },
+                                body: JSON.stringify({
+                                    status: "RESTART_FLOW_ERROR",
+                                }),
+                            });
+                        }
+
+                        return request.continue();
+                    };
+                    page.on("request", requestHandler);
+                    try {
+                        await tryEmailPasswordSignIn(page, email);
+
+                        await setInputValues(page, [
+                            contactMethod === "PHONE"
+                                ? { name: "phoneNumber_text", value: getTestPhoneNumber() }
+                                : { name: "email", value: await getTestEmail() },
+                        ]);
+                        await submitForm(page);
+
+                        await completeOTP(page);
+
+                        const error = await getGeneralError(page);
+                        assert.strictEqual("Login unsuccessful. Please try again.", error);
+                    } finally {
+                        page.off("request", requestHandler);
+                        await page.setRequestInterception(false);
+                    }
+                });
+
                 it("should enable you to change the contact info during setup (w/ contact form)", async () => {
                     await setMFAInfo({
                         requirements: [factorId],