@wbce-d9/api 10.3.1 → 10.4.0

package/dist/app.js

@@ -108,10 +108,12 @@ export default async function createApp() {
     await emitter.emitInit('app.before', { app });
     await emitter.emitInit('middlewares.before', { app });
     app.use(expressLogger);
-    app.use((_req, res, next) => {
-        res.setHeader('X-Powered-By', 'Directus');
-        next();
-    });
+    if (env['X_POWERED_BY_ENABLED'] === true) {
+        app.use((_req, res, next) => {
+            res.setHeader('X-Powered-By', 'Directus');
+            next();
+        });
+    }
     if (env['CORS_ENABLED'] === true) {
         app.use(cors);
     }

package/dist/auth/drivers/saml.js

@@ -3,7 +3,7 @@ import { BaseException } from '@wbce-d9/exceptions';
 import express, { Router } from 'express';
 import * as samlify from 'samlify';
 import { getAuthProvider } from '../../auth.js';
-import { ACCESS_COOKIE_OPTIONS, REFRESH_COOKIE_OPTIONS } from '../../constants.js';
+import { ACCESS_COOKIE_CLEAR_OPTIONS, ACCESS_COOKIE_OPTIONS, REFRESH_COOKIE_CLEAR_OPTIONS, REFRESH_COOKIE_OPTIONS, } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import emitter from '../../emitter.js';
 import env from '../../env.js';
@@ -103,13 +103,13 @@ export function createSAMLAuthRouter(providerName) {
         const { context } = sp.createLogoutRequest(idp, 'redirect', req.body);
         const authService = new AuthenticationService({ accountability: req.accountability, schema: req.schema });
         if (req.cookies[env['ACCESS_TOKEN_COOKIE_NAME']]) {
-            res.clearCookie(env['ACCESS_TOKEN_COOKIE_NAME'], ACCESS_COOKIE_OPTIONS);
+            res.clearCookie(env['ACCESS_TOKEN_COOKIE_NAME'], ACCESS_COOKIE_CLEAR_OPTIONS);
         }
         if (req.cookies[env['REFRESH_TOKEN_COOKIE_NAME']]) {
             const currentRefreshToken = req.cookies[env['REFRESH_TOKEN_COOKIE_NAME']];
             if (currentRefreshToken) {
                 await authService.logout(currentRefreshToken);
-                res.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_OPTIONS);
+                res.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_CLEAR_OPTIONS);
             }
         }
         return res.redirect(context);

package/dist/cli/utils/create-env/env-stub.liquid

@@ -230,6 +230,9 @@ REFRESH_TOKEN_COOKIE_NAME="directus_refresh_token"
 # and it should be greater than the time taken for a login request with an invalid password [500]
 # LOGIN_STALL_TIME=500
 
+# Whether or not to enable the X-Powered-By Header [true]
+X_POWERED_BY_ENABLED=false
+
 # Whether or not to enable the CORS headers [false]
 CORS_ENABLED=true
 

package/dist/constants.d.ts

@@ -9,8 +9,10 @@ export declare const COLUMN_TRANSFORMS: string[];
 export declare const GENERATE_SPECIAL: string[];
 export declare const UUID_REGEX = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 export declare const REFRESH_COOKIE_OPTIONS: CookieOptions;
+export declare const REFRESH_COOKIE_CLEAR_OPTIONS: CookieOptions;
 export declare const GET_SET_HEADER: (cookieValue: string) => string;
 export declare const ACCESS_COOKIE_OPTIONS: CookieOptions;
+export declare const ACCESS_COOKIE_CLEAR_OPTIONS: CookieOptions;
 export declare const OAS_REQUIRED_SCHEMAS: string[];
 /** Formats from which transformation is supported */
 export declare const SUPPORTED_IMAGE_TRANSFORM_FORMATS: string[];

package/dist/constants.js

