@wbce-d9/api 11.1.6 → 12.0.1

package/dist/auth/drivers/openid.js

@@ -76,6 +76,14 @@ export class OpenIDAuthDriver extends BaseOAuthDriver {
             const client = await this.client;
             const codeChallenge = generators.codeChallenge(codeVerifier);
             const paramsConfig = typeof this.config['params'] === 'object' ? this.config['params'] : {};
+            const redirectAfterLogin = additionalParams?.['redirect'];
+            delete additionalParams?.['redirect'];
+            let finalRedirectUri = this.redirectUrl;
+            if (redirectAfterLogin) {
+                const redirectUriWithParams = new URL(this.redirectUrl);
+                redirectUriWithParams.searchParams.set('redirect', redirectAfterLogin);
+                finalRedirectUri = redirectUriWithParams.toString();
+            }
             return client.authorizationUrl({
                 scope: this.config['scope'] ?? 'openid profile email',
                 access_type: 'offline',
@@ -86,6 +94,7 @@ export class OpenIDAuthDriver extends BaseOAuthDriver {
                 // Some providers require state even with PKCE
                 state: codeChallenge,
                 nonce: codeChallenge,
+                redirect_uri: finalRedirectUri,
                 ...additionalParams,
             });
         }
@@ -147,28 +156,40 @@ export function createOpenIDAuthRouter(providerName) {
             expiresIn: '5m',
             issuer: 'directus',
         });
