@wbce-d9/api 10.3.0 → 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/ldap.js

@@ -1,9 +1,10 @@
 import { Router } from 'express';
 import Joi from 'joi';
 import ldap from 'ldapjs';
-import { GET_SET_HEADER } from '../../constants.js';
+import { ACCESS_COOKIE_OPTIONS, REFRESH_COOKIE_OPTIONS } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import emitter from '../../emitter.js';
+import env from '../../env.js';
 import { RecordNotUniqueException } from '../../exceptions/database/record-not-unique.js';
 import { InvalidConfigException, InvalidCredentialsException, InvalidPayloadException, InvalidProviderException, ServiceUnavailableException, UnexpectedResponseException, } from '../../exceptions/index.js';
 import logger from '../../logger.js';
@@ -314,7 +315,8 @@ export function createLDAPAuthRouter(provider) {
             payload['data']['refresh_token'] = refreshToken;
         }
         if (mode === 'cookie') {
-            res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
+            res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], accessToken, ACCESS_COOKIE_OPTIONS);
+            res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, REFRESH_COOKIE_OPTIONS);
         }
         res.locals['payload'] = payload;
         return next();

package/dist/auth/drivers/local.js

@@ -2,7 +2,7 @@ import argon2 from 'argon2';
 import { Router } from 'express';
 import Joi from 'joi';
 import { performance } from 'perf_hooks';
-import { GET_SET_HEADER } from '../../constants.js';
+import { ACCESS_COOKIE_OPTIONS, REFRESH_COOKIE_OPTIONS } from '../../constants.js';
 import env from '../../env.js';
 import { InvalidCredentialsException, InvalidPayloadException } from '../../exceptions/index.js';
 import { respond } from '../../middleware/respond.js';
@@ -74,7 +74,8 @@ export function createLocalAuthRouter(provider) {
             payload['data']['refresh_token'] = refreshToken;
         }
         if (mode === 'cookie') {
-            res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
+            res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], accessToken, ACCESS_COOKIE_OPTIONS);
+            res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, REFRESH_COOKIE_OPTIONS);
         }
         res.locals['payload'] = payload;
         return next();

package/dist/auth/drivers/oauth2.js

@@ -2,11 +2,11 @@ import { BaseException } from '@wbce-d9/exceptions';
 import express, { Router } from 'express';
 import flatten from 'flat';
 import jwt from 'jsonwebtoken';
-import { generators, Issuer } from 'openid-client';
+import { Issuer, generators } from 'openid-client';
 import { getAuthProvider } from '../../auth.js';
-import { GET_SET_HEADER } from '../../constants.js';
+import { ACCESS_COOKIE_OPTIONS, REFRESH_COOKIE_OPTIONS } from '../../constants.js';
 import env from '../../env.js';
-import { InvalidConfigException, InvalidCredentialsException, InvalidTokenException } from '../../exceptions/index.js';
+import { InvalidConfigException, InvalidCredentialsException, InvalidTokenException, InvalidPayloadException, } from '../../exceptions/index.js';
 import logger from '../../logger.js';
 import { respond } from '../../middleware/respond.js';
 import { AuthenticationService } from '../../services/authentication.js';
@@ -16,6 +16,7 @@ import { getConfigFromEnv } from '../../utils/get-config-from-env.js';
 import { getIPFromReq } from '../../utils/get-ip-from-req.js';
 import { Url } from '../../utils/url.js';
 import { BaseOAuthDriver } from './baseoauth.js';
