added expires in functionality back

adrien2p · Nov 1, 2023 · 295cb9c · 295cb9c
1 parent 3a527b3
commit 295cb9c
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 8 deletions.
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/auth0/admin.ts b/packages/medusa-plugin-auth/src/auth-strategies/auth0/admin.ts
@@ -78,5 +78,6 @@ export function getAuth0AdminAuthRouter(auth0: Auth0Options, configModule: Confi
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: auth0.admin.failureRedirect,
 		},
+		expiresIn: auth0.admin.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/auth0/store.ts b/packages/medusa-plugin-auth/src/auth-strategies/auth0/store.ts
@@ -79,5 +79,6 @@ export function getAuth0StoreAuthRouter(auth0: Auth0Options, configModule: Confi
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: auth0.store.failureRedirect,
 		},
+		expiresIn: auth0.store.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/azure-oidc/admin.ts b/packages/medusa-plugin-auth/src/auth-strategies/azure-oidc/admin.ts
@@ -66,5 +66,6 @@ export function getAzureAdminAuthRouter(azure: AzureAuthOptions, configModule: C
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: azure.admin.failureRedirect,
 		},
+		expiresIn: azure.admin.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/azure-oidc/store.ts b/packages/medusa-plugin-auth/src/auth-strategies/azure-oidc/store.ts
@@ -66,5 +66,6 @@ export function getAzureStoreAuthRouter(azure: AzureAuthOptions, configModule: C
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: azure.store.failureRedirect,
 		},
+		expiresIn: azure.store.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/facebook/admin.ts b/packages/medusa-plugin-auth/src/auth-strategies/facebook/admin.ts
@@ -67,5 +67,6 @@ export function getFacebookAdminAuthRouter(facebook: FacebookAuthOptions, config
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: facebook.admin.failureRedirect,
 		},
+		expiresIn: facebook.admin.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/facebook/store.ts b/packages/medusa-plugin-auth/src/auth-strategies/facebook/store.ts
@@ -67,5 +67,6 @@ export function getFacebookStoreAuthRouter(facebook: FacebookAuthOptions, config
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: facebook.store.failureRedirect,
 		},
