Merge remote-tracking branch 'upstream/develop' into develop

2025-12-26 16:27:17 +01:00 · 2023-11-05 17:29:23 +05:00
parent bd65f940e3 a45fc86032
commit b9c0d5f46e
25 changed files with 669 additions and 270 deletions
--- a/server/index.ts
+++ b/server/index.ts
@@ -162,7 +162,7 @@ app
        cookie: {
          maxAge: 1000 * 60 * 60 * 24 * 30,
          httpOnly: true,
-          sameSite: true,
+          sameSite: settings.main.csrfProtection ? 'strict' : 'lax',
          secure: 'auto',
        },
        store: new TypeormStore({