@directus/api 35.0.2 → 35.1.0

package/dist/auth/drivers/openid.js

@@ -33,17 +33,14 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 		super(options, config);
 		const logger = useLogger();
 		const { issuerUrl, clientId, clientSecret, clientPrivateKeys, clientTokenEndpointAuthMethod, provider, issuerDiscoveryMustSucceed } = config;
-		const isPrivateKeyJwtAuthMethod = clientTokenEndpointAuthMethod === "private_key_jwt";
-		if (!issuerUrl || !clientId || !(clientSecret || isPrivateKeyJwtAuthMethod && clientPrivateKeys) || !provider) {
+		if (!issuerUrl || !clientId || !(clientSecret || clientTokenEndpointAuthMethod === "private_key_jwt" && clientPrivateKeys) || !provider) {
 			logger.error("Invalid provider config");
 			throw new InvalidProviderConfigError({ provider });
 		}
 		this.config = config;
 		this.roleMap = {};
 		const roleMapping = this.config["roleMapping"];
-		if (roleMapping) {
-			this.roleMap = roleMapping;
-		}
+		if (roleMapping) this.roleMap = roleMapping;
 		if (roleMapping instanceof Array) {
 			logger.error("[OpenID] Expected a JSON-Object as role mapping, got an Array instead. Make sure you declare the variable with 'json:' prefix.");
 			throw new InvalidProviderError();
@@ -63,17 +60,14 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 		const { issuerUrl, clientId, clientSecret, clientPrivateKeys, clientTokenEndpointAuthMethod, provider } = this.config;
 		const isPrivateKeyJwtAuthMethod = clientTokenEndpointAuthMethod === "private_key_jwt";
 		const clientHttpOptions = getConfigFromEnv(`AUTH_${provider.toUpperCase()}_CLIENT_HTTP_`);
-		if (clientHttpOptions) {
-			Issuer[custom.http_options] = (_, options) => {
-				return {
-					...options,
-					...clientHttpOptions
-				};
+		if (clientHttpOptions) Issuer[custom.http_options] = (_, options) => {
+			return {
+				...options,
+				...clientHttpOptions
 			};
-		}
+		};
 		const issuer = await Issuer.discover(issuerUrl);
-		const supportedTypes = issuer.metadata["response_types_supported"];
-		if (!supportedTypes?.includes("code")) {
+		if (!issuer.metadata["response_types_supported"]?.includes("code")) {
 			logger.error("OpenID provider does not support required code flow");
 			throw new InvalidProviderConfigError({ provider });
 		}
@@ -91,15 +85,13 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 			...!isPrivateKeyJwtAuthMethod && { client_secret: clientSecret },
 			response_types: ["code"],
 			...clientOptionsOverrides
-		}, isPrivateKeyJwtAuthMethod ? { keys: clientPrivateKeys } : undefined);
-		if (clientHttpOptions) {
-			client[custom.http_options] = (_, options) => {
-				return {
-					...options,
-					...clientHttpOptions
-				};
+		}, isPrivateKeyJwtAuthMethod ? { keys: clientPrivateKeys } : void 0);
+		if (clientHttpOptions) client[custom.http_options] = (_, options) => {
+			return {
+				...options,
+				...clientHttpOptions
 			};
-		}
+		};
 		this.client = client;
 		return client;
 	}
@@ -115,7 +107,7 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 			return client.authorizationUrl({
 				scope: this.config["scope"] ?? "openid profile email",
 				access_type: "offline",
-				prompt: prompt ? "consent" : undefined,
+				prompt: prompt ? "consent" : void 0,
 				...paramsConfig,
 				code_challenge: codeChallenge,
 				code_challenge_method: plainCodeChallenge ? "plain" : "S256",
@@ -128,8 +120,7 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 		}
 	}
 	async fetchUserId(identifier) {
-		const user = await this.knex.select("id").from("directus_users").whereRaw("LOWER(??) = ?", ["external_identifier", identifier.toLowerCase()]).first();
-		return user?.id;
+		return (await this.knex.select("id").from("directus_users").whereRaw("LOWER(??) = ?", ["external_identifier", identifier.toLowerCase()]).first())?.id;
 	}
 	async getUserID(payload) {
 		const logger = useLogger();
@@ -153,12 +144,10 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 				nonce: codeChallenge
 			});
 			userInfo = tokenSet.claims();
