Skip to content

Revert "Make logged-in cookie name configurable via login module options" #5436

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.

Sign up for GitHub

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

Merged
boutell merged 1 commit into from
Jun 2, 2026
Merged

Revert "Make logged-in cookie name configurable via login module options" #5436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions packages/apostrophe/modules/@apostrophecms/login/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const { createId } = require('@paralleldrive/cuid2');
const expressSession = require('express-session');

const loginAttemptsNamespace = '@apostrophecms/loginAttempt';
const DEFAULT_LOGGED_IN_COOKIE_NAME = 'loggedIn';
const loggedInCookieName = 'loggedIn';

module.exports = {
cascades: [ 'requirements' ],
Expand Down Expand Up @@ -77,7 +77,6 @@ module.exports = {
whoamiFields: []
},
async init(self) {
self.loggedInCookieName = self.options.loggedInCookieName || DEFAULT_LOGGED_IN_COOKIE_NAME;
self.passport = new Passport();
self.enableSerializeUsers();
self.enableDeserializeUsers();
Expand Down Expand Up @@ -165,7 +164,8 @@ module.exports = {
const name = self.apos.modules['@apostrophecms/express'].sessionOptions.name;
req.res.header('set-cookie', expireCookie.serialize(name, 'deleted'));

req.res.cookie(`${self.apos.shortName}.${self.loggedInCookieName}`, 'false');
// TODO: get cookie name from config
req.res.cookie(`${self.apos.shortName}.${loggedInCookieName}`, 'false');
}
},
async whoami(req) {
Expand Down Expand Up @@ -934,7 +934,7 @@ module.exports = {
// Awaitable wrapper for req.login. An implementation detail of the login
// route
async passportLogin(req, user) {
const cookieName = `${self.apos.shortName}.${self.loggedInCookieName}`;
const cookieName = `${self.apos.shortName}.${loggedInCookieName}`;
if (req.cookies[cookieName] !== 'true') {
req.res.cookie(cookieName, 'true');
}
Expand Down Expand Up @@ -1201,7 +1201,8 @@ module.exports = {
addLoggedInCookie: {
before: '@apostrophecms/i18n',
middleware(req, res, next) {
const cookieName = `${self.apos.shortName}.${self.loggedInCookieName}`;
// TODO: get cookie name from config
const cookieName = `${self.apos.shortName}.${loggedInCookieName}`;
if (req.user && req.cookies[cookieName] !== 'true') {
res.cookie(cookieName, 'true');
}
Expand Down
Loading