PR changes

supertokens · Dec 7, 2023 · 104a2b0 · 104a2b0
1 parent 3877f51
commit 104a2b0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 32 deletions.
diff --git a/lib/ts/recipe/recipeModule/types.ts b/lib/ts/recipe/recipeModule/types.ts
@@ -22,10 +22,7 @@ export type RecipePostAPIHookFunction<Action> = (context: RecipePostAPIHookConte
 export type RecipeOnHandleEventFunction<EventType> = (context: EventType) => void;
 
 export type UserInput<GetRedirectionURLContextType, Action, OnHandleEventContextType> = {
-    getRedirectionURL?: (
-        context: GetRedirectionURLContextType,
-        userContext: any
-    ) => Promise<string | undefined | null>;
+    getRedirectionURL?: (context: GetRedirectionURLContextType, userContext: any) => Promise<string | undefined | null>;
     preAPIHook?: RecipePreAPIHookFunction<Action>;
     postAPIHook?: RecipePostAPIHookFunction<Action>;
     onHandleEvent?: RecipeOnHandleEventFunction<OnHandleEventContextType>;

diff --git a/lib/ts/recipe/session/recipe.tsx b/lib/ts/recipe/session/recipe.tsx
@@ -19,7 +19,6 @@
 import SessionWebJS from "supertokens-web-js/recipe/session";
 import WebJSSessionRecipe from "supertokens-web-js/recipe/session";
 
-import { logDebugMessage } from "../../logger";
 import SuperTokens from "../../superTokens";
 import { getLocalStorage, isTest, removeFromLocalStorage, setLocalStorage } from "../../utils";
 import RecipeModule from "../recipeModule";
@@ -166,17 +165,6 @@ export default class Session extends RecipeModule<unknown, unknown, unknown, Nor
                 userContext,
             });
 
-            if (failureRedirectInfo.redirectPath === null) {
-                logDebugMessage(
-                    `Skipping redirection because the user override returned null for validator ${JSON.stringify(
-                        failureRedirectInfo.failedClaim,
-                        null,
-                        2
-                    )}`
-                );
-                return;
-            }
-
             // if redirectPath is string that means failed claim had callback that returns path, we redirect there otherwise continue
             if (failureRedirectInfo.redirectPath !== undefined) {
                 return SuperTokens.getInstanceOrThrow().redirectToUrl(failureRedirectInfo.redirectPath, navigate);

diff --git a/lib/ts/recipe/session/sessionAuth.tsx b/lib/ts/recipe/session/sessionAuth.tsx
@@ -18,7 +18,6 @@
  */
 import React, { useEffect, useState, useRef, useCallback } from "react";
 
-import { logDebugMessage } from "../../logger";
 import SuperTokens from "../../superTokens";
 import UI from "../../ui";
 import { useUserContext } from "../../usercontext";
@@ -187,18 +186,6 @@ const SessionAuth: React.FC<PropsWithChildren<SessionAuthProps>> = ({ children,
                         userContext,
                     });
 
-                    if (failureRedirectInfo.redirectPath === null) {
-                        setContext(toSetContext);
-                        logDebugMessage(
-                            `Skipping redirection because the user override returned null for validator ${JSON.stringify(
-                                failureRedirectInfo.failedClaim,
-                                null,
-                                2
-                            )}`
-                        );
-                        return;
-                    }
-
                     if (failureRedirectInfo.redirectPath !== undefined) {
                         setContext(toSetContext);
                         return await SuperTokens.getInstanceOrThrow().redirectToUrl(

diff --git a/lib/ts/recipe/session/utils.ts b/lib/ts/recipe/session/utils.ts
@@ -57,7 +57,7 @@ export const getFailureRedirectionInfo = async ({
         userContext: any
     ) => SessionClaimValidator[];
     userContext: any;
-}): Promise<{ redirectPath?: string | null; failedClaim?: ClaimValidationError }> => {
+}): Promise<{ redirectPath?: string; failedClaim?: ClaimValidationError }> => {
     const globalValidators = getGlobalClaimValidators({
         overrideGlobalClaimValidators,
         userContext,

diff --git a/lib/ts/types.ts b/lib/ts/types.ts
@@ -329,8 +329,7 @@ export type ThemeBaseProps = {
     styleFromInit?: string;
 };
 
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type FeatureBaseProps<T = {}> = PropsWithChildren<
+export type FeatureBaseProps<T = Record<string, unknown>> = PropsWithChildren<
     {
         navigate?: Navigate;
     } & T