+import { isRedirectAllowedOnLogin } from '../../utils/is-redirect-allowed-on-login.js';
 export class OAuth2AuthDriver extends BaseOAuthDriver {
     client;
     redirectUrl;
@@ -118,7 +119,11 @@ export function createOAuth2AuthRouter(providerName) {
         const provider = getAuthProvider(providerName);
         const codeVerifier = provider.generateCodeVerifier();
         const prompt = !!req.query['prompt'];
-        const token = jwt.sign({ verifier: codeVerifier, redirect: req.query['redirect'], prompt }, env['SECRET'], {
+        const redirect = req.query['redirect'];
+        if (isRedirectAllowedOnLogin(redirect, providerName) === false) {
+            throw new InvalidPayloadException(`URL "${redirect}" can't be used to redirect after login`);
+        }
+        const token = jwt.sign({ verifier: codeVerifier, redirect, prompt }, env['SECRET'], {
             expiresIn: '5m',
             issuer: 'directus',
         });
@@ -186,7 +191,8 @@ export function createOAuth2AuthRouter(providerName) {
         }
         const { accessToken, refreshToken, expires } = authResponse;
         if (redirect) {
-            res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
+            res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], accessToken, ACCESS_COOKIE_OPTIONS);
+            res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, REFRESH_COOKIE_OPTIONS);
             return res.redirect(redirect);
         }
         res.locals['payload'] = {

package/dist/auth/drivers/openid.js

@@ -2,11 +2,11 @@ import { BaseException } from '@wbce-d9/exceptions';
 import express, { Router } from 'express';
 import flatten from 'flat';
 import jwt from 'jsonwebtoken';
-import { generators, Issuer } from 'openid-client';
+import { Issuer, generators } from 'openid-client';
 import { getAuthProvider } from '../../auth.js';
-import { GET_SET_HEADER } from '../../constants.js';
+import { ACCESS_COOKIE_OPTIONS, REFRESH_COOKIE_OPTIONS } from '../../constants.js';
 import env from '../../env.js';
-import { InvalidConfigException, InvalidCredentialsException, InvalidTokenException } from '../../exceptions/index.js';
+import { InvalidConfigException, InvalidCredentialsException, InvalidTokenException, InvalidPayloadException, } from '../../exceptions/index.js';
 import logger from '../../logger.js';
 import { respond } from '../../middleware/respond.js';
 import { AuthenticationService } from '../../services/authentication.js';
@@ -15,6 +15,7 @@ import asyncHandler from '../../utils/async-handler.js';
 import { getConfigFromEnv } from '../../utils/get-config-from-env.js';
 import { getIPFromReq } from '../../utils/get-ip-from-req.js';
 import { Url } from '../../utils/url.js';
+import { isRedirectAllowedOnLogin } from '../../utils/is-redirect-allowed-on-login.js';
 import { BaseOAuthDriver } from './baseoauth.js';
 export class OpenIDAuthDriver extends BaseOAuthDriver {
     client;
@@ -138,7 +139,11 @@ export function createOpenIDAuthRouter(providerName) {
         const provider = getAuthProvider(providerName);
         const codeVerifier = provider.generateCodeVerifier();
         const prompt = !!req.query['prompt'];
-        const token = jwt.sign({ verifier: codeVerifier, redirect: req.query['redirect'], prompt }, env['SECRET'], {
+        const redirect = req.query['redirect'];
+        if (isRedirectAllowedOnLogin(redirect, providerName) === false) {
+            throw new InvalidPayloadException(`URL "${redirect}" can't be used to redirect after login`);
+        }
+        const token = jwt.sign({ verifier: codeVerifier, redirect, prompt }, env['SECRET'], {
             expiresIn: '5m',
             issuer: 'directus',
         });
@@ -211,7 +216,8 @@ export function createOpenIDAuthRouter(providerName) {
         }
         const { accessToken, refreshToken, expires } = authResponse;
         if (redirect) {
-            res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
+            res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], accessToken, ACCESS_COOKIE_OPTIONS);
+            res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, REFRESH_COOKIE_OPTIONS);
             return res.redirect(redirect);
         }
         res.locals['payload'] = {

package/dist/auth/drivers/saml.js

@@ -3,18 +3,19 @@ import { BaseException } from '@wbce-d9/exceptions';
 import express, { Router } from 'express';
 import * as samlify from 'samlify';
 import { getAuthProvider } from '../../auth.js';
-import { COOKIE_OPTIONS, GET_SET_HEADER } 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';
 import { RecordNotUniqueException } from '../../exceptions/database/record-not-unique.js';
-import { InvalidCredentialsException, InvalidProviderException } from '../../exceptions/index.js';
+import { InvalidCredentialsException, InvalidProviderException, InvalidPayloadException, } from '../../exceptions/index.js';
 import logger from '../../logger.js';
 import { respond } from '../../middleware/respond.js';
 import { AuthenticationService } from '../../services/authentication.js';
 import { UsersService } from '../../services/users.js';
 import asyncHandler from '../../utils/async-handler.js';
 import { getConfigFromEnv } from '../../utils/get-config-from-env.js';
+import { isRedirectAllowedOnLogin } from '../../utils/is-redirect-allowed-on-login.js';
 import { LocalAuthDriver } from './local.js';
 // Register the samlify schema validator
 samlify.setSchemaValidator(validator);
@@ -89,7 +90,11 @@ export function createSAMLAuthRouter(providerName) {
         const { context: url } = sp.createLoginRequest(idp, 'redirect');
         const parsedUrl = new URL(url);
         if (req.query['redirect']) {
-            parsedUrl.searchParams.append('RelayState', req.query['redirect']);
+            const redirect = req.query['redirect'];
+            if (isRedirectAllowedOnLogin(redirect, providerName) === false) {
+                throw new InvalidPayloadException(`URL "${redirect}" can't be used to redirect after login`);
+            }
+            parsedUrl.searchParams.append('RelayState', redirect);
         }
         return res.redirect(parsedUrl.toString());
     }));
@@ -97,11 +102,14 @@ export function createSAMLAuthRouter(providerName) {
         const { sp, idp } = getAuthProvider(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_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'], COOKIE_OPTIONS);
+                res.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_CLEAR_OPTIONS);
             }
         }
         return res.redirect(context);
@@ -121,7 +129,8 @@ export function createSAMLAuthRouter(providerName) {
                 },
             };
             if (relayState) {
-                res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
+                res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], accessToken, ACCESS_COOKIE_OPTIONS);
+                res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, REFRESH_COOKIE_OPTIONS);
                 return res.redirect(relayState);
             }
             return next();

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

