@croct/plug-nuxt 0.1.1 → 0.2.1

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "0.1.1",
+  "version": "0.2.1",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -68,7 +68,7 @@ const module = defineNuxtModule({
       getContents: () => clientOptionsCode
     });
     nuxt.options.alias["#croct/client-options"] = join(nuxt.options.buildDir, "croct/client-options");
-    addPlugin(resolver.resolve("./runtime/plugin.client"));
+    addPlugin(resolver.resolve("./runtime/plugin"));
     addServerHandler({
       handler: resolver.resolve("./runtime/server/middleware/croct"),
       middleware: true
@@ -113,6 +113,13 @@ function generateResolversModule(options, appResolver) {
   } else {
     lines.push("export const userIdResolver = undefined;");
   }
+  if (options.credentialsResolver !== void 0) {
+    lines.push(
+      `export { default as credentialsResolver } from '${appResolver.resolve(options.credentialsResolver)}';`
+    );
+  } else {
+    lines.push("export const credentialsResolver = undefined;");
+  }
   return lines.join("\n");
 }
 function generateClientOptionsModule(options, appResolver) {

package/dist/runtime/components/Personalization.js

@@ -1,5 +1,5 @@
 import { defineComponent } from "vue";
-import { useAsyncData } from "#app";
+import { useAsyncData, useRequestFetch } from "#app";
 export default defineComponent({
   name: "Personalization",
   props: {
@@ -28,7 +28,7 @@ export default defineComponent({
     };
     const { data, pending, error } = await useAsyncData(
       `croct:pers:${props.query}:${JSON.stringify(options)}`,
-      () => $fetch("/api/_croct/evaluate", {
+      () => useRequestFetch()("/api/_croct/evaluate", {
         method: "POST",
         body: { query: props.query, ...options }
       })

package/dist/runtime/components/Slot.js

@@ -1,5 +1,5 @@
 import { defineComponent } from "vue";
-import { useAsyncData } from "#app";
+import { useAsyncData, useRequestFetch } from "#app";
 import { resolveLocale } from "../utils/locale.js";
 export default defineComponent({
   name: "Slot",
@@ -30,7 +30,7 @@ export default defineComponent({
     };
     const { data, error } = await useAsyncData(
       `croct:slot:${props.id}:${JSON.stringify(options)}`,
-      () => $fetch("/api/_croct/content", {
+      () => useRequestFetch()("/api/_croct/content", {
         method: "POST",
         body: { slotId: props.id, ...options }
       })

package/dist/runtime/composables/useContent.js

@@ -1,4 +1,4 @@
-import { useAsyncData } from "#app";
+import { useAsyncData, useRequestFetch } from "#app";
 import { resolveLocale } from "../utils/locale.js";
 function useContentNuxt(slotId, options = {}) {
   const { preferredLocale, ...rest } = options;
@@ -10,7 +10,7 @@ function useContentNuxt(slotId, options = {}) {
   const cacheKey = `croct:content:${slotId}:${JSON.stringify(resolvedOptions)}`;
   return useAsyncData(
     cacheKey,
-    () => $fetch("/api/_croct/content", {
+    () => useRequestFetch()("/api/_croct/content", {
       method: "POST",
       body: { slotId, ...resolvedOptions }
     })

package/dist/runtime/composables/useEvaluation.js

@@ -1,9 +1,9 @@
-import { useAsyncData } from "#app";
+import { useAsyncData, useRequestFetch } from "#app";
 function useEvaluationNuxt(query, options = {}) {
   const cacheKey = `croct:eval:${query}:${JSON.stringify(options)}`;
   return useAsyncData(
     cacheKey,
-    () => $fetch("/api/_croct/evaluate", {
+    () => useRequestFetch()("/api/_croct/evaluate", {
       method: "POST",
       body: { query, ...options }
     })

package/dist/runtime/{plugin.client.js → plugin.js}

@@ -1,10 +1,14 @@
 import { createCroct } from "@croct/plug-vue";
-import { defineNuxtPlugin, useRuntimeConfig } from "#app";
+import { defineNuxtPlugin, useRuntimeConfig, useRequestEvent, useState } from "#app";
 import { urlSanitizer } from "#croct/client-options";
 export default defineNuxtPlugin((nuxtApp) => {
   const config = useRuntimeConfig().public.croct;
+  const appId = useState("croct:app-id", () => {
+    const event = useRequestEvent();
+    return event?.context.croctCredentials?.appId ?? config.appId;
+  });
   const plugin = createCroct({
-    appId: config.appId,
+    appId: appId.value !== void 0 && appId.value !== "" ? appId.value : config.appId,
     disableCidMirroring: true,
     ...config.debug === true ? { debug: true } : {},
     ...config.test === true ? { test: true } : {},

package/dist/runtime/server/composables/anonymize.js

@@ -2,5 +2,6 @@ import { useEvent } from "#imports";
 import { issueToken } from "../utils/security.js";
 import { setUserTokenCookie } from "../utils/cookie.js";
 export async function anonymize() {
-  setUserTokenCookie(useEvent(), await issueToken());
+  const event = useEvent();
+  setUserTokenCookie(event, await issueToken(null, void 0, event));
 }

package/dist/runtime/server/composables/evaluate.js

@@ -8,13 +8,13 @@ export async function evaluate(query, options = {}) {
   const context = event.context.croct;
   if (context === void 0) {
     throw new Error(
-      "Croct's request context is missing. Make sure the @croct/plug-nuxt module is installed in your nuxt.config.ts. For help, see: https://croct.help/sdk/nuxt/missing-middleware"
+      "Croct's request context is missing. Make sure the @croct/plug-nuxt module is installed in your nuxt.config.ts. For help, see: https://croct.help/sdk/nuxt/missing-module"
     );
   }
   const config = useRuntimeConfig();
   const timeout = config.public.croct.defaultFetchTimeout;
   return executeQuery(query, {
-    apiKey: getApiKey(),
+    apiKey: getApiKey(event),
     clientIp: context.clientIp ?? "127.0.0.1",
     ...context.previewToken !== void 0 ? { previewToken: context.previewToken } : {},
     ...context.userToken !== void 0 ? { userToken: context.userToken } : {},

package/dist/runtime/server/composables/fetchContent.js

@@ -8,14 +8,14 @@ export async function fetchContent(slotId, options = {}) {
   const context = event.context.croct;
   if (context === void 0) {
     throw new Error(
-      "Croct's request context is missing. Make sure the @croct/plug-nuxt module is installed in your nuxt.config.ts. For help, see: https://croct.help/sdk/nuxt/missing-middleware"
+      "Croct's request context is missing. Make sure the @croct/plug-nuxt module is installed in your nuxt.config.ts. For help, see: https://croct.help/sdk/nuxt/missing-module"
     );
   }
   const config = useRuntimeConfig();
   const timeout = config.public.croct.defaultFetchTimeout;
   const { logger, ...rest } = options;
   const commonOptions = {
-    apiKey: getApiKey(),
+    apiKey: getApiKey(event),
     ...typeof config.public.croct.baseEndpointUrl === "string" && config.public.croct.baseEndpointUrl !== "" ? { baseEndpointUrl: config.public.croct.baseEndpointUrl } : {},
     ...typeof timeout === "number" && timeout > 0 ? { timeout } : {},
     logger: logger ?? FilteredLogger.include(new ConsoleLogger(), ["warn", "error"])

package/dist/runtime/server/composables/identify.js

@@ -2,5 +2,6 @@ import { useEvent } from "#imports";
 import { issueToken } from "../utils/security.js";
 import { setUserTokenCookie } from "../utils/cookie.js";
 export async function identify(userId) {
-  setUserTokenCookie(useEvent(), await issueToken(userId));
+  const event = useEvent();
+  setUserTokenCookie(event, await issueToken(userId, void 0, event));
 }

package/dist/runtime/server/croct-resolvers.d.ts

@@ -1,4 +1,11 @@
 import type {H3Event} from 'h3';
 
+export type CroctCredentials = {
+    appId: string,
+    apiKey: string,
+};
+
 export type UserIdResolver = (event: H3Event) => Promise<string | null> | string | null;
 export type LocaleResolver = (event: H3Event) => Promise<string | null> | string | null;
+export type CredentialsResolver = (event: H3Event) =>
+    Promise<CroctCredentials | null> | CroctCredentials | null;

package/dist/runtime/server/middleware/croct.js

@@ -10,7 +10,7 @@ import {
 import { Token } from "@croct/sdk/token";
 import { base64UrlDecode } from "@croct/sdk/base64Url";
 import { useRuntimeConfig } from "#imports";
-import { localeResolver, userIdResolver } from "#croct/resolvers";
+import { credentialsResolver, localeResolver, userIdResolver } from "#croct/resolvers";
 import { setUserTokenCookie, getProductionDefaults } from "../utils/cookie.js";
 import { getAuthenticationKey, isUserTokenAuthenticationEnabled, issueToken } from "../utils/security.js";
 const CLIENT_ID_PATTERN = /^(?:[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|[a-f0-9]{32})$/;
@@ -30,6 +30,7 @@ export default defineEventHandler(async (event) => {
   }
   const config = useRuntimeConfig();
   const { cookie } = config.public.croct;
+  event.context.croctCredentials = await resolveCredentials(event);
   const clientId = resolveClientId(getCookie(event, cookie.clientId.name));
   const userToken = await resolveUserToken(event, getCookie(event, cookie.userToken.name));
   const preferredLocale = await resolvePreferredLocale(event, config.public.croct.defaultPreferredLocale);
@@ -75,8 +76,26 @@ function resolveClientId(cookieValue) {
   }
   return crypto.randomUUID();
 }
+async function resolveCredentials(event) {
+  const config = useRuntimeConfig();
+  const fallback = {
+    appId: config.public.croct.appId,
+    apiKey: config.croct.apiKey
+  };
+  if (credentialsResolver === void 0) {
+    return fallback;
+  }
+  const credentials = await credentialsResolver(event);
+  if (credentials === null || credentials === void 0) {
+    return fallback;
+  }
+  return {
+    appId: credentials.appId ?? fallback.appId,
+    apiKey: credentials.apiKey ?? fallback.apiKey
+  };
+}
 async function resolveUserToken(event, cookieValue) {
-  const { appId } = useRuntimeConfig().public.croct;
+  const { appId } = event.context.croctCredentials;
   let token = null;
   if (cookieValue !== void 0) {
     try {
@@ -85,15 +104,15 @@ async function resolveUserToken(event, cookieValue) {
     }
   }
   const userId = userIdResolver !== void 0 ? await userIdResolver(event) : void 0;
-  if (token === null || isUserTokenAuthenticationEnabled() && !token.isSigned() || !token.isValidNow() || userId !== void 0 && (userId === null ? !token.isAnonymous() : !token.isSubject(userId))) {
-    return issueToken(userId ?? null);
+  if (token === null || isUserTokenAuthenticationEnabled(event) && !token.isSigned() || !token.isValidNow() || userId !== void 0 && (userId === null ? !token.isAnonymous() : !token.isSubject(userId))) {
+    return issueToken(userId ?? null, void 0, event);
   }
   const tokenAppId = token.getApplicationId();
   if (tokenAppId !== null && tokenAppId !== appId) {
-    return issueToken(userId ?? null);
+    return issueToken(userId ?? null, void 0, event);
   }
-  if (token.isSigned() && !await token.matchesKeyId(getAuthenticationKey())) {
-    return issueToken(token.getSubject(), token.getTokenId() ?? void 0);
+  if (token.isSigned() && !await token.matchesKeyId(getAuthenticationKey(event))) {
+    return issueToken(token.getSubject(), token.getTokenId() ?? void 0, event);
   }
   return token;
 }

package/dist/runtime/server/utils/security.d.ts

@@ -1,6 +1,7 @@
+import type { H3Event } from 'h3';
 import { ApiKey } from '@croct/sdk/apiKey';
 import { Token } from '@croct/sdk/token';
-export declare function getApiKey(): ApiKey;
-export declare function getAuthenticationKey(): ApiKey;
-export declare function isUserTokenAuthenticationEnabled(): boolean;
-export declare function issueToken(userId?: string | null, tokenId?: string): Promise<Token>;
+export declare function getApiKey(event?: H3Event): ApiKey;
+export declare function getAuthenticationKey(event?: H3Event): ApiKey;
+export declare function isUserTokenAuthenticationEnabled(event?: H3Event): boolean;
+export declare function issueToken(userId?: string | null, tokenId?: string, event?: H3Event): Promise<Token>;

package/dist/runtime/server/utils/security.js

@@ -1,11 +1,11 @@
 import { ApiKey } from "@croct/sdk/apiKey";
 import { Token } from "@croct/sdk/token";
 import { useRuntimeConfig } from "#imports";
-export function getApiKey() {
-  const { apiKey } = useRuntimeConfig().croct;
+export function getApiKey(event) {
+  const apiKey = resolveApiKey(event);
   if (apiKey === "") {
     throw new Error(
-      "Croct's API key is missing. Did you forget to set the NUXT_CROCT_API_KEY environment variable? For help, see: https://croct.help/sdk/nuxt/missing-environment-variable"
+      "Croct's API key is missing. Did you forget to set the NUXT_CROCT_API_KEY environment variable? For help, see: https://croct.help/sdk/nuxt/missing-api-key"
     );
   }
   try {
@@ -16,8 +16,8 @@ export function getApiKey() {
     );
   }
 }
-export function getAuthenticationKey() {
-  const apiKey = getApiKey();
+export function getAuthenticationKey(event) {
+  const apiKey = getApiKey(event);
   if (!apiKey.hasPrivateKey()) {
     throw new Error(
       "Croct's API key does not have a private key. Please generate an API key with authenticate permissions and update the NUXT_CROCT_API_KEY environment variable."
@@ -25,16 +25,19 @@ export function getAuthenticationKey() {
   }
   return apiKey;
 }
-export function isUserTokenAuthenticationEnabled() {
-  const config = useRuntimeConfig().croct;
-  return config.apiKey !== "" && config.disableUserTokenAuthentication !== true;
+export function isUserTokenAuthenticationEnabled(event) {
+  return resolveApiKey(event) !== "" && useRuntimeConfig().croct.disableUserTokenAuthentication !== true;
 }
-export function issueToken(userId = null, tokenId) {
-  const config = useRuntimeConfig();
-  const { appId } = config.public.croct;
-  const token = Token.issue(appId, userId).withDuration(config.croct.tokenDuration);
-  if (isUserTokenAuthenticationEnabled()) {
-    return token.withTokenId(tokenId ?? crypto.randomUUID()).signedWith(getAuthenticationKey());
+export function issueToken(userId = null, tokenId, event) {
+  const token = Token.issue(resolveAppId(event), userId).withDuration(useRuntimeConfig().croct.tokenDuration);
+  if (isUserTokenAuthenticationEnabled(event)) {
+    return token.withTokenId(tokenId ?? crypto.randomUUID()).signedWith(getAuthenticationKey(event));
   }
   return Promise.resolve(token);
 }
+function resolveAppId(event) {
+  return event?.context.croctCredentials?.appId ?? useRuntimeConfig().public.croct.appId;
+}
+function resolveApiKey(event) {
+  return event?.context.croctCredentials?.apiKey ?? useRuntimeConfig().croct.apiKey;
+}

package/dist/runtime/types.d.ts

@@ -2,4 +2,4 @@ export type * from '@croct/plug/sdk/json';
 export type * from '@croct/plug/slot';
 export type * from '@croct/plug/component';
 export type { UrlSanitizer } from '@croct/sdk/tab';
-export type { UserIdResolver, LocaleResolver } from './server/croct-resolvers.js';
+export type { UserIdResolver, LocaleResolver, CredentialsResolver, CroctCredentials, } from './server/croct-resolvers.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@croct/plug-nuxt",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Nuxt module to plug your Nuxt 3 applications into Croct.",
   "author": {
     "name": "Croct",
@@ -48,6 +48,8 @@
     "lint": "eslint .",
     "test": "vitest run",
     "test:watch": "vitest watch",
+    "test:e2e": "playwright test",
+    "test:e2e:prerender": "playwright test -c playwright.prerender.config.ts",
     "validate": "tsc --noEmit"
   },
   "peerDependencies": {