c8y-nitro 0.4.1 → 0.4.2

package/dist/cli/index.mjs

@@ -1,4 +1,4 @@
-import { n as name, r as version, t as description } from "../package-CobwNpP9.mjs";
+import { n as name, r as version, t as description } from "../package-C4HtuVu_.mjs";
 import { defineCommand, runMain } from "citty";
 //#region src/cli/index.ts
 runMain(defineCommand({

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { a as findMicroserviceByName, g as GENERATED_READINESS_ROUTE, h as GENERATED_LIVENESS_ROUTE, l as subscribeToApplication, m as createC8yManifestFromNitro, n as createBasicAuthHeader, o as getBootstrapCredentials, p as createC8yManifest, r as createMicroservice } from "./c8y-api-BBSKRwKs.mjs";
 import { t as writeBootstrapCredentials } from "./env-file-B0BK-uZW.mjs";
-import { n as name } from "./package-CobwNpP9.mjs";
+import { n as name } from "./package-C4HtuVu_.mjs";
 import { basename, dirname, join, relative } from "node:path";
 import { mkdir, writeFile } from "node:fs/promises";
 import { x } from "tinyexec";

package/dist/{package-CobwNpP9.mjs → package-C4HtuVu_.mjs}

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "c8y-nitro";
-var version = "0.4.1";
+var version = "0.4.2";
 var description = "Lightning fast Cumulocity IoT microservice development powered by Nitro";
 //#endregion
 export { name as n, version as r, description as t };

package/dist/utils.mjs

@@ -1,7 +1,9 @@
+import { Buffer } from "node:buffer";
 import process from "node:process";
 import { useLogger } from "evlog/nitro/v3";
 import { BasicAuth, Client, MicroserviceClientRequestAuth } from "@c8y/client";
 import { defineCachedFunction } from "nitro/cache";
+import { createHash, randomBytes } from "node:crypto";
 import { HTTPError, defineHandler } from "nitro/h3";
 import { useStorage } from "nitro/storage";
 import { useRuntimeConfig } from "nitro/runtime-config";
@@ -30,6 +32,55 @@ function convertRequestHeadersToC8yFormat(request) {
 	return headers;
 }
 //#endregion
+//#region src/utils/internal/tenant.ts
+const USER_TENANT_CACHE_SALT = randomBytes(32).toString("hex");
+function getCookieValue(cookieHeader, name) {
+	try {
+		const value = cookieHeader?.match(`(^|;)\\s*${name}\\s*=\\s*([^;]+)`);
+		return value ? value.pop() : void 0;
+	} catch {
+		return;
+	}
+}
+function getCurrentUserTenantCacheKeyMaterial(requestOrEvent) {
+	const request = "req" in requestOrEvent ? requestOrEvent.req : requestOrEvent;
+	const cookieAuth = getCookieValue(request.headers.get("cookie"), "authorization");
+	if (cookieAuth) return `cookie:${cookieAuth}`;
+	const authorization = request.headers.get("authorization");
+	if (authorization) return `header:${authorization}`;
+}
+function createCurrentUserTenantCacheKey(requestOrEvent) {
+	const material = getCurrentUserTenantCacheKeyMaterial(requestOrEvent);
+	if (!material) throw new Error("Cannot create current user tenant cache key without auth material");
+	return createHash("sha256").update(USER_TENANT_CACHE_SALT).update(":").update(material).digest("hex");
+}
+function tryGetTenantFromBasicAuth(requestOrEvent) {
+	const authorization = ("req" in requestOrEvent ? requestOrEvent.req : requestOrEvent).headers.get("authorization");
+	if (!authorization?.startsWith("Basic ")) return;
+	try {
+		const decoded = Buffer.from(authorization.slice(6), "base64").toString("utf8");
+		const separatorIndex = decoded.indexOf(":");
+		const userPart = separatorIndex === -1 ? decoded : decoded.slice(0, separatorIndex);
+		const slashIndex = userPart.indexOf("/");
+		if (slashIndex <= 0) return;
+		return userPart.slice(0, slashIndex);
+	} catch {
+		return;
+	}
+}
+const getCurrentUserTenantId = defineCachedFunction(async (requestOrEvent) => {
+	const basicTenant = tryGetTenantFromBasicAuth(requestOrEvent);
+	if (basicTenant) return basicTenant;
+	return (await useUserClient(requestOrEvent).tenant.current()).data.name;
+}, {
+	maxAge: 60,
+	name: "_c8y_nitro_get_current_user_tenant_id",
+	group: "c8y_nitro",
+	swr: false,
+	getKey: (requestOrEvent) => createCurrentUserTenantCacheKey(requestOrEvent),
+	shouldBypassCache: (requestOrEvent) => !getCurrentUserTenantCacheKeyMaterial(requestOrEvent)
+});
+//#endregion
 //#region src/utils/credentials.ts
 /**
 * Fetches credentials for all tenants subscribed to this microservice.\
@@ -128,7 +179,7 @@ const useDeployedTenantCredentials = Object.assign(async () => {
 async function useUserTenantCredentials(requestOrEvent) {
 	const request = "req" in requestOrEvent ? requestOrEvent.req : requestOrEvent;
 	if (request.context?.["c8y_user_tenant_credentials"]) return request.context["c8y_user_tenant_credentials"];
-	const tenantId = useUserClient(requestOrEvent).core.tenant;
+	const tenantId = await getCurrentUserTenantId(requestOrEvent);
 	const userTenantCreds = (await useSubscribedTenantCredentials())[tenantId];
 	if (!userTenantCreds) throw new HTTPError({
 		message: `No subscribed tenant credentials found for user tenant '${tenantId}'`,
@@ -172,7 +223,7 @@ function useUserClient(requestOrEvent) {
 async function useUserTenantClient(requestOrEvent) {
 	const request = "req" in requestOrEvent ? requestOrEvent.req : requestOrEvent;
 	if (request.context?.["c8y_user_tenant_client"]) return request.context["c8y_user_tenant_client"];
-	const tenantId = useUserClient(requestOrEvent).core.tenant;
+	const tenantId = await getCurrentUserTenantId(requestOrEvent);
 	const creds = await useSubscribedTenantCredentials();
 	if (!creds[tenantId]) throw new HTTPError({
 		message: `No subscribed tenant credentials found for user tenant '${tenantId}'`,
@@ -281,7 +332,7 @@ function hasUserRequiredRole(roleOrRoles) {
 function isUserFromAllowedTenant(tenantIdOrIds) {
 	return defineHandler(async (event) => {
 		const allowedTenants = Array.isArray(tenantIdOrIds) ? tenantIdOrIds : [tenantIdOrIds];
-		const userTenantId = useUserClient(event).core.tenant;
+		const userTenantId = await getCurrentUserTenantId(event);
 		if (!allowedTenants.includes(userTenantId)) throw new HTTPError({
 			status: 403,
 			statusText: "Forbidden",
@@ -306,7 +357,7 @@ function isUserFromAllowedTenant(tenantIdOrIds) {
 */
 function isUserFromDeployedTenant() {
 	return defineHandler(async (event) => {
-		const userTenantId = useUserClient(event).core.tenant;
+		const userTenantId = await getCurrentUserTenantId(event);
 		const deployedTenantId = process.env.C8Y_BOOTSTRAP_TENANT;
 		if (!deployedTenantId) throw new HTTPError({
 			status: 500,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c8y-nitro",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "Lightning fast Cumulocity IoT microservice development powered by Nitro",
   "keywords": [