-        res.cookie(`openid.${providerName}`, token, {
+        const additionalParams = { ...req.query };
+        delete additionalParams['prompt'];
+        const authUrl = await provider.generateAuthUrl(codeVerifier, prompt, additionalParams);
+        const urlParams = new URL(authUrl);
+        const state = urlParams.searchParams.get('state');
+        const cookieName = `openid.${providerName}.${state || ''}`;
+        res.cookie(cookieName, token, {
             httpOnly: true,
             sameSite: 'lax',
         });
-        const additionalParams = { ...req.query };
-        delete additionalParams['prompt'];
-        delete additionalParams['redirect'];
-        return res.redirect(await provider.generateAuthUrl(codeVerifier, prompt, additionalParams));
+        return res.redirect(authUrl);
     }), respond);
     router.post('/callback', express.urlencoded({ extended: false }), (req, res) => {
         res.redirect(303, `./callback?${new URLSearchParams(req.body)}`);
     }, respond);
     router.get('/callback', asyncHandler(async (req, res, next) => {
+        const redirectUrl = req.query['redirect'];
+        const validRedirectUrl = isRedirectAllowedOnLogin(redirectUrl, providerName) ? redirectUrl : null;
+        const state = req.query['state'];
+        const cookieName = `openid.${providerName}.${state || ''}`;
+        const cookieValue = req.cookies[cookieName];
         let tokenData;
         try {
-            tokenData = jwt.verify(req.cookies[`openid.${providerName}`], env['SECRET'], {
+            tokenData = jwt.verify(cookieValue, env['SECRET'], {
                 issuer: 'directus',
             });
         }
         catch (e) {
-            logger.warn(e, `[OpenID] Couldn't verify OpenID cookie`);
-            throw new InvalidCredentialsException();
+            logger.warn(e, `[OpenID] Couldn't verify OpenID cookie ${state ? `for state ${state}` : ''}`);
+            const baseUrl = env['PUBLIC_URL'];
+            const loginPath = '/admin/login';
+            const url = new URL(loginPath, baseUrl);
+            const redirectTo = validRedirectUrl || url.toString();
+            return res.redirect(`${redirectTo}?reason=INVALID_CREDENTIALS`);
         }
         const { verifier, redirect, prompt } = tokenData;
         const accountability = {
@@ -187,7 +208,7 @@ export function createOpenIDAuthRouter(providerName) {
         });
         let authResponse;
         try {
-            res.clearCookie(`openid.${providerName}`);
+            res.clearCookie(cookieName);
             authResponse = await authenticationService.login(providerName, {
                 code: req.query['code'],
                 codeVerifier: verifier,

package/dist/cli/utils/create-db-connection.js

@@ -2,7 +2,6 @@ import knex from 'knex';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
-import { promisify } from 'util';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export default function createDBConnection(client, credentials) {
     let connection = {};
@@ -46,10 +45,9 @@ export default function createDBConnection(client, credentials) {
         knexConfig.useNullAsDefault = true;
     }
     if (client === 'cockroachdb') {
-        knexConfig.pool.afterCreate = async (conn, callback) => {
-            const run = promisify(conn.query.bind(conn));
-            await run('SET serial_normalization = "sql_sequence"');
-            await run('SET default_int_size = 4');
+        knexConfig.pool.afterCreate = (conn, callback) => {
+            conn.query('SET serial_normalization = "sql_sequence"');
+            conn.query('SET default_int_size = 4');
             callback(null, conn);
         };
     }

package/dist/database/index.js

@@ -6,7 +6,6 @@ import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
 import { performance } from 'perf_hooks';
-import { promisify } from 'util';
 import env from '../env.js';
 import logger from '../logger.js';
 import { getConfigFromEnv } from '../utils/get-config-from-env.js';
@@ -77,29 +76,31 @@ export default function getDatabase() {
     };
     if (client === 'sqlite3') {
         knexConfig.useNullAsDefault = true;
-        poolConfig.afterCreate = async (conn, callback) => {
+        poolConfig.afterCreate = (conn, callback) => {
             logger.trace('Enabling SQLite Foreign Keys support...');
-            const run = promisify(conn.run.bind(conn));
-            await run('PRAGMA foreign_keys = ON');
+            conn.run('PRAGMA foreign_keys = ON');
             callback(null, conn);
         };
     }
     if (client === 'cockroachdb') {
-        poolConfig.afterCreate = async (conn, callback) => {
+        poolConfig.afterCreate = (conn, callback) => {
             logger.trace('Setting CRDB serial_normalization and default_int_size');
-            const run = promisify(conn.query.bind(conn));
-            await run('SET serial_normalization = "sql_sequence"');
-            await run('SET default_int_size = 4');
+            conn.query('SET serial_normalization = "sql_sequence"');
+            conn.query('SET default_int_size = 4');
             callback(null, conn);
         };
     }
     if (client === 'mysql') {
-        poolConfig.afterCreate = async (conn, callback) => {
+        poolConfig.afterCreate = (conn, callback) => {
             logger.trace('Retrieving database version');
-            const run = promisify(conn.query.bind(conn));
-            const version = await run('SELECT @@version;');
-            databaseVersion = version[0]['@@version'];
-            callback(null, conn);
+            conn.query('SELECT @@version AS version;', (error, results) => {
+                if (error) {
+                    callback(error, null);
+                    return;
+                }
+                databaseVersion = results[0]?.version || results[0]?.['@@version'];
+                callback(null, conn);
+            });
         };
     }
     if (client === 'mssql') {

package/dist/operations/exec/index.js

@@ -17,7 +17,7 @@ export default defineOperationApi({
         jail.setSync('process', { env: environmentVariables }, { copy: true });
         jail.setSync('module', { exports: null }, { copy: true });
         // Adding a secure logger for the isolate
-        const createLoggerCallback = (logFn) => new ivm.Callback((...args) => logFn(args.length === 1 ? args[0] : args), { sync: true });
+        const createLoggerCallback = (logFn) => new ivm.Callback((...args) => logFn(args.length === 1 ? args[0] : args), () => { }, { sync: true });
         jail.setSync('console', {
             log: createLoggerCallback(() => logger.info),
             info: createLoggerCallback(() => logger.info),
@@ -27,12 +27,12 @@ export default defineOperationApi({
             trace: createLoggerCallback(() => logger.trace),
         }, { copy: true });
         // Executing the code within the isolate
-        await context.eval(code, { timeout: executionTimeout });
+        await context.eval(code, { timeout: executionTimeout }, () => { });
         const dataCopy = new ivm.ExternalCopy({ data });
         const resultReference = await context.evalClosure(`return module.exports($0.data)`, [dataCopy.copyInto()], {
             result: { reference: true, promise: true },
             timeout: executionTimeout,
-        });
+        }, () => { });
         const finalResult = await resultReference.copy();
         // Cleanup memory
         resultReference.release();

package/dist/types/meta.js

@@ -2,4 +2,4 @@ export var Meta;
 (function (Meta) {
     Meta["TOTAL_COUNT"] = "total_count";
     Meta["FILTER_COUNT"] = "filter_count";
-})(Meta || (Meta = {}));
+})(Meta = Meta || (Meta = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbce-d9/api",
-  "version": "11.1.6",
+  "version": "12.0.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -101,7 +101,7 @@
     "icc": "3.0.0",
     "inquirer": "9.1.5",
     "ioredis": "5.3.2",
-    "isolated-vm": "^5.0.3",
+    "isolated-vm": "^6.0.1",
     "joi": "17.9.1",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
@@ -143,20 +143,20 @@
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
     "wellknown": "0.5.0",
-    "@wbce-d9/app": "9.33.6",
-    "@wbce-d9/exceptions": "9.26.4",
-    "@wbce-d9/constants": "9.28.0",
-    "@wbce-d9/extensions-sdk": "9.27.4",
-    "@wbce-d9/schema": "9.26.4",
+    "@wbce-d9/app": "9.33.8",
+    "@wbce-d9/constants": "10.0.0",
+    "@wbce-d9/exceptions": "10.0.0",
+    "@wbce-d9/extensions-sdk": "10.0.0",
     "@wbce-d9/specs": "9.26.5",
-    "@wbce-d9/storage": "9.26.4",
-    "@wbce-d9/storage-driver-azure": "9.26.10",
-    "@wbce-d9/storage-driver-cloudinary": "9.27.3",
-    "@wbce-d9/storage-driver-gcs": "9.26.10",
-    "@wbce-d9/storage-driver-local": "9.26.10",
-    "@wbce-d9/storage-driver-s3": "9.26.12",
-    "@wbce-d9/utils": "9.29.3",
-    "@wbce-d9/update-check": "9.28.1"
+    "@wbce-d9/schema": "10.0.0",
+    "@wbce-d9/storage": "10.0.0",
+    "@wbce-d9/storage-driver-azure": "10.0.0",
+    "@wbce-d9/storage-driver-cloudinary": "10.0.0",
+    "@wbce-d9/storage-driver-gcs": "10.0.0",
+    "@wbce-d9/storage-driver-local": "10.0.0",
+    "@wbce-d9/update-check": "10.0.0",
+    "@wbce-d9/storage-driver-s3": "10.0.0",
+    "@wbce-d9/utils": "10.0.0"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",
@@ -197,14 +197,14 @@
     "@types/uuid-validate": "0.0.1",
     "@types/wellknown": "0.5.4",
     "@vitest/coverage-c8": "0.30.1",
-    "@wbce-d9/tsconfig": "0.0.7",
+    "@wbce-d9/tsconfig": "2.0.0",
     "copyfiles": "2.4.1",
     "form-data": "4.0.4",
     "knex-mock-client": "3.0.2",
     "supertest": "6.3.3",
     "typescript": "5.0.4",
     "vitest": "0.30.1",
-    "@wbce-d9/types": "9.28.1"
+    "@wbce-d9/types": "10.0.0"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.7",
@@ -218,7 +218,7 @@
     "tedious": "18.6.1"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22"
   },
   "scripts": {
     "build": "tsc --build && copyfiles \"src/**/*.{yaml,liquid}\" -u 1 dist",