Merge branch 'varun-raj:main' into ui-enhance

This commit is contained in:
Sai charan Guntupalli authored and GitHub committed 2024-09-13 20:34:58 +05:30
commit 52b4183aa6
5 files changed
+9 -4

No files matched your search

+1
View File
@@ -4,6 +4,7 @@ export const ENV = {
IMMICH_API_KEY: process.env.IMMICH_API_KEY as string,
DATABASE_URL: (process.env.DATABASE_URL || `postgresql://${process.env.DB_USERNAME}:${process.env.DB_PASSWORD}@${(process.env.DB_HOST || 'immich_postgres')}:${(process.env.DB_PORT || '5432')}/${process.env.DB_DATABASE_NAME}`),
JWT_SECRET: process.env.JWT_SECRET as string,
SECURE_COOKIE: process.env.SECURE_COOKIE === 'true',
};
+2 -2
View File
@@ -1,3 +1,4 @@
import { ENV } from '@/config/environment'
import type { CookieSerializeOptions } from 'cookie'
import cookie from 'cookie'
import type { IncomingMessage } from 'http'
@@ -22,8 +23,7 @@ export const serializeCookie = (
return cookie.serialize(name, String(value), {
httpOnly: true,
maxAge: 60 * 60 * 24 * 7,
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
secure: process.env.NODE_ENV === 'production',
secure: ENV.SECURE_COOKIE,
path: '/',
...options,
})