@wbce-d9/api 11.1.1 → 11.1.2

package/dist/database/migrations/20250910A-add-session-tracking.d.ts

@@ -0,0 +1,3 @@
+import type { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20250910A-add-session-tracking.js

@@ -0,0 +1,16 @@
+export async function up(knex) {
+    await knex.schema.alterTable('directus_activity', (table) => {
+        table.string('session_id', 64).nullable();
+    });
+    await knex.schema.alterTable('directus_sessions', (table) => {
+        table.string('session_id', 64).nullable();
+    });
+}
+export async function down(knex) {
+    await knex.schema.alterTable('directus_activity', (table) => {
+        table.dropColumn('session_id');
+    });
+    await knex.schema.alterTable('directus_sessions', (table) => {
+        table.dropColumn('session_id');
+    });
+}

package/dist/env.js

@@ -43,6 +43,7 @@ const allowedEnvironmentVars = [
     'REFRESH_TOKEN_COOKIE_SECURE',
     'REFRESH_TOKEN_COOKIE_SAME_SITE',
     'REFRESH_TOKEN_COOKIE_NAME',
+    'REFRESH_TOKEN_OVERLAP_DURATION',
     'LOGIN_STALL_TIME',
     'PASSWORD_RESET_URL_ALLOW_LIST',
     'USER_INVITE_URL_ALLOW_LIST',

package/dist/middleware/authenticate.js

@@ -47,6 +47,7 @@ export const handler = async (req, _res, next) => {
                     .select({
                     session_expires: 's.expires',
                     user_id: 'u.id',
+                    session_id: 's.session_id',
                 })
                     .from('directus_sessions AS s')
                     .leftJoin('directus_users AS u', 's.user', 'u.id')
@@ -59,6 +60,7 @@ export const handler = async (req, _res, next) => {
                 req.accountability.role = payload.role;
                 req.accountability.admin = payload.admin_access === true || payload.admin_access == 1;
                 req.accountability.app = payload.app_access === true || payload.app_access == 1;
+                req.accountability.session_id = user.session_id;
                 if (payload.share)
                     req.accountability.share = payload.share;
                 if (payload.share_scope)

package/dist/request/response-interceptor.d.ts

@@ -1,2 +1,2 @@
 import type { AxiosResponse } from 'axios';
-export declare const responseInterceptor: (config: AxiosResponse<any, any>) => Promise<AxiosResponse<any, any>>;
+export declare const responseInterceptor: (config: AxiosResponse<any, any>) => Promise<AxiosResponse<any, any, {}>>;

package/dist/services/authentication.js

@@ -120,6 +120,7 @@ export class AuthenticationService {
         }
         const refreshToken = nanoid(64);
         const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
+        const sessionId = nanoid(64);
         await this.knex('directus_sessions').insert({
             token: refreshToken,
             user: user.id,
@@ -127,6 +128,7 @@ export class AuthenticationService {
             ip: this.accountability?.ip,
             user_agent: this.accountability?.userAgent,
             origin: this.accountability?.origin,
+            session_id: sessionId,
         });
         const tokenPayload = {
             id: user.id,
@@ -159,6 +161,7 @@ export class AuthenticationService {
                 origin: this.accountability.origin,
                 collection: 'directus_users',
                 item: user.id,
+                session_id: sessionId,
             });
         }
         await this.knex('directus_users').update({ last_access: new Date() }).where({ id: user.id });
@@ -185,6 +188,7 @@ export class AuthenticationService {
             .select({
             session_expires: 's.expires',
             session_fallback_token: 's.fallback_token',
+            session_id: 's.session_id',
             user_id: 'u.id',
             user_first_name: 'u.first_name',
             user_last_name: 'u.last_name',
@@ -259,6 +263,7 @@ export class AuthenticationService {
             .andWhere('expires', '<', new Date());
         let newRefreshToken = record.session_fallback_token ?? nanoid(64);
         const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
+        const sessionId = record.session_id ?? nanoid(64);
         // If a fallback session already exists, just update its expiration
         if (record.session_fallback_token) {
             await this.knex('directus_sessions')
@@ -295,6 +300,7 @@ export class AuthenticationService {
                     ip: this.accountability?.ip,
                     user_agent: this.accountability?.userAgent,
                     origin: this.accountability?.origin,
+                    session_id: sessionId,
                 });
             }
         }

package/dist/services/items.js

@@ -162,6 +162,7 @@ export class ItemsService {
                     user_agent: this.accountability.userAgent,
                     origin: this.accountability.origin,
                     item: primaryKey,
+                    session_id: this.accountability.session_id,
                 });
                 // If revisions are tracked, create revisions record
                 if (this.schema.collections[this.collection].accountability === 'all') {
@@ -496,6 +497,7 @@ export class ItemsService {
                     user_agent: this.accountability.userAgent,
                     origin: this.accountability.origin,
                     item: key,
+                    session_id: this.accountability?.session_id,
                 })), { bypassLimits: true });
                 if (this.schema.collections[this.collection].accountability === 'all') {
                     const itemsService = new ItemsService(this.collection, {
@@ -680,6 +682,7 @@ export class ItemsService {
                     user_agent: this.accountability.userAgent,
                     origin: this.accountability.origin,
                     item: key,
+                    session_id: this.accountability.session_id,
                 })), { bypassLimits: true });
             }
         });