+		expiresIn: facebook.store.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/firebase/admin.ts b/packages/medusa-plugin-auth/src/auth-strategies/firebase/admin.ts
@@ -47,5 +47,6 @@ export function getFirebaseAdminAuthRouter(firebase: FirebaseAuthOptions, config
 		configModule,
 		authPath: firebase.admin.authPath ?? '/admin/auth/firebase',
 		strategyName: FIREBASE_ADMIN_STRATEGY_NAME,
+		expiresIn: firebase.admin.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/firebase/store.ts b/packages/medusa-plugin-auth/src/auth-strategies/firebase/store.ts
@@ -47,5 +47,6 @@ export function getFirebaseStoreAuthRouter(firebase: FirebaseAuthOptions, config
 		configModule,
 		authPath: firebase.store.authPath ?? '/store/auth/firebase',
 		strategyName: FIREBASE_STORE_STRATEGY_NAME,
+		expiresIn: firebase.store.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/firebase/utils.ts b/packages/medusa-plugin-auth/src/auth-strategies/firebase/utils.ts
@@ -4,11 +4,11 @@ import { ConfigModule } from '@medusajs/medusa/dist/types/global';
 import { Router, Request, Response } from 'express';
 import { authenticateSessionFactory, signToken } from '../../core/auth-callback-middleware';
 
-function firebaseCallbackMiddleware(domain: 'admin' | 'store', configModule: ConfigModule) {
+function firebaseCallbackMiddleware(domain: 'admin' | 'store', configModule: ConfigModule, expiresIn?: string | number) {
 	return (req: Request, res: Response) => {
 		console.log(req.query);
 		if(req.query.returnAccessToken == 'true') {
-			const token = signToken(domain, configModule, req.user);
+			const token = signToken(domain, configModule, req.user, expiresIn);
 			res.json({ access_token: token });
 			return;
 		} else {
@@ -25,11 +25,13 @@ export function firebaseAuthRoutesBuilder({
 	configModule,
 	authPath,
 	strategyName,
+	expiresIn,
 }: {
 	domain: 'admin' | 'store';
 	configModule: ConfigModule;
 	authPath: string;
 	strategyName: string;
+	expiresIn?: string | number;
 }): Router {
 	const router = Router();
 
@@ -45,7 +47,7 @@ export function firebaseAuthRoutesBuilder({
 	/*necessary if you are using non medusajs client such as a pure axios call, axios initially requests options and then get*/
 	router.options(authPath, cors(corsOptions));
 
-	const callbackHandler = firebaseCallbackMiddleware(domain, configModule);
+	const callbackHandler = firebaseCallbackMiddleware(domain, configModule, expiresIn);
 
 	router.get(
 		authPath,

diff --git a/packages/medusa-plugin-auth/src/auth-strategies/google/admin.ts b/packages/medusa-plugin-auth/src/auth-strategies/google/admin.ts
@@ -69,5 +69,6 @@ export function getGoogleAdminAuthRouter(google: GoogleAuthOptions, configModule
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: google.admin.failureRedirect,
 		},
+		expiresIn: google.admin.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/google/store.ts b/packages/medusa-plugin-auth/src/auth-strategies/google/store.ts
@@ -69,5 +69,6 @@ export function getGoogleStoreAuthRouter(google: GoogleAuthOptions, configModule
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: google.store.failureRedirect,
 		},
+		expiresIn: google.store.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/linkedin/admin.ts b/packages/medusa-plugin-auth/src/auth-strategies/linkedin/admin.ts
@@ -71,5 +71,6 @@ export function getLinkedinAdminAuthRouter(linkedin: LinkedinAuthOptions, config
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: linkedin.admin.failureRedirect,
 		},
+		expiresIn: linkedin.store.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/auth-strategies/linkedin/store.ts b/packages/medusa-plugin-auth/src/auth-strategies/linkedin/store.ts
@@ -71,5 +71,6 @@ export function getLinkedinStoreAuthRouter(linkedin: LinkedinAuthOptions, config
 		passportCallbackAuthenticateMiddlewareOptions: {
 			failureRedirect: linkedin.store.failureRedirect,
 		},
+		expiresIn: linkedin.store.expiresIn,
 	});
 }
diff --git a/packages/medusa-plugin-auth/src/core/auth-callback-middleware.ts b/packages/medusa-plugin-auth/src/core/auth-callback-middleware.ts
@@ -15,21 +15,21 @@ export function authCallbackMiddleware(
 	};
 }
 
-export function signToken(domain: 'admin' | 'store', configModule: ConfigModule, user: any) {
+export function signToken(domain: 'admin' | 'store', configModule: ConfigModule, user: any, expiresIn?: string | number) {
 	if(domain === 'admin') {
 		return jwt.sign(
 			{ user_id: user.id, domain: 'admin' },
 			configModule.projectConfig.jwt_secret,
 			{
-			expiresIn: '24h',
+			expiresIn: expiresIn ?? '24h',
 			}
 		);
 	} else {
 		return jwt.sign(
 			{ customer_id: user.id, domain: 'store' },
 			configModule.projectConfig.jwt_secret,
 			{
-			  expiresIn: '30d',
+			  expiresIn: expiresIn ?? '30d',
 			}
 		);
 	}

diff --git a/packages/medusa-plugin-auth/src/core/passport/utils/auth-routes-builder.ts b/packages/medusa-plugin-auth/src/core/passport/utils/auth-routes-builder.ts
@@ -35,6 +35,7 @@ export function passportAuthRoutesBuilder({
 	passportCallbackAuthenticateMiddlewareOptions,
 	successRedirect,
 	authCallbackPath,
+	expiresIn,
 }: {
 	domain: 'admin' | 'store';
 	configModule: ConfigModule;
@@ -44,6 +45,7 @@ export function passportAuthRoutesBuilder({
 	passportCallbackAuthenticateMiddlewareOptions: PassportCallbackAuthenticateMiddlewareOptions;
 	successRedirect: string;
 	authCallbackPath: string;
+	expiresIn?: number | string;
 }): Router {
 	const router = Router();
 
@@ -96,11 +98,11 @@ export function passportAuthRoutesBuilder({
 	return router;
 }
 
-function successActionHandlerFactory(req: Request, domain: 'admin' | 'store', configModule: ConfigModule, defaultRedirect: string) {
+function successActionHandlerFactory(req: Request, domain: 'admin' | 'store', configModule: ConfigModule, defaultRedirect: string, expiresIn?: string | number) {
 	const returnAccessToken = req.query.returnAccessToken == 'true';
 	const redirectUrl = (req.query.redirectTo ? req.query.redirectTo : defaultRedirect) as string;
 
-	const token = signToken(domain, configModule, req.user);
+	const token = signToken(domain, configModule, req.user, expiresIn);
 
 	if(returnAccessToken) {
 		return (req: Request, res: Response) => {