{showBackButton ? (
+ {oauth2ClientInfo &&
+ oauth2ClientInfo.clientName !== undefined &&
+ oauth2ClientInfo.clientName.length > 0 && (
+
+ {t("AUTH_PAGE_HEADER_TITLE_SIGN_IN_UP_TO_APP")}
+ {oauth2ClientInfo.clientUri !== undefined ? (
+
+ {oauth2ClientInfo.clientName}
+
+ ) : (
+
+ {oauth2ClientInfo.clientName}
+
+ )}
+
+ )}
{hasSeparateSignUpView &&
(!isSignUp ? (
diff --git a/lib/ts/recipe/authRecipe/components/theme/authPage/index.tsx b/lib/ts/recipe/authRecipe/components/theme/authPage/index.tsx
index cec9ccd85..88d937b38 100644
--- a/lib/ts/recipe/authRecipe/components/theme/authPage/index.tsx
+++ b/lib/ts/recipe/authRecipe/components/theme/authPage/index.tsx
@@ -50,6 +50,7 @@ export function AuthPageTheme(props: AuthPageThemeProps): JSX.Element {
hasSeparateSignUpView={props.hasSeparateSignUpView}
resetFactorList={props.resetFactorList}
showBackButton={props.showBackButton}
+ oauth2ClientInfo={props.oauth2ClientInfo}
/>
{props.error !== undefined && = {
preloadInfo: T;
};
+export type AuthSuccessContext = Omit<
+ SuccessRedirectContext,
+ "redirectToPath" | "action" | "loginChallenge" | "recipeId"
+> & { recipeId: string };
+
export type AuthPageThemeProps = {
+ oauth2ClientInfo?: {
+ clientLogo?: string;
+ clientUri?: string;
+ clientName: string;
+ };
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise;
+
showBackButton: boolean;
setFactorList: (factorIds: string[]) => void;
resetFactorList: () => void;
diff --git a/lib/ts/recipe/emailpassword/components/features/signin/index.tsx b/lib/ts/recipe/emailpassword/components/features/signin/index.tsx
index 3a7a09119..23b768f50 100644
--- a/lib/ts/recipe/emailpassword/components/features/signin/index.tsx
+++ b/lib/ts/recipe/emailpassword/components/features/signin/index.tsx
@@ -23,16 +23,18 @@ import { useCallback } from "react";
import AuthComponentWrapper from "../../../../../components/authCompWrapper";
import { useTranslation } from "../../../../../translation/translationContext";
-import { getRedirectToPathFromURL, useRethrowInRender } from "../../../../../utils";
+import { getTenantIdFromQueryParams, useRethrowInRender } from "../../../../../utils";
import { EmailVerificationClaim } from "../../../../emailverification";
import EmailVerification from "../../../../emailverification/recipe";
import { getInvalidClaimsFromResponse } from "../../../../session";
import Session from "../../../../session/recipe";
import useSessionContext from "../../../../session/useSessionContext";
+import EmailPassword from "../../../recipe";
import { Label } from "../../library";
import SignInTheme from "../../themes/signIn";
import type { Navigate, UserContext, PartialAuthComponentProps } from "../../../../../types";
+import type { AuthSuccessContext } from "../../../../authRecipe/types";
import type Recipe from "../../../recipe";
import type { SignInThemeProps } from "../../../types";
import type { ComponentOverrideMap } from "../../../types";
@@ -40,6 +42,7 @@ import type { RecipeInterface } from "supertokens-web-js/recipe/emailpassword";
export function useChildProps(
recipe: Recipe,
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise,
error: string | undefined,
onError: (err: string) => void,
clearError: () => void,
@@ -61,30 +64,26 @@ export function useChildProps(
payloadAfterCall = undefined;
}
- return Session.getInstanceOrThrow()
- .validateGlobalClaimsAndHandleSuccessRedirection(
- {
- action: "SUCCESS",
- createdNewUser: false,
- isNewRecipeUser: false,
- newSessionCreated:
- session.loading ||
- !session.doesSessionExist ||
- (payloadAfterCall !== undefined &&
- session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
- recipeId: recipe!.recipeID,
- },
- recipe!.recipeID,
- getRedirectToPathFromURL(),
- userContext,
- navigate
- )
- .catch(rethrowInRender);
+ return onAuthSuccess({
+ createdNewUser: false,
+ isNewRecipeUser: false,
+ newSessionCreated:
+ session.loading ||
+ !session.doesSessionExist ||
+ (payloadAfterCall !== undefined &&
+ session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
+ recipeId: EmailPassword.RECIPE_ID,
+ }).catch(rethrowInRender);
}, [recipe, userContext, navigate]);
return useMemo(() => {
const onForgotPasswordClick = () =>
- recipe.redirect({ action: "RESET_PASSWORD" }, navigate, undefined, userContext);
+ recipe.redirect(
+ { action: "RESET_PASSWORD", tenantIdFromQueryParams: getTenantIdFromQueryParams() },
+ navigate,
+ undefined,
+ userContext
+ );
const signInAndUpFeature = recipe.config.signInAndUpFeature;
const signInFeature = signInAndUpFeature.signInForm;
@@ -124,6 +123,7 @@ export function useChildProps(
await evInstance.redirect(
{
action: "VERIFY_EMAIL",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
navigate,
undefined,
@@ -153,6 +153,7 @@ export const SignInFeature: React.FC<
> = (props) => {
const childProps = useChildProps(
props.recipe,
+ props.onAuthSuccess,
props.error,
props.onError,
props.clearError,
@@ -187,5 +188,13 @@ export default SignInFeature;
const getModifiedRecipeImplementation = (origImpl: RecipeInterface): RecipeInterface => {
return {
...origImpl,
+ signIn: async function (input) {
+ const response = await origImpl.signIn({ ...input, shouldTryLinkingWithSessionUser: false });
+ return response;
+ },
+ signUp: async function (input) {
+ const response = await origImpl.signUp({ ...input, shouldTryLinkingWithSessionUser: false });
+ return response;
+ },
};
};
diff --git a/lib/ts/recipe/emailpassword/components/features/signup/index.tsx b/lib/ts/recipe/emailpassword/components/features/signup/index.tsx
index 43f236a5b..aa0c27f19 100644
--- a/lib/ts/recipe/emailpassword/components/features/signup/index.tsx
+++ b/lib/ts/recipe/emailpassword/components/features/signup/index.tsx
@@ -24,7 +24,7 @@ import STGeneralError from "supertokens-web-js/utils/error";
import AuthComponentWrapper from "../../../../../components/authCompWrapper";
import { useUserContext } from "../../../../../usercontext";
-import { getRedirectToPathFromURL, useRethrowInRender } from "../../../../../utils";
+import { getTenantIdFromQueryParams, useRethrowInRender } from "../../../../../utils";
import { EmailVerificationClaim } from "../../../../emailverification";
import EmailVerification from "../../../../emailverification/recipe";
import { getInvalidClaimsFromResponse } from "../../../../session";
@@ -33,6 +33,7 @@ import useSessionContext from "../../../../session/useSessionContext";
import SignUpTheme from "../../themes/signUp";
import type { Navigate, NormalisedFormField, UserContext, PartialAuthComponentProps } from "../../../../../types";
+import type { AuthSuccessContext } from "../../../../authRecipe/types";
import type Recipe from "../../../recipe";
import type { SignUpThemeProps } from "../../../types";
import type { ComponentOverrideMap, FormFieldThemeProps } from "../../../types";
@@ -41,6 +42,7 @@ import type { User } from "supertokens-web-js/types";
export function useChildProps(
recipe: Recipe,
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise,
error: string | undefined,
onError: (err: string) => void,
clearError: () => void,
@@ -61,25 +63,16 @@ export function useChildProps(
} catch {
payloadAfterCall = undefined;
}
- return Session.getInstanceOrThrow()
- .validateGlobalClaimsAndHandleSuccessRedirection(
- {
- action: "SUCCESS",
- createdNewUser: result.user.loginMethods.length === 1,
- isNewRecipeUser: true,
- newSessionCreated:
- session.loading ||
- !session.doesSessionExist ||
- (payloadAfterCall !== undefined &&
- session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
- recipeId: recipe!.recipeID,
- },
- recipe!.recipeID,
- getRedirectToPathFromURL(),
- userContext,
- navigate
- )
- .catch(rethrowInRender);
+ return onAuthSuccess({
+ createdNewUser: result.user.loginMethods.length === 1,
+ isNewRecipeUser: true,
+ newSessionCreated:
+ session.loading ||
+ !session.doesSessionExist ||
+ (payloadAfterCall !== undefined &&
+ session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
+ recipeId: recipe!.recipeID,
+ }).catch(rethrowInRender);
},
[recipe, userContext, navigate]
);
@@ -103,6 +96,7 @@ export function useChildProps(
await evInstance.redirect(
{
action: "VERIFY_EMAIL",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
navigate,
undefined,
@@ -138,6 +132,7 @@ export const SignUpFeature: React.FC<
}
const childProps = useChildProps(
props.recipe,
+ props.onAuthSuccess,
props.error,
props.onError,
props.clearError,
@@ -172,6 +167,14 @@ export default SignUpFeature;
const getModifiedRecipeImplementation = (origImpl: RecipeInterface): RecipeInterface => {
return {
...origImpl,
+ signIn: async function (input) {
+ const response = await origImpl.signIn({ ...input, shouldTryLinkingWithSessionUser: false });
+ return response;
+ },
+ signUp: async function (input) {
+ const response = await origImpl.signUp({ ...input, shouldTryLinkingWithSessionUser: false });
+ return response;
+ },
};
};
diff --git a/lib/ts/recipe/emailpassword/components/themes/signIn/index.tsx b/lib/ts/recipe/emailpassword/components/themes/signIn/index.tsx
index 298a8d394..61d66b8ec 100644
--- a/lib/ts/recipe/emailpassword/components/themes/signIn/index.tsx
+++ b/lib/ts/recipe/emailpassword/components/themes/signIn/index.tsx
@@ -57,6 +57,7 @@ export const SignInForm = withOverride(
const response = await props.recipeImplementation.signIn({
formFields,
+ shouldTryLinkingWithSessionUser: false,
userContext,
});
if (response.status === "WRONG_CREDENTIALS_ERROR") {
diff --git a/lib/ts/recipe/emailpassword/components/themes/signUp/index.tsx b/lib/ts/recipe/emailpassword/components/themes/signUp/index.tsx
index 9e796e0c4..d07c5c8b5 100644
--- a/lib/ts/recipe/emailpassword/components/themes/signUp/index.tsx
+++ b/lib/ts/recipe/emailpassword/components/themes/signUp/index.tsx
@@ -57,6 +57,7 @@ export const SignUpForm = withOverride(
const res = await props.recipeImplementation.signUp({
formFields,
+ shouldTryLinkingWithSessionUser: false,
userContext,
});
diff --git a/lib/ts/recipe/emailpassword/index.ts b/lib/ts/recipe/emailpassword/index.ts
index e601cf2ba..52957243b 100644
--- a/lib/ts/recipe/emailpassword/index.ts
+++ b/lib/ts/recipe/emailpassword/index.ts
@@ -100,6 +100,7 @@ export default class Wrapper {
id: string;
value: string;
}[];
+ shouldTryLinkingWithSessionUser?: boolean;
options?: RecipeFunctionOptions;
userContext?: UserContext;
}): Promise<
@@ -133,6 +134,7 @@ export default class Wrapper {
id: string;
value: string;
}[];
+ shouldTryLinkingWithSessionUser?: boolean;
options?: RecipeFunctionOptions;
userContext?: UserContext;
}): Promise<
diff --git a/lib/ts/recipe/emailpassword/recipe.tsx b/lib/ts/recipe/emailpassword/recipe.tsx
index e0f05a2ad..367b0186b 100644
--- a/lib/ts/recipe/emailpassword/recipe.tsx
+++ b/lib/ts/recipe/emailpassword/recipe.tsx
@@ -18,10 +18,9 @@
*/
import EmailPasswordWebJS from "supertokens-web-js/recipe/emailpassword";
-import NormalisedURLPath from "supertokens-web-js/utils/normalisedURLPath";
import { SSR_ERROR } from "../../constants";
-import { isTest } from "../../utils";
+import { getDefaultRedirectionURLForPath, isTest } from "../../utils";
import AuthRecipe from "../authRecipe";
import { FactorIds } from "../multifactorauth/types";
@@ -50,7 +49,7 @@ export default class EmailPassword extends AuthRecipe<
NormalisedConfig
> {
static instance?: EmailPassword;
- static RECIPE_ID = "emailpassword";
+ static RECIPE_ID = "emailpassword" as const;
recipeID = EmailPassword.RECIPE_ID;
firstFactorIds = [FactorIds.EMAILPASSWORD];
@@ -63,15 +62,11 @@ export default class EmailPassword extends AuthRecipe<
public readonly webJSRecipe: WebJSRecipeInterface = EmailPasswordWebJS
) {
super(config);
- this.recipeID = config.recipeId;
}
getDefaultRedirectionURL = async (context: GetRedirectionURLContext): Promise => {
if (context.action === "RESET_PASSWORD") {
- const resetPasswordPath = new NormalisedURLPath(DEFAULT_RESET_PASSWORD_PATH);
- return `${this.config.appInfo.websiteBasePath.appendPath(resetPasswordPath).getAsStringDangerous()}?rid=${
- this.config.recipeId
- }`;
+ return getDefaultRedirectionURLForPath(this.config, DEFAULT_RESET_PASSWORD_PATH, context);
}
return this.getAuthRecipeDefaultRedirectionURL(context);
diff --git a/lib/ts/recipe/emailpassword/types.ts b/lib/ts/recipe/emailpassword/types.ts
index e67ea3d86..b30f27e3f 100644
--- a/lib/ts/recipe/emailpassword/types.ts
+++ b/lib/ts/recipe/emailpassword/types.ts
@@ -26,6 +26,7 @@ import type {
FormFieldBaseConfig,
NormalisedBaseConfig,
NormalisedFormField,
+ NormalisedGetRedirectionURLContext,
ThemeBaseProps,
UserContext,
} from "../../types";
@@ -265,12 +266,12 @@ export type PreAPIHookContext = {
userContext: UserContext;
};
-export type GetRedirectionURLContext = {
+export type GetRedirectionURLContext = NormalisedGetRedirectionURLContext<{
/*
* Get Redirection URL Context
*/
action: "RESET_PASSWORD";
-};
+}>;
export type OnHandleEventContext =
| AuthRecipeModuleOnHandleEventContext
diff --git a/lib/ts/recipe/emailverification/emailVerificationClaim.ts b/lib/ts/recipe/emailverification/emailVerificationClaim.ts
index dd68daa42..550cf0dff 100644
--- a/lib/ts/recipe/emailverification/emailVerificationClaim.ts
+++ b/lib/ts/recipe/emailverification/emailVerificationClaim.ts
@@ -1,5 +1,7 @@
import { EmailVerificationClaimClass as EmailVerificationClaimClassWebJS } from "supertokens-web-js/recipe/emailverification";
+import { getTenantIdFromQueryParams } from "../../utils";
+
import EmailVerification from "./recipe";
import type { UserContext, ValidationFailureCallback } from "../../types";
@@ -24,7 +26,10 @@ export class EmailVerificationClaimClass extends EmailVerificationClaimClassWebJ
}
const recipe = EmailVerification.getInstanceOrThrow();
if (recipe.config.mode === "REQUIRED") {
- return recipe.getRedirectUrl({ action: "VERIFY_EMAIL" }, args.userContext);
+ return recipe.getRedirectUrl(
+ { action: "VERIFY_EMAIL", tenantIdFromQueryParams: getTenantIdFromQueryParams() },
+ args.userContext
+ );
}
return undefined;
},
diff --git a/lib/ts/recipe/emailverification/recipe.tsx b/lib/ts/recipe/emailverification/recipe.tsx
index bb2cbcb42..07a1f2e89 100644
--- a/lib/ts/recipe/emailverification/recipe.tsx
+++ b/lib/ts/recipe/emailverification/recipe.tsx
@@ -18,12 +18,11 @@
*/
import EmailVerificationWebJS from "supertokens-web-js/recipe/emailverification";
-import NormalisedURLPath from "supertokens-web-js/utils/normalisedURLPath";
import { PostSuperTokensInitCallbacks } from "supertokens-web-js/utils/postSuperTokensInitCallbacks";
import { SessionClaimValidatorStore } from "supertokens-web-js/utils/sessionClaimValidatorStore";
import { SSR_ERROR } from "../../constants";
-import { isTest } from "../../utils";
+import { getDefaultRedirectionURLForPath, isTest } from "../../utils";
import RecipeModule from "../recipeModule";
import { DEFAULT_VERIFY_EMAIL_PATH } from "./constants";
@@ -135,10 +134,7 @@ export default class EmailVerification extends RecipeModule<
getDefaultRedirectionURL = async (context: GetRedirectionURLContext): Promise => {
if (context.action === "VERIFY_EMAIL") {
- const verifyEmailPath = new NormalisedURLPath(DEFAULT_VERIFY_EMAIL_PATH);
- return `${this.config.appInfo.websiteBasePath.appendPath(verifyEmailPath).getAsStringDangerous()}?rid=${
- this.config.recipeId
- }`;
+ return getDefaultRedirectionURLForPath(this.config, DEFAULT_VERIFY_EMAIL_PATH, context);
} else {
return "/";
}
diff --git a/lib/ts/recipe/emailverification/types.ts b/lib/ts/recipe/emailverification/types.ts
index 224449991..01f3fba7b 100644
--- a/lib/ts/recipe/emailverification/types.ts
+++ b/lib/ts/recipe/emailverification/types.ts
@@ -15,7 +15,7 @@
import type { SendVerifyEmail } from "./components/themes/emailVerification/sendVerifyEmail";
import type { VerifyEmailLinkClicked } from "./components/themes/emailVerification/verifyEmailLinkClicked";
import type { ComponentOverride } from "../../components/componentOverride/componentOverride";
-import type { FeatureBaseConfig, ThemeBaseProps, UserContext } from "../../types";
+import type { FeatureBaseConfig, NormalisedGetRedirectionURLContext, ThemeBaseProps, UserContext } from "../../types";
import type {
Config as RecipeModuleConfig,
NormalisedConfig as NormalisedRecipeModuleConfig,
@@ -61,9 +61,9 @@ export type NormalisedConfig = {
};
} & NormalisedRecipeModuleConfig;
-export type GetRedirectionURLContext = {
+export type GetRedirectionURLContext = NormalisedGetRedirectionURLContext<{
action: "VERIFY_EMAIL";
-};
+}>;
export type PreAndPostAPIHookAction = "VERIFY_EMAIL" | "SEND_VERIFY_EMAIL" | "IS_EMAIL_VERIFIED";
diff --git a/lib/ts/recipe/multifactorauth/recipe.tsx b/lib/ts/recipe/multifactorauth/recipe.tsx
index 9d6ef7dcd..d7fd8f0d0 100644
--- a/lib/ts/recipe/multifactorauth/recipe.tsx
+++ b/lib/ts/recipe/multifactorauth/recipe.tsx
@@ -19,7 +19,6 @@
import MultiFactorAuthWebJS from "supertokens-web-js/recipe/multifactorauth";
import { getNormalisedUserContext } from "supertokens-web-js/utils";
-import NormalisedURLPath from "supertokens-web-js/utils/normalisedURLPath";
import { PostSuperTokensInitCallbacks } from "supertokens-web-js/utils/postSuperTokensInitCallbacks";
import { SessionClaimValidatorStore } from "supertokens-web-js/utils/sessionClaimValidatorStore";
import { WindowHandlerReference } from "supertokens-web-js/utils/windowHandler";
@@ -29,7 +28,9 @@ import SuperTokens from "../../superTokens";
import {
appendQueryParamsToURL,
getCurrentNormalisedUrlPathWithQueryParamsAndFragments,
+ getDefaultRedirectionURLForPath,
getRedirectToPathFromURL,
+ getTenantIdFromQueryParams,
isTest,
} from "../../utils";
import RecipeModule from "../recipeModule";
@@ -69,7 +70,10 @@ export default class MultiFactorAuth extends RecipeModule<
static MultiFactorAuthClaim = new MultiFactorAuthClaimClass(
() => MultiFactorAuth.getInstanceOrThrow(),
async (context, userContext) =>
- (await this.getInstanceOrThrow().getRedirectUrl(context, userContext)) || undefined
+ (await this.getInstanceOrThrow().getRedirectUrl(
+ { ...context, tenantIdFromQueryParams: getTenantIdFromQueryParams() },
+ userContext
+ )) || undefined
);
public recipeID = MultiFactorAuth.RECIPE_ID;
@@ -149,36 +153,22 @@ export default class MultiFactorAuth extends RecipeModule<
getDefaultRedirectionURL = async (context: GetRedirectionURLContext, userContext: UserContext): Promise => {
if (context.action === "FACTOR_CHOOSER") {
- const chooserPath = new NormalisedURLPath(DEFAULT_FACTOR_CHOOSER_PATH);
- let url = this.config.appInfo.websiteBasePath.appendPath(chooserPath).getAsStringDangerous();
- const queryParams = new URLSearchParams();
- if (context.nextFactorOptions && context.nextFactorOptions.length > 0) {
- queryParams.set("n", context.nextFactorOptions.join(","));
- }
- if (context.stepUp) {
- queryParams.set("stepUp", "true");
- }
- if (queryParams.toString() !== "") {
- url += "?" + queryParams.toString();
- }
- return url;
+ const nParam =
+ context.nextFactorOptions && context.nextFactorOptions.length > 0
+ ? context.nextFactorOptions.join(",")
+ : undefined;
+
+ return getDefaultRedirectionURLForPath(this.config, DEFAULT_FACTOR_CHOOSER_PATH, context, {
+ n: nParam,
+ stepUp: context.stepUp ? "true" : undefined,
+ });
} else if (context.action === "GO_TO_FACTOR") {
const redirectInfo = this.getSecondaryFactors(userContext).find((f) => f.id === context.factorId);
if (redirectInfo !== undefined) {
- let url = this.config.appInfo.websiteBasePath
- .appendPath(new NormalisedURLPath(redirectInfo.path))
- .getAsStringDangerous();
- const queryParams = new URLSearchParams();
- if (context.forceSetup) {
- queryParams.set("setup", "true");
- }
- if (context.stepUp) {
- queryParams.set("stepUp", "true");
- }
- if (queryParams.toString() !== "") {
- url += "?" + queryParams.toString();
- }
- return url;
+ return getDefaultRedirectionURLForPath(this.config, redirectInfo.path, context, {
+ setup: context.forceSetup ? "true" : undefined,
+ stepUp: context.stepUp ? "true" : undefined,
+ });
}
throw new Error("Requested redirect to unknown factor id: " + context.factorId);
} else {
@@ -219,7 +209,13 @@ export default class MultiFactorAuth extends RecipeModule<
userContext: UserContext | undefined;
}) {
let url = await this.getRedirectUrl(
- { action: "GO_TO_FACTOR", forceSetup, stepUp, factorId },
+ {
+ action: "GO_TO_FACTOR",
+ forceSetup,
+ stepUp,
+ factorId,
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
+ },
getNormalisedUserContext(userContext)
);
if (url === null) {
@@ -262,7 +258,12 @@ export default class MultiFactorAuth extends RecipeModule<
userContext: UserContext | undefined;
}) {
let url = await this.getRedirectUrl(
- { action: "FACTOR_CHOOSER", nextFactorOptions, stepUp },
+ {
+ action: "FACTOR_CHOOSER",
+ nextFactorOptions,
+ stepUp,
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
+ },
getNormalisedUserContext(userContext)
);
diff --git a/lib/ts/recipe/multifactorauth/types.ts b/lib/ts/recipe/multifactorauth/types.ts
index fbcc75693..6dc4b24eb 100644
--- a/lib/ts/recipe/multifactorauth/types.ts
+++ b/lib/ts/recipe/multifactorauth/types.ts
@@ -18,7 +18,7 @@ import type { FactorChooserHeader } from "./components/themes/factorChooser/fact
import type { FactorList } from "./components/themes/factorChooser/factorList";
import type { FactorOption } from "./components/themes/factorChooser/factorOption";
import type { ComponentOverride } from "../../components/componentOverride/componentOverride";
-import type { FeatureBaseConfig, UserContext } from "../../types";
+import type { FeatureBaseConfig, NormalisedGetRedirectionURLContext, UserContext } from "../../types";
import type {
Config as RecipeModuleConfig,
NormalisedConfig as NormalisedRecipeModuleConfig,
@@ -75,7 +75,7 @@ export type NormalisedConfig = {
};
} & NormalisedRecipeModuleConfig;
-export type GetRedirectionURLContext =
+export type GetRedirectionURLContext = NormalisedGetRedirectionURLContext<
| {
action: "FACTOR_CHOOSER";
nextFactorOptions?: string[];
@@ -86,7 +86,8 @@ export type GetRedirectionURLContext =
factorId: string;
forceSetup?: boolean;
stepUp?: boolean;
- };
+ }
+>;
export type PreAndPostAPIHookAction = "GET_MFA_INFO";
diff --git a/lib/ts/recipe/multifactorauth/utils.ts b/lib/ts/recipe/multifactorauth/utils.ts
index 2e276e42e..fb1934d29 100644
--- a/lib/ts/recipe/multifactorauth/utils.ts
+++ b/lib/ts/recipe/multifactorauth/utils.ts
@@ -13,6 +13,7 @@
* under the License.
*/
+import { logDebugMessage } from "../../logger";
import { normaliseRecipeModuleConfig } from "../recipeModule/utils";
import type MultiFactorAuth from "./recipe";
@@ -48,6 +49,14 @@ export function getAvailableFactors(
recipe: MultiFactorAuth,
userContext: UserContext
) {
+ logDebugMessage(`getAvailableFactors: allowed to setup: ${factors.allowedToSetup}`);
+ logDebugMessage(`getAvailableFactors: already setup: ${factors.alreadySetup}`);
+ logDebugMessage(`getAvailableFactors: next from factorInfo: ${factors.next}`);
+ logDebugMessage(`getAvailableFactors: nextArrayQueryParam: ${nextArrayQueryParam}`);
+ logDebugMessage(
+ `getAvailableFactors: secondary factors: ${recipe.getSecondaryFactors(userContext).map((f) => f.id)}`
+ );
+
// There are 3 cases here:
// 1. The app provided an array of factors to show (nextArrayQueryParam) -> we show whatever is in the array
// 2. no app provided list and validator passed -> we show all factors available to set up or complete
diff --git a/lib/ts/recipe/oauth2provider/componentOverrideContext.tsx b/lib/ts/recipe/oauth2provider/componentOverrideContext.tsx
new file mode 100644
index 000000000..467bd5485
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/componentOverrideContext.tsx
@@ -0,0 +1,7 @@
+import { createGenericComponentsOverrideContext } from "../../components/componentOverride/genericComponentOverrideContext";
+
+import type { ComponentOverrideMap } from "./types";
+
+const [useContext, Provider] = createGenericComponentsOverrideContext();
+
+export { useContext as useRecipeComponentOverrideContext, Provider as RecipeComponentsOverrideContextProvider };
diff --git a/lib/ts/recipe/oauth2provider/components/features/oauth2LogoutScreen/index.tsx b/lib/ts/recipe/oauth2provider/components/features/oauth2LogoutScreen/index.tsx
new file mode 100644
index 000000000..175a56e8e
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/components/features/oauth2LogoutScreen/index.tsx
@@ -0,0 +1,136 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Imports.
+ */
+import * as React from "react";
+import { Fragment } from "react";
+
+import { ComponentOverrideContext } from "../../../../../components/componentOverride/componentOverrideContext";
+import FeatureWrapper from "../../../../../components/featureWrapper";
+import SuperTokens from "../../../../../superTokens";
+import UI from "../../../../../ui";
+import { useUserContext } from "../../../../../usercontext";
+import { getQueryParams, getTenantIdFromQueryParams, useRethrowInRender } from "../../../../../utils";
+import { SessionContext } from "../../../../session";
+import OAuth2Provider from "../../../recipe";
+import { OAuth2LogoutScreenTheme } from "../../themes/oauth2LogoutScreen";
+import { defaultTranslationsOAuth2Provider } from "../../themes/translations";
+
+import type { FeatureBaseProps, UserContext } from "../../../../../types";
+import type Recipe from "../../../recipe";
+import type { ComponentOverrideMap } from "../../../types";
+
+type Prop = FeatureBaseProps<{
+ recipe: Recipe;
+ userContext?: UserContext;
+ useComponentOverrides: () => ComponentOverrideMap;
+}>;
+
+export const OAuth2LogoutScreen: React.FC = (props) => {
+ const rethrowInRender = useRethrowInRender();
+ const sessionContext = React.useContext(SessionContext);
+ const [isLoggingOut, setIsLoggingOut] = React.useState(false);
+ const recipeComponentOverrides = props.useComponentOverrides();
+ let userContext = useUserContext();
+ if (props.userContext !== undefined) {
+ userContext = props.userContext;
+ }
+
+ const logoutChallenge = getQueryParams("logoutChallenge") ?? undefined;
+ const navigate = props.navigate ?? UI.getReactRouterDomWithCustomHistory()?.useHistoryCustom();
+
+ const onLogout = React.useCallback(async () => {
+ if (logoutChallenge === undefined) {
+ return;
+ }
+ setIsLoggingOut(true);
+ try {
+ const { frontendRedirectTo } = await OAuth2Provider.getInstanceOrThrow().webJSRecipe.logOut({
+ logoutChallenge,
+ userContext,
+ });
+ await props.recipe.redirect(
+ {
+ recipeId: "oauth2provider",
+ action: "POST_OAUTH2_LOGOUT_REDIRECT",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
+ frontendRedirectTo,
+ },
+ navigate,
+ {},
+ userContext
+ );
+ } catch (err: any) {
+ rethrowInRender(err);
+ }
+ }, [logoutChallenge, navigate, props.recipe, userContext, rethrowInRender]);
+
+ React.useEffect(() => {
+ // We wait for session loading to finish
+ if (sessionContext.loading === false) {
+ // Redirect to the auth page if there is no logoutChallenge
+ if (logoutChallenge === undefined) {
+ void SuperTokens.getInstanceOrThrow()
+ .redirectToAuth({
+ userContext,
+ redirectBack: false,
+ })
+ .catch(rethrowInRender);
+ } else {
+ // Call logOut directly if there is no session
+ if (sessionContext.doesSessionExist === false) {
+ void onLogout();
+ }
+ }
+ }
+ }, [userContext, logoutChallenge, sessionContext, onLogout]);
+
+ const childProps = {
+ config: props.recipe.config,
+ showSpinner: sessionContext.loading || sessionContext.doesSessionExist === false,
+ onLogoutClicked: onLogout,
+ isLoggingOut,
+ };
+
+ if (logoutChallenge === undefined) {
+ return null;
+ }
+
+ return (
+
+
+
+ {/* No custom theme, use default. */}
+ {props.children === undefined &&
+
+
+ );
+};
+
+export default OAuth2LogoutScreen;
diff --git a/lib/ts/recipe/oauth2provider/components/features/tryRefreshPage/index.tsx b/lib/ts/recipe/oauth2provider/components/features/tryRefreshPage/index.tsx
new file mode 100644
index 000000000..ddb045694
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/components/features/tryRefreshPage/index.tsx
@@ -0,0 +1,104 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Imports.
+ */
+import * as React from "react";
+import { useContext, Fragment } from "react";
+
+import FeatureWrapper from "../../../../../components/featureWrapper";
+import SuperTokens from "../../../../../superTokens";
+import { useUserContext } from "../../../../../usercontext";
+import { getQueryParams, getTenantIdFromQueryParams, useRethrowInRender } from "../../../../../utils";
+import DynamicLoginMethodsSpinner from "../../../../multitenancy/components/features/dynamicLoginMethodsSpinner";
+import { SessionContext } from "../../../../session";
+import { defaultTranslationsOAuth2Provider } from "../../themes/translations";
+
+import type { FeatureBaseProps, UserContext } from "../../../../../types";
+import type Recipe from "../../../recipe";
+import type { ComponentOverrideMap } from "../../../types";
+
+type Prop = FeatureBaseProps<{
+ recipe: Recipe;
+ userContext?: UserContext;
+ useComponentOverrides: () => ComponentOverrideMap;
+}>;
+
+export const TryRefreshPage: React.FC = (props) => {
+ const rethrowInRender = useRethrowInRender();
+ const sessionContext = useContext(SessionContext);
+ const loginChallenge = getQueryParams("loginChallenge") ?? undefined;
+ let userContext = useUserContext();
+ if (props.userContext !== undefined) {
+ userContext = props.userContext;
+ }
+
+ React.useEffect(() => {
+ if (sessionContext.loading === false) {
+ if (loginChallenge) {
+ (async function () {
+ const { frontendRedirectTo } = await props.recipe.webJSRecipe.getRedirectURLToContinueOAuthFlow({
+ loginChallenge,
+ userContext,
+ });
+ return props.recipe.redirect(
+ {
+ action: "CONTINUE_OAUTH2_AFTER_REFRESH",
+ frontendRedirectTo,
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
+ recipeId: "oauth2provider",
+ },
+ props.navigate,
+ {},
+ userContext
+ );
+ })().catch(rethrowInRender);
+ } else {
+ void SuperTokens.getInstanceOrThrow()
+ .redirectToAuth({
+ userContext,
+ redirectBack: false,
+ })
+ .catch(rethrowInRender);
+ }
+ }
+ }, [loginChallenge, props.recipe, props.navigate, userContext, sessionContext]);
+
+ const childProps = {
+ config: props.recipe.config,
+ };
+ return (
+
+
+ {/* No custom theme, use default. */}
+ {props.children === undefined &&
+
+ );
+};
+
+export default TryRefreshPage;
diff --git a/lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen/OAuth2LogoutScreenInner.tsx b/lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen/OAuth2LogoutScreenInner.tsx
new file mode 100644
index 000000000..75244caa2
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen/OAuth2LogoutScreenInner.tsx
@@ -0,0 +1,41 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+import LogoutIcon from "../../../../../components/assets/logoutIcon";
+import { withOverride } from "../../../../../components/componentOverride/withOverride";
+import { useTranslation } from "../../../../../translation/translationContext";
+import { Button } from "../../../../emailpassword/components/library";
+
+export const OAuth2LogoutScreenInner = withOverride(
+ "OAuth2LogoutScreenInner",
+ function OAuth2LogoutScreenInner(props: { isLoggingOut: boolean; onLogoutClicked: () => void }): JSX.Element {
+ const t = useTranslation();
+ return (
+ <>
+ = (props) => {
+ if (props.showSpinner) {
+ return = (props) => {
+ const rootStyle = SuperTokens.getInstanceOrThrow().rootStyle;
+
+ return (
+
+
+ );
+};
diff --git a/lib/ts/recipe/oauth2provider/components/themes/styles.css b/lib/ts/recipe/oauth2provider/components/themes/styles.css
new file mode 100644
index 000000000..b26535209
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/components/themes/styles.css
@@ -0,0 +1,31 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+@import "../../../../styles/styles.css";
+
+[data-supertokens~="logoutIcon"] {
+ padding: 18px 20px 18px 24px;
+ background-color: rgba(var(--palette-textGray), 0.1);
+ border-radius: 12px;
+}
+
+[data-supertokens~="oauth2Logout"] [data-supertokens~="headerTitle"] {
+ margin-top: 24px;
+ margin-bottom: 24px;
+}
+
+[data-supertokens~="oauth2Logout"] [data-supertokens~="button"] {
+ margin-bottom: 24px;
+}
diff --git a/lib/ts/recipe/oauth2provider/components/themes/themeBase.tsx b/lib/ts/recipe/oauth2provider/components/themes/themeBase.tsx
new file mode 100644
index 000000000..883671522
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/components/themes/themeBase.tsx
@@ -0,0 +1,36 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from "react";
+import { Fragment } from "react";
+
+import styles from "./styles.css";
+
+import type { PropsWithChildren } from "react";
+
+export const ThemeBase: React.FC }>> = ({
+ children,
+ userStyles,
+}) => {
+ return (
+
+ {children}
+
+
+ );
+};
diff --git a/lib/ts/recipe/oauth2provider/components/themes/translations.ts b/lib/ts/recipe/oauth2provider/components/themes/translations.ts
new file mode 100644
index 000000000..92edb895e
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/components/themes/translations.ts
@@ -0,0 +1,10 @@
+import { defaultTranslationsCommon } from "../../../../translation/translations";
+
+export const defaultTranslationsOAuth2Provider = {
+ en: {
+ ...defaultTranslationsCommon.en,
+ LOGGING_OUT: "Logging Out",
+ LOGOUT_CONFIRMATION: "Are you sure you want to log out?",
+ LOGOUT: "LOG OUT",
+ },
+};
diff --git a/lib/ts/recipe/oauth2provider/constants.ts b/lib/ts/recipe/oauth2provider/constants.ts
new file mode 100644
index 000000000..3ac81a72d
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/constants.ts
@@ -0,0 +1,16 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+export const DEFAULT_TRY_REFRESH_PATH = "/try-refresh";
+export const DEFAULT_OAUTH2_LOGOUT_PATH = "/oauth/logout";
diff --git a/lib/ts/recipe/oauth2provider/functionOverrides.ts b/lib/ts/recipe/oauth2provider/functionOverrides.ts
new file mode 100644
index 000000000..e1df04bd8
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/functionOverrides.ts
@@ -0,0 +1,28 @@
+import type { OnHandleEventContext } from "./types";
+import type { RecipeOnHandleEventFunction } from "../recipeModule/types";
+import type { RecipeInterface } from "supertokens-web-js/recipe/oauth2provider";
+
+export const getFunctionOverrides =
+ (onHandleEvent: RecipeOnHandleEventFunction) =>
+ (originalImp: RecipeInterface): RecipeInterface => ({
+ ...originalImp,
+ async getLoginChallengeInfo(input) {
+ const response = await originalImp.getLoginChallengeInfo(input);
+ onHandleEvent({
+ action: "LOADED_LOGIN_CHALLENGE",
+ loginChallenge: input.loginChallenge,
+ loginInfo: response.info,
+ userContext: input.userContext,
+ });
+ return response;
+ },
+ async logOut(input) {
+ const response = await originalImp.logOut(input);
+ onHandleEvent({
+ action: "OAUTH2_LOGOUT_SUCCESS",
+ frontendRedirectTo: response.frontendRedirectTo,
+ userContext: input.userContext,
+ });
+ return response;
+ },
+ });
diff --git a/lib/ts/recipe/oauth2provider/index.ts b/lib/ts/recipe/oauth2provider/index.ts
new file mode 100644
index 000000000..b935f352f
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/index.ts
@@ -0,0 +1,115 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RecipeComponentsOverrideContextProvider } from "./componentOverrideContext";
+import OAuth2Provider from "./recipe";
+import { UserInput, GetRedirectionURLContext, PreAPIHookContext, OnHandleEventContext } from "./types";
+
+import type { RecipeFunctionOptions, LoginInfo } from "supertokens-web-js/recipe/oauth2provider";
+import type { RecipeInterface } from "supertokens-web-js/recipe/oauth2provider";
+
+export default class Wrapper {
+ static init(config?: UserInput) {
+ return OAuth2Provider.init(config);
+ }
+ /**
+ * Returns information about an OAuth login in progress
+ *
+ * @param loginChallenge The login challenge from the url
+ *
+ * @param userContext (OPTIONAL) Refer to {@link https://supertokens.com/docs/emailpassword/advanced-customizations/user-context the documentation}
+ *
+ * @param options (OPTIONAL) Use this to configure additional properties (for example pre api hooks)
+ *
+ * @returns `{status: "OK", info: LoginInfo}`
+ *
+ * @throws STGeneralError if the API exposed by the backend SDKs returns `status: "GENERAL_ERROR"`
+ */
+ static getLoginChallengeInfo(input: {
+ loginChallenge: string;
+ options?: RecipeFunctionOptions;
+ userContext?: any;
+ }): Promise<{
+ status: "OK";
+ info: LoginInfo;
+ fetchResponse: Response;
+ }> {
+ return OAuth2Provider.getInstanceOrThrow().webJSRecipe.getLoginChallengeInfo(input);
+ }
+
+ /**
+ * Accepts the OAuth2 Login request and returns the redirect URL to continue the OAuth flow.
+ *
+ * @param loginChallenge The login challenge from the url
+ *
+ * @param userContext (OPTIONAL) Refer to {@link https://supertokens.com/docs/emailpassword/advanced-customizations/user-context the documentation}
+ *
+ * @param options (OPTIONAL) Use this to configure additional properties (for example pre api hooks)
+ *
+ * @returns `{status: "OK", frontendRedirectTo: string}`
+ *
+ * @throws STGeneralError if the API exposed by the backend SDKs returns `status: "GENERAL_ERROR"`
+ */
+ static getRedirectURLToContinueOAuthFlow(input: {
+ loginChallenge: string;
+ options?: RecipeFunctionOptions;
+ userContext?: any;
+ }): Promise<{
+ status: "OK";
+ frontendRedirectTo: string;
+ fetchResponse: Response;
+ }> {
+ return OAuth2Provider.getInstanceOrThrow().webJSRecipe.getRedirectURLToContinueOAuthFlow(input);
+ }
+
+ /**
+ * Accepts the OAuth2 Logout request, clears the SuperTokens session and returns post logout redirect URL.
+ *
+ * @param logoutChallenge The logout challenge from the url
+ *
+ * @param userContext (OPTIONAL) Refer to {@link https://supertokens.com/docs/emailpassword/advanced-customizations/user-context the documentation}
+ *
+ * @param options (OPTIONAL) Use this to configure additional properties (for example pre api hooks)
+ *
+ * @returns `{status: "OK", frontendRedirectTo: string}`
+ *
+ * @throws STGeneralError if the API exposed by the backend SDKs returns `status: "GENERAL_ERROR"`
+ */
+ static logOut(input: { logoutChallenge: string; options?: RecipeFunctionOptions; userContext?: any }): Promise<{
+ status: "OK";
+ frontendRedirectTo: string;
+ fetchResponse: Response;
+ }> {
+ return OAuth2Provider.getInstanceOrThrow().webJSRecipe.logOut(input);
+ }
+
+ static ComponentsOverrideProvider = RecipeComponentsOverrideContextProvider;
+}
+
+const init = Wrapper.init;
+const getLoginChallengeInfo = Wrapper.getLoginChallengeInfo;
+const logOut = Wrapper.logOut;
+
+export {
+ init,
+ getLoginChallengeInfo,
+ logOut,
+ GetRedirectionURLContext,
+ PreAPIHookContext,
+ OnHandleEventContext,
+ UserInput,
+ RecipeInterface,
+ RecipeComponentsOverrideContextProvider,
+};
diff --git a/lib/ts/recipe/oauth2provider/prebuiltui.tsx b/lib/ts/recipe/oauth2provider/prebuiltui.tsx
new file mode 100644
index 000000000..3f88e7e71
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/prebuiltui.tsx
@@ -0,0 +1,140 @@
+import NormalisedURLPath from "supertokens-web-js/utils/normalisedURLPath";
+
+import UserContextWrapper from "../../usercontext/userContextWrapper";
+import { isTest, matchRecipeIdUsingQueryParams } from "../../utils";
+import { RecipeRouter } from "../recipeRouter";
+import { SessionAuth } from "../session";
+
+import { useRecipeComponentOverrideContext } from "./componentOverrideContext";
+import { default as OAuth2LogoutScreen } from "./components/features/oauth2LogoutScreen";
+import { default as TryRefreshPageFeature } from "./components/features/tryRefreshPage";
+import { defaultTranslationsOAuth2Provider } from "./components/themes/translations";
+import { DEFAULT_TRY_REFRESH_PATH, DEFAULT_OAUTH2_LOGOUT_PATH } from "./constants";
+import OAuth2ProviderRecipe from "./recipe";
+
+import type { GenericComponentOverrideMap } from "../../components/componentOverride/componentOverrideContext";
+import type { FeatureBaseProps, RecipeFeatureComponentMap, UserContext } from "../../types";
+import type { AuthComponent } from "../../types";
+
+export class OAuth2ProviderPreBuiltUI extends RecipeRouter {
+ static instance?: OAuth2ProviderPreBuiltUI;
+ languageTranslations = defaultTranslationsOAuth2Provider;
+
+ constructor(public readonly recipeInstance: OAuth2ProviderRecipe) {
+ super();
+ }
+
+ // Static methods
+ static getInstanceOrInitAndGetInstance(): OAuth2ProviderPreBuiltUI {
+ if (OAuth2ProviderPreBuiltUI.instance === undefined) {
+ const recipeInstance = OAuth2ProviderRecipe.getInstanceOrThrow();
+ OAuth2ProviderPreBuiltUI.instance = new OAuth2ProviderPreBuiltUI(recipeInstance);
+ }
+
+ return OAuth2ProviderPreBuiltUI.instance;
+ }
+ static getFeatures(
+ useComponentOverrides: () => GenericComponentOverrideMap = useRecipeComponentOverrideContext
+ ): RecipeFeatureComponentMap {
+ return OAuth2ProviderPreBuiltUI.getInstanceOrInitAndGetInstance().getFeatures(useComponentOverrides);
+ }
+ static getFeatureComponent(
+ componentName: "try-refresh-page" | "oauth2-logout-screen",
+ props: any,
+ useComponentOverrides: () => GenericComponentOverrideMap = useRecipeComponentOverrideContext
+ ): JSX.Element {
+ return OAuth2ProviderPreBuiltUI.getInstanceOrInitAndGetInstance().getFeatureComponent(
+ componentName,
+ props,
+ useComponentOverrides
+ );
+ }
+
+ // Instance methods
+ getFeatures = (
+ useComponentOverrides: () => GenericComponentOverrideMap = useRecipeComponentOverrideContext
+ ): RecipeFeatureComponentMap => {
+ if (this.recipeInstance.config.disableDefaultUI) {
+ return {};
+ }
+ const features: RecipeFeatureComponentMap = {};
+ if (this.recipeInstance.config.tryRefreshPage.disableDefaultUI !== true) {
+ const normalisedFullPath = this.recipeInstance.config.appInfo.websiteBasePath.appendPath(
+ new NormalisedURLPath(DEFAULT_TRY_REFRESH_PATH)
+ );
+ features[normalisedFullPath.getAsStringDangerous()] = {
+ matches: matchRecipeIdUsingQueryParams(this.recipeInstance.config.recipeId),
+ component: (props: any) => this.getFeatureComponent("try-refresh-page", props, useComponentOverrides),
+ recipeID: OAuth2ProviderRecipe.RECIPE_ID,
+ };
+ }
+ if (this.recipeInstance.config.oauth2LogoutScreen.disableDefaultUI !== true) {
+ const normalisedFullPath = this.recipeInstance.config.appInfo.websiteBasePath.appendPath(
+ new NormalisedURLPath(DEFAULT_OAUTH2_LOGOUT_PATH)
+ );
+ features[normalisedFullPath.getAsStringDangerous()] = {
+ matches: matchRecipeIdUsingQueryParams(this.recipeInstance.config.recipeId),
+ component: (props) =>
+ this.getFeatureComponent("oauth2-logout-screen", props as any, useComponentOverrides),
+ recipeID: OAuth2ProviderRecipe.RECIPE_ID,
+ };
+ }
+ return features;
+ };
+ getFeatureComponent = (
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ componentName: "try-refresh-page" | "oauth2-logout-screen",
+ props: FeatureBaseProps<{ userContext?: UserContext }>,
+ useComponentOverrides: () => GenericComponentOverrideMap = useRecipeComponentOverrideContext
+ ): JSX.Element => {
+ if (componentName === "try-refresh-page") {
+ return (
+
+ []}>
+
+
+ );
+ } else if (componentName === "oauth2-logout-screen") {
+ return (
+
+ []}>
+
+
+ );
+ }
+ throw new Error("Should never come here.");
+ };
+
+ getAuthComponents(): AuthComponent[] {
+ return [];
+ }
+
+ // For tests
+ static reset(): void {
+ if (!isTest()) {
+ return;
+ }
+
+ OAuth2ProviderPreBuiltUI.instance = undefined;
+ return;
+ }
+
+ static TryRefreshPage = (props: FeatureBaseProps<{ userContext?: UserContext }>) =>
+ OAuth2ProviderPreBuiltUI.getInstanceOrInitAndGetInstance().getFeatureComponent("try-refresh-page", props);
+ static OAuth2LogoutScreen = (props: FeatureBaseProps<{ userContext?: UserContext }>) =>
+ OAuth2ProviderPreBuiltUI.getInstanceOrInitAndGetInstance().getFeatureComponent("oauth2-logout-screen", props);
+}
+
+const TryRefreshPage = OAuth2ProviderPreBuiltUI.TryRefreshPage;
+
+export { TryRefreshPage };
diff --git a/lib/ts/recipe/oauth2provider/recipe.ts b/lib/ts/recipe/oauth2provider/recipe.ts
new file mode 100644
index 000000000..1509a632d
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/recipe.ts
@@ -0,0 +1,137 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Imports.
+ */
+
+import OAuth2WebJS from "supertokens-web-js/recipe/oauth2provider";
+
+import { SSR_ERROR } from "../../constants";
+import { isTest } from "../../utils";
+import RecipeModule from "../recipeModule";
+
+import { getFunctionOverrides } from "./functionOverrides";
+import { normaliseOAuth2Config } from "./utils";
+
+import type {
+ GetRedirectionURLContext,
+ NormalisedConfig,
+ OnHandleEventContext,
+ PreAndPostAPIHookAction,
+ UserInput,
+} from "./types";
+import type { RecipeInitResult, NormalisedConfigWithAppInfoAndRecipeID, WebJSRecipeInterface } from "../../types";
+import type { NormalisedAppInfo } from "../../types";
+
+/*
+ * Class.
+ */
+export default class OAuth2Provider extends RecipeModule<
+ GetRedirectionURLContext,
+ PreAndPostAPIHookAction,
+ OnHandleEventContext,
+ NormalisedConfig
+> {
+ static instance?: OAuth2Provider;
+ static readonly RECIPE_ID = "oauth2provider";
+
+ public readonly recipeID = OAuth2Provider.RECIPE_ID;
+
+ constructor(
+ config: NormalisedConfigWithAppInfoAndRecipeID,
+ public readonly webJSRecipe: WebJSRecipeInterface = OAuth2WebJS
+ ) {
+ super(config);
+ }
+
+ static init(config?: UserInput): RecipeInitResult {
+ const normalisedConfig = normaliseOAuth2Config(config);
+ return {
+ recipeID: OAuth2Provider.RECIPE_ID,
+ authReact: (
+ appInfo: NormalisedAppInfo
+ ): RecipeModule<
+ GetRedirectionURLContext,
+ PreAndPostAPIHookAction,
+ OnHandleEventContext,
+ NormalisedConfig
+ > => {
+ OAuth2Provider.instance = new OAuth2Provider({
+ ...normalisedConfig,
+ appInfo,
+ recipeId: OAuth2Provider.RECIPE_ID,
+ });
+ return OAuth2Provider.instance;
+ },
+ webJS: OAuth2WebJS.init({
+ ...normalisedConfig,
+ override: {
+ functions: (originalImpl, builder) => {
+ const functions = getFunctionOverrides(normalisedConfig.onHandleEvent);
+ builder.override(functions);
+ builder.override(normalisedConfig.override.functions);
+ return originalImpl;
+ },
+ },
+ }),
+ };
+ }
+
+ static getInstanceOrThrow(): OAuth2Provider {
+ if (OAuth2Provider.instance === undefined) {
+ let error =
+ "No instance of OAuth2Provider found. Make sure to call the OAuth2Provider.init method." +
+ "See https://supertokens.io/docs/oauth2/quick-setup/frontend";
+
+ // eslint-disable-next-line supertokens-auth-react/no-direct-window-object
+ if (typeof window === "undefined") {
+ error = error + SSR_ERROR;
+ }
+ throw Error(error);
+ }
+
+ return OAuth2Provider.instance;
+ }
+
+ static getInstance(): OAuth2Provider | undefined {
+ return OAuth2Provider.instance;
+ }
+
+ async getDefaultRedirectionURL(ctx: GetRedirectionURLContext): Promise {
+ // We do not use the util here, because we are likely redirecting across domains here.
+ if (
+ ctx.action === "SUCCESS_OAUTH2" ||
+ ctx.action === "CONTINUE_OAUTH2_AFTER_REFRESH" ||
+ ctx.action === "POST_OAUTH2_LOGOUT_REDIRECT"
+ ) {
+ return ctx.frontendRedirectTo;
+ } else {
+ throw new Error("Should never come here: unknown action in OAuth2Provider.getDefaultRedirectionURL");
+ }
+ }
+
+ /*
+ * Tests methods.
+ */
+ static reset(): void {
+ if (!isTest()) {
+ return;
+ }
+
+ OAuth2Provider.instance = undefined;
+ return;
+ }
+}
diff --git a/lib/ts/recipe/oauth2provider/types.ts b/lib/ts/recipe/oauth2provider/types.ts
new file mode 100644
index 000000000..6d8f8e7ec
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/types.ts
@@ -0,0 +1,106 @@
+import type { OAuth2LogoutScreenInner } from "./components/themes/oauth2LogoutScreen/OAuth2LogoutScreenInner";
+import type { ComponentOverride } from "../../components/componentOverride/componentOverride";
+import type {
+ NormalisedBaseConfig,
+ NormalisedGetRedirectionURLContext,
+ SuccessRedirectContextOAuth2,
+ UserContext,
+} from "../../types";
+import type {
+ UserInput as RecipeModuleUserInput,
+ NormalisedConfig as NormalisedRecipeModuleConfig,
+} from "../recipeModule/types";
+import type OverrideableBuilder from "supertokens-js-override";
+import type { LoginInfo, RecipeInterface } from "supertokens-web-js/recipe/oauth2provider/types";
+
+export type PreAndPostAPIHookAction =
+ | "GET_LOGIN_CHALLENGE_INFO"
+ | "GET_REDIRECT_URL_TO_CONTINUE_OAUTH_FLOW"
+ | "LOG_OUT";
+
+export type PreAPIHookContext = {
+ action: PreAndPostAPIHookAction;
+ requestInit: RequestInit;
+ url: string;
+ userContext: UserContext;
+};
+
+export type UserInput = {
+ disableDefaultUI?: boolean;
+ oauth2LogoutScreen?: Partial;
+ tryRefreshPage?: Partial;
+ override?: {
+ functions?: (
+ originalImplementation: RecipeInterface,
+ builder: OverrideableBuilder
+ ) => RecipeInterface;
+ };
+} & RecipeModuleUserInput;
+
+export type NormalisedConfig = NormalisedRecipeModuleConfig<
+ GetRedirectionURLContext,
+ PreAndPostAPIHookAction,
+ OnHandleEventContext
+> & {
+ disableDefaultUI: boolean;
+ oauth2LogoutScreen: OAuth2LogoutScreenConfig;
+ tryRefreshPage: OAuth2TryRefreshPageConfig;
+ override: {
+ functions: (
+ originalImplementation: RecipeInterface,
+ builder: OverrideableBuilder
+ ) => RecipeInterface;
+ };
+};
+
+export type OAuth2LogoutScreenConfig = NormalisedBaseConfig & {
+ disableDefaultUI: boolean;
+};
+
+// This doesn't have the NormalisedBaseConfig because it only shows the generic spinner
+export type OAuth2TryRefreshPageConfig = {
+ disableDefaultUI: boolean;
+};
+
+export type ContinueOAuth2AfterRefreshRedirectContext = {
+ recipeId: "oauth2provider";
+ action: "CONTINUE_OAUTH2_AFTER_REFRESH";
+ frontendRedirectTo: string;
+};
+
+export type PostOAuth2LogoutRedirectContext = {
+ recipeId: "oauth2provider";
+ action: "POST_OAUTH2_LOGOUT_REDIRECT";
+ frontendRedirectTo: string;
+};
+
+export type GetRedirectionURLContext = NormalisedGetRedirectionURLContext<
+ SuccessRedirectContextOAuth2 | ContinueOAuth2AfterRefreshRedirectContext | PostOAuth2LogoutRedirectContext
+>;
+
+export type OnHandleEventContext =
+ | {
+ /*
+ * On Handle Event actions
+ */
+ action: "LOADED_LOGIN_CHALLENGE";
+ loginChallenge: string;
+ loginInfo: LoginInfo;
+ userContext: UserContext;
+ }
+ | {
+ action: "OAUTH2_LOGOUT_SUCCESS";
+ frontendRedirectTo: string;
+ userContext: UserContext;
+ };
+
+export type ComponentOverrideMap = {
+ OAuth2LogoutScreenInner_Override?: ComponentOverride;
+};
+
+export type OAuth2LogoutScreenThemeProps = {
+ config: NormalisedConfig;
+ isLoggingOut: boolean;
+ onLogoutClicked: () => void;
+ showSpinner: boolean;
+};
diff --git a/lib/ts/recipe/oauth2provider/utils.ts b/lib/ts/recipe/oauth2provider/utils.ts
new file mode 100644
index 000000000..762dde7cf
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/utils.ts
@@ -0,0 +1,23 @@
+import { normaliseRecipeModuleConfig } from "../recipeModule/utils";
+
+import type { UserInput, NormalisedConfig } from "./types";
+
+export function normaliseOAuth2Config(config?: UserInput): NormalisedConfig {
+ return {
+ ...normaliseRecipeModuleConfig(config),
+ disableDefaultUI: config?.disableDefaultUI ?? false,
+ tryRefreshPage: {
+ disableDefaultUI: false,
+ ...config?.tryRefreshPage,
+ },
+ oauth2LogoutScreen: {
+ disableDefaultUI: false,
+ style: "",
+ ...config?.oauth2LogoutScreen,
+ },
+ override: {
+ functions: (originalImplementation) => originalImplementation,
+ ...config?.override,
+ },
+ };
+}
diff --git a/lib/ts/recipe/passwordless/components/features/linkClickedScreen/index.tsx b/lib/ts/recipe/passwordless/components/features/linkClickedScreen/index.tsx
index 50ece20a0..89deed42d 100644
--- a/lib/ts/recipe/passwordless/components/features/linkClickedScreen/index.tsx
+++ b/lib/ts/recipe/passwordless/components/features/linkClickedScreen/index.tsx
@@ -23,7 +23,13 @@ import { ComponentOverrideContext } from "../../../../../components/componentOve
import FeatureWrapper from "../../../../../components/featureWrapper";
import SuperTokens from "../../../../../superTokens";
import { useUserContext } from "../../../../../usercontext";
-import { getQueryParams, getURLHash, useOnMountAPICall, useRethrowInRender } from "../../../../../utils";
+import {
+ getQueryParams,
+ getTenantIdFromQueryParams,
+ getURLHash,
+ useOnMountAPICall,
+ useRethrowInRender,
+} from "../../../../../utils";
import Session from "../../../../session/recipe";
import { LinkClickedScreen as LinkClickedScreenTheme } from "../../themes/linkClickedScreen";
import { defaultTranslationsPasswordless } from "../../themes/translations";
@@ -148,6 +154,7 @@ const LinkClickedScreen: React.FC = (props) => {
(payloadBeforeCall === undefined ||
payloadBeforeCall.sessionHandle !== payloadAfterCall.sessionHandle),
recipeId: props.recipe.recipeID,
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
props.recipe.recipeID,
loginAttemptInfo?.redirectToPath,
diff --git a/lib/ts/recipe/passwordless/components/features/linkSent/index.tsx b/lib/ts/recipe/passwordless/components/features/linkSent/index.tsx
index a6ec99e49..d8b457233 100644
--- a/lib/ts/recipe/passwordless/components/features/linkSent/index.tsx
+++ b/lib/ts/recipe/passwordless/components/features/linkSent/index.tsx
@@ -20,7 +20,12 @@ import { Fragment } from "react";
import { useMemo } from "react";
import AuthComponentWrapper from "../../../../../components/authCompWrapper";
-import { clearErrorQueryParam, getRedirectToPathFromURL, useRethrowInRender } from "../../../../../utils";
+import {
+ clearErrorQueryParam,
+ getRedirectToPathFromURL,
+ getTenantIdFromQueryParams,
+ useRethrowInRender,
+} from "../../../../../utils";
import { EmailVerificationClaim } from "../../../../emailverification";
import EmailVerification from "../../../../emailverification/recipe";
import { getInvalidClaimsFromResponse } from "../../../../session";
@@ -81,6 +86,7 @@ export function useChildProps(
(payloadAfterCall !== undefined &&
session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
recipeId: recipe.recipeID,
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
recipe.recipeID,
getRedirectToPathFromURL(),
@@ -98,6 +104,7 @@ export function useChildProps(
const evInstance = EmailVerification.getInstanceOrThrow();
await evInstance.redirect(
{
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
action: "VERIFY_EMAIL",
},
navigate,
@@ -204,6 +211,7 @@ function getModifiedRecipeImplementation(
userContext: input.userContext,
attemptInfo: {
...loginAttemptInfo,
+ shouldTryLinkingWithSessionUser: loginAttemptInfo.shouldTryLinkingWithSessionUser ?? false,
lastResend: timestamp,
},
});
diff --git a/lib/ts/recipe/passwordless/components/features/mfa/index.tsx b/lib/ts/recipe/passwordless/components/features/mfa/index.tsx
index c742fc27e..a8d83bef1 100644
--- a/lib/ts/recipe/passwordless/components/features/mfa/index.tsx
+++ b/lib/ts/recipe/passwordless/components/features/mfa/index.tsx
@@ -29,6 +29,7 @@ import {
clearErrorQueryParam,
getQueryParams,
getRedirectToPathFromURL,
+ getTenantIdFromQueryParams,
useOnMountAPICall,
useRethrowInRender,
} from "../../../../../utils";
@@ -182,6 +183,7 @@ export function useChildProps(
await evInstance.redirect(
{
action: "VERIFY_EMAIL",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
navigate,
undefined,
@@ -384,6 +386,7 @@ function useOnLoad(
// createCode also dispatches the event that marks this page fully loaded
createResp = await recipeImplementation!.createCode({
...createCodeInfo,
+ shouldTryLinkingWithSessionUser: true,
userContext,
});
} catch (err: any) {
@@ -398,6 +401,7 @@ function useOnLoad(
const evInstance = EmailVerificationRecipe.getInstanceOrThrow();
await evInstance.redirect(
{
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
action: "VERIFY_EMAIL",
},
props.navigate,
@@ -490,6 +494,7 @@ function getModifiedRecipeImplementation(
const res = await originalImpl.createCode({
...input,
+ shouldTryLinkingWithSessionUser: true,
userContext: { ...input.userContext, additionalAttemptInfo },
});
@@ -520,6 +525,7 @@ function getModifiedRecipeImplementation(
userContext: input.userContext,
attemptInfo: {
...loginAttemptInfo,
+ shouldTryLinkingWithSessionUser: loginAttemptInfo.shouldTryLinkingWithSessionUser ?? true,
lastResend: timestamp,
},
});
@@ -536,7 +542,10 @@ function getModifiedRecipeImplementation(
},
consumeCode: async (input) => {
- const res = await originalImpl.consumeCode(input);
+ const res = await originalImpl.consumeCode({
+ ...input,
+ shouldTryLinkingWithSessionUser: true,
+ });
if (res.status === "RESTART_FLOW_ERROR") {
await originalImpl.clearLoginAttemptInfo({
diff --git a/lib/ts/recipe/passwordless/components/features/signInAndUp/index.tsx b/lib/ts/recipe/passwordless/components/features/signInAndUp/index.tsx
index 20ade54f8..4e29f5fc8 100644
--- a/lib/ts/recipe/passwordless/components/features/signInAndUp/index.tsx
+++ b/lib/ts/recipe/passwordless/components/features/signInAndUp/index.tsx
@@ -21,11 +21,10 @@ import { useMemo } from "react";
import AuthComponentWrapper from "../../../../../components/authCompWrapper";
import { useUserContext } from "../../../../../usercontext";
-import { getRedirectToPathFromURL, useRethrowInRender } from "../../../../../utils";
+import { getRedirectToPathFromURL, getTenantIdFromQueryParams, useRethrowInRender } from "../../../../../utils";
import { EmailVerificationClaim } from "../../../../emailverification";
import EmailVerification from "../../../../emailverification/recipe";
import { getInvalidClaimsFromResponse } from "../../../../session";
-import SessionRecipe from "../../../../session/recipe";
import Session from "../../../../session/recipe";
import useSessionContext from "../../../../session/useSessionContext";
import { defaultPhoneNumberValidator } from "../../../defaultPhoneNumberValidator";
@@ -33,6 +32,7 @@ import { getPhoneNumberUtils } from "../../../phoneNumberUtils";
import SignInUpThemeWrapper from "../../themes/signInUp";
import type { Navigate, UserContext, PartialAuthComponentProps } from "../../../../../types";
+import type { AuthSuccessContext } from "../../../../authRecipe/types";
import type Recipe from "../../../recipe";
import type { ComponentOverrideMap } from "../../../types";
import type { SignInUpChildProps, NormalisedConfig } from "../../../types";
@@ -42,6 +42,7 @@ import type { User } from "supertokens-web-js/types";
export function useChildProps(
recipe: Recipe,
factorIds: string[],
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise,
error: string | undefined,
onError: (err: string) => void,
clearError: () => void,
@@ -68,25 +69,16 @@ export function useChildProps(
} catch {
payloadAfterCall = undefined;
}
- return SessionRecipe.getInstanceOrThrow()
- .validateGlobalClaimsAndHandleSuccessRedirection(
- {
- action: "SUCCESS",
- createdNewUser: result.createdNewRecipeUser && result.user.loginMethods.length === 1,
- isNewRecipeUser: result.createdNewRecipeUser,
- newSessionCreated:
- session.loading ||
- !session.doesSessionExist ||
- (payloadAfterCall !== undefined &&
- session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
- recipeId: recipe.recipeID,
- },
- recipe.recipeID,
- getRedirectToPathFromURL(),
- userContext,
- navigate
- )
- .catch(rethrowInRender);
+ return onAuthSuccess({
+ createdNewUser: result.createdNewRecipeUser && result.user.loginMethods.length === 1,
+ isNewRecipeUser: result.createdNewRecipeUser,
+ newSessionCreated:
+ session.loading ||
+ !session.doesSessionExist ||
+ (payloadAfterCall !== undefined &&
+ session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
+ recipeId: "passwordless",
+ }).catch(rethrowInRender);
},
error,
onError,
@@ -101,6 +93,7 @@ export function useChildProps(
await evInstance.redirect(
{
action: "VERIFY_EMAIL",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
navigate,
undefined,
@@ -137,6 +130,7 @@ const SignInUpFeatureInner: React.FC<
const childProps = useChildProps(
props.recipe,
props.factorIds,
+ props.onAuthSuccess,
props.error,
props.onError,
props.clearError,
@@ -215,6 +209,7 @@ function getModifiedRecipeImplementation(
const res = await originalImpl.createCode({
...input,
+ shouldTryLinkingWithSessionUser: false,
userContext: { ...input.userContext, additionalAttemptInfo },
});
if (res.status === "OK") {
diff --git a/lib/ts/recipe/passwordless/components/features/signInAndUpEPCombo/index.tsx b/lib/ts/recipe/passwordless/components/features/signInAndUpEPCombo/index.tsx
index d2f3d5775..2e808e4a8 100644
--- a/lib/ts/recipe/passwordless/components/features/signInAndUpEPCombo/index.tsx
+++ b/lib/ts/recipe/passwordless/components/features/signInAndUpEPCombo/index.tsx
@@ -22,13 +22,17 @@ import STGeneralError from "supertokens-web-js/lib/build/error";
import AuthComponentWrapper from "../../../../../components/authCompWrapper";
import { useUserContext } from "../../../../../usercontext";
-import { getRedirectToPathFromURL, useRethrowInRender, validateForm } from "../../../../../utils";
+import {
+ getRedirectToPathFromURL,
+ getTenantIdFromQueryParams,
+ useRethrowInRender,
+ validateForm,
+} from "../../../../../utils";
import EmailPassword from "../../../../emailpassword/recipe";
import { EmailVerificationClaim } from "../../../../emailverification";
import EmailVerification from "../../../../emailverification/recipe";
import { FactorIds } from "../../../../multifactorauth";
import { getInvalidClaimsFromResponse } from "../../../../session";
-import SessionRecipe from "../../../../session/recipe";
import Session from "../../../../session/recipe";
import useSessionContext from "../../../../session/useSessionContext";
import { defaultPhoneNumberValidator } from "../../../defaultPhoneNumberValidator";
@@ -36,6 +40,7 @@ import { getPhoneNumberUtils } from "../../../phoneNumberUtils";
import SignInUpEPComboThemeWrapper from "../../themes/signInUpEPCombo";
import type { Navigate, UserContext, PartialAuthComponentProps } from "../../../../../types";
+import type { AuthSuccessContext } from "../../../../authRecipe/types";
import type Recipe from "../../../recipe";
import type { ComponentOverrideMap } from "../../../types";
import type { SignInUpEPComboChildProps, NormalisedConfig } from "../../../types";
@@ -44,6 +49,7 @@ import type { RecipeInterface } from "supertokens-web-js/recipe/passwordless";
export function useChildProps(
recipe: Recipe,
factorIds: string[],
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise,
error: string | undefined,
onError: (err: string) => void,
clearError: () => void,
@@ -80,7 +86,11 @@ export function useChildProps(
showContinueWithPasswordlessLink,
onContactInfoSubmit: async (contactInfo: string) => {
if (isPhoneNumber) {
- const createRes = await recipeImplementation.createCode({ phoneNumber: contactInfo, userContext });
+ const createRes = await recipeImplementation.createCode({
+ phoneNumber: contactInfo,
+ shouldTryLinkingWithSessionUser: false,
+ userContext,
+ });
if (createRes.status === "SIGN_IN_UP_NOT_ALLOWED") {
throw new STGeneralError(createRes.reason);
@@ -109,7 +119,11 @@ export function useChildProps(
return { status: "OK" };
} else if (pwlessExists.doesExist) {
// only pwless exists
- const createRes = await recipeImplementation.createCode({ email, userContext });
+ const createRes = await recipeImplementation.createCode({
+ email,
+ shouldTryLinkingWithSessionUser: false,
+ userContext,
+ });
if (createRes.status === "SIGN_IN_UP_NOT_ALLOWED") {
throw new STGeneralError(createRes.reason);
@@ -140,6 +154,7 @@ export function useChildProps(
const response = await EmailPassword.getInstanceOrThrow().webJSRecipe.signIn({
formFields,
+ shouldTryLinkingWithSessionUser: false,
userContext,
});
if (response.status === "WRONG_CREDENTIALS_ERROR") {
@@ -153,7 +168,11 @@ export function useChildProps(
onContinueWithPasswordlessClick: async (contactInfo) => {
// When this function is called, the contactInfo has already been validated
const createInfo = isPhoneNumber ? { phoneNumber: contactInfo } : { email: contactInfo };
- const createRes = await recipeImplementation.createCode({ ...createInfo, userContext });
+ const createRes = await recipeImplementation.createCode({
+ ...createInfo,
+ shouldTryLinkingWithSessionUser: false,
+ userContext,
+ });
if (createRes.status !== "OK") {
onError(createRes.reason);
} else {
@@ -172,25 +191,16 @@ export function useChildProps(
} catch {
payloadAfterCall = undefined;
}
- return SessionRecipe.getInstanceOrThrow()
- .validateGlobalClaimsAndHandleSuccessRedirection(
- {
- action: "SUCCESS",
- createdNewUser: result.createdNewRecipeUser && result.user.loginMethods.length === 1,
- isNewRecipeUser: result.createdNewRecipeUser,
- newSessionCreated:
- session.loading ||
- !session.doesSessionExist ||
- (payloadAfterCall !== undefined &&
- session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
- recipeId: result.isEmailPassword ? EmailPassword.RECIPE_ID : recipe.recipeID,
- },
- result.isEmailPassword ? EmailPassword.RECIPE_ID : recipe.recipeID,
- getRedirectToPathFromURL(),
- userContext,
- navigate
- )
- .catch(rethrowInRender);
+ return onAuthSuccess({
+ createdNewUser: result.createdNewRecipeUser && result.user.loginMethods.length === 1,
+ isNewRecipeUser: result.createdNewRecipeUser,
+ newSessionCreated:
+ session.loading ||
+ !session.doesSessionExist ||
+ (payloadAfterCall !== undefined &&
+ session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
+ recipeId: result.isEmailPassword ? EmailPassword.RECIPE_ID : recipe.recipeID,
+ }).catch(rethrowInRender);
},
error,
onError,
@@ -205,6 +215,7 @@ export function useChildProps(
await evInstance.redirect(
{
action: "VERIFY_EMAIL",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
navigate,
undefined,
@@ -249,6 +260,7 @@ const SignInUpEPComboFeatureInner: React.FC<
const childProps = useChildProps(
props.recipe,
props.factorIds,
+ props.onAuthSuccess,
props.error,
props.onError,
props.clearError,
@@ -327,6 +339,7 @@ function getModifiedRecipeImplementation(
const res = await originalImpl.createCode({
...input,
+ shouldTryLinkingWithSessionUser: false,
userContext: { ...input.userContext, additionalAttemptInfo },
});
if (res.status === "OK") {
diff --git a/lib/ts/recipe/passwordless/components/features/userInputCode/index.tsx b/lib/ts/recipe/passwordless/components/features/userInputCode/index.tsx
index 6baa25972..b49d83827 100644
--- a/lib/ts/recipe/passwordless/components/features/userInputCode/index.tsx
+++ b/lib/ts/recipe/passwordless/components/features/userInputCode/index.tsx
@@ -20,16 +20,16 @@ import { Fragment } from "react";
import { useMemo } from "react";
import AuthComponentWrapper from "../../../../../components/authCompWrapper";
-import { clearErrorQueryParam, getRedirectToPathFromURL, useRethrowInRender } from "../../../../../utils";
+import { clearErrorQueryParam, getTenantIdFromQueryParams, useRethrowInRender } from "../../../../../utils";
import { EmailVerificationClaim } from "../../../../emailverification";
import EmailVerification from "../../../../emailverification/recipe";
import { getInvalidClaimsFromResponse } from "../../../../session";
-import SessionRecipe from "../../../../session/recipe";
import Session from "../../../../session/recipe";
import useSessionContext from "../../../../session/useSessionContext";
import UserInputCodeFormScreenWrapper from "../../themes/userInputCodeForm/userInputCodeFormScreen";
import type { Navigate, UserContext, AuthComponentProps } from "../../../../../types";
+import type { AuthSuccessContext } from "../../../../authRecipe/types";
import type Recipe from "../../../recipe";
import type {
AdditionalLoginAttemptInfoProperties,
@@ -43,6 +43,7 @@ import type { User } from "supertokens-web-js/types";
export function useChildProps(
recipe: Recipe,
loginAttemptInfo: LoginAttemptInfo,
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise,
error: string | undefined,
onError: (err: string) => void,
clearError: () => void,
@@ -69,25 +70,16 @@ export function useChildProps(
} catch {
payloadAfterCall = undefined;
}
- return SessionRecipe.getInstanceOrThrow()
- .validateGlobalClaimsAndHandleSuccessRedirection(
- {
- action: "SUCCESS",
- createdNewUser: result.createdNewRecipeUser && result.user.loginMethods.length === 1,
- isNewRecipeUser: result.createdNewRecipeUser,
- newSessionCreated:
- session.loading ||
- !session.doesSessionExist ||
- (payloadAfterCall !== undefined &&
- session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
- recipeId: recipe.recipeID,
- },
- recipe.recipeID,
- getRedirectToPathFromURL(),
- userContext,
- navigate
- )
- .catch(rethrowInRender);
+ return onAuthSuccess({
+ createdNewUser: result.createdNewRecipeUser && result.user.loginMethods.length === 1,
+ isNewRecipeUser: result.createdNewRecipeUser,
+ newSessionCreated:
+ session.loading ||
+ !session.doesSessionExist ||
+ (payloadAfterCall !== undefined &&
+ session.accessTokenPayload.sessionHandle !== payloadAfterCall.sessionHandle),
+ recipeId: "passwordless",
+ }).catch(rethrowInRender);
},
onFetchError: async (err: Response) => {
if (err.status === Session.getInstanceOrThrow().config.invalidClaimStatusCode) {
@@ -99,6 +91,7 @@ export function useChildProps(
await evInstance.redirect(
{
action: "VERIFY_EMAIL",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
navigate,
undefined,
@@ -132,6 +125,7 @@ const UserInputCodeFeatureInner: React.FC<
const childProps = useChildProps(
props.recipe,
props.loginAttemptInfo,
+ props.onAuthSuccess,
props.error,
props.onError,
props.clearError,
@@ -206,6 +200,7 @@ function getModifiedRecipeImplementation(
userContext: input.userContext,
attemptInfo: {
...loginAttemptInfo,
+ shouldTryLinkingWithSessionUser: loginAttemptInfo.shouldTryLinkingWithSessionUser ?? false,
lastResend: timestamp,
},
});
diff --git a/lib/ts/recipe/passwordless/components/themes/signInUp/emailForm.tsx b/lib/ts/recipe/passwordless/components/themes/signInUp/emailForm.tsx
index 902924b0c..aadd55613 100644
--- a/lib/ts/recipe/passwordless/components/themes/signInUp/emailForm.tsx
+++ b/lib/ts/recipe/passwordless/components/themes/signInUp/emailForm.tsx
@@ -62,6 +62,7 @@ export const EmailForm = withOverride(
const response = await props.recipeImplementation.createCode({
email,
+ // shouldTryLinkingWithSessionUser is set by the fn override
userContext,
});
diff --git a/lib/ts/recipe/passwordless/components/themes/signInUp/emailOrPhoneForm.tsx b/lib/ts/recipe/passwordless/components/themes/signInUp/emailOrPhoneForm.tsx
index 795bf7faa..afbe7000e 100644
--- a/lib/ts/recipe/passwordless/components/themes/signInUp/emailOrPhoneForm.tsx
+++ b/lib/ts/recipe/passwordless/components/themes/signInUp/emailOrPhoneForm.tsx
@@ -137,6 +137,7 @@ export const EmailOrPhoneForm = withOverride(
const response = await props.recipeImplementation.createCode({
...contactInfo,
+ // shouldTryLinkingWithSessionUser is set by the fn override
userContext,
});
diff --git a/lib/ts/recipe/passwordless/components/themes/signInUp/phoneForm.tsx b/lib/ts/recipe/passwordless/components/themes/signInUp/phoneForm.tsx
index 0fe9efe43..cf733537c 100644
--- a/lib/ts/recipe/passwordless/components/themes/signInUp/phoneForm.tsx
+++ b/lib/ts/recipe/passwordless/components/themes/signInUp/phoneForm.tsx
@@ -79,6 +79,7 @@ export const PhoneForm = withOverride(
const response = await props.recipeImplementation.createCode({
phoneNumber,
+ // shouldTryLinkingWithSessionUser is set by the fn override
userContext,
});
diff --git a/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailForm.tsx b/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailForm.tsx
index 0fa0c7dc4..06560aa56 100644
--- a/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailForm.tsx
+++ b/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailForm.tsx
@@ -17,6 +17,7 @@ import STGeneralError from "supertokens-web-js/utils/error";
import { withOverride } from "../../../../../components/componentOverride/withOverride";
import { useTranslation } from "../../../../../translation/translationContext";
+import { getTenantIdFromQueryParams } from "../../../../../utils";
import { Label } from "../../../../emailpassword/components/library";
import FormBase from "../../../../emailpassword/components/library/formBase";
import EmailPassword from "../../../../emailpassword/recipe";
@@ -57,7 +58,12 @@ export const EPComboEmailForm = withOverride(
{t("LOGGING_OUT")}
+ {t("LOGOUT_CONFIRMATION")}
+
+
+
+ );
+ }
+);
diff --git a/lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen/index.tsx b/lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen/index.tsx
new file mode 100644
index 000000000..76c9d556a
--- /dev/null
+++ b/lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen/index.tsx
@@ -0,0 +1,36 @@
+/* eslint-disable react/jsx-no-literals */
+import React from "react";
+
+import { SuperTokensBranding } from "../../../../../components/SuperTokensBranding";
+import SuperTokens from "../../../../../superTokens";
+import DynamicLoginMethodsSpinner from "../../../../multitenancy/components/features/dynamicLoginMethodsSpinner";
+import { ThemeBase } from "../themeBase";
+
+import { OAuth2LogoutScreenInner } from "./OAuth2LogoutScreenInner";
+
+import type { OAuth2LogoutScreenThemeProps } from "../../../types";
+import type { FC } from "react";
+
+const OAuth2LogoutScreen: FC
+
+ );
+};
+
+export const OAuth2LogoutScreenTheme: React.FC
+
+
EmailPassword.getInstanceOrThrow().redirect({ action: "RESET_PASSWORD" })}
+ onClick={() =>
+ EmailPassword.getInstanceOrThrow().redirect({
+ action: "RESET_PASSWORD",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
+ })
+ }
data-supertokens="link linkButton formLabelLinkBtn forgotPasswordLink">
{t("PWLESS_COMBO_FORGOT_PW_LINK")}
diff --git a/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailOrPhoneForm.tsx b/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailOrPhoneForm.tsx
index 1dfe55059..30d5b9e85 100644
--- a/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailOrPhoneForm.tsx
+++ b/lib/ts/recipe/passwordless/components/themes/signInUpEPCombo/emailOrPhoneForm.tsx
@@ -19,6 +19,7 @@ import STGeneralError from "supertokens-web-js/utils/error";
import { withOverride } from "../../../../../components/componentOverride/withOverride";
import { useTranslation } from "../../../../../translation/translationContext";
+import { getTenantIdFromQueryParams } from "../../../../../utils";
import { Label } from "../../../../emailpassword/components/library";
import FormBase from "../../../../emailpassword/components/library/formBase";
import EmailPassword from "../../../../emailpassword/recipe";
@@ -107,7 +108,12 @@ export const EPComboEmailOrPhoneForm = withOverride(
EmailPassword.getInstanceOrThrow().redirect({ action: "RESET_PASSWORD" })}
+ onClick={() =>
+ EmailPassword.getInstanceOrThrow().redirect({
+ action: "RESET_PASSWORD",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
+ })
+ }
data-supertokens="link linkButton formLabelLinkBtn forgotPasswordLink">
{t("PWLESS_COMBO_FORGOT_PW_LINK")}
diff --git a/lib/ts/recipe/passwordless/index.ts b/lib/ts/recipe/passwordless/index.ts
index b3276b8e0..89ed3066f 100644
--- a/lib/ts/recipe/passwordless/index.ts
+++ b/lib/ts/recipe/passwordless/index.ts
@@ -40,8 +40,18 @@ export default class Wrapper {
static async createCode(
input:
- | { email: string; userContext?: UserContext; options?: RecipeFunctionOptions }
- | { phoneNumber: string; userContext?: UserContext; options?: RecipeFunctionOptions }
+ | {
+ email: string;
+ shouldTryLinkingWithSessionUser?: boolean;
+ userContext?: UserContext;
+ options?: RecipeFunctionOptions;
+ }
+ | {
+ phoneNumber: string;
+ shouldTryLinkingWithSessionUser?: boolean;
+ userContext?: UserContext;
+ options?: RecipeFunctionOptions;
+ }
): Promise<
| {
status: "OK";
diff --git a/lib/ts/recipe/recipeModule/index.ts b/lib/ts/recipe/recipeModule/index.ts
index c8e0cf3fd..d5db9ce4b 100644
--- a/lib/ts/recipe/recipeModule/index.ts
+++ b/lib/ts/recipe/recipeModule/index.ts
@@ -20,7 +20,7 @@ import { appendQueryParamsToURL, getNormalisedUserContext } from "../../utils";
import { BaseRecipeModule } from "./baseRecipeModule";
import type { NormalisedConfig } from "./types";
-import type { Navigate, UserContext } from "../../types";
+import type { Navigate, NormalisedGetRedirectionURLContext, UserContext } from "../../types";
export default abstract class RecipeModule<
GetRedirectionURLContextType,
@@ -29,7 +29,7 @@ export default abstract class RecipeModule<
N extends NormalisedConfig
> extends BaseRecipeModule {
redirect = async (
- context: GetRedirectionURLContextType,
+ context: NormalisedGetRedirectionURLContext,
navigate?: Navigate,
queryParams?: Record,
userContext?: UserContext
@@ -54,7 +54,7 @@ export default abstract class RecipeModule<
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
getRedirectUrl = async (
- context: GetRedirectionURLContextType,
+ context: NormalisedGetRedirectionURLContext,
userContext: UserContext
): Promise => {
// If getRedirectionURL provided by user.
@@ -68,7 +68,10 @@ export default abstract class RecipeModule<
};
// eslint-disable-next-line @typescript-eslint/no-unused-vars
- async getDefaultRedirectionURL(_: GetRedirectionURLContextType, _userContext: UserContext): Promise {
+ async getDefaultRedirectionURL(
+ _: NormalisedGetRedirectionURLContext,
+ _userContext: UserContext
+ ): Promise {
throw new Error("getDefaultRedirectionURL is not implemented.");
}
}
diff --git a/lib/ts/recipe/recipeModule/types.ts b/lib/ts/recipe/recipeModule/types.ts
index e302fed6e..830451db3 100644
--- a/lib/ts/recipe/recipeModule/types.ts
+++ b/lib/ts/recipe/recipeModule/types.ts
@@ -1,4 +1,4 @@
-import type { UserContext } from "../../types";
+import type { NormalisedGetRedirectionURLContext, UserContext } from "../../types";
export type RecipePreAPIHookContext = {
requestInit: RequestInit;
@@ -25,7 +25,7 @@ export type RecipeOnHandleEventFunction = (context: EventType) => voi
export type UserInput = {
getRedirectionURL?: (
- context: GetRedirectionURLContextType,
+ context: NormalisedGetRedirectionURLContext,
userContext: UserContext
) => Promise;
preAPIHook?: RecipePreAPIHookFunction;
@@ -42,7 +42,7 @@ export type Config = {
getRedirectionURL: (
- context: GetRedirectionURLContextType,
+ context: NormalisedGetRedirectionURLContext,
userContext: UserContext
) => Promise;
onHandleEvent: RecipeOnHandleEventFunction;
diff --git a/lib/ts/recipe/session/recipe.tsx b/lib/ts/recipe/session/recipe.tsx
index 5c628333b..dd2741cc3 100644
--- a/lib/ts/recipe/session/recipe.tsx
+++ b/lib/ts/recipe/session/recipe.tsx
@@ -23,10 +23,12 @@ import SuperTokens from "../../superTokens";
import {
getLocalStorage,
getNormalisedUserContext,
+ getTenantIdFromQueryParams,
isTest,
removeFromLocalStorage,
setLocalStorage,
} from "../../utils";
+import OAuth2Provider from "../oauth2provider/recipe";
import RecipeModule from "../recipeModule";
import {
@@ -41,8 +43,10 @@ import type {
Navigate,
NormalisedAppInfo,
NormalisedConfigWithAppInfoAndRecipeID,
+ NormalisedGetRedirectionURLContext,
RecipeInitResult,
- SuccessRedirectContext,
+ SuccessRedirectContextInApp,
+ SuccessRedirectContextOAuth2,
UserContext,
} from "../../types";
import type { ClaimValidationError, SessionClaimValidator } from "supertokens-web-js/recipe/session";
@@ -126,11 +130,16 @@ export default class Session extends RecipeModule & { recipeId: string }) | undefined,
+ successRedirectContext:
+ | ((Omit | Omit) & {
+ recipeId: string;
+ tenantIdFromQueryParams: string | undefined;
+ })
+ | undefined,
fallbackRecipeId: string,
- redirectToPath?: string,
- userContext?: UserContext,
- navigate?: Navigate
+ redirectToPath: string | undefined,
+ userContext: UserContext | undefined,
+ navigate: Navigate | undefined
): Promise => {
userContext = getNormalisedUserContext(userContext);
// First we check if there is an active session
@@ -202,6 +211,7 @@ export default class Session extends RecipeModule,
+ navigate,
+ {},
+ userContext
+ );
+ }
+
+ if (successRedirectContext.action === "SUCCESS" && redirectToPath !== undefined) {
successRedirectContext.redirectToPath = redirectToPath;
}
return SuperTokens.getInstanceOrThrow().redirect(
- successRedirectContext as SuccessRedirectContext,
+ successRedirectContext as NormalisedGetRedirectionURLContext,
navigate,
{},
userContext
@@ -227,6 +246,7 @@ export default class Session extends RecipeModule => {
+ // We do not use the util here, since we are redirecting outside of the SDK routes
return "/";
};
diff --git a/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx b/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx
index c19ac7f4f..215738113 100644
--- a/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx
+++ b/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx
@@ -27,12 +27,14 @@ import { mergeProviders } from "../../../utils";
import SignInAndUpTheme from "../../themes/signInAndUp";
import type { Navigate, PartialAuthComponentProps, UserContext, WebJSRecipeInterface } from "../../../../../types";
+import type { AuthSuccessContext } from "../../../../authRecipe/types";
import type Recipe from "../../../recipe";
import type { ComponentOverrideMap, SignInAndUpThemeProps } from "../../../types";
import type ThirdPartyWebJS from "supertokens-web-js/recipe/thirdparty";
export function useChildProps(
recipe: Recipe,
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise,
error: string | undefined,
onError: (err: string) => void,
clearError: () => void,
@@ -57,6 +59,7 @@ export function useChildProps(
}
return {
+ onAuthSuccess,
error,
onError,
clearError,
@@ -84,6 +87,7 @@ type PropType = PartialAuthComponentProps & {
export const SignInAndUpFeature: React.FC = (props) => {
const childProps = useChildProps(
props.recipe,
+ props.onAuthSuccess,
props.error,
props.onError,
props.clearError,
diff --git a/lib/ts/recipe/thirdparty/components/features/signInAndUpCallback/index.tsx b/lib/ts/recipe/thirdparty/components/features/signInAndUpCallback/index.tsx
index 4d9fe7a5f..28dd8feb7 100644
--- a/lib/ts/recipe/thirdparty/components/features/signInAndUpCallback/index.tsx
+++ b/lib/ts/recipe/thirdparty/components/features/signInAndUpCallback/index.tsx
@@ -22,9 +22,10 @@ import { ComponentOverrideContext } from "../../../../../components/componentOve
import FeatureWrapper from "../../../../../components/featureWrapper";
import SuperTokens from "../../../../../superTokens";
import { useUserContext } from "../../../../../usercontext";
-import { useOnMountAPICall, useRethrowInRender } from "../../../../../utils";
+import { getTenantIdFromQueryParams, useOnMountAPICall, useRethrowInRender } from "../../../../../utils";
import { EmailVerificationClaim } from "../../../../emailverification";
import EmailVerification from "../../../../emailverification/recipe";
+import OAuth2Provider from "../../../../oauth2provider/recipe";
import { getInvalidClaimsFromResponse } from "../../../../session";
import Session from "../../../../session/recipe";
import { SignInAndUpCallbackTheme } from "../../themes/signInAndUpCallback";
@@ -104,25 +105,55 @@ const SignInAndUpCallback: React.FC = (props) => {
userContext,
});
const redirectToPath = stateResponse === undefined ? undefined : stateResponse.redirectToPath;
-
- return Session.getInstanceOrThrow()
- .validateGlobalClaimsAndHandleSuccessRedirection(
- {
- action: "SUCCESS",
- createdNewUser: response.createdNewRecipeUser && response.user.loginMethods.length === 1,
- isNewRecipeUser: response.createdNewRecipeUser,
- newSessionCreated:
- payloadAfterCall !== undefined &&
- (payloadBeforeCall === undefined ||
- payloadBeforeCall.sessionHandle !== payloadAfterCall.sessionHandle),
- recipeId: props.recipe.recipeID,
- },
- props.recipe.recipeID,
- redirectToPath,
- userContext,
- props.navigate
- )
- .catch(rethrowInRender);
+ const loginChallenge = stateResponse?.oauth2LoginChallenge;
+
+ const ctx = {
+ createdNewUser: response.createdNewRecipeUser && response.user.loginMethods.length === 1,
+ isNewRecipeUser: response.createdNewRecipeUser,
+ newSessionCreated:
+ payloadAfterCall !== undefined &&
+ (payloadBeforeCall === undefined ||
+ payloadBeforeCall.sessionHandle !== payloadAfterCall.sessionHandle),
+ recipeId: props.recipe.recipeID,
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
+ };
+ const oauth2Recipe = OAuth2Provider.getInstance();
+ if (loginChallenge !== undefined && oauth2Recipe !== undefined) {
+ try {
+ const { frontendRedirectTo } = await oauth2Recipe.webJSRecipe.getRedirectURLToContinueOAuthFlow(
+ {
+ loginChallenge,
+ userContext,
+ }
+ );
+ return Session.getInstanceOrThrow().validateGlobalClaimsAndHandleSuccessRedirection(
+ {
+ ...ctx,
+ action: "SUCCESS_OAUTH2",
+ frontendRedirectTo,
+ },
+ props.recipe.recipeID,
+ redirectToPath,
+ userContext,
+ props.navigate
+ );
+ } catch (e: any) {
+ rethrowInRender(e);
+ }
+ } else {
+ return Session.getInstanceOrThrow()
+ .validateGlobalClaimsAndHandleSuccessRedirection(
+ {
+ ...ctx,
+ action: "SUCCESS",
+ },
+ props.recipe.recipeID,
+ redirectToPath,
+ userContext,
+ props.navigate
+ )
+ .catch(rethrowInRender);
+ }
}
},
[props.recipe, props.navigate, userContext]
@@ -139,6 +170,7 @@ const SignInAndUpCallback: React.FC = (props) => {
await evInstance.redirect(
{
action: "VERIFY_EMAIL",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
props.navigate,
undefined,
diff --git a/lib/ts/recipe/thirdparty/components/themes/signInAndUp/providersForm.tsx b/lib/ts/recipe/thirdparty/components/themes/signInAndUp/providersForm.tsx
index 2240c395c..824056dee 100644
--- a/lib/ts/recipe/thirdparty/components/themes/signInAndUp/providersForm.tsx
+++ b/lib/ts/recipe/thirdparty/components/themes/signInAndUp/providersForm.tsx
@@ -35,6 +35,7 @@ export const ThirdPartySignInAndUpProvidersForm: React.FC
recipeImplementation: props.recipeImplementation,
thirdPartyId: providerId,
config: props.config,
+ shouldTryLinkingWithSessionUser: false,
userContext,
});
} catch (e) {
diff --git a/lib/ts/recipe/thirdparty/functionOverrides.ts b/lib/ts/recipe/thirdparty/functionOverrides.ts
index 299ce2236..c95f8f51f 100644
--- a/lib/ts/recipe/thirdparty/functionOverrides.ts
+++ b/lib/ts/recipe/thirdparty/functionOverrides.ts
@@ -1,4 +1,4 @@
-import { getRedirectToPathFromURL } from "../../utils";
+import { getQueryParams, getRedirectToPathFromURL } from "../../utils";
import Session from "../session/recipe";
import type { OnHandleEventContext } from "./types";
@@ -49,6 +49,7 @@ export const getFunctionOverrides =
},
setStateAndOtherInfoToStorage: function (input) {
+ const loginChallenge = getQueryParams("loginChallenge") ?? undefined;
return originalImp.setStateAndOtherInfoToStorage<{
rid?: string;
redirectToPath?: string;
@@ -56,6 +57,7 @@ export const getFunctionOverrides =
state: {
...input.state,
rid: recipeId,
+ oauth2LoginChallenge: loginChallenge,
redirectToPath: getRedirectToPathFromURL(),
},
userContext: input.userContext,
diff --git a/lib/ts/recipe/thirdparty/index.ts b/lib/ts/recipe/thirdparty/index.ts
index 126364905..7ef82cf3a 100644
--- a/lib/ts/recipe/thirdparty/index.ts
+++ b/lib/ts/recipe/thirdparty/index.ts
@@ -61,6 +61,7 @@ export default class Wrapper {
static async redirectToThirdPartyLogin(input: {
thirdPartyId: string;
+ shouldTryLinkingWithSessionUser?: boolean;
userContext?: UserContext;
}): Promise<{ status: "OK" | "ERROR" }> {
const recipeInstance: ThirdParty = ThirdParty.getInstanceOrThrow();
@@ -69,6 +70,7 @@ export default class Wrapper {
thirdPartyId: input.thirdPartyId,
config: recipeInstance.config,
userContext: getNormalisedUserContext(input.userContext),
+ shouldTryLinkingWithSessionUser: input.shouldTryLinkingWithSessionUser,
recipeImplementation: recipeInstance.webJSRecipe,
});
}
@@ -86,6 +88,7 @@ export default class Wrapper {
thirdPartyId: string;
frontendRedirectURI: string;
redirectURIOnProviderDashboard?: string;
+ shouldTryLinkingWithSessionUser?: boolean;
userContext?: UserContext;
options?: RecipeFunctionOptions;
}): Promise {
diff --git a/lib/ts/recipe/thirdparty/types.ts b/lib/ts/recipe/thirdparty/types.ts
index dd6658ace..89d177d90 100644
--- a/lib/ts/recipe/thirdparty/types.ts
+++ b/lib/ts/recipe/thirdparty/types.ts
@@ -116,4 +116,5 @@ export type StateObject = WebJsStateObject & {
export type CustomStateProperties = {
rid: string;
redirectToPath: string;
+ oauth2LoginChallenge?: string;
};
diff --git a/lib/ts/recipe/thirdparty/utils.ts b/lib/ts/recipe/thirdparty/utils.ts
index eceb9dd45..d641324b1 100644
--- a/lib/ts/recipe/thirdparty/utils.ts
+++ b/lib/ts/recipe/thirdparty/utils.ts
@@ -130,6 +130,7 @@ export async function redirectToThirdPartyLogin(input: {
thirdPartyId: string;
config: NormalisedConfig;
userContext: UserContext;
+ shouldTryLinkingWithSessionUser: boolean | undefined;
recipeImplementation: WebJSRecipeInterface;
}): Promise<{ status: "OK" | "ERROR" }> {
const loginMethods = await Multitenancy.getInstanceOrThrow().getCurrentDynamicLoginMethods({
@@ -152,6 +153,7 @@ export async function redirectToThirdPartyLogin(input: {
thirdPartyId: input.thirdPartyId,
frontendRedirectURI: provider.getRedirectURL(),
redirectURIOnProviderDashboard: provider.getRedirectURIOnProviderDashboard(),
+ shouldTryLinkingWithSessionUser: input.shouldTryLinkingWithSessionUser,
userContext: input.userContext,
});
diff --git a/lib/ts/styles/styles.css b/lib/ts/styles/styles.css
index da7329534..711e979e6 100644
--- a/lib/ts/styles/styles.css
+++ b/lib/ts/styles/styles.css
@@ -387,6 +387,28 @@
[data-supertokens~="authComponentList"] {
padding-bottom: 20px;
}
+
+[data-supertokens~="authPageTitleOAuthClient"] {
+ color: rgb(var(--palette-textGray));
+ font-size: var(--font-size-1);
+ font-weight: 400;
+ margin: 10px 0 25px;
+}
+
+[data-supertokens~="authPageTitleOAuthClientUrl"] {
+ text-decoration: none;
+}
+
+[data-supertokens~="authPageTitleOAuthClientLogo"] {
+ width: 44px;
+ height: 44px;
+ margin-bottom: 10px;
+}
+
+[data-supertokens~="authPageTitleOAuthClient"] [data-supertokens~="authPageTitleOAuthClientName"] {
+ color: rgb(var(--palette-textTitle));
+}
+
[data-supertokens~="buttonWithArrow"] {
border-radius: 6px;
border: 1px solid #d0d5dd;
diff --git a/lib/ts/superTokens.tsx b/lib/ts/superTokens.tsx
index c0a2416b0..5225bf133 100644
--- a/lib/ts/superTokens.tsx
+++ b/lib/ts/superTokens.tsx
@@ -21,7 +21,7 @@ import { CookieHandlerReference } from "supertokens-web-js/utils/cookieHandler";
import { PostSuperTokensInitCallbacks } from "supertokens-web-js/utils/postSuperTokensInitCallbacks";
import { WindowHandlerReference } from "supertokens-web-js/utils/windowHandler";
-import { SSR_ERROR } from "./constants";
+import { SSR_ERROR, TENANT_ID_QUERY_PARAM } from "./constants";
import { enableLogging, logDebugMessage } from "./logger";
import Multitenancy from "./recipe/multitenancy/recipe";
import { saveCurrentLanguage, TranslationController } from "./translation/translationHelpers";
@@ -32,6 +32,7 @@ import {
getDefaultCookieScope,
getNormalisedUserContext,
getOriginOfPage,
+ getTenantIdFromQueryParams,
isTest,
normaliseCookieScopeOrThrowError,
normaliseInputAppInfoOrThrowError,
@@ -43,7 +44,14 @@ import type RecipeModule from "./recipe/recipeModule";
import type { BaseRecipeModule } from "./recipe/recipeModule/baseRecipeModule";
import type { NormalisedConfig as NormalisedRecipeModuleConfig } from "./recipe/recipeModule/types";
import type { TranslationFunc, TranslationStore } from "./translation/translationHelpers";
-import type { Navigate, GetRedirectionURLContext, NormalisedAppInfo, SuperTokensConfig, UserContext } from "./types";
+import type {
+ Navigate,
+ GetRedirectionURLContext,
+ NormalisedAppInfo,
+ SuperTokensConfig,
+ UserContext,
+ NormalisedGetRedirectionURLContext,
+} from "./types";
/*
* Class.
@@ -183,7 +191,10 @@ export default class SuperTokens {
this.languageTranslations.translationEventSource.emit("TranslationLoaded", store);
}
- async getRedirectUrl(context: GetRedirectionURLContext, userContext: UserContext): Promise {
+ async getRedirectUrl(
+ context: NormalisedGetRedirectionURLContext,
+ userContext: UserContext
+ ): Promise {
if (this.userGetRedirectionURL) {
const userRes = await this.userGetRedirectionURL(context, userContext);
if (userRes !== undefined) {
@@ -192,7 +203,11 @@ export default class SuperTokens {
}
if (context.action === "TO_AUTH") {
const redirectUrl = this.appInfo.websiteBasePath.getAsStringDangerous();
- return appendTrailingSlashToURL(redirectUrl);
+ const basePath = appendTrailingSlashToURL(redirectUrl);
+ if (context.tenantIdFromQueryParams) {
+ return appendQueryParamsToURL(basePath, { [TENANT_ID_QUERY_PARAM]: context.tenantIdFromQueryParams });
+ }
+ return basePath;
} else if (context.action === "SUCCESS") {
return context.redirectToPath ?? "/";
}
@@ -218,6 +233,7 @@ export default class SuperTokens {
{
action: "TO_AUTH",
showSignIn: options.show === "signin",
+ tenantIdFromQueryParams: getTenantIdFromQueryParams(),
},
options.userContext
);
@@ -235,7 +251,7 @@ export default class SuperTokens {
};
redirect = async (
- context: GetRedirectionURLContext,
+ context: NormalisedGetRedirectionURLContext,
navigate?: Navigate,
queryParams?: Record,
userContext?: UserContext
diff --git a/lib/ts/translation/translations.ts b/lib/ts/translation/translations.ts
index b78c4098b..424897019 100644
--- a/lib/ts/translation/translations.ts
+++ b/lib/ts/translation/translations.ts
@@ -3,6 +3,7 @@ export const defaultTranslationsCommon = {
AUTH_PAGE_HEADER_TITLE_SIGN_IN_AND_UP: "Sign Up / Sign In",
AUTH_PAGE_HEADER_TITLE_SIGN_IN: "Sign In",
AUTH_PAGE_HEADER_TITLE_SIGN_UP: "Sign Up",
+ AUTH_PAGE_HEADER_TITLE_SIGN_IN_UP_TO_APP: " to continue to ",
AUTH_PAGE_HEADER_SUBTITLE_SIGN_IN_START: "Not registered yet?",
AUTH_PAGE_HEADER_SUBTITLE_SIGN_IN_SIGN_UP_LINK: "Sign Up",
diff --git a/lib/ts/types.ts b/lib/ts/types.ts
index ad4b2fff0..118021079 100644
--- a/lib/ts/types.ts
+++ b/lib/ts/types.ts
@@ -14,6 +14,7 @@
*/
import type { DateProviderInput } from "./dateProvider/types";
+import type { AuthSuccessContext } from "./recipe/authRecipe/types";
import type { BaseRecipeModule } from "./recipe/recipeModule/baseRecipeModule";
import type { NormalisedConfig as NormalisedRecipeModuleConfig } from "./recipe/recipeModule/types";
import type { TranslationFunc, TranslationStore } from "./translation/translationHelpers";
@@ -25,7 +26,7 @@ import type NormalisedURLDomain from "supertokens-web-js/utils/normalisedURLDoma
import type NormalisedURLPath from "supertokens-web-js/utils/normalisedURLPath";
import type { WindowHandlerInput } from "supertokens-web-js/utils/windowHandler/types";
-export type SuccessRedirectContext = {
+type SuccessRedirectContextCommon = {
recipeId:
| "emailpassword"
| "thirdparty"
@@ -34,19 +35,26 @@ export type SuccessRedirectContext = {
| "thirdpartyemailpassword"
| "emailverification"
| "totp";
- action: "SUCCESS";
isNewRecipeUser: boolean;
createdNewUser: boolean;
newSessionCreated: boolean;
- redirectToPath?: string;
};
-export type GetRedirectionURLContext =
+export type SuccessRedirectContextInApp = SuccessRedirectContextCommon & { action: "SUCCESS"; redirectToPath?: string };
+export type SuccessRedirectContextOAuth2 = SuccessRedirectContextCommon & {
+ action: "SUCCESS_OAUTH2";
+ frontendRedirectTo: string;
+};
+
+export type SuccessRedirectContext = SuccessRedirectContextInApp | SuccessRedirectContextOAuth2;
+
+export type GetRedirectionURLContext = NormalisedGetRedirectionURLContext<
| {
action: "TO_AUTH";
showSignIn?: boolean;
}
- | SuccessRedirectContext;
+ | SuccessRedirectContextInApp
+>;
export type ValidationFailureCallback =
| (({
@@ -126,7 +134,7 @@ export type SuperTokensConfig = {
};
enableDebugLogs?: boolean;
getRedirectionURL?: (
- context: GetRedirectionURLContext,
+ context: NormalisedGetRedirectionURLContext,
userContext: UserContext
) => Promise;
@@ -415,6 +423,7 @@ export type UserContext = Record;
export type AuthComponentProps = {
setFactorList: (factorIds: string[]) => void;
rebuildAuthPage: () => void;
+ onAuthSuccess: (successContext: AuthSuccessContext) => Promise;
navigate: Navigate | undefined;
userContext: UserContext;
error: string | undefined;
@@ -441,3 +450,6 @@ export type PartialAuthComponent = {
};
export type AuthComponent = PartialAuthComponent | FullPageAuthComponent;
+export type NormalisedGetRedirectionURLContext = RecipeContext & {
+ tenantIdFromQueryParams: string | undefined;
+};
diff --git a/lib/ts/ui/types.ts b/lib/ts/ui/types.ts
index c5d366605..fd7d43094 100644
--- a/lib/ts/ui/types.ts
+++ b/lib/ts/ui/types.ts
@@ -1,6 +1,7 @@
import type { EmailPasswordPreBuiltUI } from "../recipe/emailpassword/prebuiltui";
import type { EmailVerificationPreBuiltUI } from "../recipe/emailverification/prebuiltui";
import type { MultiFactorAuthPreBuiltUI } from "../recipe/multifactorauth/prebuiltui";
+import type { OAuth2ProviderPreBuiltUI } from "../recipe/oauth2provider/prebuiltui";
import type { PasswordlessPreBuiltUI } from "../recipe/passwordless/prebuiltui";
import type { SessionPreBuiltUI } from "../recipe/session/prebuiltui";
import type { ThirdPartyPreBuiltUI } from "../recipe/thirdparty/prebuiltui";
@@ -19,5 +20,6 @@ export type PreBuiltRecipes = (
| typeof EmailVerificationPreBuiltUI
| typeof MultiFactorAuthPreBuiltUI
| typeof TOTPPreBuiltUI
+ | typeof OAuth2ProviderPreBuiltUI
| typeof SessionPreBuiltUI
)[];
diff --git a/lib/ts/utils.ts b/lib/ts/utils.ts
index 3c1a7e58d..30776ce13 100644
--- a/lib/ts/utils.ts
+++ b/lib/ts/utils.ts
@@ -19,7 +19,12 @@ import NormalisedURLDomain from "supertokens-web-js/utils/normalisedURLDomain";
import NormalisedURLPath from "supertokens-web-js/utils/normalisedURLPath";
import { WindowHandlerReference } from "supertokens-web-js/utils/windowHandler";
-import { DEFAULT_API_BASE_PATH, DEFAULT_WEBSITE_BASE_PATH, RECIPE_ID_QUERY_PARAM } from "./constants";
+import {
+ DEFAULT_API_BASE_PATH,
+ DEFAULT_WEBSITE_BASE_PATH,
+ RECIPE_ID_QUERY_PARAM,
+ TENANT_ID_QUERY_PARAM,
+} from "./constants";
import type { FormFieldError } from "./recipe/emailpassword/types";
import type {
@@ -28,6 +33,7 @@ import type {
Navigate,
NormalisedAppInfo,
NormalisedFormField,
+ NormalisedGetRedirectionURLContext,
UserContext,
} from "./types";
@@ -119,6 +125,40 @@ export function getRedirectToPathFromURL(): string | undefined {
}
}
+export function getTenantIdFromQueryParams(): string | undefined {
+ return getQueryParams(TENANT_ID_QUERY_PARAM) ?? undefined;
+}
+
+export function getDefaultRedirectionURLForPath(
+ config: { appInfo: NormalisedAppInfo },
+ defaultPath: string,
+ context: NormalisedGetRedirectionURLContext,
+ extraQueryParams?: Record
+): string {
+ const redirectPath = config.appInfo.websiteBasePath
+ .appendPath(new NormalisedURLPath(defaultPath))
+ .getAsStringDangerous();
+
+ const queryParams = new URLSearchParams();
+ if (context.tenantIdFromQueryParams !== undefined) {
+ queryParams.set(TENANT_ID_QUERY_PARAM, context.tenantIdFromQueryParams);
+ }
+
+ if (extraQueryParams !== undefined) {
+ Object.entries(extraQueryParams).forEach(([key, value]) => {
+ if (value !== undefined) {
+ queryParams.set(key, value);
+ }
+ });
+ }
+
+ if (queryParams.toString() !== "") {
+ return `${redirectPath}?${queryParams.toString()}`;
+ }
+
+ return redirectPath;
+}
+
/*
* isTest
*/
diff --git a/lib/ts/version.ts b/lib/ts/version.ts
index e7e73cd84..1de93fae4 100644
--- a/lib/ts/version.ts
+++ b/lib/ts/version.ts
@@ -12,4 +12,4 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-export const package_version = "0.47.1";
+export const package_version = "0.49.0";
diff --git a/package-lock.json b/package-lock.json
index 3fe8e0c0f..994cf25d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "supertokens-auth-react",
- "version": "0.47.1",
+ "version": "0.49.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "supertokens-auth-react",
- "version": "0.47.1",
+ "version": "0.49.0",
"license": "Apache-2.0",
"dependencies": {
"intl-tel-input": "^17.0.19",
@@ -103,7 +103,7 @@
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0",
- "supertokens-web-js": "^0.13.0"
+ "supertokens-web-js": "github:supertokens/supertokens-web-js#0.15"
}
},
"eslint": {
@@ -23889,19 +23889,19 @@
"integrity": "sha512-r0JFBjkMIdep3Lbk3JA+MpnpuOtw4RSyrlRAbrzMcxwiYco3GFWl/daimQZ5b1forOiUODpOlXbSOljP/oyurg=="
},
"node_modules/supertokens-web-js": {
- "version": "0.13.0",
- "resolved": "https://registry.npmjs.org/supertokens-web-js/-/supertokens-web-js-0.13.0.tgz",
- "integrity": "sha512-I0o8Pblu4G1Bopm6c0YI2bZQ/22k5qrjdPFV7etNJ+ydOmNoQPBCo1iY9QbmLANcokyLOaWS5k8jEuwoVh/FYQ==",
+ "version": "0.15.0",
+ "resolved": "git+ssh://git@github.com/supertokens/supertokens-web-js.git#7910f10944829b14dc2c512039f466a566bb8c44",
+ "license": "Apache-2.0",
"peer": true,
"dependencies": {
"supertokens-js-override": "0.0.4",
- "supertokens-website": "^20.0.1"
+ "supertokens-website": "github:supertokens/supertokens-website#20.1"
}
},
"node_modules/supertokens-website": {
- "version": "20.1.1",
- "resolved": "https://registry.npmjs.org/supertokens-website/-/supertokens-website-20.1.1.tgz",
- "integrity": "sha512-AuYp+uOGuUihdrLVVpeB8r8+AJljfqzn8KfiErRgHMPAgxHGbbm2F/+kfi7sudPrh04D6IAfBKxzvKTmJ07w4A==",
+ "version": "20.1.5",
+ "resolved": "git+ssh://git@github.com/supertokens/supertokens-website.git#20c203d8341c5511a1e807991cd00c272e1797bf",
+ "license": "Apache-2.0",
"peer": true,
"dependencies": {
"browser-tabs-lock": "^1.3.0",
@@ -43370,19 +43370,17 @@
"integrity": "sha512-r0JFBjkMIdep3Lbk3JA+MpnpuOtw4RSyrlRAbrzMcxwiYco3GFWl/daimQZ5b1forOiUODpOlXbSOljP/oyurg=="
},
"supertokens-web-js": {
- "version": "0.13.0",
- "resolved": "https://registry.npmjs.org/supertokens-web-js/-/supertokens-web-js-0.13.0.tgz",
- "integrity": "sha512-I0o8Pblu4G1Bopm6c0YI2bZQ/22k5qrjdPFV7etNJ+ydOmNoQPBCo1iY9QbmLANcokyLOaWS5k8jEuwoVh/FYQ==",
+ "version": "git+ssh://git@github.com/supertokens/supertokens-web-js.git#7910f10944829b14dc2c512039f466a566bb8c44",
+ "from": "supertokens-web-js@github:supertokens/supertokens-web-js#0.15",
"peer": true,
"requires": {
"supertokens-js-override": "0.0.4",
- "supertokens-website": "^20.0.1"
+ "supertokens-website": "github:supertokens/supertokens-website#20.1"
}
},
"supertokens-website": {
- "version": "20.1.1",
- "resolved": "https://registry.npmjs.org/supertokens-website/-/supertokens-website-20.1.1.tgz",
- "integrity": "sha512-AuYp+uOGuUihdrLVVpeB8r8+AJljfqzn8KfiErRgHMPAgxHGbbm2F/+kfi7sudPrh04D6IAfBKxzvKTmJ07w4A==",
+ "version": "git+ssh://git@github.com/supertokens/supertokens-website.git#20c203d8341c5511a1e807991cd00c272e1797bf",
+ "from": "supertokens-website@github:supertokens/supertokens-website#20.1",
"peer": true,
"requires": {
"browser-tabs-lock": "^1.3.0",
diff --git a/package.json b/package.json
index add96ed49..e847a78b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "supertokens-auth-react",
- "version": "0.47.1",
+ "version": "0.49.0",
"description": "ReactJS SDK that provides login functionality with SuperTokens.",
"main": "./index.js",
"engines": {
@@ -98,7 +98,7 @@
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0",
- "supertokens-web-js": "^0.13.0"
+ "supertokens-web-js": "github:supertokens/supertokens-web-js#0.15"
},
"scripts": {
"init": "bash ./init.sh",
@@ -137,19 +137,19 @@
"size-limit": [
{
"path": "lib/build/index.js",
- "limit": "23.5kb"
+ "limit": "25kb"
},
{
"path": "recipe/session/index.js",
- "limit": "24.5kb"
+ "limit": "26kb"
},
{
"path": "recipe/session/prebuiltui.js",
- "limit": "29kb"
+ "limit": "31kb"
},
{
"path": "recipe/thirdparty/index.js",
- "limit": "33kb"
+ "limit": "34kb"
},
{
"path": "recipe/emailpassword/index.js",
@@ -165,19 +165,19 @@
},
{
"path": "recipe/emailverification/prebuiltui.js",
- "limit": "34kb"
+ "limit": "36kb"
},
{
"path": "recipe/thirdparty/prebuiltui.js",
- "limit": "54kb"
+ "limit": "56kb"
},
{
"path": "recipe/emailpassword/prebuiltui.js",
- "limit": "40kb"
+ "limit": "42kb"
},
{
"path": "recipe/passwordless/prebuiltui.js",
- "limit": "130kb"
+ "limit": "132kb"
},
{
"path": "recipe/multitenancy/index.js",
@@ -189,6 +189,14 @@
},
{
"path": "recipe/multifactorauth/prebuiltui.js",
+ "limit": "35kb"
+ },
+ {
+ "path": "recipe/oauth2provider/index.js",
+ "limit": "12kb"
+ },
+ {
+ "path": "recipe/oauth2provider/prebuiltui.js",
"limit": "33kb"
}
],
diff --git a/recipe/oauth2provider/index.d.ts b/recipe/oauth2provider/index.d.ts
new file mode 100644
index 000000000..e7ece88b8
--- /dev/null
+++ b/recipe/oauth2provider/index.d.ts
@@ -0,0 +1,17 @@
+/* Copyright (c) 2021, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+export * from "../../lib/build/recipe/oauth2provider";
+import * as _default from "../../lib/build/recipe/oauth2provider";
+export default _default;
diff --git a/recipe/oauth2provider/index.js b/recipe/oauth2provider/index.js
new file mode 100644
index 000000000..5802d3c8e
--- /dev/null
+++ b/recipe/oauth2provider/index.js
@@ -0,0 +1,20 @@
+/* Copyright (c) 2021, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+"use strict";
+function __export(m) {
+ for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+exports.__esModule = true;
+__export(require("../../lib/build/oauth2provider"));
diff --git a/recipe/oauth2provider/prebuiltui.d.ts b/recipe/oauth2provider/prebuiltui.d.ts
new file mode 100644
index 000000000..c983a1551
--- /dev/null
+++ b/recipe/oauth2provider/prebuiltui.d.ts
@@ -0,0 +1,17 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+export * from "../../lib/build/recipe/oauth2provider/prebuiltui";
+import * as _default from "../../lib/build/recipe/oauth2provider/prebuiltui";
+export default _default;
diff --git a/recipe/oauth2provider/prebuiltui.js b/recipe/oauth2provider/prebuiltui.js
new file mode 100644
index 000000000..c5380476f
--- /dev/null
+++ b/recipe/oauth2provider/prebuiltui.js
@@ -0,0 +1,20 @@
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+"use strict";
+function __export(m) {
+ for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+exports.__esModule = true;
+__export(require("../../lib/build/oauth2providerprebuiltui"));
diff --git a/rollup.config.mjs b/rollup.config.mjs
index e59a7aa1d..8314eab99 100644
--- a/rollup.config.mjs
+++ b/rollup.config.mjs
@@ -25,6 +25,8 @@ export default [
emailpasswordprebuiltui: "lib/ts/recipe/emailpassword/prebuiltui.tsx",
passwordless: "lib/ts/recipe/passwordless/index.ts",
passwordlessprebuiltui: "lib/ts/recipe/passwordless/prebuiltui.tsx",
+ oauth2provider: "lib/ts/recipe/oauth2provider/index.ts",
+ oauth2providerprebuiltui: "lib/ts/recipe/oauth2provider/prebuiltui.tsx",
thirdparty: "lib/ts/recipe/thirdparty/index.ts",
thirdpartyprebuiltui: "lib/ts/recipe/thirdparty/prebuiltui.tsx",
multitenancy: "lib/ts/recipe/multitenancy/index.ts",
diff --git a/stories/allrecipes.stories.tsx b/stories/allrecipes.stories.tsx
index 6b13ea26f..d096ab495 100644
--- a/stories/allrecipes.stories.tsx
+++ b/stories/allrecipes.stories.tsx
@@ -141,6 +141,17 @@ export const ResetPasswordLinkClicked: Story = {
},
};
+export const OAuth2Login: Story = {
+ args: {
+ path: "/auth",
+ query: "loginChallenge=asdf",
+ "oauth2.initialized": true,
+ "oauth2.clientName": "Google",
+ "oauth2.logoUri": "https://upload.wikimedia.org/wikipedia/commons/c/c1/Google_%22G%22_logo.svg",
+ "oauth2.clientUri": "https://google.com",
+ },
+};
+
export const ContactFormCombined: Story = {
args: {
"multifactorauth.firstFactors": ["thirdparty", "emailpassword", "otp-email", "otp-phone"],
diff --git a/stories/authPage.stories.tsx b/stories/authPage.stories.tsx
index 63618e908..0cbb59f7b 100644
--- a/stories/authPage.stories.tsx
+++ b/stories/authPage.stories.tsx
@@ -20,6 +20,10 @@ export type Args = {
"passwordless.initialized": boolean;
"passwordless.contactMethod": "PHONE" | "EMAIL" | "EMAIL_OR_PHONE";
"passwordless.defaultToEmail": boolean;
+ "oauth2.initialized": boolean;
+ "oauth2.clientName": string;
+ "oauth2.logoUri": string;
+ "oauth2.clientUri": string;
path?: string;
query?: string;
hash?: string;
@@ -104,6 +108,10 @@ const meta: Meta = {
"passwordless.contactMethod": "EMAIL_OR_PHONE",
"passwordless.defaultToEmail": true,
rootStyle: "",
+ "oauth2.initialized": true,
+ "oauth2.clientName": "My App",
+ "oauth2.logoUri": "https://example.com/logo.png",
+ "oauth2.clientUri": "https://example.com",
},
argTypes: {
"multifactorauth.initialized": {
@@ -211,6 +219,38 @@ const meta: Meta = {
truthy: true,
},
},
+ "oauth2.initialized": {
+ table: {
+ category: "oauth2",
+ },
+ },
+ "oauth2.clientName": {
+ table: {
+ category: "oauth2",
+ },
+ if: {
+ arg: "oauth2.initialized",
+ truthy: true,
+ },
+ },
+ "oauth2.logoUri": {
+ table: {
+ category: "oauth2",
+ },
+ if: {
+ arg: "oauth2.initialized",
+ truthy: true,
+ },
+ },
+ "oauth2.clientUri": {
+ table: {
+ category: "oauth2",
+ },
+ if: {
+ arg: "oauth2.initialized",
+ truthy: true,
+ },
+ },
},
};
diff --git a/stories/oauth2provider.stories.tsx b/stories/oauth2provider.stories.tsx
new file mode 100644
index 000000000..68c839ad3
--- /dev/null
+++ b/stories/oauth2provider.stories.tsx
@@ -0,0 +1,81 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { OAuth2LogoutScreenTheme as Page } from "../lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen";
+import React from "react";
+import { defaultTranslationsOAuth2Provider } from "../lib/ts/recipe/oauth2provider/components/themes/translations";
+import { WindowHandlerReference } from "supertokens-web-js/utils/windowHandler";
+import { TranslationContextProvider } from "../lib/ts/translation/translationContext";
+import { ComponentOverrideContext } from "../lib/ts/components/componentOverride/componentOverrideContext";
+import { resetAndInitST } from "./utils";
+import { SessionContext } from "../lib/ts/recipe/session";
+
+function noop() {}
+WindowHandlerReference.init((oI) => ({ ...oI }));
+
+const defaultSessionContext = {
+ loading: false,
+ doesSessionExist: true,
+ invalidClaims: [],
+ accessTokenPayload: {},
+ userId: "test-user",
+};
+
+const meta: Meta = {
+ title: "OAuth2Provider",
+ decorators: [
+ (Story, context) => {
+ return (
+
+
+
+
+
+
+ );
+ },
+ ],
+ component: Page,
+ render: (args, ctx) => {
+ resetAndInitST();
+ return ;
+
+export const OAuth2LogoutScreen: Story = {
+ parameters: {
+ design: {
+ type: "figma",
+ url: "https://www.figma.com/design/FlU5eMznAw68y5XU3pRVyZ/Homepage-and-pricing-page?node-id=5018-33&t=u8hfT9V6cJ7b7qEL-0",
+ },
+ },
+ args: {},
+};
+
+export const OAuth2LogoutScreenSpinner: Story = {
+ parameters: {
+ design: {
+ type: "figma",
+ url: "https://www.figma.com/design/FlU5eMznAw68y5XU3pRVyZ/Homepage-and-pricing-page?node-id=5018-33&t=u8hfT9V6cJ7b7qEL-0",
+ },
+ },
+ args: {
+ showSpinner: true,
+ },
+};
diff --git a/stories/utils.ts b/stories/utils.ts
index 16dcdee89..a1ebed743 100644
--- a/stories/utils.ts
+++ b/stories/utils.ts
@@ -29,6 +29,7 @@ import SuperTokensWebJS from "supertokens-web-js/lib/build/supertokens";
import { AdditionalLoginAttemptInfoProperties, LoginAttemptInfo } from "../lib/ts/recipe/passwordless/types";
import { WindowHandlerReference } from "supertokens-web-js/utils/windowHandler";
import { PostSuperTokensInitCallbacks } from "supertokens-web-js/utils/postSuperTokensInitCallbacks";
+import OAuth2Provider from "../lib/ts/recipe/oauth2provider/recipe";
export function withFetchResponse(resp: T): T & { fetchResponse: Response } {
return resp as any;
@@ -125,6 +126,12 @@ export type AuthPageConf = {
firstFactors: FirstFactor[];
providers: ProviderId[];
};
+ oauth2: {
+ initialized: boolean;
+ clientName: string;
+ logoUri: string;
+ clientUri: string;
+ };
};
export function buildInit(args: AuthPageConf, funcOverrides: any) {
@@ -213,6 +220,29 @@ export function buildInit(args: AuthPageConf, funcOverrides: any) {
);
}
+ if (args.oauth2.initialized) {
+ recipeList.push(
+ OAuth2Provider.init({
+ override: {
+ functions: (oI) => ({
+ ...oI,
+ getLoginChallengeInfo: async () => {
+ return {
+ status: "OK",
+ info: {
+ clientName: args.oauth2.clientName,
+ logoUri: args.oauth2.logoUri || undefined,
+ clientUri: args.oauth2.clientUri || undefined,
+ },
+ fetchResponse: undefined as any,
+ };
+ },
+ }),
+ },
+ }) as any
+ );
+ }
+
return {
useShadowDom: false,
defaultToSignUp: args.defaultToSignUp,
diff --git a/test/end-to-end/accountlinking.test.js b/test/end-to-end/accountlinking.test.js
index 0b23079d4..92bedc11e 100644
--- a/test/end-to-end/accountlinking.test.js
+++ b/test/end-to-end/accountlinking.test.js
@@ -45,6 +45,7 @@ import {
sendEmailResetPasswordSuccessMessage,
changeEmail,
backendBeforeEach,
+ setupBrowser,
} from "../helpers";
import { TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL, SIGN_IN_UP_API, RESET_PASSWORD_API } from "../constants";
@@ -71,10 +72,7 @@ describe("SuperTokens Account linking", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
page.on("console", (consoleObj) => {
const log = consoleObj.text();
diff --git a/test/end-to-end/emailverification.test.js b/test/end-to-end/emailverification.test.js
index 468a80ea5..3c4b89035 100644
--- a/test/end-to-end/emailverification.test.js
+++ b/test/end-to-end/emailverification.test.js
@@ -55,6 +55,7 @@ import {
getDefaultSignUpFieldValues,
getTestEmail,
waitForUrl,
+ setupBrowser,
} from "../helpers";
describe("SuperTokens Email Verification", function () {
@@ -68,10 +69,7 @@ describe("SuperTokens Email Verification", function () {
await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
accountLinkingSupported = await isAccountLinkingSupported();
page = await browser.newPage();
@@ -104,6 +102,7 @@ describe("SuperTokens Email Verification", function () {
consoleLogs = [];
page.on("console", (consoleObj) => {
const log = consoleObj.text();
+ // console.log(log);
if (log.startsWith("ST_LOGS")) {
consoleLogs.push(log);
}
@@ -618,10 +617,7 @@ describe("SuperTokens Email Verification server errors", function () {
let consoleLogs;
before(async function () {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
await page.goto(`${TEST_CLIENT_BASE_URL}/auth?mode=REQUIRED`);
});
@@ -675,10 +671,7 @@ describe("SuperTokens Email Verification general errors", function () {
await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
await Promise.all([
page.goto(`${TEST_CLIENT_BASE_URL}/auth?mode=REQUIRED`),
@@ -786,10 +779,7 @@ describe("SuperTokens Email Verification isEmailVerified server error", function
await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -866,10 +856,7 @@ describe("Email verification signOut errors", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -952,10 +939,7 @@ describe("Email verification claim refresh with clock skew", function () {
}),
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/embed.test.js b/test/end-to-end/embed.test.js
index e5a335334..1ca49a76a 100644
--- a/test/end-to-end/embed.test.js
+++ b/test/end-to-end/embed.test.js
@@ -5,17 +5,19 @@ import { TEST_SERVER_BASE_URL } from "../constants";
import { AuthPage } from "./pages/AuthPage";
import { EmailVerificationPage } from "./pages/EmailVerificationPage";
import { ResetPasswordPage } from "./pages/ResetPasswordPage";
-import { backendBeforeEach, clearBrowserCookiesWithoutAffectingConsole, screenshotOnFailure } from "../helpers";
+import {
+ backendBeforeEach,
+ clearBrowserCookiesWithoutAffectingConsole,
+ screenshotOnFailure,
+ setupBrowser,
+} from "../helpers";
describe("Embed components", async () => {
let browser;
let page;
before(async function () {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
await backendBeforeEach();
await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
diff --git a/test/end-to-end/generalerror.test.js b/test/end-to-end/generalerror.test.js
index 10160aebd..1100c0150 100644
--- a/test/end-to-end/generalerror.test.js
+++ b/test/end-to-end/generalerror.test.js
@@ -42,6 +42,7 @@ import {
setGeneralErrorToLocalStorage,
backendBeforeEach,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import {
@@ -78,10 +79,7 @@ describe("General error rendering", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -175,7 +173,7 @@ describe("General error rendering", function () {
{ name: "name", value: "John Doe" },
{ name: "age", value: "20" },
],
- '{"formFields":[{"id":"email","value":"john.doe2@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"},{"id":"name","value":"John Doe"},{"id":"age","value":"20"},{"id":"country","value":""}]}',
+ '{"formFields":[{"id":"email","value":"john.doe2@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"},{"id":"name","value":"John Doe"},{"id":"age","value":"20"},{"id":"country","value":""}],"shouldTryLinkingWithSessionUser":false}',
rid
);
@@ -240,10 +238,7 @@ function getEmailPasswordTests(rid, ridForStorage) {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -378,10 +373,7 @@ function getThirdPartyTests(rid, ridForStorage) {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/getRedirectionURL.test.js b/test/end-to-end/getRedirectionURL.test.js
index fa0304c82..f491f7ad9 100644
--- a/test/end-to-end/getRedirectionURL.test.js
+++ b/test/end-to-end/getRedirectionURL.test.js
@@ -17,6 +17,7 @@ import {
isPasswordlessSupported,
isThirdPartyPasswordlessSupported,
backendBeforeEach,
+ setupBrowser,
} from "../helpers";
import {
@@ -38,10 +39,7 @@ describe("getRedirectionURL Tests", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -86,10 +84,7 @@ describe("getRedirectionURL Tests", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
await page.goto(`${TEST_CLIENT_BASE_URL}/auth?authRecipe=thirdparty`);
});
@@ -139,10 +134,7 @@ describe("getRedirectionURL Tests", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
});
@@ -216,10 +208,7 @@ describe("getRedirectionURL Tests", function () {
}),
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
await Promise.all([
page.goto(
@@ -303,10 +292,7 @@ describe("getRedirectionURL Tests", function () {
}),
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
await Promise.all([
page.goto(
@@ -390,10 +376,7 @@ describe("getRedirectionURL Tests", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
// We need to set the localStorage value before the page loads to ensure ST initialises with the correct value
@@ -464,10 +447,7 @@ describe("getRedirectionURL Tests", function () {
}),
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
// We need to set the localStorage value before the page loads to ensure ST initialises with the correct value
await page.evaluateOnNewDocument(() => {
@@ -557,10 +537,7 @@ describe("getRedirectionURL Tests", function () {
}),
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
// We need to set the localStorage value before the page loads to ensure ST initialises with the correct value
await page.evaluateOnNewDocument(() => {
@@ -632,10 +609,7 @@ describe("getRedirectionURL Tests", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
// We need to set the localStorage value before the page loads to ensure ST initialises with the correct value
diff --git a/test/end-to-end/mfa.chooserscreen.test.js b/test/end-to-end/mfa.chooserscreen.test.js
index 3fab733b6..cb14c1d70 100644
--- a/test/end-to-end/mfa.chooserscreen.test.js
+++ b/test/end-to-end/mfa.chooserscreen.test.js
@@ -33,6 +33,7 @@ import {
setAccountLinkingConfig,
isMFASupported,
expectErrorThrown,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { CREATE_CODE_API, CREATE_TOTP_DEVICE_API, MFA_INFO_API } from "../constants";
@@ -80,10 +81,7 @@ describe("SuperTokens SignIn w/ MFA", function () {
}).catch(console.error);
await setAccountLinkingConfig(true, true, false);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/mfa.default_reqs.test.js b/test/end-to-end/mfa.default_reqs.test.js
index ab1fda1d3..04e150bf8 100644
--- a/test/end-to-end/mfa.default_reqs.test.js
+++ b/test/end-to-end/mfa.default_reqs.test.js
@@ -32,6 +32,7 @@ import {
getFactorChooserOptions,
setAccountLinkingConfig,
isMFASupported,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { CREATE_CODE_API, CREATE_TOTP_DEVICE_API, MFA_INFO_API, TEST_APPLICATION_SERVER_BASE_URL } from "../constants";
@@ -80,10 +81,7 @@ describe("SuperTokens SignIn w/ MFA", function () {
}).catch(console.error);
await setAccountLinkingConfig(true, true, false);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/mfa.factorscreen.otp.test.js b/test/end-to-end/mfa.factorscreen.otp.test.js
index 53d9dba6c..6632126ab 100644
--- a/test/end-to-end/mfa.factorscreen.otp.test.js
+++ b/test/end-to-end/mfa.factorscreen.otp.test.js
@@ -34,6 +34,7 @@ import {
isMFASupported,
setAccountLinkingConfig,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import {
@@ -87,10 +88,7 @@ describe("SuperTokens SignIn w/ MFA", function () {
}).catch(console.error);
await setAccountLinkingConfig(true, true, false);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/mfa.factorscreen.totp.test.js b/test/end-to-end/mfa.factorscreen.totp.test.js
index 87ea80bab..aafdc6398 100644
--- a/test/end-to-end/mfa.factorscreen.totp.test.js
+++ b/test/end-to-end/mfa.factorscreen.totp.test.js
@@ -33,6 +33,7 @@ import {
isMFASupported,
setAccountLinkingConfig,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { CREATE_CODE_API, CREATE_TOTP_DEVICE_API, MFA_INFO_API } from "../constants";
@@ -81,10 +82,7 @@ describe("SuperTokens SignIn w/ MFA", function () {
}).catch(console.error);
await setAccountLinkingConfig(true, true, false);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/mfa.firstFactors.test.js b/test/end-to-end/mfa.firstFactors.test.js
index a9e597c9a..c3cdd2fcf 100644
--- a/test/end-to-end/mfa.firstFactors.test.js
+++ b/test/end-to-end/mfa.firstFactors.test.js
@@ -28,6 +28,7 @@ import {
submitForm,
isMFASupported,
setAccountLinkingConfig,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
@@ -56,10 +57,7 @@ describe("SuperTokens MFA firstFactors support", function () {
}).catch(console.error);
await setAccountLinkingConfig(true, true, false);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/mfa.requirement_handling.test.js b/test/end-to-end/mfa.requirement_handling.test.js
index 347ed2db8..e170f1e45 100644
--- a/test/end-to-end/mfa.requirement_handling.test.js
+++ b/test/end-to-end/mfa.requirement_handling.test.js
@@ -32,6 +32,7 @@ import {
getFactorChooserOptions,
setAccountLinkingConfig,
isMFASupported,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { CREATE_CODE_API, CREATE_TOTP_DEVICE_API, MFA_INFO_API } from "../constants";
@@ -78,10 +79,7 @@ describe("SuperTokens SignIn w/ MFA", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/mfa.signin.test.js b/test/end-to-end/mfa.signin.test.js
index 9e9d0da92..364f234a5 100644
--- a/test/end-to-end/mfa.signin.test.js
+++ b/test/end-to-end/mfa.signin.test.js
@@ -33,6 +33,7 @@ import {
setAccountLinkingConfig,
expectErrorThrown,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { CREATE_CODE_API, CREATE_TOTP_DEVICE_API, MFA_INFO_API } from "../constants";
@@ -81,10 +82,7 @@ describe("SuperTokens SignIn w/ MFA", function () {
await setAccountLinkingConfig(true, true, false);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/multitenancy.dynamic_login_methods.test.js b/test/end-to-end/multitenancy.dynamic_login_methods.test.js
index 210a6864c..6364161fd 100644
--- a/test/end-to-end/multitenancy.dynamic_login_methods.test.js
+++ b/test/end-to-end/multitenancy.dynamic_login_methods.test.js
@@ -40,6 +40,7 @@ import {
setupTenant,
backendBeforeEach,
getTextByDataSupertokens,
+ setupBrowser,
} from "../helpers";
import {
TEST_CLIENT_BASE_URL,
@@ -106,10 +107,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
});
before(async () => {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox", "--disable-web-security"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/multitenancy.mock.test.js b/test/end-to-end/multitenancy.mock.test.js
index 2e479ddb9..34b56121f 100644
--- a/test/end-to-end/multitenancy.mock.test.js
+++ b/test/end-to-end/multitenancy.mock.test.js
@@ -28,6 +28,7 @@ import {
assertNoSTComponents,
assertProviders,
getProviderLogoCount,
+ setupBrowser,
} from "../helpers";
import { TEST_CLIENT_BASE_URL, DEFAULT_WEBSITE_BASE_PATH, ST_ROOT_SELECTOR } from "../constants";
import { before } from "mocha";
@@ -64,10 +65,7 @@ describe.skip("SuperTokens Multitenancy w/ mocked login methods", function () {
});
before(async () => {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox", "--disable-web-security"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/multitenancy.tenant_interactions.test.js b/test/end-to-end/multitenancy.tenant_interactions.test.js
index 57a1bb33f..bceeaedc7 100644
--- a/test/end-to-end/multitenancy.tenant_interactions.test.js
+++ b/test/end-to-end/multitenancy.tenant_interactions.test.js
@@ -47,6 +47,7 @@ import {
removeTenant,
backendBeforeEach,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import {
TEST_CLIENT_BASE_URL,
@@ -117,10 +118,7 @@ describe("SuperTokens Multitenancy tenant interactions", function () {
});
before(async () => {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox", "--disable-web-security"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/oauth2provider.test.js b/test/end-to-end/oauth2provider.test.js
new file mode 100644
index 000000000..4e2a052f8
--- /dev/null
+++ b/test/end-to-end/oauth2provider.test.js
@@ -0,0 +1,667 @@
+/* Copyright (c) 2021, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ * This software is licensed under the Apache License, Version 2.0 (the
+ * "License") as published by the Apache Software Foundation.
+ *
+ * You may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Imports
+ */
+
+import assert from "assert";
+import puppeteer from "puppeteer";
+import {
+ clearBrowserCookiesWithoutAffectingConsole,
+ toggleSignInSignUp,
+ screenshotOnFailure,
+ backendBeforeEach,
+ waitForUrl,
+ createOAuth2Client,
+ setOAuth2ClientInfo,
+ removeOAuth2ClientInfo,
+ getOAuth2LoginButton,
+ getOAuth2LogoutButton,
+ getOAuth2TokenData,
+ isReact16,
+ waitFor,
+ signUp,
+ getDefaultSignUpFieldValues,
+ getTestEmail,
+ getOAuth2Error,
+ waitForSTElement,
+ isOauth2Supported,
+ setupBrowser,
+} from "../helpers";
+import fetch from "isomorphic-fetch";
+
+import {
+ TEST_CLIENT_BASE_URL,
+ TEST_SERVER_BASE_URL,
+ SIGN_OUT_API,
+ TEST_APPLICATION_SERVER_BASE_URL,
+} from "../constants";
+
+// We do no thave to use a separate domain for the oauth2 client, since the way we are testing
+// the lib doesn't interact with the supertokens session handling.
+// Using a redirection uri that has the same domain as the auth portal shouldn't affect the test.
+
+/*
+ * Tests.
+ */
+describe("SuperTokens OAuth2Provider", function () {
+ let browser;
+ let page;
+ let consoleLogs = [];
+ let skipped = false;
+
+ before(async function () {
+ // Skip these tests if running in React 16
+ if (isReact16() || !(await isOauth2Supported())) {
+ skipped = true;
+ this.skip();
+ }
+
+ await backendBeforeEach();
+
+ await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
+ method: "POST",
+ headers: { "content-type": "application/json" },
+ body: JSON.stringify({
+ coreConfig: {
+ access_token_validity: 5, // 5 seconds
+ },
+ }),
+ }).catch(console.error);
+
+ browser = await setupBrowser();
+ });
+
+ after(async function () {
+ if (skipped) {
+ return;
+ }
+ await browser.close();
+
+ await fetch(`${TEST_SERVER_BASE_URL}/after`, {
+ method: "POST",
+ }).catch(console.error);
+
+ await fetch(`${TEST_SERVER_BASE_URL}/stopst`, {
+ method: "POST",
+ }).catch(console.error);
+ });
+
+ afterEach(function () {
+ return screenshotOnFailure(this, browser);
+ });
+
+ beforeEach(async function () {
+ page = await browser.newPage();
+ page.on("console", (consoleObj) => {
+ const log = consoleObj.text();
+ if (log.startsWith("ST_LOGS")) {
+ consoleLogs.push(log);
+ }
+ });
+ consoleLogs = await clearBrowserCookiesWithoutAffectingConsole(page, []);
+ });
+
+ describe("Generic OAuth2 Client Library", function () {
+ afterEach(async function () {
+ await removeOAuth2ClientInfo(page);
+ });
+
+ it("should successfully complete the OAuth2 flow", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId);
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenData = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenData.aud, client.clientId);
+
+ // Logout
+ const logoutButton = await getOAuth2LogoutButton(page);
+ await logoutButton.click();
+
+ await waitFor(1000);
+
+ await page.waitForSelector("#oauth2-token-data", { hidden: true });
+
+ // Ensure the Login Button is visible after logout is clicked
+ loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+ await waitForUrl(page, "/oauth/callback");
+ });
+
+ it("should successfully complete the OAuth2 Logout flow", async function () {
+ const postLogoutRedirectUri = `${TEST_CLIENT_BASE_URL}/oauth/login?logout=true`;
+
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ postLogoutRedirectUris: [postLogoutRedirectUri],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ });
+
+ await setOAuth2ClientInfo(
+ page,
+ client.clientId,
+ undefined,
+ undefined,
+ undefined,
+ JSON.stringify({
+ post_logout_redirect_uri: postLogoutRedirectUri,
+ })
+ );
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Logout
+ const logoutButton = await getOAuth2LogoutButton(page, "redirect");
+ await logoutButton.click();
+
+ await waitForUrl(page, "/auth/oauth/logout");
+
+ // Click the Logout button on the provider website
+ const stLogoutButton = await waitForSTElement(page, "[data-supertokens~=button]");
+ await stLogoutButton.click();
+
+ // Ensure the final url matches the post_logout_redirect uri
+ await waitForUrl(page, "/oauth/login?logout=true", false);
+
+ await page.waitForSelector("#oauth2-token-data", { hidden: true });
+
+ // Ensure that the SuperTokens session was cleared by checking for a redirect to the provider's auth page during the login flow.
+ loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+ await waitForUrl(page, "/auth");
+ });
+
+ it("should login without interaction if the user already has a session", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId);
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/auth`),
+ ]);
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenData = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenData.aud, client.clientId);
+ });
+
+ it("should require logging in again with prompt=login", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId);
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page, "prompt-login");
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenData = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenData.aud, client.clientId);
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ loginButton = await getOAuth2LoginButton(page, "prompt-login");
+ await loginButton.click();
+ await waitForUrl(page, "/auth");
+ });
+
+ it("should require logging in again with max_age=3 after 3 seconds", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId);
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page, "max-age-3");
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenData = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenData.aud, client.clientId);
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ loginButton = await getOAuth2LoginButton(page, "max-age-3");
+ await loginButton.click();
+ await waitForUrl(page, "/oauth/callback");
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ await waitFor(3000);
+ loginButton = await getOAuth2LoginButton(page, "max-age-3");
+ await loginButton.click();
+ await waitForUrl(page, "/auth");
+ });
+
+ it("should successfully refresh the tokens after expiry", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ // The library refreshes the token 60 seconds before it expires.
+ // We set the token lifespan to 63 seconds to force a refresh in 3 seconds.
+ authorizationCodeGrantAccessTokenLifespan: "63s",
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId);
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenDataAfterLogin = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterLogin.aud, client.clientId);
+
+ // Although the react-oidc-context library automatically refreshes the
+ // token, we wait for 4 seconds and reload the page to ensure a refresh.
+ await waitFor(4000);
+ await Promise.all([page.reload(), page.waitForNavigation({ waitUntil: "networkidle0" })]);
+
+ const tokenDataAfterRefresh = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterRefresh.aud, client.clientId);
+
+ // Validate the token was refreshed
+ assert(tokenDataAfterLogin.iat !== tokenDataAfterRefresh.iat);
+ assert(tokenDataAfterLogin.exp < tokenDataAfterRefresh.exp);
+ });
+
+ it("should have roles in the id_token if the scopes is requested", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email roles permissions",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId, "offline_access profile openid email roles permissions");
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenDataAfterLogin = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterLogin.aud, client.clientId);
+
+ await page.evaluate(
+ (url) =>
+ window.fetch(url, {
+ method: "POST",
+ headers: [["content-type", "application/json"]],
+ body: JSON.stringify({
+ role: "testRole",
+ permissions: ["testPerm"],
+ }),
+ }),
+ `${TEST_APPLICATION_SERVER_BASE_URL}/setRole`
+ );
+
+ await waitFor(2000);
+ loginButton = await getOAuth2LoginButton(page, "silent");
+ await loginButton.click();
+
+ await waitFor(1000);
+
+ const tokenDataAfterRefresh = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterRefresh.aud, client.clientId);
+
+ // Validate the token was refreshed
+ assert(tokenDataAfterLogin.iat !== tokenDataAfterRefresh.iat);
+ assert(tokenDataAfterLogin.exp < tokenDataAfterRefresh.exp);
+
+ assert.deepStrictEqual(tokenDataAfterLogin.roles, []);
+ assert.deepStrictEqual(tokenDataAfterLogin.permissions, []);
+
+ assert.deepStrictEqual(tokenDataAfterRefresh.roles, ["testRole"]);
+ assert.deepStrictEqual(tokenDataAfterRefresh.permissions, ["testPerm"]);
+ });
+
+ it("should not include email info if the scope is not requested", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid roles permissions",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ // The library refreshes the token 60 seconds before it expires.
+ // We set the token lifespan to 63 seconds to force a refresh in 3 seconds.
+ authorizationCodeGrantAccessTokenLifespan: "63s",
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId, "offline_access profile openid roles permissions");
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenDataAfterLogin = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterLogin.aud, client.clientId);
+
+ // Although the react-oidc-context library automatically refreshes the
+ // token, we wait for 4 seconds and reload the page to ensure a refresh.
+ await waitFor(4000);
+ await Promise.all([page.reload(), page.waitForNavigation({ waitUntil: "networkidle0" })]);
+
+ const tokenDataAfterRefresh = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterRefresh.aud, client.clientId);
+
+ // Validate the token was refreshed
+ assert(tokenDataAfterLogin.iat !== tokenDataAfterRefresh.iat);
+ assert(tokenDataAfterLogin.exp < tokenDataAfterRefresh.exp);
+
+ assert.strictEqual(tokenDataAfterLogin.email, undefined);
+ assert.strictEqual(tokenDataAfterLogin.email_verified, undefined);
+ assert.strictEqual(tokenDataAfterRefresh.email, undefined);
+ assert.strictEqual(tokenDataAfterRefresh.email_verified, undefined);
+ });
+
+ it("should work if the scope phoneNumber is requested for emailpassword user", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid phoneNumber",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ // The library refreshes the token 60 seconds before it expires.
+ // We set the token lifespan to 63 seconds to force a refresh in 3 seconds.
+ authorizationCodeGrantAccessTokenLifespan: "63s",
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId, "offline_access profile openid phoneNumber");
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/auth");
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenDataAfterLogin = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterLogin.aud, client.clientId);
+
+ // Although the react-oidc-context library automatically refreshes the
+ // token, we wait for 4 seconds and reload the page to ensure a refresh.
+ await waitFor(4000);
+ await Promise.all([page.reload(), page.waitForNavigation({ waitUntil: "networkidle0" })]);
+
+ const tokenDataAfterRefresh = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterRefresh.aud, client.clientId);
+
+ // Validate the token was refreshed
+ assert(tokenDataAfterLogin.iat !== tokenDataAfterRefresh.iat);
+ assert(tokenDataAfterLogin.exp < tokenDataAfterRefresh.exp);
+
+ assert.strictEqual(tokenDataAfterLogin.email, undefined);
+ assert.strictEqual(tokenDataAfterLogin.email_verified, undefined);
+ assert.strictEqual(tokenDataAfterRefresh.email, undefined);
+ assert.strictEqual(tokenDataAfterRefresh.email_verified, undefined);
+ assert.strictEqual(tokenDataAfterLogin.phoneNumber, undefined);
+ assert.notStrictEqual(tokenDataAfterLogin.phoneNumber_verified, undefined);
+ assert.strictEqual(tokenDataAfterRefresh.phoneNumber, undefined);
+ assert.notStrictEqual(tokenDataAfterRefresh.phoneNumber_verified, undefined);
+ });
+
+ it("should reject the login if the wrong scope is requested", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ // The library refreshes the token 60 seconds before it expires.
+ // We set the token lifespan to 63 seconds to force a refresh in 3 seconds.
+ authorizationCodeGrantAccessTokenLifespan: "63s",
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId, "offline_access profile openid roles permissions");
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ assert.strictEqual(
+ await getOAuth2Error(page),
+ `Error: The requested scope is invalid, unknown, or malformed. The OAuth 2.0 Client is not allowed to request scope 'roles'.`
+ );
+ });
+
+ it("should work even if the supertokens session is expired", async function () {
+ const { client } = await createOAuth2Client({
+ scope: "offline_access profile openid email",
+ redirectUris: [`${TEST_CLIENT_BASE_URL}/oauth/callback`],
+ accessTokenStrategy: "jwt",
+ tokenEndpointAuthMethod: "none",
+ grantTypes: ["authorization_code", "refresh_token"],
+ responseTypes: ["code", "id_token"],
+ skipConsent: true,
+ // The library refreshes the token 60 seconds before it expires.
+ // We set the token lifespan to 63 seconds to force a refresh in 3 seconds.
+ authorizationCodeGrantAccessTokenLifespan: "63s",
+ });
+
+ await setOAuth2ClientInfo(page, client.clientId);
+
+ await toggleSignInSignUp(page);
+ const { fieldValues, postValues } = getDefaultSignUpFieldValues({ email: getTestEmail() });
+ await signUp(page, fieldValues, postValues, "emailpassword");
+
+ await waitFor(6000);
+
+ await Promise.all([
+ page.waitForNavigation({ waitUntil: "networkidle0" }),
+ page.goto(`${TEST_CLIENT_BASE_URL}/oauth/login`),
+ ]);
+
+ let loginButton = await getOAuth2LoginButton(page);
+ await loginButton.click();
+
+ await waitForUrl(page, "/oauth/callback");
+
+ // Validate token data
+ const tokenDataAfterLogin = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterLogin.aud, client.clientId);
+
+ // Although the react-oidc-context library automatically refreshes the
+ // token, we wait for 6 seconds and reload the page to ensure a refresh.
+ await waitFor(6000);
+ await Promise.all([page.reload(), page.waitForNavigation({ waitUntil: "networkidle0" })]);
+
+ const tokenDataAfterRefresh = await getOAuth2TokenData(page);
+ assert.deepStrictEqual(tokenDataAfterRefresh.aud, client.clientId);
+
+ // Validate the token was refreshed
+ assert(tokenDataAfterLogin.iat !== tokenDataAfterRefresh.iat);
+ assert(tokenDataAfterLogin.exp < tokenDataAfterRefresh.exp);
+ });
+ });
+});
diff --git a/test/end-to-end/passwordless.test_gen.js b/test/end-to-end/passwordless.test_gen.js
index cb9f41e14..4d21d8c7f 100644
--- a/test/end-to-end/passwordless.test_gen.js
+++ b/test/end-to-end/passwordless.test_gen.js
@@ -37,6 +37,7 @@ import {
isAccountLinkingSupported,
backendBeforeEach,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import { TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL, SOMETHING_WENT_WRONG_ERROR } from "../constants";
@@ -1907,10 +1908,7 @@ async function initBrowser(contactMethod, consoleLogs, authRecipe, { defaultCoun
}),
}).catch(console.error);
- const browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox", "--remote-debugging-port=9222"],
- headless: true,
- });
+ const browser = await setupBrowser();
const page = await browser.newPage();
page.on("console", (consoleObj) => {
const log = consoleObj.text();
diff --git a/test/end-to-end/refresherrors.test.js b/test/end-to-end/refresherrors.test.js
index 06909e4cf..259ef4c1f 100644
--- a/test/end-to-end/refresherrors.test.js
+++ b/test/end-to-end/refresherrors.test.js
@@ -19,7 +19,12 @@
import assert from "assert";
import puppeteer from "puppeteer";
-import { clearBrowserCookiesWithoutAffectingConsole, getTextInDashboardNoAuth, screenshotOnFailure } from "../helpers";
+import {
+ clearBrowserCookiesWithoutAffectingConsole,
+ getTextInDashboardNoAuth,
+ screenshotOnFailure,
+ setupBrowser,
+} from "../helpers";
import { TEST_CLIENT_BASE_URL } from "../constants";
@@ -29,10 +34,7 @@ describe("Refresh errors", function () {
let page;
before(async function () {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/resetpasswordusingtoken.test.js b/test/end-to-end/resetpasswordusingtoken.test.js
index 54b7cf7dc..d8ebe60b6 100644
--- a/test/end-to-end/resetpasswordusingtoken.test.js
+++ b/test/end-to-end/resetpasswordusingtoken.test.js
@@ -55,6 +55,7 @@ import {
backendBeforeEach,
waitForText,
waitForUrl,
+ setupBrowser,
} from "../helpers";
/*
@@ -72,10 +73,7 @@ describe("SuperTokens Reset password", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
diff --git a/test/end-to-end/routing.test.js b/test/end-to-end/routing.test.js
index 7071ef669..27dd56570 100644
--- a/test/end-to-end/routing.test.js
+++ b/test/end-to-end/routing.test.js
@@ -32,6 +32,7 @@ import {
clearBrowserCookiesWithoutAffectingConsole,
screenshotOnFailure,
waitForUrl,
+ setupBrowser,
} from "../helpers";
/*
* Tests.
@@ -40,10 +41,7 @@ describe("SuperTokens Routing in Test App", function () {
let browser, page;
before(async function () {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
});
diff --git a/test/end-to-end/signin-rrdv5.test.js b/test/end-to-end/signin-rrdv5.test.js
index bb9b1ab8a..3c29a2edb 100644
--- a/test/end-to-end/signin-rrdv5.test.js
+++ b/test/end-to-end/signin-rrdv5.test.js
@@ -52,6 +52,7 @@ import {
backendBeforeEach,
setEnabledRecipes,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { SOMETHING_WENT_WRONG_ERROR } from "../constants";
@@ -77,10 +78,7 @@ describe("SuperTokens SignIn with react router dom v5", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -655,10 +653,7 @@ describe("SuperTokens SignIn => Server Error", function () {
before(async function () {
await setEnabledRecipes(["emailpassword"], []);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/signin-rrdv6.test.js b/test/end-to-end/signin-rrdv6.test.js
index ab595eba7..5222f2e62 100644
--- a/test/end-to-end/signin-rrdv6.test.js
+++ b/test/end-to-end/signin-rrdv6.test.js
@@ -53,6 +53,7 @@ import {
getInvalidClaimsJSON,
expectErrorThrown,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { SOMETHING_WENT_WRONG_ERROR } from "../constants";
@@ -74,10 +75,7 @@ describe("SuperTokens SignIn with react router dom v6", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -186,7 +184,7 @@ describe("SuperTokens SignIn with react router dom v6", function () {
assert.strictEqual(request.headers().rid, "emailpassword");
assert.strictEqual(
request.postData(),
- '{"formFields":[{"id":"email","value":"john@gmail.com"},{"id":"password","value":"********"}]}'
+ '{"formFields":[{"id":"email","value":"john@gmail.com"},{"id":"password","value":"********"}],"shouldTryLinkingWithSessionUser":false}'
);
assert.strictEqual(response.status, "WRONG_CREDENTIALS_ERROR");
@@ -258,7 +256,7 @@ describe("SuperTokens SignIn with react router dom v6", function () {
assert.strictEqual(request.headers().rid, "emailpassword");
assert.strictEqual(
request.postData(),
- '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}]}'
+ '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}],"shouldTryLinkingWithSessionUser":false}'
);
assert.strictEqual(response.status, "OK");
@@ -403,7 +401,7 @@ describe("SuperTokens SignIn with react router dom v6", function () {
assert.strictEqual(request.headers().rid, "emailpassword");
assert.strictEqual(
request.postData(),
- '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}]}'
+ '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}],"shouldTryLinkingWithSessionUser":false}'
);
assert.strictEqual(response.status, "OK");
@@ -802,10 +800,7 @@ describe("SuperTokens SignIn => Server Error", function () {
let consoleLogs;
before(async function () {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/signin.test.js b/test/end-to-end/signin.test.js
index 46a4fcbad..a410e3f08 100644
--- a/test/end-to-end/signin.test.js
+++ b/test/end-to-end/signin.test.js
@@ -56,6 +56,7 @@ import {
getInputField,
isReact16,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import fetch from "isomorphic-fetch";
import { SOMETHING_WENT_WRONG_ERROR } from "../constants";
@@ -77,10 +78,7 @@ describe("SuperTokens SignIn", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -187,7 +185,7 @@ describe("SuperTokens SignIn", function () {
assert.strictEqual(request.headers().rid, "emailpassword");
assert.strictEqual(
request.postData(),
- '{"formFields":[{"id":"email","value":"john@gmail.com"},{"id":"password","value":"********"}]}'
+ '{"formFields":[{"id":"email","value":"john@gmail.com"},{"id":"password","value":"********"}],"shouldTryLinkingWithSessionUser":false}'
);
assert.strictEqual(response.status, "WRONG_CREDENTIALS_ERROR");
@@ -300,7 +298,7 @@ describe("SuperTokens SignIn", function () {
assert.strictEqual(request.headers().rid, "emailpassword");
assert.strictEqual(
request.postData(),
- '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}]}'
+ '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}],"shouldTryLinkingWithSessionUser":false}'
);
assert.strictEqual(response.status, "OK");
@@ -445,7 +443,7 @@ describe("SuperTokens SignIn", function () {
assert.strictEqual(request.headers().rid, "emailpassword");
assert.strictEqual(
request.postData(),
- '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}]}'
+ '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"}],"shouldTryLinkingWithSessionUser":false}'
);
assert.strictEqual(response.status, "OK");
@@ -512,7 +510,7 @@ describe("SuperTokens SignIn", function () {
await assertSignInRedirectTo(
page,
`${TEST_CLIENT_BASE_URL}/auth?rid=emailpassword&redirectToPath=%2Fredirect-here`,
- `${TEST_CLIENT_BASE_URL}/redirect-here`
+ `/redirect-here`
);
// test that if we visit auth again, we end up in redirect-heree again with query params kept
@@ -529,7 +527,7 @@ describe("SuperTokens SignIn", function () {
await assertSignInRedirectTo(
page,
`${TEST_CLIENT_BASE_URL}/auth?rid=emailpassword&redirectToPath=redirect-here`,
- `${TEST_CLIENT_BASE_URL}/redirect-here`
+ `/redirect-here`
);
});
@@ -560,7 +558,7 @@ describe("SuperTokens SignIn", function () {
await assertSignInRedirectTo(
page,
`${TEST_CLIENT_BASE_URL}/auth?rid=emailpassword&redirectToPath=https://attacker.com/path`,
- `${TEST_CLIENT_BASE_URL}/path`
+ `/path`
);
});
@@ -569,7 +567,7 @@ describe("SuperTokens SignIn", function () {
await assertSignInRedirectTo(
page,
`${TEST_CLIENT_BASE_URL}/auth?rid=emailpassword&redirectToPath=javascript:alert(1)`,
- `${TEST_CLIENT_BASE_URL}/javascript:alert(1)`
+ `/javascript:alert(1)`
);
});
@@ -903,10 +901,7 @@ describe("SuperTokens SignIn => Server Error", function () {
let consoleLogs;
before(async function () {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
@@ -1083,11 +1078,5 @@ async function assertSignInRedirectTo(page, startUrl, finalUrl) {
]);
// Submit.
- await Promise.all([
- submitFormReturnRequestAndResponse(page, SIGN_IN_API),
- page.waitForNavigation({ waitUntil: "networkidle0" }),
- ]);
-
- let href = await page.evaluate(() => window.location.href);
- assert.deepStrictEqual(href, finalUrl);
+ await Promise.all([submitFormReturnRequestAndResponse(page, SIGN_IN_API), waitForUrl(page, finalUrl, false)]);
}
diff --git a/test/end-to-end/signup.test.js b/test/end-to-end/signup.test.js
index 486719c84..2d4f1389b 100644
--- a/test/end-to-end/signup.test.js
+++ b/test/end-to-end/signup.test.js
@@ -44,6 +44,7 @@ import {
isReact16,
getDefaultSignUpFieldValues,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import {
@@ -69,10 +70,7 @@ describe("SuperTokens SignUp", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
page.on("console", (consoleObj) => {
const log = consoleObj.text();
@@ -880,10 +878,7 @@ describe("SuperTokens SignUp => Server Error", function () {
let consoleLogs;
before(async function () {
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
});
after(async function () {
diff --git a/test/end-to-end/thirdparty.test.js b/test/end-to-end/thirdparty.test.js
index dac9a98b1..49411419b 100644
--- a/test/end-to-end/thirdparty.test.js
+++ b/test/end-to-end/thirdparty.test.js
@@ -33,6 +33,7 @@ import {
clickOnProviderButtonWithoutWaiting,
backendBeforeEach,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import { TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL, SIGN_IN_UP_API, GET_AUTH_URL_API } from "../constants";
@@ -60,10 +61,7 @@ export function getThirdPartyTestCases({ authRecipe, rid, signInUpPageLoadLogs,
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
page.on("console", (consoleObj) => {
const log = consoleObj.text();
diff --git a/test/end-to-end/thirdpartyemailpassword.test.js b/test/end-to-end/thirdpartyemailpassword.test.js
index ae102d88d..fb4bdef59 100644
--- a/test/end-to-end/thirdpartyemailpassword.test.js
+++ b/test/end-to-end/thirdpartyemailpassword.test.js
@@ -49,6 +49,7 @@ import {
getLabelsText,
isReact16,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import {
TEST_CLIENT_BASE_URL,
@@ -77,10 +78,7 @@ describe("SuperTokens Third Party Email Password", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
page.on("console", (consoleObj) => {
const log = consoleObj.text();
@@ -332,7 +330,7 @@ describe("SuperTokens Third Party Email Password", function () {
{ name: "name", value: "John Doe" },
{ name: "age", value: "20" },
],
- '{"formFields":[{"id":"email","value":"bradparishdoh@gmail.com"},{"id":"password","value":"Str0ngP@ssw0rd"},{"id":"name","value":"John Doe"},{"id":"age","value":"20"},{"id":"country","value":""}]}',
+ '{"formFields":[{"id":"email","value":"bradparishdoh@gmail.com"},{"id":"password","value":"Str0ngP@ssw0rd"},{"id":"name","value":"John Doe"},{"id":"age","value":"20"},{"id":"country","value":""}],"shouldTryLinkingWithSessionUser":false}',
"thirdpartyemailpassword"
);
await waitForUrl(page, "/dashboard");
diff --git a/test/end-to-end/thirdpartypasswordless.test.js b/test/end-to-end/thirdpartypasswordless.test.js
index 80fc4c485..d97f74d34 100644
--- a/test/end-to-end/thirdpartypasswordless.test.js
+++ b/test/end-to-end/thirdpartypasswordless.test.js
@@ -38,6 +38,7 @@ import {
getGeneralError,
backendBeforeEach,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import { TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL, SIGN_IN_UP_API, GET_AUTH_URL_API } from "../constants";
@@ -71,10 +72,7 @@ describe("SuperTokens Third Party Passwordless", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
page.on("console", (consoleObj) => {
const log = consoleObj.text();
diff --git a/test/end-to-end/userContext.test.js b/test/end-to-end/userContext.test.js
index 3903415c8..2a5e120f8 100644
--- a/test/end-to-end/userContext.test.js
+++ b/test/end-to-end/userContext.test.js
@@ -26,6 +26,7 @@ import {
loginWithAuth0,
backendBeforeEach,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import {
TEST_CLIENT_BASE_URL,
@@ -48,10 +49,7 @@ describe("SuperTokens userContext with UI components test", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
page.on("console", (consoleObj) => {
const log = consoleObj.text();
diff --git a/test/end-to-end/userroles.test.js b/test/end-to-end/userroles.test.js
index 1587e5804..96bb1648d 100644
--- a/test/end-to-end/userroles.test.js
+++ b/test/end-to-end/userroles.test.js
@@ -32,6 +32,7 @@ import {
waitForText,
backendBeforeEach,
waitForUrl,
+ setupBrowser,
} from "../helpers";
import { TEST_APPLICATION_SERVER_BASE_URL, TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL } from "../constants";
@@ -54,10 +55,7 @@ describe("User Roles in the frontend", function () {
method: "POST",
}).catch(console.error);
- browser = await puppeteer.launch({
- args: ["--no-sandbox", "--disable-setuid-sandbox"],
- headless: true,
- });
+ browser = await setupBrowser();
page = await browser.newPage();
await Promise.all([
page.goto(`${TEST_CLIENT_BASE_URL}/auth?authRecipe=emailpassword`),
diff --git a/test/helpers.js b/test/helpers.js
index 4cbaf99d3..c9ddfeb08 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -27,7 +27,9 @@ import {
import path from "path";
import assert from "assert";
+import { appendFile } from "fs/promises";
import mkdirp from "mkdirp";
+import Puppeteer from "puppeteer";
const SESSION_STORAGE_STATE_KEY = "supertokens-oauth-state";
@@ -649,7 +651,7 @@ export async function defaultSignUp(page, rid = "emailpassword") {
{ name: "name", value: "John Doe" },
{ name: "age", value: "20" },
],
- '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"},{"id":"name","value":"John Doe"},{"id":"age","value":"20"},{"id":"country","value":""}]}',
+ '{"formFields":[{"id":"email","value":"john.doe@supertokens.io"},{"id":"password","value":"Str0ngP@ssw0rd"},{"id":"name","value":"John Doe"},{"id":"age","value":"20"},{"id":"country","value":""}],"shouldTryLinkingWithSessionUser":false}',
rid
);
}
@@ -666,7 +668,7 @@ export function getDefaultSignUpFieldValues({
{ name: "name", value: name },
{ name: "age", value: age },
];
- const postValues = `{"formFields":[{"id":"email","value":"${email}"},{"id":"password","value":"${password}"},{"id":"name","value":"${name}"},{"id":"age","value":"${age}"},{"id":"country","value":""}]}`;
+ const postValues = `{"formFields":[{"id":"email","value":"${email}"},{"id":"password","value":"${password}"},{"id":"name","value":"${name}"},{"id":"age","value":"${age}"},{"id":"country","value":""}],"shouldTryLinkingWithSessionUser":false}`;
return { fieldValues, postValues };
}
@@ -752,12 +754,114 @@ export async function getTextInDashboardNoAuth(page) {
return await page.evaluate(() => document.querySelector("#root > div > div.fill > div.not-logged-in").innerText);
}
+export async function setupBrowser() {
+ const browser = await Puppeteer.launch({
+ args: [
+ "--no-sandbox",
+ "--disable-setuid-sandbox",
+ "--disable-web-security",
+ "--host-resolver-rules=MAP example.com 127.0.0.1, MAP *.example.com 127.0.0.1",
+ ],
+ headless: process.env.HEADLESS !== "false",
+ });
+ browser.logs = [];
+ function addLog(str) {
+ if (process.env.BROWSER_LOGS !== undefined) {
+ console.log(str);
+ }
+ browser.logs.push(str);
+ }
+ const origNewPage = browser.newPage.bind(browser);
+ browser.newPage = async () => {
+ const page = await origNewPage();
+ page.on("console", (msg) => {
+ if (msg.text().startsWith("com.supertokens")) {
+ addLog(msg.text());
+ } else {
+ addLog(
+ `browserlog.console ${JSON.stringify({
+ t: new Date().toISOString(),
+ message: msg.text(),
+ pageurl: page.url(),
+ })}`
+ );
+ }
+ });
+
+ page.on("request", (req) => {
+ addLog(
+ `browserlog.network ${JSON.stringify({
+ t: new Date().toISOString(),
+ message: `Requested: ${req.method()} ${req.url()} (${req.postData()})`,
+ pageurl: page.url(),
+ })}`
+ );
+ });
+ page.on("requestfinished", async (req) => {
+ if (req.method() === "OPTION") {
+ return;
+ }
+ const resp = await req.response();
+ let respText;
+ try {
+ respText = req.url().startsWith(TEST_APPLICATION_SERVER_BASE_URL)
+ ? await resp.text()
+ : "response omitted";
+ } catch (e) {
+ respText = "response loading failed " + e.message;
+ }
+ addLog(
+ `browserlog.network ${JSON.stringify({
+ t: new Date().toISOString(),
+ message: `Request done: ${req.method()} ${req.url()}: ${resp.status()} ${respText}`,
+ pageurl: page.url(),
+ })}`
+ );
+ });
+ page.on("requestfailed", async (req) => {
+ if (req.method() === "OPTION") {
+ return;
+ }
+ const resp = await req.response();
+ let respText;
+ try {
+ respText = req.url().startsWith(TEST_APPLICATION_SERVER_BASE_URL)
+ ? await resp.text()
+ : "response omitted";
+ } catch (e) {
+ respText = "response loading failed " + e.message;
+ }
+ addLog(
+ `browserlog.network ${JSON.stringify({
+ t: new Date().toISOString(),
+ message: `Request failed: ${req.method()} ${req.url()}: ${resp.status()} ${respText}`,
+ pageurl: page.url(),
+ })}`
+ );
+ });
+ return page;
+ };
+ browser.on("disconnected", async () => {
+ if (process.env.MOCHA_FILE !== undefined) {
+ const reportFile = path.parse(process.env.MOCHA_FILE);
+ const logFile = path.join(reportFile.dir, "logs", "browser.log");
+ await appendFile(logFile, browser.logs.join("\n"));
+ }
+ });
+ return browser;
+}
+
/**
* @param {import("mocha").Context} ctx
* @param {import("puppeteer").Browser} browser
*/
export async function screenshotOnFailure(ctx, browser) {
if (ctx.currentTest?.isFailed()) {
+ console.log(
+ `${ctx.currentTest.fullTitle()} failed ${new Date(
+ Date.now() - ctx.currentTest.duration
+ ).toISOString()} - ${new Date().toISOString()}`
+ );
const pages = await browser.pages();
let screenshotRoot;
@@ -947,6 +1051,15 @@ export async function isMFASupported() {
return true;
}
+export async function isOauth2Supported() {
+ const features = await getFeatureFlags();
+ if (!features.includes("oauth2")) {
+ return false;
+ }
+
+ return true;
+}
+
/**
* For example setGeneralErrorToLocalStorage("EMAIL_PASSWORD", "EMAIL_PASSWORD_SIGN_UP", page) to
* set for signUp in email password
@@ -958,7 +1071,7 @@ export async function setGeneralErrorToLocalStorage(recipeName, action, page) {
});
}
-export async function getTestEmail(post) {
+export function getTestEmail(post) {
return `john.doe+${Date.now()}-${post ?? "0"}@supertokens.io`;
}
@@ -1105,3 +1218,65 @@ export async function expectErrorThrown(page, cb) {
await Promise.all([hitErrorBoundary, cb()]);
assert(hitErrorBoundary);
}
+
+export async function createOAuth2Client(input) {
+ const resp = await fetch(`${TEST_APPLICATION_SERVER_BASE_URL}/test/create-oauth2-client`, {
+ method: "POST",
+ headers: { "content-type": "application/json" },
+ body: JSON.stringify(input),
+ });
+ return await resp.json();
+}
+
+// For the OAuth2 end-to-end test, we need to provide the created clientId to both the OAuth2 login and callback pages.
+// We use localStorage to store the clientId instead of query params, as it must be available on the callback page as well.
+export async function setOAuth2ClientInfo(page, clientId, scopes, extraConfig, extraSignInParams, extraSignOutParams) {
+ await page.evaluate((clientId) => localStorage.setItem("oauth2-client-id", clientId), clientId);
+ if (scopes) {
+ await page.evaluate((scopes) => localStorage.setItem("oauth2-scopes", scopes), scopes);
+ }
+ if (extraConfig) {
+ await page.evaluate((extraConfig) => localStorage.setItem("oauth2-extra-config", extraConfig), extraConfig);
+ }
+ if (extraSignInParams) {
+ await page.evaluate(
+ (extraSignInParams) => localStorage.setItem("oauth2-extra-sign-in-params", extraSignInParams),
+ extraSignInParams
+ );
+ }
+ if (extraSignOutParams) {
+ await page.evaluate(
+ (extraSignOutParams) => localStorage.setItem("oauth2-extra-sign-out-params", extraSignOutParams),
+ extraSignOutParams
+ );
+ }
+}
+
+export async function removeOAuth2ClientInfo(page) {
+ await page.evaluate(() => localStorage.removeItem("oauth2-client-id"));
+ await page.evaluate(() => localStorage.removeItem("oauth2-scopes"));
+ await page.evaluate(() => localStorage.removeItem("oauth2-extra-config"));
+ await page.evaluate(() => localStorage.removeItem("oauth2-extra-sign-in-params"));
+ await page.evaluate(() => localStorage.removeItem("oauth2-extra-sign-out-params"));
+}
+
+export async function getOAuth2LoginButton(page, type = "default") {
+ const id = type === "default" ? "#oauth2-login-button" : `#oauth2-login-button-${type}`;
+ return page.waitForSelector(id);
+}
+
+export async function getOAuth2Error(page) {
+ const ele = await page.waitForSelector("#oauth2-error-message");
+ return await ele.evaluate((el) => el.textContent);
+}
+
+export async function getOAuth2LogoutButton(page, type = "silent") {
+ const id = type === "silent" ? "#oauth2-logout-button" : `#oauth2-logout-button-${type}`;
+ return page.waitForSelector(id);
+}
+
+export async function getOAuth2TokenData(page) {
+ const element = await page.waitForSelector("#oauth2-token-data");
+ const tokenData = await element.evaluate((el) => el.textContent);
+ return JSON.parse(tokenData);
+}
diff --git a/test/prepTestApp.sh b/test/prepTestApp.sh
index d42f26602..a628f362a 100755
--- a/test/prepTestApp.sh
+++ b/test/prepTestApp.sh
@@ -2,14 +2,17 @@
# pack-unpack repo to simulate an install
npm pack
+
+REPO=$(pwd)
+
cd $1
rm -rf node_modules/.cache
rm -rf node_modules/supertokens-auth-react/lib || true
rm -rf node_modules/supertokens-auth-react/recipe || true
mkdir -p node_modules/supertokens-auth-react
-tar -xf ../../supertokens-auth-react-*.tgz --strip-components=1 -C node_modules/supertokens-auth-react
-rm ../../supertokens-auth-react-*.tgz
+tar -xf $REPO/supertokens-auth-react-*.tgz --strip-components=1 -C node_modules/supertokens-auth-react
+rm $REPO/supertokens-auth-react-*.tgz
cd node_modules/supertokens-auth-react
@@ -22,9 +25,9 @@ rm -rf node_modules/supertokens-web-js || true
rm -rf node_modules/supertokens-website || true
# We symlink the supertokens-web-js dep to ensure it's the same version (maybe linked locally)
-ln -s ../../../../../node_modules/supertokens-web-js node_modules/supertokens-web-js
+ln -s $REPO/node_modules/supertokens-web-js node_modules/supertokens-web-js
# We symlink the supertokens-website dep to ensure it's the same version (maybe linked locally)
-ln -s ../../../../../node_modules/supertokens-website node_modules/supertokens-website
+ln -s $REPO/node_modules/supertokens-website node_modules/supertokens-website
echo "$1 prepped."
diff --git a/test/server/index.js b/test/server/index.js
index fdaf08e7a..27a675c17 100644
--- a/test/server/index.js
+++ b/test/server/index.js
@@ -52,7 +52,7 @@ const UserRolesRaw = require("supertokens-node/lib/build/recipe/userroles/recipe
const UserRoles = require("supertokens-node/recipe/userroles");
const MultitenancyRaw = require("supertokens-node/lib/build/recipe/multitenancy/recipe").default;
-const Multitenancy = require("supertokens-node/lib/build/recipe/multitenancy/index");
+const Multitenancy = require("supertokens-node/recipe/multitenancy");
const AccountLinkingRaw = require("supertokens-node/lib/build/recipe/accountlinking/recipe").default;
const AccountLinking = require("supertokens-node/recipe/accountlinking");
@@ -66,6 +66,15 @@ const MultiFactorAuth = require("supertokens-node/recipe/multifactorauth");
const TOTPRaw = require("supertokens-node/lib/build/recipe/totp/recipe").default;
const TOTP = require("supertokens-node/recipe/totp");
+let OAuth2ProviderRaw = undefined;
+let OAuth2Provider = undefined;
+try {
+ OAuth2ProviderRaw = require("supertokens-node/lib/build/recipe/oauth2provider/recipe").default;
+ OAuth2Provider = require("supertokens-node/recipe/oauth2provider");
+} catch {
+ // OAuth2Provider is not supported by the tested version of the node SDK
+}
+
const OTPAuth = require("otpauth");
let generalErrorSupported;
@@ -491,6 +500,7 @@ app.get("/test/featureFlags", (req, res) => {
available.push("accountlinking");
available.push("mfa");
available.push("recipeConfig");
+ available.push("oauth2");
available.push("accountlinking-fixes");
res.send({
@@ -498,6 +508,15 @@ app.get("/test/featureFlags", (req, res) => {
});
});
+app.post("/test/create-oauth2-client", async (req, res, next) => {
+ try {
+ const { client } = await OAuth2Provider.createOAuth2Client(req.body);
+ res.send({ client });
+ } catch (e) {
+ next(e);
+ }
+});
+
app.use(errorHandler());
app.use(async (err, req, res, next) => {
@@ -541,6 +560,9 @@ function initST() {
UserMetadataRaw.reset();
MultiFactorAuthRaw.reset();
TOTPRaw.reset();
+ if (OAuth2ProviderRaw) {
+ OAuth2ProviderRaw.reset();
+ }
EmailVerificationRaw.reset();
EmailPasswordRaw.reset();
@@ -740,6 +762,9 @@ function initST() {
}),
],
];
+ if (OAuth2Provider) {
+ recipeList.push(["oauth2provider", OAuth2Provider.init()]);
+ }
passwordlessConfig = {
contactMethod: "EMAIL_OR_PHONE",
diff --git a/test/server/package-lock.json b/test/server/package-lock.json
index bcca9a74c..6cf95278b 100644
--- a/test/server/package-lock.json
+++ b/test/server/package-lock.json
@@ -16,7 +16,7 @@
"express": "4.17.1",
"morgan": "^1.10.0",
"otpauth": "^9.2.0",
- "supertokens-node": "latest"
+ "supertokens-node": "github:supertokens/supertokens-node#feat/oauth2/base"
}
},
"node_modules/accepts": {
@@ -995,6 +995,11 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/set-cookie-parser": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.0.tgz",
+ "integrity": "sha512-lXLOiqpkUumhRdFF3k1osNXCy9akgx/dyPZ5p8qAg9seJzXr5ZrlqZuWIMuY6ejOsVLE6flJ5/h3lsn57fQ/PQ=="
+ },
"node_modules/set-function-length": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
@@ -1041,9 +1046,8 @@
"integrity": "sha512-r0JFBjkMIdep3Lbk3JA+MpnpuOtw4RSyrlRAbrzMcxwiYco3GFWl/daimQZ5b1forOiUODpOlXbSOljP/oyurg=="
},
"node_modules/supertokens-node": {
- "version": "18.0.2",
- "resolved": "https://registry.npmjs.org/supertokens-node/-/supertokens-node-18.0.2.tgz",
- "integrity": "sha512-ihmCLz9FnA05gniBvUTjoeW9c8WZsMwYBNxWnwN9QICNYfu32giBtQP2ncaTBnO9vqImagBcuCtMA/3v8G9AGg==",
+ "version": "20.0.2",
+ "resolved": "git+ssh://git@github.com/supertokens/supertokens-node.git#905b5cd6e9babe50488318e32295a353523b8069",
"dependencies": {
"content-type": "^1.0.5",
"cookie": "0.4.0",
@@ -1055,6 +1059,7 @@
"nodemailer": "^6.7.2",
"pkce-challenge": "^3.0.0",
"psl": "1.8.0",
+ "set-cookie-parser": "^2.6.0",
"supertokens-js-override": "^0.0.4",
"twilio": "^4.19.3"
}
@@ -1976,6 +1981,11 @@
"send": "0.17.1"
}
},
+ "set-cookie-parser": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.0.tgz",
+ "integrity": "sha512-lXLOiqpkUumhRdFF3k1osNXCy9akgx/dyPZ5p8qAg9seJzXr5ZrlqZuWIMuY6ejOsVLE6flJ5/h3lsn57fQ/PQ=="
+ },
"set-function-length": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
@@ -2013,9 +2023,8 @@
"integrity": "sha512-r0JFBjkMIdep3Lbk3JA+MpnpuOtw4RSyrlRAbrzMcxwiYco3GFWl/daimQZ5b1forOiUODpOlXbSOljP/oyurg=="
},
"supertokens-node": {
- "version": "18.0.2",
- "resolved": "https://registry.npmjs.org/supertokens-node/-/supertokens-node-18.0.2.tgz",
- "integrity": "sha512-ihmCLz9FnA05gniBvUTjoeW9c8WZsMwYBNxWnwN9QICNYfu32giBtQP2ncaTBnO9vqImagBcuCtMA/3v8G9AGg==",
+ "version": "git+ssh://git@github.com/supertokens/supertokens-node.git#905b5cd6e9babe50488318e32295a353523b8069",
+ "from": "supertokens-node@github:supertokens/supertokens-node#feat/oauth2/base",
"requires": {
"content-type": "^1.0.5",
"cookie": "0.4.0",
@@ -2027,6 +2036,7 @@
"nodemailer": "^6.7.2",
"pkce-challenge": "^3.0.0",
"psl": "1.8.0",
+ "set-cookie-parser": "^2.6.0",
"supertokens-js-override": "^0.0.4",
"twilio": "^4.19.3"
},
diff --git a/test/server/package.json b/test/server/package.json
index 3bce6a99c..a36e4efd1 100644
--- a/test/server/package.json
+++ b/test/server/package.json
@@ -16,6 +16,6 @@
"express": "4.17.1",
"morgan": "^1.10.0",
"otpauth": "^9.2.0",
- "supertokens-node": "latest"
+ "supertokens-node": "github:supertokens/supertokens-node#feat/oauth2/base"
}
}
diff --git a/test/server/utils.js b/test/server/utils.js
index 5e7bb8c8a..64e242071 100644
--- a/test/server/utils.js
+++ b/test/server/utils.js
@@ -20,8 +20,8 @@ let axios = require("axios").default;
module.exports.executeCommand = async function (cmd) {
return new Promise((resolve, reject) => {
exec(cmd, (err, stdout, stderr) => {
- console.log(err, stderr, stdout);
if (err) {
+ // console.log({ err });
reject(err);
return;
}
@@ -180,9 +180,14 @@ module.exports.startST = async function (config = {}) {
},
body: JSON.stringify({
appId,
- emailPasswordEnabled: true,
- thirdPartyEnabled: true,
- passwordlessEnabled: true,
+ firstFactors: [
+ "emailpassword",
+ "thirdparty",
+ "otp-phone",
+ "link-phone",
+ "otp-email",
+ "link-email",
+ ],
coreConfig: config.coreConfig,
}),
});
diff --git a/test/unit/componentOverrides.test.tsx b/test/unit/componentOverrides.test.tsx
index b83c106bf..b3025c76d 100644
--- a/test/unit/componentOverrides.test.tsx
+++ b/test/unit/componentOverrides.test.tsx
@@ -10,6 +10,7 @@ import { ComponentOverrideMap as PasswordlessOverrideMap } from "../../lib/ts/re
import { ComponentOverrideMap as TOTPOverrideMap } from "../../lib/ts/recipe/totp/types";
import { ComponentOverrideMap as MFAOverrideMap } from "../../lib/ts/recipe/multifactorauth/types";
import { ComponentOverrideMap as AuthRecipeOverrideMap } from "../../lib/ts/recipe/authRecipe/types";
+import { ComponentOverrideMap as OAuth2ProviderOverrideMap } from "../../lib/ts/recipe/oauth2provider/types";
import "@testing-library/jest-dom";
import EmailPassword from "../../lib/ts/recipe/emailpassword/recipe";
@@ -56,6 +57,7 @@ import { FactorChooserHeader } from "../../lib/ts/recipe/multifactorauth/compone
import { FactorList } from "../../lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorList";
import { FactorOption } from "../../lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorOption";
import { AuthPageComponentList, AuthPageFooter, AuthPageHeader } from "../../lib/ts/ui";
+import { OAuth2LogoutScreenInner } from "../../lib/ts/recipe/oauth2provider/components/themes/oauth2LogoutScreen/OAuth2LogoutScreenInner";
type AllComponentsOverrideMap = AuthRecipeOverrideMap &
EmailPasswordOverrideMap &
@@ -63,7 +65,8 @@ type AllComponentsOverrideMap = AuthRecipeOverrideMap &
EmailVerificationOverrideMap &
PasswordlessOverrideMap &
TOTPOverrideMap &
- MFAOverrideMap;
+ MFAOverrideMap &
+ OAuth2ProviderOverrideMap;
const makeOverride = () => () => = ({ overrideMap, children }) => {
@@ -131,6 +134,7 @@ describe("Theme component overrides", () => {
AuthPageComponentList_Override: AuthPageComponentList,
AuthPageFooter_Override: AuthPageFooter,
AuthPageHeader_Override: AuthPageHeader,
+ OAuth2LogoutScreenInner_Override: OAuth2LogoutScreenInner,
};
Object.entries(overrides).forEach(([key, comp]) => {
@@ -157,6 +161,7 @@ describe("Theme component overrides", () => {
},
verifyEmailLinkClickedScreen: { style: `` },
sendVerifyEmailScreen: { style: `` },
+ oauth2LogoutScreen: { style: `` },
},
},
];
diff --git a/test/unit/recipe/emailpassword/emailPassword.test.tsx b/test/unit/recipe/emailpassword/emailPassword.test.tsx
index da30ea14c..52e7473f6 100644
--- a/test/unit/recipe/emailpassword/emailPassword.test.tsx
+++ b/test/unit/recipe/emailpassword/emailPassword.test.tsx
@@ -628,6 +628,11 @@ describe("EmailPassword", function () {
},
}).authReact(SuperTokens.getInstanceOrThrow().appInfo, false);
- assert((await EmailPassword.getInstanceOrThrow().getRedirectUrl({ action: "RESET_PASSWORD" }, {})) === null);
+ assert(
+ (await EmailPassword.getInstanceOrThrow().getRedirectUrl(
+ { action: "RESET_PASSWORD", tenantIdFromQueryParams: undefined },
+ {}
+ )) === null
+ );
});
});
diff --git a/test/unit/recipe/thirdparty/thirdParty.test.ts b/test/unit/recipe/thirdparty/thirdParty.test.ts
index 05fc6a43b..6b454b42e 100644
--- a/test/unit/recipe/thirdparty/thirdParty.test.ts
+++ b/test/unit/recipe/thirdparty/thirdParty.test.ts
@@ -386,6 +386,7 @@ describe("ThirdParty", function () {
userContext: {
key: "value",
},
+ shouldTryLinkingWithSessionUser: false,
});
throw new Error("redirectToThirdPartyLogin should have failed but didnt");
} catch (e) {
diff --git a/test/with-typescript/src/App.tsx b/test/with-typescript/src/App.tsx
index 4f4565349..4adf3b83a 100644
--- a/test/with-typescript/src/App.tsx
+++ b/test/with-typescript/src/App.tsx
@@ -37,6 +37,8 @@ import { SessionPreBuiltUI, AccessDeniedScreen } from "../../../recipe/session/p
import { LinkClicked as PasswordlessLinkClicked } from "../../../recipe/passwordless/prebuiltui";
import EmailVerification from "../../../recipe/emailverification";
import MultiFactorAuth from "../../../recipe/multifactorauth";
+import OAuth2Provider from "../../../recipe/oauth2provider";
+import { OAuth2ProviderPreBuiltUI } from "../../../recipe/oauth2provider/prebuiltui";
import { DateProviderReference } from "../../../utils/dateProvider";
import { DateProviderInput, DateProviderInterface } from "../../../utils/dateProvider/types";
@@ -281,6 +283,9 @@ function getRecipeList() {
}
return context;
},
+ postAPIHook: async (context) => {
+ context.userContext;
+ },
override: {
functions: (oI) => {
return {
@@ -1105,8 +1110,41 @@ function testAuthPagePropTypes() {
// @ts-expect-error This has to be a valid first factor