-			if (client.issuer.metadata["userinfo_endpoint"]) {
-				userInfo = {
-					...userInfo,
-					...await client.userinfo(tokenSet.access_token)
-				};
-			}
+			if (client.issuer.metadata["userinfo_endpoint"]) userInfo = {
+				...userInfo,
+				...await client.userinfo(tokenSet.access_token)
+			};
 		} catch (e) {
 			throw handleError(e);
 		}
@@ -166,18 +155,14 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 		const groupClaimName = this.config["groupClaimName"] ?? "groups";
 		const groups = userInfo[groupClaimName] ? toArray(userInfo[groupClaimName]) : [];
 		if (groups.length > 0) {
-			for (const key in this.roleMap) {
-				if (groups.includes(key)) {
-					role = this.roleMap[key];
-					break;
-				}
+			for (const key in this.roleMap) if (groups.includes(key)) {
+				role = this.roleMap[key];
+				break;
 			}
-		} else if (Object.keys(this.roleMap).length > 0) {
-			logger.debug(`[OpenID] Configured group claim with name "${groupClaimName}" does not exist or is empty.`);
-		}
+		} else if (Object.keys(this.roleMap).length > 0) logger.debug(`[OpenID] Configured group claim with name "${groupClaimName}" does not exist or is empty.`);
 		userInfo = flatten(userInfo);
 		const { provider, identifierKey, allowPublicRegistration, requireVerifiedEmail, syncUserInfo } = this.config;