@@ -56,6 +56,8 @@ export const REFRESH_COOKIE_OPTIONS = {
     sameSite: env['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict',
     path: '/auth',
 };
+const { maxAge: refreshCookieMaxAge, expires: refreshCookieExpires, ...refresh_cookie_clear_options } = REFRESH_COOKIE_OPTIONS;
+export const REFRESH_COOKIE_CLEAR_OPTIONS = refresh_cookie_clear_options;
 export const GET_SET_HEADER = (cookieValue) => {
     const domainHeader = env['REFRESH_TOKEN_COOKIE_DOMAIN'] ? ` Domain=${env['REFRESH_TOKEN_COOKIE_DOMAIN']};` : '';
     const partitionedHeader = env['REFRESH_TOKEN_COOKIE_PARTITIONED'] == true ? ' Partitioned;' : '';
@@ -70,6 +72,8 @@ export const ACCESS_COOKIE_OPTIONS = {
     sameSite: env['ACCESS_TOKEN_COOKIE_SAME_SITE'] || 'strict',
     path: '/',
 };
+const { maxAge: accessCookieMaxAge, expires: accessCookieExpires, ...access_cookie_clear_options } = ACCESS_COOKIE_OPTIONS;
+export const ACCESS_COOKIE_CLEAR_OPTIONS = access_cookie_clear_options;
 export const OAS_REQUIRED_SCHEMAS = ['Diff', 'Schema', 'Query', 'x-metadata'];
 /** Formats from which transformation is supported */
 export const SUPPORTED_IMAGE_TRANSFORM_FORMATS = ['image/jpeg', 'image/png', 'image/webp', 'image/tiff', 'image/avif'];

package/dist/controllers/auth.js

@@ -1,6 +1,6 @@
 import { Router } from 'express';
 import { createLDAPAuthRouter, createLocalAuthRouter, createOAuth2AuthRouter, createOpenIDAuthRouter, createSAMLAuthRouter, } from '../auth/drivers/index.js';
-import { ACCESS_COOKIE_OPTIONS, DEFAULT_AUTH_PROVIDER, REFRESH_COOKIE_OPTIONS } from '../constants.js';
+import { ACCESS_COOKIE_CLEAR_OPTIONS, ACCESS_COOKIE_OPTIONS, DEFAULT_AUTH_PROVIDER, REFRESH_COOKIE_CLEAR_OPTIONS, REFRESH_COOKIE_OPTIONS, } from '../constants.js';
 import env from '../env.js';
 import { InvalidPayloadException } from '../exceptions/index.js';
 import logger from '../logger.js';
@@ -55,6 +55,9 @@ router.post('/refresh', asyncHandler(async (req, res, next) => {
         accountability: accountability,
         schema: req.schema,
     });
+    if (req.cookies[env['ACCESS_TOKEN_COOKIE_NAME']]) {
+        res.clearCookie(env['ACCESS_TOKEN_COOKIE_NAME'], ACCESS_COOKIE_CLEAR_OPTIONS);
+    }
     const currentRefreshToken = req.body.refresh_token || req.cookies[env['REFRESH_TOKEN_COOKIE_NAME']];
     if (!currentRefreshToken) {
         throw new InvalidPayloadException(`"refresh_token" is required in either the JSON payload or Cookie`);
@@ -95,10 +98,10 @@ router.post('/logout', asyncHandler(async (req, res, next) => {
     }
     await authenticationService.logout(currentRefreshToken);
     if (req.cookies[env['ACCESS_TOKEN_COOKIE_NAME']]) {
-        res.clearCookie(env['ACCESS_TOKEN_COOKIE_NAME'], ACCESS_COOKIE_OPTIONS);
+        res.clearCookie(env['ACCESS_TOKEN_COOKIE_NAME'], ACCESS_COOKIE_CLEAR_OPTIONS);
     }
     if (req.cookies[env['REFRESH_TOKEN_COOKIE_NAME']]) {
-        res.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_OPTIONS);
+        res.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_CLEAR_OPTIONS);
     }
     return next();
 }), respond);

package/dist/database/run-ast.js

@@ -35,7 +35,7 @@ export default async function runAST(originalAST, schema, options) {
             return null;
         // Run the items through the special transforms
         const payloadService = new PayloadService(collection, { knex, schema });
-        let items = await payloadService.processValues('read', rawItems);
+        let items = await payloadService.processValues('read', rawItems, query.alias ?? {});
         if (!items || (Array.isArray(items) && items.length === 0))
             return items;
         // Apply the `_in` filters to the nested collection batches

package/dist/env.js

@@ -54,6 +54,7 @@ const allowedEnvironmentVars = [
     'HSTS_.+',
     // hashing
     'HASH_.+',
+    'X_POWERED_BY_ENABLED',
     // cors
     'CORS_ENABLED',
     'CORS_ORIGIN',
@@ -226,6 +227,7 @@ const defaults = {
     LOGIN_STALL_TIME: 500,
     SERVER_SHUTDOWN_TIMEOUT: 1000,
     ROOT_REDIRECT: './admin',
+    X_POWERED_BY_ENABLED: true,
     CORS_ENABLED: false,
     CORS_ORIGIN: false,
     CORS_METHODS: 'GET,POST,PATCH,DELETE',

package/dist/middleware/authenticate.js

@@ -2,7 +2,7 @@ import { isEqual } from 'lodash-es';
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
 import env from '../env.js';
-import { InvalidCredentialsException } from '../exceptions/index.js';
+import { InvalidCredentialsException, TokenExpiredException } from '../exceptions/index.js';
 import asyncHandler from '../utils/async-handler.js';
 import { getIPFromReq } from '../utils/get-ip-from-req.js';
 import isDirectusJWT from '../utils/is-directus-jwt.js';
@@ -40,6 +40,20 @@ export const handler = async (req, _res, next) => {
     if (req.token) {
         if (isDirectusJWT(req.token)) {
             const payload = verifyAccessJWT(req.token, env['SECRET']);
+            // Try finding the user with a valid refresh token stored in the access token
+            const user = await database
+                .select({
+                session_expires: 's.expires',
+                user_id: 'u.id',
+            })
+                .from('directus_sessions AS s')
+                .leftJoin('directus_users AS u', 's.user', 'u.id')
+                .where('s.token', payload.refresh_token)
+                .andWhere('s.expires', '>=', new Date())
+                .first();
+            if (!user) {
+                throw new TokenExpiredException();
+            }
             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;

package/dist/services/authentication.js

@@ -128,11 +128,22 @@ export class AuthenticationService {
                 throw new InvalidOTPException(`"otp" is invalid`);
             }
         }
+        const refreshToken = nanoid(64);
+        const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
+        await this.knex('directus_sessions').insert({
+            token: refreshToken,
+            user: user.id,
+            expires: refreshTokenExpiration,
+            ip: this.accountability?.ip,
+            user_agent: this.accountability?.userAgent,
+            origin: this.accountability?.origin,
+        });
         const tokenPayload = {
             id: user.id,
             role: user.role,
             app_access: user.app_access,
             admin_access: user.admin_access,
+            refresh_token: refreshToken,
         };
         const customClaims = await emitter.emitFilter('auth.jwt', tokenPayload, {
             status: 'pending',
@@ -148,16 +159,6 @@ export class AuthenticationService {
             expiresIn: env['ACCESS_TOKEN_TTL'],
             issuer: 'directus',
         });
-        const refreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
-        await this.knex('directus_sessions').insert({
-            token: refreshToken,
-            user: user.id,
-            expires: refreshTokenExpiration,
-            ip: this.accountability?.ip,
-            user_agent: this.accountability?.userAgent,
-            origin: this.accountability?.origin,
-        });
         await this.knex('directus_sessions').delete().where('expires', '<', new Date());
         if (this.accountability) {
             await this.activityService.createOne({
@@ -260,11 +261,20 @@ export class AuthenticationService {
                 admin_access: record.role_admin_access,
             });
         }
+        const newRefreshToken = nanoid(64);
+        const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
+        await this.knex('directus_sessions')
+            .update({
+            token: newRefreshToken,
+            expires: refreshTokenExpiration,
+        })
+            .where({ token: refreshToken });
         const tokenPayload = {
             id: record.user_id,
             role: record.role_id,
             app_access: record.role_app_access,
             admin_access: record.role_admin_access,
+            refresh_token: newRefreshToken,
         };
         if (record.share_id) {
             tokenPayload.share = record.share_id;
@@ -291,14 +301,6 @@ export class AuthenticationService {
             expiresIn: env['ACCESS_TOKEN_TTL'],
             issuer: 'directus',
         });
-        const newRefreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
-        await this.knex('directus_sessions')
-            .update({
-            token: newRefreshToken,
-            expires: refreshTokenExpiration,
-        })
-            .where({ token: refreshToken });
         if (record.user_id) {
             await this.knex('directus_users').update({ last_access: new Date() }).where({ id: record.user_id });
         }

package/dist/services/graphql/index.js

@@ -5,7 +5,7 @@ import { GraphQLBoolean, GraphQLEnumType, GraphQLError, GraphQLFloat, GraphQLID,
 import { GraphQLJSON, InputTypeComposer, ObjectTypeComposer, SchemaComposer, toInputObjectType } from 'graphql-compose';
 import { flatten, get, mapKeys, merge, omit, pick, set, transform, uniq } from 'lodash-es';
 import { clearSystemCache, getCache } from '../../cache.js';
-import { ACCESS_COOKIE_OPTIONS, DEFAULT_AUTH_PROVIDER, GENERATE_SPECIAL, REFRESH_COOKIE_OPTIONS, } from '../../constants.js';
+import { ACCESS_COOKIE_CLEAR_OPTIONS, ACCESS_COOKIE_OPTIONS, DEFAULT_AUTH_PROVIDER, GENERATE_SPECIAL, REFRESH_COOKIE_CLEAR_OPTIONS, REFRESH_COOKIE_OPTIONS, } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import env from '../../env.js';
 import { ForbiddenException, GraphQLValidationException, InvalidPayloadException } from '../../exceptions/index.js';
@@ -1766,10 +1766,10 @@ export class GraphQLService {
                     }
                     await authenticationService.logout(currentRefreshToken);
                     if (req?.cookies?.[env['ACCESS_TOKEN_COOKIE_NAME']]) {
-                        res?.clearCookie(env['ACCESS_TOKEN_COOKIE_NAME'], ACCESS_COOKIE_OPTIONS);
+                        res?.clearCookie(env['ACCESS_TOKEN_COOKIE_NAME'], ACCESS_COOKIE_CLEAR_OPTIONS);
                     }
                     if (req?.cookies?.[env['REFRESH_TOKEN_COOKIE_NAME']]) {
-                        res?.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_OPTIONS);
+                        res?.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_CLEAR_OPTIONS);
                     }
                     return true;
                 },

package/dist/services/payload.d.ts

@@ -27,6 +27,8 @@ export declare class PayloadService {
     transformers: Transformers;
     processValues(action: Action, payloads: Partial<Item>[]): Promise<Partial<Item>[]>;
     processValues(action: Action, payload: Partial<Item>): Promise<Partial<Item>>;
+    processValues(action: Action, payloads: Partial<Item>[], aliasMap: Record<string, string>): Promise<Partial<Item>[]>;
+    processValues(action: Action, payload: Partial<Item>, aliasMap: Record<string, string>): Promise<Partial<Item>>;
     processAggregates(payload: Partial<Item>[]): void;
     processField(field: SchemaOverview['collections'][string]['fields'][string], payload: Partial<Item>, action: Action, accountability: Accountability | null): Promise<any>;
     /**

package/dist/services/payload.js

@@ -121,12 +121,20 @@ export class PayloadService {
             return value;
         },
     };
-    async processValues(action, payload) {
+    async processValues(action, payload, aliasMap = {}) {
         const processedPayload = toArray(payload);
         if (processedPayload.length === 0)
             return [];
         const fieldsInPayload = Object.keys(processedPayload[0]);
         let specialFieldsInCollection = Object.entries(this.schema.collections[this.collection].fields).filter(([_name, field]) => field.special && field.special.length > 0);
+        const aliasEntries = Object.entries(aliasMap);
+        for (const [name, field] of specialFieldsInCollection) {
+            for (const [aliasName, fieldName] of aliasEntries) {
+                if (fieldName === name) {
+                    specialFieldsInCollection.push([aliasName, { ...field, field: aliasName }]);
+                }
+            }
+        }
         if (action === 'read') {
             specialFieldsInCollection = specialFieldsInCollection.filter(([name]) => {
                 return fieldsInPayload.includes(name);

package/dist/services/shares.js

@@ -59,6 +59,17 @@ export class SharesService extends ItemsService {
         await this.knex('directus_shares')
             .update({ times_used: record.share_times_used + 1 })
             .where('id', record.share_id);
+        const refreshToken = nanoid(64);
+        const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
+        await this.knex('directus_sessions').insert({
+            token: refreshToken,
+            expires: refreshTokenExpiration,
+            ip: this.accountability?.ip,
+            user_agent: this.accountability?.userAgent,
+            origin: this.accountability?.origin,
+            share: record.share_id,
+        });
+        await this.knex('directus_sessions').delete().where('expires', '<', new Date());
         const tokenPayload = {
             app_access: false,
             admin_access: false,
@@ -68,22 +79,12 @@ export class SharesService extends ItemsService {
                 item: record.share_item,
                 collection: record.share_collection,
             },
+            refresh_token: refreshToken,
         };
         const accessToken = jwt.sign(tokenPayload, env['SECRET'], {
             expiresIn: env['ACCESS_TOKEN_TTL'],
             issuer: 'directus',
         });
-        const refreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env['REFRESH_TOKEN_TTL'], 0));
-        await this.knex('directus_sessions').insert({
-            token: refreshToken,
-            expires: refreshTokenExpiration,
-            ip: this.accountability?.ip,
-            user_agent: this.accountability?.userAgent,
-            origin: this.accountability?.origin,
-            share: record.share_id,
-        });
-        await this.knex('directus_sessions').delete().where('expires', '<', new Date());
         return {
             accessToken,
             refreshToken,

package/dist/types/auth.d.ts

@@ -34,6 +34,7 @@ export type DirectusTokenPayload = {
         collection: string;
         item: string;
     };
+    refresh_token: string;
 };
 export type ShareData = {
     share_id: string;

package/dist/utils/jwt.js

@@ -21,9 +21,9 @@ export function verifyJWT(token, secret) {
     return payload;
 }
 export function verifyAccessJWT(token, secret) {
-    const { id, role, app_access, admin_access, share, share_scope } = verifyJWT(token, secret);
-    if (role === undefined || app_access === undefined || admin_access === undefined) {
+    const { id, role, app_access, admin_access, share, share_scope, refresh_token } = verifyJWT(token, secret);
+    if (role === undefined || app_access === undefined || admin_access === undefined || refresh_token === undefined) {
         throw new InvalidTokenException('Invalid token payload.');
     }
-    return { id, role, app_access, admin_access, share, share_scope };
+    return { id, role, app_access, admin_access, share, share_scope, refresh_token };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbce-d9/api",
-  "version": "10.3.1",
+  "version": "10.4.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -143,20 +143,20 @@
     "uuid-validate": "0.0.3",
     "vm2": "^3.9.19",
     "wellknown": "0.5.0",
-    "@wbce-d9/app": "9.29.1",
-    "@wbce-d9/constants": "9.26.4",
-    "@wbce-d9/extensions-sdk": "9.26.6",
-    "@wbce-d9/specs": "9.26.4",
+    "@wbce-d9/app": "9.30.0",
     "@wbce-d9/exceptions": "9.26.4",
-    "@wbce-d9/storage": "9.26.4",
+    "@wbce-d9/constants": "9.27.0",
+    "@wbce-d9/extensions-sdk": "9.26.7",
     "@wbce-d9/schema": "9.26.4",
-    "@wbce-d9/storage-driver-azure": "9.26.6",
-    "@wbce-d9/storage-driver-cloudinary": "9.26.6",
-    "@wbce-d9/storage-driver-gcs": "9.26.6",
-    "@wbce-d9/storage-driver-local": "9.26.6",
-    "@wbce-d9/storage-driver-s3": "9.26.8",
+    "@wbce-d9/storage": "9.26.4",
+    "@wbce-d9/specs": "9.26.4",
+    "@wbce-d9/storage-driver-azure": "9.26.7",
+    "@wbce-d9/storage-driver-cloudinary": "9.26.7",
+    "@wbce-d9/storage-driver-gcs": "9.26.7",
     "@wbce-d9/update-check": "9.26.4",
-    "@wbce-d9/utils": "9.28.1"
+    "@wbce-d9/storage-driver-local": "9.26.7",
+    "@wbce-d9/storage-driver-s3": "9.26.9",
+    "@wbce-d9/utils": "9.29.0"
   },
   "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.26.4"
+    "@wbce-d9/types": "9.27.0"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.7",