use origin

aws-amplify · May 10, 2024 · 30d0cd2 · 30d0cd2
1 parent 1dbe6e0
commit 30d0cd2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/packages/adapter-nextjs/src/oauth/createOAuthRouteHandlerFactory.ts b/packages/adapter-nextjs/src/oauth/createOAuthRouteHandlerFactory.ts
@@ -18,6 +18,7 @@ import { completeOAuthFlow } from './utils/completeOAuthFlow';
 
 export const createOAuthRouteHandlerFactory: CreateOAuthRouteHandlerFactory = ({
 	config: resourcesConfig,
+	origin,
 	setAuthCookieOptions,
 }): CreateOAuthRouteHandler => {
 	const handleRequest = async (
@@ -28,6 +29,7 @@ export const createOAuthRouteHandlerFactory: CreateOAuthRouteHandlerFactory = ({
 			onError,
 		}: CreateOAuthRouteHandlerInput,
 	): Promise<Response | void> => {
+		if (!origin) throw new Error('Origin is not provided');
 		assertTokenProviderConfig(resourcesConfig.Auth?.Cognito);
 		assertOAuthConfig(resourcesConfig.Auth.Cognito);
 
@@ -37,6 +39,7 @@ export const createOAuthRouteHandlerFactory: CreateOAuthRouteHandlerFactory = ({
 		// when request url has `init` query param - initiate oauth flow
 		if (searchParams.has('init')) {
 			return initOAuthFlow({
+				origin,
 				setAuthCookieOptions,
 				request,
 				customState,
@@ -47,6 +50,7 @@ export const createOAuthRouteHandlerFactory: CreateOAuthRouteHandlerFactory = ({
 
 		if (searchParams.has('code') && searchParams.has('state')) {
 			return completeOAuthFlow({
+				origin,
 				request,
 				redirectOnComplete: redirectOnAuthComplete,
 				setAuthCookieOptions,

diff --git a/packages/adapter-nextjs/src/oauth/types.ts b/packages/adapter-nextjs/src/oauth/types.ts
@@ -34,6 +34,7 @@ export type CreateOAuthRouteHandler = (
 
 interface CreateOAuthRouteHandlerFactoryInput {
 	config: ResourcesConfig;
+	origin?: string;
 	setAuthCookieOptions?: NextServer.SetCookieOptions;
 }
 

diff --git a/packages/adapter-nextjs/src/oauth/utils/completeOAuthFlow.ts b/packages/adapter-nextjs/src/oauth/utils/completeOAuthFlow.ts
@@ -23,12 +23,14 @@ import { createCookieStorageAdapterFromNextServerContext } from '../../utils/cre
 import { getRedirectUrl } from './getRedirectUrl';
 
 export const completeOAuthFlow = async ({
+	origin,
 	request,
 	redirectOnComplete,
 	cognitoUserPoolConfig,
 	oAuthConfig,
 	setAuthCookieOptions,
 }: {
+	origin: string;
 	request: NextRequest;
 	customState: string | undefined;
 	redirectOnComplete: string;
@@ -72,7 +74,7 @@ export const completeOAuthFlow = async ({
 		code,
 		client_id: cognitoUserPoolConfig.userPoolClientId,
 		// TODO(Hui): request.nextUrl.origin should be generic and not use Next specifics
-		redirect_uri: getRedirectUrl(request.nextUrl.origin, oAuthConfig),
+		redirect_uri: getRedirectUrl(origin, oAuthConfig),
 		...(codeVerifier ? { code_verifier: codeVerifier } : {}),
 	};
 

diff --git a/packages/adapter-nextjs/src/oauth/utils/initOAuthFlow.ts b/packages/adapter-nextjs/src/oauth/utils/initOAuthFlow.ts
@@ -25,6 +25,7 @@ export const initOAuthFlow = async ({
 	oAuthConfig,
 	setAuthCookieOptions,
 }: {
+	origin: string;
 	request: NextRequest;
 	customState: string | undefined;
 	cognitoUserPoolConfig: CognitoUserPoolConfig;
@@ -41,7 +42,7 @@ export const initOAuthFlow = async ({
 	const scope = oAuthConfig.scopes.join(' ');
 
 	const redirectUrlSearchParams = new URLSearchParams({
-		redirect_uri: getRedirectUrl(request.nextUrl.origin, oAuthConfig),
+		redirect_uri: getRedirectUrl(origin, oAuthConfig),
 		response_type: oAuthConfig.responseType,
 		client_id: cognitoUserPoolConfig.userPoolClientId!,
 		identity_provider: provider,