fix(auth): Remove promise options resolution as it is not supported b…

…y medusa for now
xponential-asia · Jan 4, 2024 · 8852c3e · 8852c3e
1 parent a05e110
commit 8852c3e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/packages/medusa-plugin-auth/src/api/index.ts b/packages/medusa-plugin-auth/src/api/index.ts
@@ -11,20 +11,17 @@ import AzureStrategy from '../auth-strategies/azure-oidc';
 
 import { AuthOptions, AuthOptionsWrapper, handleOption } from '../types';
 
-export default async function (rootDirectory, pluginOptions: AuthOptions | AuthOptions[]): Promise<Router[]> {
+export default function (rootDirectory, pluginOptions: AuthOptions | AuthOptions[]): Router[] {
 	const configModule = loadConfig(rootDirectory);
 	return loadRouters(configModule, pluginOptions);
 }
 
-async function loadRouters(
-	configModule: ConfigModule,
-	options: AuthOptionsWrapper | AuthOptionsWrapper[]
-): Promise<Router[]> {
+function loadRouters(configModule: ConfigModule, options: AuthOptionsWrapper | AuthOptionsWrapper[]): Router[] {
 	const routers: Router[] = [];
 
 	const options_ = Array.isArray(options) ? options : [options];
 	for (const opt of options_) {
-		const option = await handleOption(opt, configModule);
+		const option = handleOption(opt, configModule);
 
 		switch (option.type) {
 			case 'azure_oidc':

diff --git a/packages/medusa-plugin-auth/src/loaders/index.ts b/packages/medusa-plugin-auth/src/loaders/index.ts
@@ -21,7 +21,7 @@ export default async function authStrategiesLoader(
 }
 
 async function handleStrategyLoading(opt: AuthOptionsWrapper, configModule: ConfigModule, container: MedusaContainer) {
-	const option = await handleOption(opt, configModule, container);
+	const option = handleOption(opt, configModule, container);
 
 	switch (option.type) {
 		case 'azure_oidc':

diff --git a/packages/medusa-plugin-auth/src/types/index.ts b/packages/medusa-plugin-auth/src/types/index.ts
@@ -26,8 +26,7 @@ export type AuthOptions = AuthProvider & ProviderOptions;
 
 export type AuthOptionsWrapper =
 	| AuthOptions
-	| ((configModule?: ConfigModule, container?: MedusaContainer) => PromiseLike<AuthOptions>)
-	| PromiseLike<AuthOptions>;
+	| ((configModule?: ConfigModule, container?: MedusaContainer) => AuthOptions);
 
 export type ProviderOptions =
 	| GoogleAuthOptions
@@ -61,14 +60,16 @@ export function handleOption(
 	opt: AuthOptionsWrapper,
 	configModule?: ConfigModule,
 	container?: MedusaContainer
-): PromiseLike<AuthOptions> {
+): AuthOptions {
 	if (typeof opt === 'function') {
 		return handleOption(opt(configModule, container), configModule, container);
 	}
 
-	if (typeof opt === 'object' && typeof (opt as any).then === 'function') {
+	/*if (typeof opt === 'object' && typeof (opt as any).then === 'function') {
 		return opt as PromiseLike<AuthOptions>;
 	}
 
-	return Promise.resolve(opt);
+	return Promise.resolve(opt);*/
+
+	return opt;
 }