@wbce-d9/api 10.0.0 → 10.3.0

package/dist/auth/drivers/ldap.js

@@ -1,9 +1,9 @@
 import { Router } from 'express';
 import Joi from 'joi';
 import ldap from 'ldapjs';
+import { GET_SET_HEADER } 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';
@@ -12,7 +12,6 @@ import { AuthenticationService } from '../../services/authentication.js';
 import { UsersService } from '../../services/users.js';
 import asyncHandler from '../../utils/async-handler.js';
 import { getIPFromReq } from '../../utils/get-ip-from-req.js';
-import { getMilliseconds } from '../../utils/get-milliseconds.js';
 import { AuthDriver } from '../auth.js';
 // 0x2: ACCOUNTDISABLE
 // 0x10: LOCKOUT
@@ -315,13 +314,7 @@ export function createLDAPAuthRouter(provider) {
             payload['data']['refresh_token'] = refreshToken;
         }
         if (mode === 'cookie') {
-            res.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], 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.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
         }
         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 { COOKIE_OPTIONS } from '../../constants.js';
+import { GET_SET_HEADER } from '../../constants.js';
 import env from '../../env.js';
 import { InvalidCredentialsException, InvalidPayloadException } from '../../exceptions/index.js';
 import { respond } from '../../middleware/respond.js';
@@ -74,7 +74,7 @@ export function createLocalAuthRouter(provider) {
             payload['data']['refresh_token'] = refreshToken;
         }
         if (mode === 'cookie') {
-            res.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, COOKIE_OPTIONS);
+            res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
         }
         res.locals['payload'] = payload;
         return next();

package/dist/auth/drivers/oauth2.js

@@ -4,6 +4,7 @@ import flatten from 'flat';
 import jwt from 'jsonwebtoken';
 import { generators, Issuer } from 'openid-client';
 import { getAuthProvider } from '../../auth.js';
+import { GET_SET_HEADER } from '../../constants.js';
 import env from '../../env.js';
 import { InvalidConfigException, InvalidCredentialsException, InvalidTokenException } from '../../exceptions/index.js';
 import logger from '../../logger.js';
@@ -13,7 +14,6 @@ import { UsersService } from '../../services/users.js';
 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 { getMilliseconds } from '../../utils/get-milliseconds.js';
 import { Url } from '../../utils/url.js';
 import { BaseOAuthDriver } from './baseoauth.js';
 export class OAuth2AuthDriver extends BaseOAuthDriver {
@@ -186,13 +186,7 @@ export function createOAuth2AuthRouter(providerName) {
         }
         const { accessToken, refreshToken, expires } = authResponse;
         if (redirect) {
-            res.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], 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.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
             return res.redirect(redirect);
         }
         res.locals['payload'] = {

package/dist/auth/drivers/openid.js

@@ -4,6 +4,7 @@ import flatten from 'flat';
 import jwt from 'jsonwebtoken';
 import { generators, Issuer } from 'openid-client';
 import { getAuthProvider } from '../../auth.js';
+import { GET_SET_HEADER } from '../../constants.js';
 import env from '../../env.js';
 import { InvalidConfigException, InvalidCredentialsException, InvalidTokenException } from '../../exceptions/index.js';
 import logger from '../../logger.js';
@@ -13,7 +14,6 @@ import { UsersService } from '../../services/users.js';
 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 { getMilliseconds } from '../../utils/get-milliseconds.js';
 import { Url } from '../../utils/url.js';
 import { BaseOAuthDriver } from './baseoauth.js';
 export class OpenIDAuthDriver extends BaseOAuthDriver {
@@ -211,13 +211,7 @@ export function createOpenIDAuthRouter(providerName) {
         }
         const { accessToken, refreshToken, expires } = authResponse;
         if (redirect) {
-            res.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], 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.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
             return res.redirect(redirect);
         }
         res.locals['payload'] = {

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 { COOKIE_OPTIONS } from '../../constants.js';
+import { COOKIE_OPTIONS, GET_SET_HEADER } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import emitter from '../../emitter.js';
 import env from '../../env.js';
@@ -121,7 +121,7 @@ export function createSAMLAuthRouter(providerName) {
                 },
             };
             if (relayState) {
-                res.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, COOKIE_OPTIONS);
+                res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
                 return res.redirect(relayState);
             }
             return next();

package/dist/constants.d.ts

@@ -9,6 +9,7 @@ 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 GET_SET_HEADER: (cookieValue: string) => string;
 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

@@ -55,6 +55,12 @@ export const COOKIE_OPTIONS = {
     secure: env['REFRESH_TOKEN_COOKIE_SECURE'] ?? false,
     sameSite: env['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict',
 };
+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}`;
+    return cookieHeaderValue;
+};
 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 { COOKIE_OPTIONS, DEFAULT_AUTH_PROVIDER } from '../constants.js';
+import { DEFAULT_AUTH_PROVIDER, GET_SET_HEADER } from '../constants.js';
 import env from '../env.js';
 import { InvalidPayloadException } from '../exceptions/index.js';
 import logger from '../logger.js';
@@ -68,7 +68,7 @@ router.post('/refresh', asyncHandler(async (req, res, next) => {
         payload['data']['refresh_token'] = refreshToken;
     }
     if (mode === 'cookie') {
-        res.cookie(env['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, COOKIE_OPTIONS);
+        res.setHeader('Set-Cookie', GET_SET_HEADER(refreshToken));
     }
     res.locals['payload'] = payload;
     return next();

package/dist/controllers/shares.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbce-d9/api",
-  "version": "10.0.0",
+  "version": "10.3.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -144,19 +144,19 @@
     "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/extensions-sdk": "9.26.5",
     "@wbce-d9/storage": "9.26.3",
-    "@wbce-d9/constants": "9.26.3",
-    "@wbce-d9/storage-driver-azure": "9.26.5",
-    "@wbce-d9/storage-driver-gcs": "9.26.5",
-    "@wbce-d9/storage-driver-local": "9.26.5",
     "@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/utils": "9.28.0",
+    "@wbce-d9/storage-driver-local": "9.26.5"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",