add fix for issue: Bug in createSessionStorage remix-run#6594

naveed-fida · Jun 13, 2023 · 73367c9 · 73367c9
1 parent fcaf2fd
commit 73367c9
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/packages/remix-server-runtime/sessions.ts b/packages/remix-server-runtime/sessions.ts
@@ -277,11 +277,20 @@ export const createSessionStorageFactory =
       },
       async commitSession(session, options) {
         let { id, data } = session;
+        let expires = cookie.expires;
+
+        if (options?.expires) {
+          expires = options.expires;
+        }
+
+        if (options?.maxAge) {
+          expires = new Date(Date.now() + options.maxAge * 1000);
+        }
 
         if (id) {
-          await updateData(id, data, cookie.expires);
+          await updateData(id, data, expires);
         } else {
-          id = await createData(data, cookie.expires);
+          id = await createData(data, expires);
         }
 
         return cookie.serialize(id, options);