directus 9.2.2 → 9.4.2

package/dist/app.js

@@ -27,6 +27,7 @@ const express_1 = __importDefault(require("express"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const qs_1 = __importDefault(require("qs"));
+const helmet_1 = __importDefault(require("helmet"));
 const activity_1 = __importDefault(require("./controllers/activity"));
 const assets_1 = __importDefault(require("./controllers/assets"));
 const auth_1 = __importDefault(require("./controllers/auth"));
@@ -51,6 +52,7 @@ const settings_1 = __importDefault(require("./controllers/settings"));
 const users_1 = __importDefault(require("./controllers/users"));
 const utils_1 = __importDefault(require("./controllers/utils"));
 const webhooks_1 = __importDefault(require("./controllers/webhooks"));
+const shares_1 = __importDefault(require("./controllers/shares"));
 const database_1 = require("./database");
 const emitter_1 = __importDefault(require("./emitter"));
 const env_1 = __importDefault(require("./env"));
@@ -74,6 +76,8 @@ const webhooks_2 = require("./webhooks");
 const cache_2 = require("./cache");
 const auth_2 = require("./auth");
 const url_1 = require("./utils/url");
+const get_config_from_env_1 = require("./utils/get-config-from-env");
+const lodash_1 = require("lodash");
 async function createApp() {
     (0, validate_env_1.validateEnv)(['KEY', 'SECRET']);
     if (!new url_1.Url(env_1.default.PUBLIC_URL).isAbsolute()) {
@@ -95,8 +99,15 @@ async function createApp() {
     await extensionManager.initialize();
     const app = (0, express_1.default)();
     app.disable('x-powered-by');
-    app.set('trust proxy', true);
+    app.set('trust proxy', env_1.default.IP_TRUST_PROXY);
     app.set('query parser', (str) => qs_1.default.parse(str, { depth: 10 }));
+    app.use(helmet_1.default.contentSecurityPolicy((0, lodash_1.merge)({
+        useDefaults: true,
+        directives: {
+            // Unsafe-eval is required for vue3 / vue-i18n / app extensions
+            scriptSrc: ["'self'", "'unsafe-eval'"],
+        },
+    }, (0, get_config_from_env_1.getConfigFromEnv)('CONTENT_SECURITY_POLICY_'))));
     await emitter_1.default.emitInit('app.before', { app });
     await emitter_1.default.emitInit('middlewares.before', { app });
     app.use(logger_1.expressLogger);
@@ -112,14 +123,14 @@ async function createApp() {
     });
     app.use((0, cookie_parser_1.default)());
     app.use(extract_token_1.default);
-    app.use((req, res, next) => {
+    app.use((_req, res, next) => {
         res.setHeader('X-Powered-By', 'Directus');
         next();
     });
     if (env_1.default.CORS_ENABLED === true) {
         app.use(cors_1.default);
     }
-    app.get('/', (req, res, next) => {
+    app.get('/', (_req, res, next) => {
         if (env_1.default.ROOT_REDIRECT) {
             res.redirect(env_1.default.ROOT_REDIRECT);
         }
@@ -133,7 +144,7 @@ async function createApp() {
         // Set the App's base path according to the APIs public URL
         const html = await fs_extra_1.default.readFile(adminPath, 'utf8');
         const htmlWithBase = html.replace(/<base \/>/, `<base href="${adminUrl.toString({ rootRelative: true })}/" />`);
-        const noCacheIndexHtmlHandler = (req, res) => {
+        const noCacheIndexHtmlHandler = (_req, res) => {
             res.setHeader('Cache-Control', 'no-cache');
             res.send(htmlWithBase);
         };
@@ -173,6 +184,7 @@ async function createApp() {
     app.use('/roles', roles_1.default);
     app.use('/server', server_1.default);
     app.use('/settings', settings_1.default);
+    app.use('/shares', shares_1.default);
     app.use('/users', users_1.default);
     app.use('/utils', utils_1.default);
     app.use('/webhooks', webhooks_1.default);

package/dist/auth/auth.d.ts

@@ -1,5 +1,5 @@
 import { Knex } from 'knex';
-import { AuthDriverOptions, SchemaOverview, User, SessionData } from '../types';
+import { AuthDriverOptions, SchemaOverview, User } from '../types';
 export declare abstract class AuthDriver {
     knex: Knex;
     schema: SchemaOverview;
@@ -28,20 +28,18 @@ export declare abstract class AuthDriver {
      * @throws InvalidCredentialsException
      * @returns Data to be stored with the session
      */
-    login(_user: User, _payload: Record<string, any>): Promise<SessionData>;
+    login(_user: User, _payload: Record<string, any>): Promise<void>;
     /**
      * Handle user session refresh
      *
      * @param _user User information
-     * @param _sessionData Session data
      * @throws InvalidCredentialsException
      */
-    refresh(_user: User, sessionData: SessionData): Promise<SessionData>;
+    refresh(_user: User): Promise<void>;
     /**
      * Handle user session termination
      *
      * @param _user User information
-     * @param _sessionData Session data
      */
-    logout(_user: User, _sessionData: SessionData): Promise<void>;
+    logout(_user: User): Promise<void>;
 }

package/dist/auth/auth.js

@@ -15,28 +15,24 @@ class AuthDriver {
      * @returns Data to be stored with the session
      */
     async login(_user, _payload) {
-        /* Optional, though should probably be set */
-        return null;
+        return;
     }
     /**
      * Handle user session refresh
      *
      * @param _user User information
-     * @param _sessionData Session data
      * @throws InvalidCredentialsException
      */
-    async refresh(_user, sessionData) {
-        /* Optional */
-        return sessionData;
+    async refresh(_user) {
+        return;
     }
     /**
      * Handle user session termination
      *
      * @param _user User information
-     * @param _sessionData Session data
      */
-    async logout(_user, _sessionData) {
-        /* Optional */
+    async logout(_user) {
+        return;
     }
 }
 exports.AuthDriver = AuthDriver;

package/dist/auth/drivers/ldap.d.ts

@@ -1,7 +1,7 @@
 import { Router } from 'express';
 import { Client } from 'ldapjs';
 import { AuthDriver } from '../auth';
-import { AuthDriverOptions, User, SessionData } from '../../types';
+import { AuthDriverOptions, User } from '../../types';
 import { UsersService } from '../../services';
 export declare class LDAPAuthDriver extends AuthDriver {
     bindClient: Client;
@@ -15,7 +15,7 @@ export declare class LDAPAuthDriver extends AuthDriver {
     private fetchUserId;
     getUserID(payload: Record<string, any>): Promise<string>;
     verify(user: User, password?: string): Promise<void>;
-    login(user: User, payload: Record<string, any>): Promise<SessionData>;
-    refresh(user: User): Promise<SessionData>;
+    login(user: User, payload: Record<string, any>): Promise<void>;
+    refresh(user: User): Promise<void>;
 }
 export declare function createLDAPAuthRouter(provider: string): Router;

package/dist/auth/drivers/ldap.js

@@ -26,6 +26,7 @@ exports.createLDAPAuthRouter = exports.LDAPAuthDriver = void 0;
 const express_1 = require("express");
 const ldapjs_1 = __importStar(require("ldapjs"));
 const ms_1 = __importDefault(require("ms"));
+const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
 const joi_1 = __importDefault(require("joi"));
 const auth_1 = require("../auth");
 const exceptions_1 = require("../../exceptions");
@@ -260,7 +261,6 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
     }
     async login(user, payload) {
         await this.verify(user, payload.password);
-        return null;
     }
     async refresh(user) {
         await this.validateBindClient();
@@ -268,7 +268,6 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
         if ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.userAccountControl) && userInfo.userAccountControl & INVALID_ACCOUNT_FLAGS) {
             throw new exceptions_1.InvalidCredentialsException();
         }
-        return null;
     }
 }
 exports.LDAPAuthDriver = LDAPAuthDriver;
@@ -294,7 +293,7 @@ function createLDAPAuthRouter(provider) {
     router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
         var _a, _b;
         const accountability = {
-            ip: req.ip,
+            ip: (0, get_ip_from_req_1.getIPFromReq)(req),
             userAgent: req.get('user-agent'),
             role: null,
         };

package/dist/auth/drivers/local.d.ts

@@ -1,9 +1,9 @@
 import { Router } from 'express';
 import { AuthDriver } from '../auth';
-import { User, SessionData } from '../../types';
+import { User } from '../../types';
 export declare class LocalAuthDriver extends AuthDriver {
     getUserID(payload: Record<string, any>): Promise<string>;
     verify(user: User, password?: string): Promise<void>;
-    login(user: User, payload: Record<string, any>): Promise<SessionData>;
+    login(user: User, payload: Record<string, any>): Promise<void>;
 }
 export declare function createLocalAuthRouter(provider: string): Router;

package/dist/auth/drivers/local.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLocalAuthRouter = exports.LocalAuthDriver = void 0;
 const express_1 = require("express");
 const argon2_1 = __importDefault(require("argon2"));
-const ms_1 = __importDefault(require("ms"));
 const joi_1 = __importDefault(require("joi"));
 const auth_1 = require("../auth");
 const exceptions_1 = require("../../exceptions");
@@ -14,6 +13,8 @@ const services_1 = require("../../services");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const env_1 = __importDefault(require("../../env"));
 const respond_1 = require("../../middleware/respond");
+const constants_1 = require("../../constants");
+const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
 class LocalAuthDriver extends auth_1.AuthDriver {
     async getUserID(payload) {
         if (!payload.email) {
@@ -36,22 +37,21 @@ class LocalAuthDriver extends auth_1.AuthDriver {
     }
     async login(user, payload) {
         await this.verify(user, payload.password);
-        return null;
     }
 }
 exports.LocalAuthDriver = LocalAuthDriver;
 function createLocalAuthRouter(provider) {
     const router = (0, express_1.Router)();
-    const loginSchema = joi_1.default.object({
+    const userLoginSchema = joi_1.default.object({
         email: joi_1.default.string().email().required(),
         password: joi_1.default.string().required(),
         mode: joi_1.default.string().valid('cookie', 'json'),
         otp: joi_1.default.string(),
     }).unknown();
     router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
-        var _a, _b;
+        var _a;
         const accountability = {
-            ip: req.ip,
+            ip: (0, get_ip_from_req_1.getIPFromReq)(req),
             userAgent: req.get('user-agent'),
             role: null,
         };
@@ -59,7 +59,7 @@ function createLocalAuthRouter(provider) {
             accountability: accountability,
             schema: req.schema,
         });
-        const { error } = loginSchema.validate(req.body);
+        const { error } = userLoginSchema.validate(req.body);
         if (error) {
             throw new exceptions_1.InvalidPayloadException(error.message);
         }
@@ -72,13 +72,7 @@ function createLocalAuthRouter(provider) {
             payload.data.refresh_token = refreshToken;
         }
         if (mode === 'cookie') {
-            res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, {
-                httpOnly: true,
-                domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-                maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
-                secure: (_b = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _b !== void 0 ? _b : false,
-                sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
-            });
+            res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, constants_1.COOKIE_OPTIONS);
         }
         res.locals.payload = payload;
         return next();

package/dist/auth/drivers/oauth2.d.ts

@@ -2,7 +2,7 @@ import { Router } from 'express';
 import { Client } from 'openid-client';
 import { LocalAuthDriver } from './local';
 import { UsersService } from '../../services';
-import { AuthDriverOptions, User, SessionData } from '../../types';
+import { AuthDriverOptions, User } from '../../types';
 export declare class OAuth2AuthDriver extends LocalAuthDriver {
     client: Client;
     redirectUrl: string;
@@ -13,7 +13,7 @@ export declare class OAuth2AuthDriver extends LocalAuthDriver {
     generateAuthUrl(codeVerifier: string, prompt?: boolean): string;
     private fetchUserId;
     getUserID(payload: Record<string, any>): Promise<string>;
-    login(user: User): Promise<SessionData>;
-    refresh(user: User, sessionData: SessionData): Promise<SessionData>;
+    login(user: User): Promise<void>;
+    refresh(user: User): Promise<void>;
 }
 export declare function createOAuth2AuthRouter(providerName: string): Router;

package/dist/auth/drivers/oauth2.js

@@ -17,6 +17,7 @@ const respond_1 = require("../../middleware/respond");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const url_1 = require("../../utils/url");
 const logger_1 = __importDefault(require("../../logger"));
+const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
 class OAuth2AuthDriver extends local_1.LocalAuthDriver {
     constructor(options, config) {
         super(options, config);
@@ -130,9 +131,9 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
         return (await this.fetchUserId(identifier));
     }
     async login(user) {
-        return this.refresh(user, null);
+        return this.refresh(user);
     }
-    async refresh(user, sessionData) {
+    async refresh(user) {
         let authData = user.auth_data;
         if (typeof authData === 'string') {
             try {
@@ -156,7 +157,6 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
                 throw handleError(e);
             }
         }
-        return sessionData;
     }
 }
 exports.OAuth2AuthDriver = OAuth2AuthDriver;
@@ -211,7 +211,7 @@ function createOAuth2AuthRouter(providerName) {
         const { verifier, redirect, prompt } = tokenData;
         const authenticationService = new services_1.AuthenticationService({
             accountability: {
-                ip: req.ip,
+                ip: (0, get_ip_from_req_1.getIPFromReq)(req),
                 userAgent: req.get('user-agent'),
                 role: null,
             },

package/dist/auth/drivers/openid.d.ts

@@ -2,7 +2,7 @@ import { Router } from 'express';
 import { Client } from 'openid-client';
 import { LocalAuthDriver } from './local';
 import { UsersService } from '../../services';
-import { AuthDriverOptions, User, SessionData } from '../../types';
+import { AuthDriverOptions, User } from '../../types';
 export declare class OpenIDAuthDriver extends LocalAuthDriver {
     client: Promise<Client>;
     redirectUrl: string;
@@ -13,7 +13,7 @@ export declare class OpenIDAuthDriver extends LocalAuthDriver {
     generateAuthUrl(codeVerifier: string, prompt?: boolean): Promise<string>;
     private fetchUserId;
     getUserID(payload: Record<string, any>): Promise<string>;
-    login(user: User): Promise<SessionData>;
-    refresh(user: User, sessionData: SessionData): Promise<SessionData>;
+    login(user: User): Promise<void>;
+    refresh(user: User): Promise<void>;
 }
 export declare function createOpenIDAuthRouter(providerName: string): Router;

package/dist/auth/drivers/openid.js

@@ -17,6 +17,7 @@ const respond_1 = require("../../middleware/respond");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const url_1 = require("../../utils/url");
 const logger_1 = __importDefault(require("../../logger"));
+const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
 class OpenIDAuthDriver extends local_1.LocalAuthDriver {
     constructor(options, config) {
         super(options, config);
@@ -135,9 +136,9 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
         return (await this.fetchUserId(identifier));
     }
     async login(user) {
-        return this.refresh(user, null);
+        return this.refresh(user);
     }
-    async refresh(user, sessionData) {
+    async refresh(user) {
         let authData = user.auth_data;
         if (typeof authData === 'string') {
             try {
@@ -162,7 +163,6 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
                 throw handleError(e);
             }
         }
-        return sessionData;
     }
 }
 exports.OpenIDAuthDriver = OpenIDAuthDriver;
@@ -213,7 +213,7 @@ function createOpenIDAuthRouter(providerName) {
         const { verifier, redirect, prompt } = tokenData;
         const authenticationService = new services_1.AuthenticationService({
             accountability: {
-                ip: req.ip,
+                ip: (0, get_ip_from_req_1.getIPFromReq)(req),
                 userAgent: req.get('user-agent'),
                 role: null,
             },

package/dist/cache.js

@@ -49,9 +49,7 @@ function getConfig(store = 'memory', ttl, namespaceSuffix = '') {
     };
     if (store === 'redis') {
         const KeyvRedis = require('@keyv/redis');
-        config.store = new KeyvRedis(env_1.default.CACHE_REDIS || (0, get_config_from_env_1.getConfigFromEnv)('CACHE_REDIS_'), {
-            commandTimeout: 500,
-        });
+        config.store = new KeyvRedis(env_1.default.CACHE_REDIS || (0, get_config_from_env_1.getConfigFromEnv)('CACHE_REDIS_'));
     }
     if (store === 'memcache') {
         const KeyvMemcache = require('keyv-memcache');

package/dist/cli/commands/bootstrap/index.js

@@ -30,6 +30,7 @@ const logger_1 = __importDefault(require("../../../logger"));
 const get_schema_1 = require("../../../utils/get-schema");
 const services_1 = require("../../../services");
 const database_1 = __importStar(require("../../../database"));
+const defaults_1 = require("../../utils/defaults");
 async function bootstrap({ skipAdminInit }) {
     logger_1.default.info('Initializing bootstrap...');
     const database = (0, database_1.default)();
@@ -75,7 +76,7 @@ async function waitForDatabase(database) {
 async function createDefaultAdmin(schema) {
     logger_1.default.info('Setting up first admin role...');
     const rolesService = new services_1.RolesService({ schema });
-    const role = await rolesService.createOne({ name: 'Admin', admin_access: true });
+    const role = await rolesService.createOne(defaults_1.defaultAdminRole);
     logger_1.default.info('Adding first admin user...');
     const usersService = new services_1.UsersService({ schema });
     let adminEmail = env_1.default.ADMIN_EMAIL;
@@ -88,5 +89,5 @@ async function createDefaultAdmin(schema) {
         adminPassword = (0, nanoid_1.nanoid)(12);
         logger_1.default.info(`No admin password provided. Defaulting to "${adminPassword}"`);
     }
-    await usersService.createOne({ email: adminEmail, password: adminPassword, role });
+    await usersService.createOne({ email: adminEmail, password: adminPassword, role, ...defaults_1.defaultAdminUser });
 }

package/dist/cli/commands/init/index.js

@@ -15,6 +15,7 @@ const create_env_1 = __importDefault(require("../../utils/create-env"));
 const drivers_1 = require("../../utils/drivers");
 const questions_1 = require("./questions");
 const generate_hash_1 = require("../../../utils/generate-hash");
+const defaults_1 = require("../../utils/defaults");
 async function init() {
     const rootPath = process.cwd();
     const { client } = await inquirer_1.default.prompt([
@@ -79,19 +80,14 @@ async function init() {
     const roleID = (0, uuid_1.v4)();
     await db('directus_roles').insert({
         id: roleID,
-        name: 'Administrator',
-        icon: 'verified',
-        admin_access: true,
-        description: 'Initial administrative role with unrestricted App/API access',
+        ...defaults_1.defaultAdminRole,
     });
     await db('directus_users').insert({
         id: userID,
-        status: 'active',
         email: firstUser.email,
         password: firstUser.password,
-        first_name: 'Admin',
-        last_name: 'User',
         role: roleID,
+        ...defaults_1.defaultAdminUser,
     });
     await db.destroy();
     process.stdout.write(`\nYour project has been created at ${chalk_1.default.green(rootPath)}.\n`);

package/dist/cli/commands/schema/apply.js

@@ -135,7 +135,7 @@ async function apply(snapshotPath, options) {
                     else {
                         continue;
                     }
-                    // Related collection doesn't exist for m2a relationship types
+                    // Related collection doesn't exist for a2o relationship types
                     if (related_collection) {
                         message += `-> ${related_collection}`;
                     }

package/dist/cli/utils/defaults.d.ts

@@ -0,0 +1,11 @@
+export declare const defaultAdminRole: {
+    name: string;
+    icon: string;
+    admin_access: boolean;
+    description: string;
+};
+export declare const defaultAdminUser: {
+    status: string;
+    first_name: string;
+    last_name: string;
+};

package/dist/cli/utils/defaults.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultAdminUser = exports.defaultAdminRole = void 0;
+exports.defaultAdminRole = {
+    name: 'Administrator',
+    icon: 'verified',
+    admin_access: true,
+    description: '$t:admin_description',
+};
+exports.defaultAdminUser = {
+    status: 'active',
+    first_name: 'Admin',
+    last_name: 'User',
+};

package/dist/constants.d.ts

@@ -5,3 +5,11 @@ export declare const FILTER_VARIABLES: string[];
 export declare const ALIAS_TYPES: string[];
 export declare const DEFAULT_AUTH_PROVIDER = "default";
 export declare const COLUMN_TRANSFORMS: 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: {
+    httpOnly: boolean;
+    domain: any;
+    maxAge: number;
+    secure: any;
+    sameSite: "lax" | "strict" | "none";
+};

package/dist/constants.js

@@ -1,6 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
+exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
+const env_1 = __importDefault(require("./env"));
+const ms_1 = __importDefault(require("ms"));
 exports.SYSTEM_ASSET_ALLOW_LIST = [
     {
         key: 'system-small-cover',
@@ -38,6 +44,14 @@ exports.ASSET_TRANSFORM_QUERY_KEYS = [
     'withoutEnlargement',
 ];
 exports.FILTER_VARIABLES = ['$NOW', '$CURRENT_USER', '$CURRENT_ROLE'];
-exports.ALIAS_TYPES = ['alias', 'o2m', 'm2m', 'm2a', 'files', 'translations'];
+exports.ALIAS_TYPES = ['alias', 'o2m', 'm2m', 'm2a', 'o2a', 'files', 'translations'];
 exports.DEFAULT_AUTH_PROVIDER = 'default';
 exports.COLUMN_TRANSFORMS = ['year', 'month', 'day', 'weekday', 'hour', 'minute', 'second'];
+exports.UUID_REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
+exports.COOKIE_OPTIONS = {
+    httpOnly: true,
+    domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
+    maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
+    secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
+    sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
+};

package/dist/controllers/activity.js

@@ -12,6 +12,7 @@ const validate_batch_1 = require("../middleware/validate-batch");
 const services_1 = require("../services");
 const types_1 = require("../types");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const get_ip_from_req_1 = require("../utils/get-ip-from-req");
 const router = express_1.default.Router();
 router.use((0, use_collection_1.default)('directus_activity'));
 const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
@@ -72,7 +73,7 @@ router.post('/comment', (0, async_handler_1.default)(async (req, res, next) => {
         ...req.body,
         action: types_1.Action.COMMENT,
         user: (_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user,
-        ip: req.ip,
+        ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         user_agent: req.get('user-agent'),
     });
     try {

package/dist/controllers/auth.js

@@ -14,6 +14,7 @@ const get_auth_providers_1 = require("../utils/get-auth-providers");
 const logger_1 = __importDefault(require("../logger"));
 const drivers_1 = require("../auth/drivers");
 const constants_1 = require("../constants");
+const get_ip_from_req_1 = require("../utils/get-ip-from-req");
 const router = (0, express_1.Router)();
 const authProviders = (0, get_auth_providers_1.getAuthProviders)();
 for (const authProvider of authProviders) {
@@ -44,7 +45,7 @@ if (!env_1.default.AUTH_DISABLE_DEFAULT) {
 router.post('/refresh', (0, async_handler_1.default)(async (req, res, next) => {
     var _a;
     const accountability = {
-        ip: req.ip,
+        ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
         role: null,
     };
@@ -79,7 +80,7 @@ router.post('/refresh', (0, async_handler_1.default)(async (req, res, next) => {
 router.post('/logout', (0, async_handler_1.default)(async (req, res, next) => {
     var _a;
     const accountability = {
-        ip: req.ip,
+        ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
         role: null,
     };
@@ -107,7 +108,7 @@ router.post('/password/request', (0, async_handler_1.default)(async (req, res, n
         throw new exceptions_1.InvalidPayloadException(`"email" field is required.`);
     }
     const accountability = {
-        ip: req.ip,
+        ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
         role: null,
     };
@@ -134,7 +135,7 @@ router.post('/password/reset', (0, async_handler_1.default)(async (req, res, nex
         throw new exceptions_1.InvalidPayloadException(`"password" field is required.`);
     }
     const accountability = {
-        ip: req.ip,
+        ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
         role: null,
     };

package/dist/controllers/shares.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;