@@ -199,6 +199,18 @@ STORAGE_LOCAL_ROOT="./uploads"
 # The duration that the access token is valid ["15m"]
 ACCESS_TOKEN_TTL="15m"
 
+# Whether or not to set the secure attribute for the access token cookie [false]
+ACCESS_TOKEN_COOKIE_SECURE=false
+
+# Value of sameSite for the access token cookie ["lax"]
+ACCESS_TOKEN_COOKIE_SAME_SITE="lax"
+
+# Name of the access token cookie ["directus_refresh_token"]
+ACCESS_TOKEN_COOKIE_NAME="directus_session_token"
+
+# Which domain to use for the access token cookie. Useful for development mode.
+# ACCESS_TOKEN_COOKIE_DOMAIN
+
 # The duration that the refresh token is valid, and also how long users stay logged-in to the App ["7d"]
 REFRESH_TOKEN_TTL="7d"
 
@@ -218,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

@@ -8,8 +8,11 @@ export declare const DEFAULT_AUTH_PROVIDER = "default";
 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 COOKIE_OPTIONS: CookieOptions;
+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

@@ -48,19 +48,32 @@ export const DEFAULT_AUTH_PROVIDER = 'default';
 export const COLUMN_TRANSFORMS = ['year', 'month', 'day', 'weekday', 'hour', 'minute', 'second'];
 export const GENERATE_SPECIAL = ['uuid', 'date-created', 'role-created', 'user-created'];
 export const UUID_REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
