Update stateful session cookie expiry on set (#1115)

auth0 · Mar 17, 2023 · 12e979c · 12e979c
2 parents d30d77f + 6e77701
commit 12e979c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/auth0-session/session/stateful-session.ts b/src/auth0-session/session/stateful-session.ts
@@ -87,11 +87,11 @@ export class StatefulSession<
     if (!sessionId) {
       sessionId = await genId!(req);
       debug('generated new session id %o', sessionId);
-      const cookieValue = await generateCookieValue(sessionName, sessionId, keys[0]);
-      cookieSetter.set(sessionName, cookieValue, cookieOptions);
-      cookieSetter.commit(res);
     }
     debug('set session %o', sessionId);
+    const cookieValue = await generateCookieValue(sessionName, sessionId, keys[0]);
+    cookieSetter.set(sessionName, cookieValue, cookieOptions);
+    cookieSetter.commit(res);
     await this.store.set(sessionId, {
       header: { iat, uat, exp },
       data: session

diff --git a/tests/auth0-session/session/stateful-session.test.ts b/tests/auth0-session/session/stateful-session.test.ts
@@ -73,6 +73,17 @@ describe('StatefulSession', () => {
   });
 
   it('should get an existing session', async () => {
+    await store.set('foo', await getPayload());
+    const baseURL = await setup(config);
+    const cookieJar = await toSignedCookieJar({ appSession: 'foo' }, baseURL);
+    const [cookie] = await cookieJar.getCookies(baseURL);
+    const expires = cookie.expires;
+    await get(baseURL, '/session', { cookieJar });
+    const [updatedCookie] = await cookieJar.getCookies(baseURL);
+    expect(updatedCookie.expires > expires);
+  });
+
+  it('should update the cookie expiry when setting an existing session', async () => {
     await store.set('foo', await getPayload());
     const baseURL = await setup(config);
     const cookieJar = await toSignedCookieJar({ appSession: 'foo' }, baseURL);