@frigear-nu/account 0.0.8 → 0.0.10

package/README.md

@@ -75,11 +75,7 @@ await changePassword({ currentPassword: 'old', newPassword: 'new-password', conf
 Strings live under the `account.*` namespace in `da`/`en` locale files and can be overridden in your app's
 `i18n/locales/<code>.json`. See the [documentation](https://docs.frigear.dev/modules/account#translations).
 
-## Frigear ID (QR code)
-
-`settings.pages.idCode` (`true` or a path, default `/account/id`) adds a page with a QR code (`urn:frigear:id:<jwt>`)
-that refreshes every 60 seconds, plus an account menu tile. `GET /api/account/id-code` returns the RS256-signed JWT
-(60s lifetime, `sub` = user id). It signs with `runtimeConfig.account.idCode.privateKey`
-(`NUXT_ACCOUNT_ID_CODE_PRIVATE_KEY`) or, when unset, the `@frigear-nu/oauth-server` key (`runtimeConfig.oauthServer`),
-so scanners can verify it against `/.well-known/jwks.json`. Without a key the endpoint responds `501`.
-`AccountIdentificationCodeDialog` wraps the same content in a modal.
+## Overriding parts
+
+Any `Account*` component can be replaced by a same-named component in your app (the module's have a lower priority).
+`AccountHeaderRight` is the block at the right of the account header; override it to show other details.

package/dist/module.d.mts

@@ -20,7 +20,6 @@ type PublicModuleOptions = {
         profile?: string;
         security?: string;
         documents?: string;
-        idCode?: string;
         apiTokens?: string;
     };
     documents: AccountDocument[];
@@ -32,7 +31,6 @@ type ModuleOptions = {
             profile?: string | boolean;
             security?: string | boolean;
             documents?: string | boolean;
-            idCode?: string | boolean;
             apiTokens?: string | boolean;
         };
         documents?: AccountDocument[];
@@ -43,15 +41,6 @@ declare module 'nuxt/schema' {
     interface NuxtConfig {
         account?: ModuleOptions;
     }
-    interface RuntimeConfig {
-        account?: {
-            idCode?: {
-                privateKey?: string;
-                keyId?: string;
-                issuer?: string;
-            };
-        };
-    }
     interface PublicRuntimeConfig {
         account?: PublicModuleOptions;
     }

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@frigear-nu/account",
   "configKey": "account",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "unknown"

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, createResolver, hasNuxtModule, addServerHandler, addImports, extendPages, addComponentsDir } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, hasNuxtModule, addImports, extendPages, addComponentsDir } from '@nuxt/kit';
 import { registerModule, registerTailwindSource, registerLocales, resolvePagePath, addOptionalMenuSource } from '@frigear-nu/module-kit/utils';
 
 const module$1 = defineNuxtModule({
@@ -30,30 +30,20 @@ const module$1 = defineNuxtModule({
     registerLocales(nuxt, resolver.resolve("./runtime/i18n/lang"));
     const settings = options.settings ?? {};
     const withMenus = hasNuxtModule("@frigear-nu/menu");
-    addServerHandler({
-      route: "/api/account/id-code",
-      method: "get",
-      handler: resolver.resolve("./runtime/server/routes/account/id-code.get")
-    });
-    const existingAccount = nuxt.options.runtimeConfig.account;
-    nuxt.options.runtimeConfig.account = {
-      idCode: { privateKey: "", keyId: "", issuer: "", ...existingAccount?.idCode }
-    };
     addImports([{ name: "useAccount", from: resolver.resolve("./runtime/app/composables/useAccount") }]);
     const profilePath = resolvePagePath(settings.pages?.profile, "/account/profile");
     const securityPath = resolvePagePath(settings.pages?.security, "/account/security");
     const documentsPath = resolvePagePath(settings.pages?.documents, "/account/documents");
-    const idCodePath = resolvePagePath(settings.pages?.idCode, "/account/id");
     const apiTokensPath = resolvePagePath(settings.pages?.apiTokens, "/account/api-tokens");
     const indexPath = withMenus ? resolvePagePath(settings.pages?.index, "/account") : void 0;
     if (!withMenus && settings.pages?.index) {
       console.warn("[@frigear-nu/account] `settings.pages.index` was set, but `@frigear-nu/menu` is not installed - skipping the dashboard page.");
     }
     nuxt.options.runtimeConfig.public.account = {
-      pages: { index: indexPath, profile: profilePath, security: securityPath, documents: documentsPath, idCode: idCodePath, apiTokens: apiTokensPath },
+      pages: { index: indexPath, profile: profilePath, security: securityPath, documents: documentsPath, apiTokens: apiTokensPath },
       documents: settings.documents ?? []
     };
-    if (indexPath || profilePath || securityPath || documentsPath || idCodePath || apiTokensPath) {
+    if (indexPath || profilePath || securityPath || documentsPath || apiTokensPath) {
       extendPages((pages) => {
         const existingPaths = new Set(pages.map((page) => page.path));
         const children = [];
@@ -64,7 +54,6 @@ const module$1 = defineNuxtModule({
         add(profilePath, "account-profile", "./runtime/app/pages/profile.vue");
         add(documentsPath, "account-documents", "./runtime/app/pages/documents.vue");
         add(securityPath, "account-security", "./runtime/app/pages/security.vue");
-        add(idCodePath, "account-id-code", "./runtime/app/pages/id-code.vue");
         add(apiTokensPath, "account-api-tokens", "./runtime/app/pages/api-tokens.vue");
         if (children.length) {
           pages.push({ name: "account-layout", path: "/__account", file: resolver.resolve("./runtime/app/pages/layout.vue"), children });
@@ -74,7 +63,7 @@ const module$1 = defineNuxtModule({
     if (hasNuxtModule("@frigear-nu/authorization")) {
       const prefixes = ["", ...(nuxt.options.i18n?.locales ?? []).map((locale) => typeof locale === "string" ? locale : locale.code).map((code) => `/${code}`)];
       const rules = nuxt.options.routeRules ||= {};
-      const guarded = [indexPath, profilePath, securityPath, documentsPath, idCodePath, apiTokensPath].filter((path) => !!path && !path.startsWith("/account"));
+      const guarded = [indexPath, profilePath, securityPath, documentsPath, apiTokensPath].filter((path) => !!path && !path.startsWith("/account"));
       for (const prefix of prefixes) {
         for (const pattern of [`${prefix}/account`, `${prefix}/account/**`, ...guarded.map((path) => `${prefix}${path}`)]) {
           rules[pattern] = { authenticated: true, ...rules[pattern] };
@@ -85,7 +74,8 @@ const module$1 = defineNuxtModule({
     }
     addOptionalMenuSource(nuxt, { file: resolver.resolve("./runtime/menus"), menu: "dashboard.account" });
     addComponentsDir({
-      path: resolver.resolve("./runtime/app/components")
+      path: resolver.resolve("./runtime/app/components"),
+      priority: -1
     });
   }
 });

package/dist/runtime/app/components/Account/AccountHeader.vue

@@ -1,7 +1,6 @@
 <script setup>
 const t = useModuleT("account");
 const route = useRoute();
-const { user } = useUserSession();
 const pages = useRuntimeConfig().public.account?.pages;
 const nuxtApp = useNuxtApp();
 const items = typeof useMenu === "function" ? useMenu("account").data : ref([]);
@@ -37,22 +36,7 @@ const description = computed(() => current.value?.description);
       />
 
       <template #links>
-        <div
-          v-if="user"
-          class="flex flex-col"
-        >
-          <div class="text-sm text-muted">
-            {{ t("signedInAs", "Signed in as") }}
-          </div>
-          <div class="text-primary">
-            {{ user.email }}
-          </div>
-          <div class="mt-1 flex justify-end">
-            <UBadge variant="soft">
-              Frigear ID: <code>{{ user.id }}</code>
-            </UBadge>
-          </div>
-        </div>
+        <AccountHeaderRight />
       </template>
     </UPageHeader>
   </UContainer>

package/dist/runtime/app/components/Account/AccountHeaderRight.vue

@@ -0,0 +1,18 @@
+<script setup>
+const t = useModuleT("account");
+const { user } = useUserSession();
+</script>
+
+<template>
+  <div
+    v-if="user"
+    class="flex flex-col"
+  >
+    <div class="text-sm text-muted">
+      {{ t("signedInAs", "Signed in as") }}
+    </div>
+    <div class="text-primary">
+      {{ user.email }}
+    </div>
+  </div>
+</template>

package/dist/runtime/i18n/lang/da.json

@@ -24,14 +24,6 @@
         "description": "Opret nøgler til scripts og værktøjer."
       }
     },
-    "identificationCode": {
-      "title": "Frigear ID",
-      "description": "Tryk her for at vise dit ID.",
-      "expiresIn": "Fornyes om {time}s",
-      "refresh": "Opdater",
-      "role": "Rolle",
-      "error": "Kunne ikke oprette dit Frigear ID."
-    },
     "profile": {
       "title": "Profil",
       "description": "Skift dine brugeroplysninger.",

package/dist/runtime/i18n/lang/en.json

@@ -24,14 +24,6 @@
         "description": "Create tokens for scripts and tools."
       }
     },
-    "identificationCode": {
-      "title": "Frigear ID",
-      "description": "Press here to show your ID.",
-      "expiresIn": "Refreshes in {time}s",
-      "refresh": "Refresh",
-      "role": "Role",
-      "error": "Could not create your Frigear ID."
-    },
     "profile": {
       "title": "Profile",
       "description": "Change your information.",

package/dist/runtime/menus.js

@@ -63,16 +63,4 @@ export default defineMenuSource(() => {
       order: 30
     });
   }
-  if (config?.pages?.idCode) {
-    extendMenuItem("account", {
-      id: "id-code",
-      label: "Frigear ID",
-      labelKey: "account.identificationCode.title",
-      description: "Press here to show your ID.",
-      descriptionKey: "account.identificationCode.description",
-      icon: "i-lucide-qr-code",
-      to: config.pages.idCode,
-      order: 5
-    });
-  }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frigear-nu/account",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "A module for managing the account area (profile, email, password, security) in the main frigear app.",
   "homepage": "https://docs.frigear.dev/modules/account",
   "repository": {
@@ -24,21 +24,19 @@
     "playground"
   ],
   "dependencies": {
-    "@frigear-nu/module-kit": "0.1.7",
-    "@frigear-nu/auth": "0.0.3",
-    "@frigear-nu/users": "1.0.9",
+    "@frigear-nu/module-kit": "1.0.1",
+    "@frigear-nu/auth": "0.0.5",
+    "@frigear-nu/users": "1.0.11",
     "@libsql/client": "^0.18.0",
     "@nuxt/kit": "^4.6.0",
     "@vueuse/core": "^15.0.0",
     "drizzle-kit": "^0.31.11",
     "drizzle-orm": "^0.45.3",
-    "jose": "^6.1.0",
-    "uqr": "^0.1.2",
     "zod": "^4.6.5"
   },
   "peerDependencies": {
-    "@frigear-nu/authorization": "0.0.6",
-    "@frigear-nu/menu": "0.0.9",
+    "@frigear-nu/authorization": "0.0.8",
+    "@frigear-nu/menu": "0.0.11",
     "@nuxt/ui": "^4.10.0",
     "@nuxthub/core": "^0.10.8"
   },
@@ -54,8 +52,8 @@
     }
   },
   "devDependencies": {
-    "@frigear-nu/authorization": "0.0.6",
-    "@frigear-nu/menu": "0.0.9",
+    "@frigear-nu/authorization": "0.0.8",
+    "@frigear-nu/menu": "0.0.11",
     "@nuxt/devtools": "^3.4.2",
     "@nuxt/eslint-config": "^1.17.0",
     "@nuxt/module-builder": "^1.0.3",

package/dist/runtime/app/components/Account/IdentificationCode.vue

@@ -1,82 +0,0 @@
-<script setup>
-import { renderSVG } from "uqr";
-import { useIntervalFn } from "@vueuse/core";
-const t = useModuleT("account.identificationCode");
-const { user } = useUserSession();
-const { data, refresh, status, error } = useFetch("/api/account/id-code", { server: false });
-const remaining = ref(0);
-watch(data, (value) => {
-  remaining.value = value?.expiresIn ?? 0;
-}, { immediate: true });
-const refreshing = computed(() => status.value === "pending");
-useIntervalFn(() => {
-  if (!data.value || refreshing.value) return;
-  if (remaining.value <= 1) {
-    remaining.value = 0;
-    refresh();
-    return;
-  }
-  remaining.value -= 1;
-}, 1e3);
-const svg = computed(() => data.value ? renderSVG(data.value.payload, { ecc: "L", border: 1 }) : "");
-const role = computed(() => user.value?.role);
-const membership = computed(() => user.value?.membership);
-</script>
-
-<template>
-  <div class="flex flex-col items-center gap-3">
-    <UAlert
-      v-if="error"
-      color="error"
-      variant="subtle"
-      icon="i-lucide-triangle-alert"
-      :title="t('error', 'Could not create your Frigear ID.')"
-    />
-    <template v-else-if="svg">
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <div
-        class="size-60 rounded-md bg-white p-2 [&>svg]:size-full"
-        v-html="svg"
-      />
-      <UBadge
-        color="warning"
-        class="text-xl font-bold"
-      >
-        {{ t("expiresIn", "Refreshes in {time}s").replace("{time}", String(remaining)) }}
-      </UBadge>
-      <div class="flex flex-wrap justify-center gap-2">
-        <UBadge
-          v-if="user"
-          size="lg"
-        >
-          Frigear ID: {{ user.id }}
-        </UBadge>
-        <UBadge
-          v-if="membership"
-          size="lg"
-        >
-          {{ membership }}
-        </UBadge>
-        <UBadge
-          v-if="role"
-          size="lg"
-          color="success"
-        >
-          {{ t("role", "Role") }}: {{ role }}
-        </UBadge>
-      </div>
-    </template>
-    <UIcon
-      v-else
-      name="i-lucide-refresh-cw"
-      class="size-6 animate-spin"
-    />
-    <UButton
-      icon="i-lucide-refresh-cw"
-      variant="subtle"
-      :loading="refreshing"
-      :label="t('refresh', 'Refresh')"
-      @click="refresh()"
-    />
-  </div>
-</template>

package/dist/runtime/app/components/Account/IdentificationCodeDialog.d.vue.ts

@@ -1,20 +0,0 @@
-type __VLS_ModelProps = {
-    'open'?: boolean;
-};
-declare var __VLS_8: {};
-type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_8) => any;
-};
-declare const __VLS_base: import("vue").DefineComponent<__VLS_ModelProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:open": (value: boolean) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_ModelProps> & Readonly<{
-    "onUpdate:open"?: ((value: boolean) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_WithSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};

package/dist/runtime/app/components/Account/IdentificationCodeDialog.vue

@@ -1,16 +0,0 @@
-<script setup>
-const t = useModuleT("account.identificationCode");
-const open = defineModel("open", { type: Boolean, ...{ default: false } });
-</script>
-
-<template>
-  <UModal
-    v-model:open="open"
-    :title="t('title', 'Frigear ID')"
-  >
-    <slot />
-    <template #body>
-      <AccountIdentificationCode v-if="open" />
-    </template>
-  </UModal>
-</template>

package/dist/runtime/app/components/Account/IdentificationCodeDialog.vue.d.ts

@@ -1,20 +0,0 @@
-type __VLS_ModelProps = {
-    'open'?: boolean;
-};
-declare var __VLS_8: {};
-type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_8) => any;
-};
-declare const __VLS_base: import("vue").DefineComponent<__VLS_ModelProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:open": (value: boolean) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_ModelProps> & Readonly<{
-    "onUpdate:open"?: ((value: boolean) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_WithSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};

package/dist/runtime/app/pages/id-code.d.vue.ts

@@ -1,3 +0,0 @@
-declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: typeof __VLS_export;
-export default _default;

package/dist/runtime/app/pages/id-code.vue

@@ -1,13 +0,0 @@
-<script setup>
-defineOptions({ name: "AccountIdCodePage" });
-</script>
-
-<template>
-  <UContainer>
-    <UPage>
-      <UPageBody>
-        <AccountIdentificationCode />
-      </UPageBody>
-    </UPage>
-  </UContainer>
-</template>

package/dist/runtime/app/pages/id-code.vue.d.ts

@@ -1,3 +0,0 @@
-declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: typeof __VLS_export;
-export default _default;

package/dist/runtime/server/routes/account/id-code.get.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/dist/runtime/server/routes/account/id-code.get.js

@@ -1,20 +0,0 @@
-import { SignJWT, importPKCS8 } from "jose";
-const TTL_SECONDS = 60;
-function normalizePem(raw) {
-  return raw.trim().replace(/^["']|["']$/g, "").replace(/\\n/g, "\n").trim();
-}
-export default defineEventHandler(async (event) => {
-  const user = await requireUser(event, { sessionOnly: true });
-  const config = useRuntimeConfig(event);
-  const own = config.account?.idCode;
-  const oauth = config.oauthServer;
-  const pem = normalizePem(own?.privateKey || oauth?.privateKey || "");
-  if (!pem) {
-    throw createError({ statusCode: 501, statusMessage: "Frigear ID is not configured: set a signing key." });
-  }
-  const keyId = own?.keyId || oauth?.keyId || "key-1";
-  const issuer = own?.issuer || oauth?.issuer || getRequestURL(event).origin;
-  const key = await importPKCS8(pem, "RS256");
-  const jwt = await new SignJWT({ typ: "frigear:id" }).setProtectedHeader({ alg: "RS256", kid: keyId }).setIssuer(issuer).setSubject(String(user.id)).setAudience("frigear:id").setIssuedAt().setExpirationTime(`${TTL_SECONDS}s`).setJti(crypto.randomUUID()).sign(key);
-  return { idCode: jwt, payload: `urn:frigear:id:${jwt}`, expiresIn: TTL_SECONDS };
-});