-export const COOKIE_OPTIONS = {
+export const REFRESH_COOKIE_OPTIONS = {
     httpOnly: true,
     domain: env['REFRESH_TOKEN_COOKIE_DOMAIN'],
     maxAge: getMilliseconds(env['REFRESH_TOKEN_TTL']),
     secure: env['REFRESH_TOKEN_COOKIE_SECURE'] ?? false,
     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;' : '';
-    const cookieHeaderValue = `${env['REFRESH_TOKEN_COOKIE_NAME']}=${cookieValue}; HttpOnly; Max-Age=${getMilliseconds(env['REFRESH_TOKEN_TTL'])}; Secure=${env['REFRESH_TOKEN_COOKIE_SECURE'] ?? false}; SameSite=${env['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict'}; Path=/;${domainHeader}${partitionedHeader}`;
+    const cookieHeaderValue = `${env['REFRESH_TOKEN_COOKIE_NAME']}=${cookieValue}; HttpOnly; Max-Age=${getMilliseconds(env['REFRESH_TOKEN_TTL'])}; Secure=${env['REFRESH_TOKEN_COOKIE_SECURE'] ?? false}; SameSite=${env['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict'}; Path=/auth;${domainHeader}${partitionedHeader}`;
     return cookieHeaderValue;
 };
+export const ACCESS_COOKIE_OPTIONS = {
+    httpOnly: true,
+    domain: env['ACCESS_TOKEN_COOKIE_DOMAIN'],
+    maxAge: getMilliseconds(env['ACCESS_TOKEN_TTL']),
+    secure: env['ACCESS_TOKEN_COOKIE_SECURE'] ?? false,
+    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 { DEFAULT_AUTH_PROVIDER, GET_SET_HEADER } 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`);
@@ -68,7 +71,8 @@ router.post('/refresh', asyncHandler(async (req, res, next) => {
         payload['data']['refresh_token'] = refreshToken;
     }
     if (mode === 'cookie') {
-        res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
+        res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], accessToken, ACCESS_COOKIE_OPTIONS);
+        res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, REFRESH_COOKIE_OPTIONS);
     }
     res.locals['payload'] = payload;
     return next();
@@ -93,13 +97,11 @@ router.post('/logout', asyncHandler(async (req, res, next) => {
         throw new InvalidPayloadException(`"refresh_token" is required in either the JSON payload or Cookie`);
     }
     await authenticationService.logout(currentRefreshToken);
+    if (req.cookies[env['ACCESS_TOKEN_COOKIE_NAME']]) {
+        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'], {
-            httpOnly: true,
-            domain: env['REFRESH_TOKEN_COOKIE_DOMAIN'],
-            secure: env['REFRESH_TOKEN_COOKIE_SECURE'] ?? false,
-            sameSite: env['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict',
-        });
+        res.clearCookie(env['REFRESH_TOKEN_COOKIE_NAME'], REFRESH_COOKIE_CLEAR_OPTIONS);
     }
     return next();
 }), respond);

package/dist/controllers/shares.js

@@ -1,6 +1,7 @@
 import express from 'express';
 import Joi from 'joi';
-import { GET_SET_HEADER, UUID_REGEX } from '../constants.js';
+import { ACCESS_COOKIE_OPTIONS, REFRESH_COOKIE_OPTIONS, UUID_REGEX } from '../constants.js';
+import env from '../env.js';
 import { ForbiddenException, InvalidPayloadException } from '../exceptions/index.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
@@ -24,7 +25,8 @@ router.post('/auth', asyncHandler(async (req, res, next) => {
         throw new InvalidPayloadException(error.message);
     }
     const { accessToken, refreshToken, expires } = await service.login(req.body);
-    res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
+    res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], accessToken, ACCESS_COOKIE_OPTIONS);
+    res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, REFRESH_COOKIE_OPTIONS);
     res.locals['payload'] = { data: { access_token: accessToken, expires } };
     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

@@ -34,6 +34,10 @@ const allowedEnvironmentVars = [
     'KEY',
     'SECRET',
     'ACCESS_TOKEN_TTL',
+    'ACCESS_TOKEN_COOKIE_DOMAIN',
+    'ACCESS_TOKEN_COOKIE_SECURE',
+    'ACCESS_TOKEN_COOKIE_SAME_SITE',
+    'ACCESS_TOKEN_COOKIE_NAME',
     'REFRESH_TOKEN_TTL',
     'REFRESH_TOKEN_COOKIE_DOMAIN',
     'REFRESH_TOKEN_COOKIE_SECURE',
@@ -50,6 +54,7 @@ const allowedEnvironmentVars = [
     'HSTS_.+',
     // hashing
     'HASH_.+',
+    'X_POWERED_BY_ENABLED',
     // cors
     'CORS_ENABLED',
     'CORS_ORIGIN',
@@ -143,6 +148,7 @@ const allowedEnvironmentVars = [
     'AUTH_.+_GROUP_SCOPE',
     'AUTH_.+_IDP.+',
     'AUTH_.+_SP.+',
+    'AUTH_.+_REDIRECT_ALLOW_LIST',
     // extensions
     'PACKAGE_FILE_LOCATION',
     'EXTENSIONS_PATH',
@@ -211,6 +217,9 @@ const defaults = {
     RATE_LIMITER_GLOBAL_DURATION: 1,
     RATE_LIMITER_GLOBAL_STORE: 'memory',
     ACCESS_TOKEN_TTL: '15m',
+    ACCESS_TOKEN_COOKIE_SECURE: false,
+    ACCESS_TOKEN_COOKIE_SAME_SITE: 'lax',
+    ACCESS_TOKEN_COOKIE_NAME: 'directus_access_token',
     REFRESH_TOKEN_TTL: '7d',
     REFRESH_TOKEN_COOKIE_SECURE: false,
     REFRESH_TOKEN_COOKIE_SAME_SITE: 'lax',
@@ -218,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/middleware/extract-token.d.ts

@@ -3,6 +3,7 @@
  *
  * Authorization: Bearer
  * access_token query parameter
+ * Access token cookie
  *
  * and store in req.token
  */

package/dist/middleware/extract-token.js

@@ -3,9 +3,11 @@
  *
  * Authorization: Bearer
  * access_token query parameter
+ * Access token cookie
  *
  * and store in req.token
  */
+import env from '../env.js';
 const extractToken = (req, _res, next) => {
     let token = null;
     if (req.query && req.query['access_token']) {
@@ -17,6 +19,12 @@ const extractToken = (req, _res, next) => {
             token = parts[1];
         }
     }
+    /**
+     * Check if there is an access token stored in the cookies
+     */
+    if (req?.cookies?.[env['ACCESS_TOKEN_COOKIE_NAME']]) {
+        token = req.cookies[env['ACCESS_TOKEN_COOKIE_NAME']];
+    }
     /**
      * @TODO
      * Look into RFC6750 compliance:

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,14 +5,13 @@ 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 { DEFAULT_AUTH_PROVIDER, GENERATE_SPECIAL } 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';
 import { getExtensionManager } from '../../extensions.js';
 import { generateHash } from '../../utils/generate-hash.js';
 import { getGraphQLType } from '../../utils/get-graphql-type.js';
-import { getMilliseconds } from '../../utils/get-milliseconds.js';
 import { reduceSchema } from '../../utils/reduce-schema.js';
 import { sanitizeQuery } from '../../utils/sanitize-query.js';
 import { validateQuery } from '../../utils/validate-query.js';
@@ -1696,13 +1695,8 @@ export class GraphQLService {
                     });
                     const result = await authenticationService.login(DEFAULT_AUTH_PROVIDER, args, args?.otp);
                     if (args['mode'] === 'cookie') {
-                        res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], result['refreshToken'], {
-                            httpOnly: true,
-                            domain: env['REFRESH_TOKEN_COOKIE_DOMAIN'],
-                            maxAge: getMilliseconds(env['REFRESH_TOKEN_TTL']),
-                            secure: env['REFRESH_TOKEN_COOKIE_SECURE'] ?? false,
-                            sameSite: env['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict',
-                        });
+                        res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], result['accessToken'], ACCESS_COOKIE_OPTIONS);
+                        res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], result['refreshToken'], REFRESH_COOKIE_OPTIONS);
                     }
                     return {
                         access_token: result['accessToken'],
@@ -1737,13 +1731,8 @@ export class GraphQLService {
                     }
                     const result = await authenticationService.refresh(currentRefreshToken);
                     if (args['mode'] === 'cookie') {
-                        res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], result['refreshToken'], {
-                            httpOnly: true,
-                            domain: env['REFRESH_TOKEN_COOKIE_DOMAIN'],
-                            maxAge: getMilliseconds(env['REFRESH_TOKEN_TTL']),
-                            secure: env['REFRESH_TOKEN_COOKIE_SECURE'] ?? false,
-                            sameSite: env['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict',
-                        });
+                        res?.cookie(env['ACCESS_TOKEN_COOKIE_NAME'], result['accessToken'], ACCESS_COOKIE_OPTIONS);
+                        res?.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], result['refreshToken'], REFRESH_COOKIE_OPTIONS);
                     }
                     return {
                         access_token: result['accessToken'],
@@ -1757,7 +1746,7 @@ export class GraphQLService {
                 args: {
                     refresh_token: GraphQLString,
                 },
-                resolve: async (_, args, { req }) => {
+                resolve: async (_, args, { req, res }) => {
                     const accountability = { role: null };
                     if (req?.ip)
                         accountability.ip = req.ip;
@@ -1776,6 +1765,12 @@ export class GraphQLService {
                         throw new InvalidPayloadException(`"refresh_token" is required in either the JSON payload or Cookie`);
                     }
                     await authenticationService.logout(currentRefreshToken);
+                    if (req?.cookies?.[env['ACCESS_TOKEN_COOKIE_NAME']]) {
+                        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_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/is-redirect-allowed-on-login.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Checks if the defined redirect after successful SSO login is in the allow list
+ */
+export declare function isRedirectAllowedOnLogin(redirect: unknown, provider: string): boolean;

package/dist/utils/is-redirect-allowed-on-login.js

@@ -0,0 +1,42 @@
+import { toArray } from '@wbce-d9/utils';
+import env from '../env.js';
+import isUrlAllowed from './is-url-allowed.js';
+function isUrlValid(string) {
+    try {
+        new URL(string);
+        return true;
+    }
+    catch (err) {
+        return false;
+    }
+}
+/**
+ * Checks if the defined redirect after successful SSO login is in the allow list
+ */
+export function isRedirectAllowedOnLogin(redirect, provider) {
+    if (!redirect)
+        return true; // empty redirect
+    if (typeof redirect !== 'string')
+        return false; // invalid type
+    const publicUrl = env['PUBLIC_URL'];
+    if (!isUrlValid(redirect)) {
+        if (!redirect.startsWith('//')) {
+            // should be a relative path like `/admin/test`
+            return true;
+        }
+        // domain without protocol `//example.com/test`
+        return false;
+    }
+    const { protocol: redirectProtocol, hostname: redirectDomain } = new URL(redirect);
+    const envKey = `AUTH_${provider.toUpperCase()}_REDIRECT_ALLOW_LIST`;
+    if (envKey in env) {
+        if (isUrlAllowed(redirect, [...toArray(env[envKey]), publicUrl]))
+            return true;
+    }
+    if (!isUrlValid(publicUrl)) {
+        return false;
+    }
+    // allow redirects to the defined PUBLIC_URL
+    const { protocol: publicProtocol, hostname: publicDomain } = new URL(publicUrl);
+    return `${redirectProtocol}//${redirectDomain}` === `${publicProtocol}//${publicDomain}`;
+}