-		const email = userInfo["email"] ? String(userInfo["email"]) : undefined;
+		const email = userInfo["email"] ? String(userInfo["email"]) : void 0;
 		const identifier = userInfo[identifierKey ?? "sub"] ? String(userInfo[identifierKey ?? "sub"]) : email;
 		if (!identifier) {
 			logger.warn(`[OpenID] Failed to find user identifier for provider "${provider}"`);
@@ -195,17 +180,13 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 		const userId = await this.fetchUserId(identifier);
 		if (userId) {
 			let emitPayload = { auth_data: userPayload.auth_data };
-			if (this.config["roleMapping"]) {
-				emitPayload["role"] = role;
-			}
-			if (syncUserInfo) {
-				emitPayload = {
-					...emitPayload,
-					first_name: userPayload.first_name,
-					last_name: userPayload.last_name,
-					email: userPayload.email
-				};
-			}
+			if (this.config["roleMapping"]) emitPayload["role"] = role;
+			if (syncUserInfo) emitPayload = {
+				...emitPayload,
+				first_name: userPayload.first_name,
+				last_name: userPayload.last_name,
+				email: userPayload.email
+			};
 			const schema$1 = await getSchema();
 			const updatedUserPayload$1 = await emitter_default.emitFilter(`auth.update`, emitPayload, {
 				identifier,
@@ -220,10 +201,7 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 				schema: schema$1,
 				accountability: null
 			});
-			if (Object.values(updatedUserPayload$1).some((value) => value !== undefined)) {
-				const usersService = this.getUsersService(schema$1);
-				await usersService.updateOne(userId, updatedUserPayload$1);
-			}
+			if (Object.values(updatedUserPayload$1).some((value) => value !== void 0)) await this.getUsersService(schema$1).updateOne(userId, updatedUserPayload$1);
 			return userId;
 		}
 		const isEmailVerified = !requireVerifiedEmail || userInfo["email_verified"];
@@ -246,8 +224,7 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 			accountability: null
 		});
 		try {
-			const usersService = this.getUsersService(schema);
-			await usersService.createOne(updatedUserPayload);
+			await this.getUsersService(schema).createOne(updatedUserPayload);
 		} catch (e) {
 			if (isDirectusError(e, ErrorCode.RecordNotUnique)) {
 				logger.warn(e, "[OpenID] Failed to register user. User not unique");
@@ -263,24 +240,16 @@ var OpenIDAuthDriver = class extends LocalAuthDriver {
 	async refresh(user) {
 		const logger = useLogger();
 		let authData = user.auth_data;
-		if (typeof authData === "string") {
-			try {
-				authData = parseJSON(authData);
-			} catch {
-				logger.warn(`[OpenID] Session data isn't valid JSON: ${authData}`);
-			}
+		if (typeof authData === "string") try {
+			authData = parseJSON(authData);
+		} catch {
+			logger.warn(`[OpenID] Session data isn't valid JSON: ${authData}`);
 		}
-		if (authData?.["refreshToken"]) {
-			try {
-				const client = await this.getClient();
-				const tokenSet = await client.refresh(authData["refreshToken"]);
-				if (tokenSet.refresh_token) {
-					const usersService = this.getUsersService(await getSchema());
-					await usersService.updateOne(user.id, { auth_data: JSON.stringify({ refreshToken: tokenSet.refresh_token }) });
-				}
-			} catch (e) {
-				throw handleError(e);
-			}
+		if (authData?.["refreshToken"]) try {
+			const tokenSet = await (await this.getClient()).refresh(authData["refreshToken"]);
+			if (tokenSet.refresh_token) await this.getUsersService(await getSchema()).updateOne(user.id, { auth_data: JSON.stringify({ refreshToken: tokenSet.refresh_token }) });
+		} catch (e) {
+			throw handleError(e);
 		}
 	}
 };
@@ -380,17 +349,12 @@ function createOpenIDAuthRouter(providerName) {
 				...otp ? { otp: String(otp) } : {}
 			});
 		} catch (error) {
-			if (isDirectusError(error, ErrorCode.InvalidToken) && !prompt) {
-				return res.redirect(`./?${redirect ? `redirect=${redirect}&` : ""}prompt=true`);
-			}
+			if (isDirectusError(error, ErrorCode.InvalidToken) && !prompt) return res.redirect(`./?${redirect ? `redirect=${redirect}&` : ""}prompt=true`);
 			logger.warn(error);
 			if (redirect) {
 				let reason = "UNKNOWN_EXCEPTION";
-				if (isDirectusError(error)) {
-					reason = error.code;
-				} else {
-					logger.warn(error, `[OpenID] Unexpected error during OpenID login`);
-				}
+				if (isDirectusError(error)) reason = error.code;
+				else logger.warn(error, `[OpenID] Unexpected error during OpenID login`);
 				return res.redirect(`${redirect.split("?")[0]}?reason=${reason}`);
 			}
 			logger.warn(error, `[OpenID] Unexpected error during OpenID login`);
@@ -398,8 +362,7 @@ function createOpenIDAuthRouter(providerName) {
 		}
 		const { accessToken, refreshToken, expires } = authResponse;
 		try {
-			const claims = verifyJWT(accessToken, getSecret());
-			if (claims?.enforce_tfa === true) {
+			if (verifyJWT(accessToken, getSecret())?.enforce_tfa === true) {
 				const url = new Url(env$1["PUBLIC_URL"]).addPath("admin", "tfa-setup");
 				if (redirect) {
 					url.setQuery("redirect", redirect);
@@ -411,11 +374,8 @@ function createOpenIDAuthRouter(providerName) {
 			logger.warn(e, `[OpenID] Unexpected error during OpenID login`);
 		}
 		if (redirect) {
-			if (authMode === "session") {
-				res.cookie(env$1["SESSION_COOKIE_NAME"], accessToken, SESSION_COOKIE_OPTIONS);
-			} else {
-				res.cookie(env$1["REFRESH_TOKEN_COOKIE_NAME"], refreshToken, REFRESH_COOKIE_OPTIONS);
-			}
+			if (authMode === "session") res.cookie(env$1["SESSION_COOKIE_NAME"], accessToken, SESSION_COOKIE_OPTIONS);
+			else res.cookie(env$1["REFRESH_TOKEN_COOKIE_NAME"], refreshToken, REFRESH_COOKIE_OPTIONS);
 			return res.redirect(redirect);
 		}
 		res.locals["payload"] = { data: {

package/dist/auth/drivers/saml.js

@@ -29,8 +29,7 @@ var SAMLAuthDriver = class extends LocalAuthDriver {
 		this.idp = samlify.IdentityProvider(getConfigFromEnv(`AUTH_${config["provider"].toUpperCase()}_IDP`));
 	}
 	async fetchUserID(identifier) {
-		const user = await this.knex.select("id").from("directus_users").whereRaw("LOWER(??) = ?", ["external_identifier", identifier.toLowerCase()]).first();
-		return user?.id;
+		return (await this.knex.select("id").from("directus_users").whereRaw("LOWER(??) = ?", ["external_identifier", identifier.toLowerCase()]).first())?.id;
 	}
 	async getUserID(payload) {
 		const logger = useLogger();
@@ -47,12 +46,10 @@ var SAMLAuthDriver = class extends LocalAuthDriver {
 			logger.warn(`[SAML] User doesn't exist, and public registration not allowed for provider "${provider}"`);
 			throw new InvalidCredentialsError();
 		}
-		const firstName = payload[givenNameKey ?? "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"];
-		const lastName = payload[familyNameKey ?? "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"];
 		const userPayload = {
 			provider,
-			first_name: firstName,
-			last_name: lastName,
+			first_name: payload[givenNameKey ?? "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"],
+			last_name: payload[familyNameKey ?? "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"],
 			email,
 			external_identifier: identifier.toLowerCase(),
 			role: this.config["defaultRoleId"]
@@ -68,8 +65,7 @@ var SAMLAuthDriver = class extends LocalAuthDriver {
 			accountability: null
 		});
 		try {
-			const usersService = this.getUsersService(schema);
-			return await usersService.createOne(updatedUserPayload);
+			return await this.getUsersService(schema).createOne(updatedUserPayload);
 		} catch (error) {
 			if (isDirectusError(error, ErrorCode.RecordNotUnique)) {
 				logger.warn(error, "[SAML] Failed to register user. User not unique");
@@ -78,9 +74,7 @@ var SAMLAuthDriver = class extends LocalAuthDriver {
 			throw error;
 		}
 	}
-	async login(_user) {
-		return;
-	}
+	async login(_user) {}
 };
 function createSAMLAuthRouter(providerName) {
 	const router = Router();
@@ -123,44 +117,35 @@ function createSAMLAuthRouter(providerName) {
 		const logger = useLogger();
 		let redirect = req.body?.RelayState;
 		const authMode = env[`AUTH_${providerName.toUpperCase()}_MODE`] ?? "session";
-		if (redirect) {
-			try {
-				redirect = resolveLoginRedirect(redirect, { provider: providerName });
-			} catch (e) {
-				useLogger().error(e);
-				throw new InvalidPayloadError({ reason: `URL "${redirect}" can't be used to redirect after login` });
-			}
+		if (redirect) try {
+			redirect = resolveLoginRedirect(redirect, { provider: providerName });
+		} catch (e) {
+			useLogger().error(e);
+			throw new InvalidPayloadError({ reason: `URL "${redirect}" can't be used to redirect after login` });
 		}
 		try {
 			const { sp, idp } = getAuthProvider(providerName);
 			const { extract } = await sp.parseLoginResponse(idp, "post", req);
-			const authService = new AuthenticationService({
+			const { accessToken, refreshToken, expires } = await new AuthenticationService({
 				accountability: req.accountability,
 				schema: req.schema
-			});
-			const { accessToken, refreshToken, expires } = await authService.login(providerName, extract.attributes, { session: authMode === "session" });
+			}).login(providerName, extract.attributes, { session: authMode === "session" });
 			res.locals["payload"] = { data: {
 				access_token: accessToken,
 				refresh_token: refreshToken,
 				expires
 			} };
 			if (redirect) {
-				if (authMode === "session") {
-					res.cookie(env["SESSION_COOKIE_NAME"], accessToken, SESSION_COOKIE_OPTIONS);
-				} else {
-					res.cookie(env["REFRESH_TOKEN_COOKIE_NAME"], refreshToken, REFRESH_COOKIE_OPTIONS);
-				}
+				if (authMode === "session") res.cookie(env["SESSION_COOKIE_NAME"], accessToken, SESSION_COOKIE_OPTIONS);
+				else res.cookie(env["REFRESH_TOKEN_COOKIE_NAME"], refreshToken, REFRESH_COOKIE_OPTIONS);
 				return res.redirect(redirect);
 			}
 			return next();
 		} catch (error) {
 			if (redirect) {
 				let reason = "UNKNOWN_EXCEPTION";
-				if (isDirectusError(error)) {
-					reason = error.code;
-				} else {
-					logger.warn(error, `[SAML] Unexpected error during SAML login`);
-				}
+				if (isDirectusError(error)) reason = error.code;
+				else logger.warn(error, `[SAML] Unexpected error during SAML login`);
 				return res.redirect(`${redirect.split("?")[0]}?reason=${reason}`);
 			}
 			logger.warn(error, `[SAML] Unexpected error during SAML login`);

package/dist/auth/utils/generate-callback-url.js

@@ -14,10 +14,7 @@ function findMatchingPublicUrl(requestOrigin, allowedPublicUrls) {
 	for (const allowedUrl of allowedPublicUrls) {
 		if (!URL.canParse(allowedUrl)) continue;
 		const { protocol, host } = new URL(allowedUrl);
-		const allowedUrlOrigin = `${protocol}//${host}`;
-		if (requestOrigin === allowedUrlOrigin) {
-			return allowedUrl;
-		}
+		if (requestOrigin === `${protocol}//${host}`) return allowedUrl;
 	}
 	return null;
 }
@@ -34,9 +31,7 @@ function findMatchingPublicUrl(requestOrigin, allowedPublicUrls) {
 function generateCallbackUrl(providerName, requestOrigin) {
 	const env = useEnv();
 	const publicUrl = env["PUBLIC_URL"];
-	const allowedPublicUrls = env["AUTH_ALLOWED_PUBLIC_URLS"] ? toArray(env["AUTH_ALLOWED_PUBLIC_URLS"]) : [];
-	const matchedUrl = findMatchingPublicUrl(requestOrigin, allowedPublicUrls);
-	return new Url(matchedUrl || publicUrl).addPath("auth", "login", providerName, "callback").toString();
+	return new Url(findMatchingPublicUrl(requestOrigin, env["AUTH_ALLOWED_PUBLIC_URLS"] ? toArray(env["AUTH_ALLOWED_PUBLIC_URLS"]) : []) || publicUrl).addPath("auth", "login", providerName, "callback").toString();
 }
 
 //#endregion

package/dist/auth/utils/resolve-login-redirect.js

@@ -17,38 +17,28 @@ function resolveLoginRedirect(redirect, opts = {}) {
 	if (!redirect) return "/";
 	if (typeof redirect !== "string") throw new Error("\"redirect\" must be a string");
 	if (!publicURL) throw new Error("\"PUBLIC_URL\" must be defined");
-	if (URL.canParse(redirect) === false) {
-		try {
-			const dummyDomain = "http://dummy.local";
-			const { protocol: dummyProtocol, host: dummyHost } = new URL(dummyDomain);
-			const parsedRelativeURL = new URL(redirect, dummyDomain);
-			if (dummyProtocol !== parsedRelativeURL.protocol || dummyHost !== parsedRelativeURL.host) {
-				throw new Error("Relative URL mismatch");
-			}
-			return parsedRelativeURL.toString().replace(dummyDomain, "");
-		} catch {
-			throw new Error("Invalid relative URL");
-		}
+	if (URL.canParse(redirect) === false) try {
+		const dummyDomain = "http://dummy.local";
+		const { protocol: dummyProtocol, host: dummyHost } = new URL(dummyDomain);
+		const parsedRelativeURL = new URL(redirect, dummyDomain);
+		if (dummyProtocol !== parsedRelativeURL.protocol || dummyHost !== parsedRelativeURL.host) throw new Error("Relative URL mismatch");
+		return parsedRelativeURL.toString().replace(dummyDomain, "");
+	} catch {
+		throw new Error("Invalid relative URL");
 	}
 	const parsedAbsoluteURL = new URL(redirect);
-	if (!["http:", "https:"].includes(parsedAbsoluteURL.protocol)) {
-		throw new Error("Only http/https redirect protocols are allowed");
-	}
+	if (!["http:", "https:"].includes(parsedAbsoluteURL.protocol)) throw new Error("Only http/https redirect protocols are allowed");
 	if (opts.provider) {
 		const envKey = `AUTH_${opts.provider.toUpperCase()}_REDIRECT_ALLOW_LIST`;
 		if (envKey in env) {
 			const allowedList = toArray(String(env[envKey]));
 			allowedList.push(publicURL);
-			if (isUrlAllowed(redirect, allowedList)) {
-				return parsedAbsoluteURL.toString();
-			}
+			if (isUrlAllowed(redirect, allowedList)) return parsedAbsoluteURL.toString();
 		}
 	}
 	if (URL.canParse(publicURL) === false) throw new Error("PUBLIC_URL must be a valid URL");
 	const { protocol: publicProtocol, host: publicHost } = new URL(publicURL);
-	if (publicProtocol !== parsedAbsoluteURL.protocol || publicHost !== parsedAbsoluteURL.host) {
-		throw new Error("App \"redirect\" must match PUBLIC_URL");
-	}
+	if (publicProtocol !== parsedAbsoluteURL.protocol || publicHost !== parsedAbsoluteURL.host) throw new Error("App \"redirect\" must match PUBLIC_URL");
 	return parsedAbsoluteURL.toString();
 }
 

package/dist/auth.js

@@ -13,7 +13,7 @@ import { InvalidProviderConfigError } from "@directus/errors";
 import { toArray } from "@directus/utils";
 
 //#region src/auth.ts
-const providers = new Map();
+const providers = /* @__PURE__ */ new Map();
 function getAuthProvider(provider) {
 	const logger = useLogger();
 	if (!providers.has(provider)) {
@@ -31,9 +31,7 @@ async function registerAuthProviders() {
 		const defaultProvider = getProviderInstance("local", options);
 		providers.set(DEFAULT_AUTH_PROVIDER, defaultProvider);
 	}
-	if (!env["AUTH_PROVIDERS"]) {
-		return;
-	}
+	if (!env["AUTH_PROVIDERS"]) return;
 	providerNames.forEach((name) => {
 		name = name.trim();
 		if (name === DEFAULT_AUTH_PROVIDER) {
@@ -64,7 +62,6 @@ function getProviderInstance(driver, options, config = {}) {
 		case "ldap": return new LDAPAuthDriver(options, config);
 		case "saml": return new SAMLAuthDriver(options, config);
 	}
-	return undefined;
 }
 
 //#endregion

package/dist/bus/lib/use-bus.js

@@ -5,15 +5,13 @@ import { useEnv } from "@directus/env";
 import { createBus } from "@directus/memory";
 
 //#region src/bus/lib/use-bus.ts
-const _cache = { bus: undefined };
+const _cache = { bus: void 0 };
 /**
 * Returns globally shared message bus. If Redis is available, will use a redis-driven pub/sub bus.
 * Otherwise will default to a local-only bus.
 */
 const useBus = () => {
-	if (_cache.bus) {
-		return _cache.bus;
-	}
+	if (_cache.bus) return _cache.bus;
 	if (redisConfigAvailable()) {
 		const env = useEnv();
 		_cache.bus = createBus({
@@ -21,9 +19,7 @@ const useBus = () => {
 			redis: useRedis(),
 			namespace: env["REDIS_BUS_NAMESPACE"] ?? "directus:bus"
 		});
-	} else {
-		_cache.bus = createBus({ type: "local" });
-	}
+	} else _cache.bus = createBus({ type: "local" });
 	return _cache.bus;
 };
 

package/dist/cache.js

@@ -28,9 +28,7 @@ const messenger = useBus();
 if (redisConfigAvailable() && !messengerSubscribed) {
 	messengerSubscribed = true;
 	messenger.subscribe("schemaChanged", async (opts) => {
-		if (env["CACHE_STORE"] === "memory" && env["CACHE_AUTO_PURGE"] && cache && opts?.["autoPurgeCache"] !== false) {
-			await cache.clear();
-		}
+		if (env["CACHE_STORE"] === "memory" && env["CACHE_AUTO_PURGE"] && cache && opts?.["autoPurgeCache"] !== false) await cache.clear();
 		await localSchemaCache?.clear();
 		memorySchemaCache = null;
 	});
@@ -59,7 +57,7 @@ function getCache() {
 		localSchemaCache.on("error", (err) => logger.warn(err, `[schema-cache] ${err}`));
 	}
 	if (lockCache === null) {
-		lockCache = getKeyvInstance(env["CACHE_STORE"], undefined, "_lock");
+		lockCache = getKeyvInstance(env["CACHE_STORE"], void 0, "_lock");
 		lockCache.on("error", (err) => logger.warn(err, `[lock-cache] ${err}`));
 	}
 	return {
@@ -89,28 +87,19 @@ async function clearSystemCache(opts) {
 }
 async function setSystemCache(key, value, ttl) {
 	const { systemCache: systemCache$1, lockCache: lockCache$1 } = getCache();
-	if (!await lockCache$1.get("system-cache-lock")) {
-		await setCacheValue(systemCache$1, key, value, ttl);
-	}
+	if (!await lockCache$1.get("system-cache-lock")) await setCacheValue(systemCache$1, key, value, ttl);
 }
 async function getSystemCache(key) {
 	const { systemCache: systemCache$1 } = getCache();
 	return await getCacheValue(systemCache$1, key);
 }
 function setMemorySchemaCache(schema) {
-	if (Object.isFrozen(schema)) {
-		memorySchemaCache = schema;
-	} else {
-		memorySchemaCache = freezeSchema(schema);
-	}
+	if (Object.isFrozen(schema)) memorySchemaCache = schema;
+	else memorySchemaCache = freezeSchema(schema);
 }
 function getMemorySchemaCache() {
-	if (env["CACHE_SCHEMA_FREEZE_ENABLED"]) {
-		return memorySchemaCache ?? undefined;
-	} else if (memorySchemaCache) {
-		return unfreezeSchema(memorySchemaCache);
-	}
-	return undefined;
+	if (env["CACHE_SCHEMA_FREEZE_ENABLED"]) return memorySchemaCache ?? void 0;
+	else if (memorySchemaCache) return unfreezeSchema(memorySchemaCache);
 }
 async function setCacheValue(cache$1, key, value, ttl) {
 	const compressed = await compress(value);
@@ -118,9 +107,8 @@ async function setCacheValue(cache$1, key, value, ttl) {
 }
 async function getCacheValue(cache$1, key) {
 	const value = await cache$1.get(key);
-	if (!value) return undefined;
-	const decompressed = await decompress(value);
-	return decompressed;
+	if (!value) return void 0;
+	return await decompress(value);
 }
 /**
 * Store a value in cache with its expiration timestamp for TTL tracking
@@ -134,12 +122,11 @@ async function setCacheValueWithExpiry(cache$1, key, value, ttl) {
 */
 async function getCacheValueWithTTL(cache$1, key) {
 	const value = await getCacheValue(cache$1, key);
-	if (!value) return undefined;
+	if (!value) return void 0;
 	const expiryData = await getCacheValue(cache$1, `${key}__expires_at`);
-	const remainingTTL = expiryData?.exp ? Math.max(0, expiryData.exp - Date.now()) : 0;
 	return {
 		data: value,
-		remainingTTL
+		remainingTTL: expiryData?.exp ? Math.max(0, expiryData.exp - Date.now()) : 0
 	};
 }
 function getKeyvInstance(store, ttl, namespaceSuffix) {

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

@@ -21,23 +21,16 @@ async function bootstrap({ skipAdminInit }) {
 		logger.info("Running migrations...");
 		await run(database, "latest");
 		const schema = await getSchema();
-		if (skipAdminInit == null) {
-			await createAdmin(schema);
-		} else {
-			logger.info("Skipping creation of default Admin user and role...");
-		}
+		if (skipAdminInit == null) await createAdmin(schema);
+		else logger.info("Skipping creation of default Admin user and role...");
 		const settingsService = new SettingsService({ schema });
-		if (env["PROJECT_NAME"] && typeof env["PROJECT_NAME"] === "string" && env["PROJECT_NAME"].length > 0) {
-			await settingsService.upsertSingleton({ project_name: env["PROJECT_NAME"] });
-		}
-		if (email().safeParse(env["PROJECT_OWNER"]).success) {
-			await settingsService.setOwner({
-				project_owner: env["PROJECT_OWNER"],
-				org_name: null,
-				project_usage: null,
-				product_updates: false
-			});
-		}
+		if (env["PROJECT_NAME"] && typeof env["PROJECT_NAME"] === "string" && env["PROJECT_NAME"].length > 0) await settingsService.upsertSingleton({ project_name: env["PROJECT_NAME"] });
+		if (email().safeParse(env["PROJECT_OWNER"]).success) await settingsService.setOwner({
+			project_owner: env["PROJECT_OWNER"],
+			org_name: null,
+			project_usage: null,
+			product_updates: false
+		});
 	} else {
 		logger.info("Database already initialized, skipping install");
 		logger.info("Running migrations...");
@@ -51,9 +44,7 @@ async function waitForDatabase(database) {
 	const tries = 5;
 	const secondsBetweenTries = 5;
 	for (let i = 0; i < tries; i++) {
-		if (await hasDatabaseConnection(database)) {
-			return true;
-		}
+		if (await hasDatabaseConnection(database)) return true;
 		await new Promise((resolve) => setTimeout(resolve, secondsBetweenTries * 1e3));
 	}
 	await validateDatabaseConnection(database);

package/dist/cli/commands/cache/clear.js

@@ -12,9 +12,7 @@ async function cacheClear({ system, data }) {
 	} else {
 		const clearAll = !system && !data;
 		try {
-			if (clearAll || system) {
-				await clearSystemCache({ forced: true });
-			}
+			if (clearAll || system) await clearSystemCache({ forced: true });
 			if (clearAll || data) {
 				const { cache } = getCache();
 				await cache?.clear();

package/dist/cli/commands/database/migrate.js

@@ -9,11 +9,8 @@ async function migrate(direction) {
 	try {
 		logger.info("Running migrations...");
 		await run(database, direction);
-		if (direction === "down") {
-			logger.info("Downgrade successful");
-		} else {
-			logger.info("Database up to date");
-		}
+		if (direction === "down") logger.info("Downgrade successful");
+		else logger.info("Database up to date");
 		database.destroy();
 		process.exit();
 	} catch (err) {

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

@@ -46,9 +46,8 @@ async function init() {
 			process.stdout.write(`\n${chalk.red(`[${err.code || "Error"}]`)} ${err.message}\n`);
 			process.stdout.write("\nPlease try again\n\n");
 			attemptsRemaining--;
-			if (attemptsRemaining > 0) {
-				return await trySeed();
-			} else {
+			if (attemptsRemaining > 0) return await trySeed();
+			else {
 				process.stdout.write("Couldn't seed the database. Exiting.\n");
 				process.exit(1);
 			}
@@ -66,8 +65,7 @@ async function init() {
 		message: "Email",
 		default: "admin@example.com",
 		validate: (input) => {
-			const emailSchema = Joi.string().email().required();
-			const { error } = emailSchema.validate(input.trim());
+			const { error } = Joi.string().email().required().validate(input.trim());
 			if (error) throw new Error("The email entered is not a valid email address!");
 			return true;
 		}