package/dist/services/shares.js

@@ -61,6 +61,7 @@ export class SharesService extends ItemsService {
             .where('id', record.share_id);
         const refreshToken = nanoid(64);
         const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
+        const sessionId = nanoid(64);
         await this.knex('directus_sessions').insert({
             token: refreshToken,
             expires: refreshTokenExpiration,
@@ -68,6 +69,7 @@ export class SharesService extends ItemsService {
             user_agent: this.accountability?.userAgent,
             origin: this.accountability?.origin,
             share: record.share_id,
+            session_id: sessionId,
         });
         await this.knex('directus_sessions').delete().where('expires', '<', new Date());
         const tokenPayload = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbce-d9/api",
-  "version": "11.1.1",
+  "version": "11.1.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -72,7 +72,7 @@
     "@wbce-d9/format-title": "10.0.0",
     "argon2": "0.30.3",
     "async": "3.2.4",
-    "axios": "^1.8.2",
+    "axios": "^1.12.0",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "7.0.1",
@@ -143,20 +143,20 @@
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
     "wellknown": "0.5.0",
+    "@wbce-d9/app": "9.33.3",
+    "@wbce-d9/exceptions": "9.26.4",
+    "@wbce-d9/extensions-sdk": "9.27.3",
     "@wbce-d9/constants": "9.28.0",
-    "@wbce-d9/app": "9.33.2",
-    "@wbce-d9/extensions-sdk": "9.27.2",
-    "@wbce-d9/schema": "9.26.4",
     "@wbce-d9/specs": "9.26.5",
     "@wbce-d9/storage": "9.26.4",
     "@wbce-d9/storage-driver-azure": "9.26.9",
     "@wbce-d9/storage-driver-cloudinary": "9.27.2",
     "@wbce-d9/storage-driver-gcs": "9.26.9",
+    "@wbce-d9/storage-driver-s3": "9.26.11",
     "@wbce-d9/storage-driver-local": "9.26.9",
     "@wbce-d9/update-check": "9.28.0",
-    "@wbce-d9/storage-driver-s3": "9.26.11",
-    "@wbce-d9/utils": "9.29.2",
-    "@wbce-d9/exceptions": "9.26.4"
+    "@wbce-d9/schema": "9.26.4",
+    "@wbce-d9/utils": "9.29.2"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",
@@ -204,7 +204,7 @@
     "supertest": "6.3.3",
     "typescript": "5.0.4",
     "vitest": "0.30.1",
-    "@wbce-d9/types": "9.28.0"
+    "@wbce-d9/types": "9.28.1"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.7",