package/dist/utils/is-redirect-allowed-on-login.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/is-url-allowed.d.ts

@@ -1,4 +1,4 @@
 /**
- * Check if url matches allow list either exactly or by domain+path
+ * Check if url matches allow list either exactly or by origin+pathname
  */
 export default function isUrlAllowed(url: string, allowList: string | string[]): boolean;

package/dist/utils/is-url-allowed.js

@@ -2,7 +2,7 @@ import { toArray } from '@wbce-d9/utils';
 import logger from '../logger.js';
 import { URL } from 'url';
 /**
- * Check if url matches allow list either exactly or by domain+path
+ * Check if url matches allow list either exactly or by origin+pathname
  */
 export default function isUrlAllowed(url, allowList) {
     const urlAllowList = toArray(allowList);
@@ -11,8 +11,8 @@ export default function isUrlAllowed(url, allowList) {
     const parsedWhitelist = urlAllowList
         .map((allowedURL) => {
         try {
-            const { hostname, pathname } = new URL(allowedURL);
-            return hostname + pathname;
+            const { origin, pathname } = new URL(allowedURL);
+            return origin + pathname;
         }
         catch {
             logger.warn(`Invalid URL used "${url}"`);
@@ -21,8 +21,8 @@ export default function isUrlAllowed(url, allowList) {
     })
         .filter((f) => f);
     try {
-        const { hostname, pathname } = new URL(url);
-        return parsedWhitelist.includes(hostname + pathname);
+        const { origin, pathname } = new URL(url);
+        return parsedWhitelist.includes(origin + pathname);
     }
     catch {
         return false;

package/dist/utils/is-url-allowed.test.d.ts

@@ -0,0 +1 @@
+export {};

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.0",
+  "version": "10.4.0",
   "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.3.6",
+    "axios": "^1.7.2",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "7.0.1",
@@ -143,20 +143,20 @@
     "uuid-validate": "0.0.3",
     "vm2": "^3.9.19",
     "wellknown": "0.5.0",
-    "@wbce-d9/app": "9.29.0",
-    "@wbce-d9/constants": "9.26.3",
-    "@wbce-d9/exceptions": "9.26.3",
-    "@wbce-d9/extensions-sdk": "9.26.5",
-    "@wbce-d9/schema": "9.26.3",
-    "@wbce-d9/storage-driver-azure": "9.26.5",
-    "@wbce-d9/specs": "9.26.3",
-    "@wbce-d9/storage": "9.26.3",
-    "@wbce-d9/storage-driver-cloudinary": "9.26.5",
-    "@wbce-d9/storage-driver-gcs": "9.26.5",
-    "@wbce-d9/storage-driver-s3": "9.26.7",
-    "@wbce-d9/update-check": "9.26.3",
-    "@wbce-d9/utils": "9.28.0",
-    "@wbce-d9/storage-driver-local": "9.26.5"
+    "@wbce-d9/app": "9.30.0",
+    "@wbce-d9/exceptions": "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": "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/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.3"
+    "@wbce-d9/types": "9.27.0"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.7",