Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cookies): Correctly apply global and per-route middlewares #2911

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/core/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ export class AppModule implements NestModule, OnApplicationShutdown {
handler: cookieSession({ ...cookieOptions, name: shopApiCookieName }),
route: shopApiPath,
});
allMiddleware.push({
handler: cookieSession({ ...cookieOptions, name: shopApiCookieName }),
route: '/',
});
}

const consumableMiddlewares = allMiddleware.filter(mid => !mid.beforeListen);
Expand Down
19 changes: 9 additions & 10 deletions packages/core/src/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,14 +412,13 @@ export function configureSessionCookies(
): void {
const { cookieOptions } = userConfig.authOptions;

// If the Admin API and Shop API should have the same cookie name
// Else, the specific cookie middlewares are handled in the 'AppModule#configure' method
if (typeof cookieOptions?.name === 'string' || cookieOptions?.name === undefined) {
app.use(
cookieSession({
...cookieOptions,
name: cookieOptions?.name ?? DEFAULT_COOKIE_NAME,
}),
);
}
// Globally set the cookie session middleware
const cookieName =
typeof cookieOptions?.name !== 'string' ? cookieOptions.name?.shop : cookieOptions.name;
app.use(
cookieSession({
...cookieOptions,
name: cookieName ?? DEFAULT_COOKIE_NAME,
}),
);
}
Loading