chore(deps): update node in ci to 22

Author: Anemy

.evergreen.yml

@@ -14,7 +14,7 @@ functions:
           set -e
           set -x
 
-          export NODE_VERSION=16.19.0
+          export NODE_VERSION=22.15.1
           bash .evergreen/install-node.sh
   install:
     - command: shell.exec

.github/workflows/nodejs.yml

@@ -15,15 +15,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [22.x, 24.x]
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-        # the oidc-provider package we use doesn't list Node.js 20 as supported
+        # the oidc-provider package we use doesn't list Node.js 22 and 24 as supported
       - name: Install Dependencies
         run: npm ci --ignore-engines
       - name: Test
@@ -34,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node-version: [18.x]
+        node-version: [22.x]
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v4
@@ -56,10 +56,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
 
       - name: Install Dependencies
         run: npm ci --ignore-engines

.github/workflows/publish-release.yml

@@ -19,10 +19,10 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Dependencies

.tool-versions

@@ -0,0 +1,6 @@
+# This file is for the version management tool "asdf".
+# mms uses it as well.
+
+# This Node.js version matches the one required in
+# the "engines" in the package.json and .everygreen.yml
+nodejs 22.15.1

package-lock.json

@@ -30,7 +30,7 @@
     "import": "./dist/.esm-wrapper.mjs"
   },
   "engines": {
-    "node": ">= 16.20.1"
+    "node": ">= 22.15.1"
   },
   "types": "./index.d.ts",
   "scripts": {

package.json

@@ -57,6 +57,7 @@ interface UserOIDCAuthState {
   // A Promise that resolves when the current authentication attempt
   // is finished, if there is one at the moment.
   currentAuthAttempt: Promise<IdPServerResponse> | null;
+  currentAuthAttemptId: string | null;
   // The last set of OIDC tokens we have received together with a
   // callback to refresh it and the client used to obtain it, if available.
   currentTokenSet: {
@@ -246,6 +247,7 @@ export class MongoDBOIDCPluginImpl implements MongoDBOIDCPlugin {
         const state: UserOIDCAuthState = {
           serverOIDCMetadata: { ...serializedState.serverOIDCMetadata },
           currentAuthAttempt: null,
+          currentAuthAttemptId: null,
           currentTokenSet: null,
           lastIdTokenClaims: serializedState.lastIdTokenClaims
             ? { ...serializedState.lastIdTokenClaims }
@@ -283,6 +285,7 @@ export class MongoDBOIDCPluginImpl implements MongoDBOIDCPlugin {
               currentTokenSet: {
                 set: { ...state.currentTokenSet?.set },
               },
+              currentAuthAttemptId: state.currentAuthAttemptId,
               lastIdTokenClaims: state.lastIdTokenClaims
                 ? { ...state.lastIdTokenClaims }
                 : undefined,
@@ -345,6 +348,7 @@ export class MongoDBOIDCPluginImpl implements MongoDBOIDCPlugin {
     const newState: UserOIDCAuthState = {
       serverOIDCMetadata: serverMetadata,
       currentAuthAttempt: null,
+      currentAuthAttemptId: null,
       currentTokenSet: null,
     };
     this.mapIdpToAuthState.set(key, newState);
@@ -1021,10 +1025,13 @@ export class MongoDBOIDCPluginImpl implements MongoDBOIDCPlugin {
       );
       try {
         state.currentAuthAttempt = newAuthAttempt;
+        state.currentAuthAttemptId = `${Date.now()}`; // TODO req id typing.
         return await newAuthAttempt;
       } finally {
-        if (state.currentAuthAttempt === newAuthAttempt)
+        if (state.currentAuthAttempt === newAuthAttempt) {
           state.currentAuthAttempt = null;
+          state.currentAuthAttemptId = null;
+        }
       }
     } finally {
       if (params.refreshToken) {