Merge branch 'master' into avoid-void

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     labels:
       - "dependencies"
       - "npm"

README.md

@@ -390,7 +390,7 @@ Base class for CookieJar stores. Available as `tough.Store`.
 
 ### Store API
 
-The storage model for each `CookieJar` instance can be replaced with a custom implementation. The default is `MemoryCookieStore` which can be found in [`lib/memstore.js`](https://github.com/salesforce/tough-cookie/blob/master/lib/memstore.js). The API uses continuation-passing-style to allow for asynchronous stores.
+The storage model for each `CookieJar` instance can be replaced with a custom implementation. The default is `MemoryCookieStore` which can be found in [`lib/memstore.ts`](https://github.com/salesforce/tough-cookie/blob/master/lib/memstore.ts). The API uses continuation-passing-style to allow for asynchronous stores.
 
 Stores should inherit from the base `Store` class, which is available as a top-level export.
 

jest.config.ts

@@ -5,6 +5,9 @@ const config: JestConfigWithTsJest = {
   testEnvironment: 'node',
   rootDir: './lib/',
   testPathIgnorePatterns: ['./lib/__tests__/data/'],
+  fakeTimers: {
+    enableGlobally: true
+  }
 }
 
 export default config

lib/__tests__/cookie.spec.ts

@@ -31,8 +31,6 @@
 
 import { Cookie } from '../cookie/cookie'
 
-jest.useFakeTimers()
-
 // ported from test/api_test.js (cookie tests)
 describe('Cookie', () => {
   let cookie: Cookie

lib/__tests__/cookieJar.spec.ts

@@ -36,8 +36,6 @@ import { MemoryCookieStore } from '../memstore'
 import { Store } from '../store'
 import { ParameterError } from '../validators'
 
-jest.useFakeTimers()
-
 // ported from:
 // - test/api_test.js (cookie jar tests)
 // - test/cookie_jar_test.js
@@ -1203,6 +1201,46 @@ it('should fix issue #282 - Prototype pollution when setting a cookie with the d
   expect('/notauth' in pollutedObject).toBe(false)
 })
 
+it('should fix issue #154 - Expiry should not be affected by creation date', async () => {
+  const now = Date.now()
+  const jar = new CookieJar()
+
+  await jar.setCookie('foo=bar; Max-Age=60;', 'https://example.com')
+
+  const initialCookies = await jar.getCookies('https://example.com')
+  expect(initialCookies).toEqual([
+    expect.objectContaining({
+      key: 'foo',
+      value: 'bar',
+      path: '/',
+      domain: 'example.com',
+      maxAge: 60,
+    }),
+  ])
+  // the expiry time should be 60s from now (0)
+  expect(initialCookies[0]?.expiryTime()).toBe(now + 60 * 1000)
+
+  // advance the time by 1s, so now = 1000
+  jest.advanceTimersByTime(1000)
+
+  await jar.setCookie('foo=bar; Max-Age=60;', 'https://example.com')
+
+  const updatedCookies = await jar.getCookies('https://example.com')
+  expect(updatedCookies).toEqual([
+    expect.objectContaining({
+      key: 'foo',
+      value: 'bar',
+      path: '/',
+      domain: 'example.com',
+      maxAge: 60,
+      // the creation time should be unchanged as per the spec
+      creation: initialCookies[0]?.creation,
+    }),
+  ])
+  // the expiry time should be 60s from now (1000)
+  expect(updatedCookies[0]?.expiryTime()).toBe(now + 60 * 1000 + 1000)
+})
+
 // special use domains under a sub-domain
 describe.each(['local', 'example', 'invalid', 'localhost', 'test'])(
   'when special use domain is dev.%s',

lib/__tests__/cookieSorting.spec.ts

@@ -2,8 +2,6 @@ import { Cookie } from '../cookie/cookie'
 import { cookieCompare } from '../cookie/cookieCompare'
 import { CookieJar } from '../cookie/cookieJar'
 
-jest.useFakeTimers()
-
 describe('Cookie sorting', () => {
   describe('assumptions', () => {
     it('should set the creation index during construction', () => {

lib/__tests__/cookieToAndFromJson.spec.ts

@@ -1,7 +1,5 @@
 import { Cookie } from '../cookie/cookie'
 
-jest.useFakeTimers()
-
 describe('Cookie.toJSON()', () => {
   it('should serialize a cookie to JSON', () => {
     const cookie = Cookie.parse(

lib/__tests__/jarSerialization.spec.ts

@@ -35,8 +35,6 @@ import { MemoryCookieStore } from '../memstore'
 import { Store } from '../store'
 import { version } from '../version'
 
-jest.useFakeTimers()
-
 describe('cookieJar serialization', () => {
   it('should use the expected version', () => {
     expect(version).toBe('5.0.0-rc.0')

lib/__tests__/lifetime.spec.ts

@@ -1,7 +1,5 @@
 import { Cookie } from '../cookie/cookie'
 
-jest.useFakeTimers()
-
 describe('Lifetime', () => {
   it('should be able to set a TTL using max-age', () => {
     const cookie = new Cookie()

lib/__tests__/nodeUtilFallback.spec.ts

@@ -1,11 +1,9 @@
 import util from 'util'
 import { Cookie } from '../cookie/cookie'
 import { CookieJar } from '../cookie/cookieJar'
-import { MemoryCookieStore, inspectFallback } from '../memstore'
+import { inspectFallback, MemoryCookieStore } from '../memstore'
 import { getCustomInspectSymbol, getUtilInspect } from '../utilHelper'
 
-jest.useFakeTimers()
-
 describe('Node util module fallback for non-node environments', () => {
   describe('getCustomInspectSymbol', () => {
     it('should not be null in a node environment', () => {

lib/cookie/cookie.ts

@@ -671,7 +671,7 @@ export class Cookie {
   // elsewhere)
   expiryTime(now?: Date): number | undefined {
     if (this.maxAge != null) {
-      const relativeTo = now || this.creation || new Date()
+      const relativeTo = now || this.lastAccessed || new Date()
       const maxAge = typeof this.maxAge === 'number' ? this.maxAge : -Infinity
       const age = maxAge <= 0 ? -Infinity : maxAge * 1000
       if (relativeTo === 'Infinity') {