@adonis-agora/authkit-server 0.80.0 → 0.80.2

package/build/commands/configure.js

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { stubsRoot } from '../stubs/main.js';
-import { resolveUiPreset, uiStubPaths } from './ui_preset.js';
+import { resolveUiPreset, uiStubDestination, uiStubPaths } from './ui_preset.js';
 function assertPresetPrereqs(preset, appRoot) {
     if (preset !== 'react')
         return;
@@ -40,8 +40,11 @@ export async function configure(command) {
         },
     });
     await codemods.makeUsingStub(stubsRoot, 'models/auth_user.stub', {});
+    // As páginas React vão byte a byte: o `page.stub` só define o destino e o
+    // conteúdo vem do `.tsx` via `contentsFromFile`, sem passar pelo template
+    // engine (que quebraria nas crases das template literals — bug #194).
     for (const path of uiStubPaths(preset)) {
-        await codemods.makeUsingStub(stubsRoot, path, {});
+        await codemods.makeUsingStub(stubsRoot, 'ui/react/page.stub', { destination: uiStubDestination(path) }, { contentsFromFile: join(stubsRoot, path) });
     }
     await codemods.updateRcFile((rcFile) => {
         rcFile.addProvider('@adonis-agora/authkit-server/authkit_server_provider');

package/build/commands/ui_preset.d.ts

@@ -1,4 +1,19 @@
 export type UiPreset = 'headless' | 'edge' | 'react';
 export declare function resolveUiPreset(value: string | undefined): UiPreset;
-/** Caminhos de stub (relativos ao stubsRoot) que o preset publica. */
+/**
+ * Arquivos (relativos ao stubsRoot) que o preset publica.
+ *
+ * As páginas React são TSX puro, SEM frontmatter `{{{ exports() }}}`: o
+ * `configure` as publica via `ui/react/page.stub` + `contentsFromFile` (ver
+ * `uiStubDestination`). Elas não podem passar pelo template engine dos stubs —
+ * crases e `${...}` de template literal quebram a compilação (bug #194) —, e
+ * como são `.tsx` o formatter reescrevia o frontmatter para `{ exports() }`,
+ * que o gerador nem reconhece.
+ */
 export declare function uiStubPaths(preset: UiPreset): string[];
+/**
+ * Destino, relativo à raiz do app, de um arquivo de `uiStubPaths('react')`:
+ * `ui/react/components/*` vai para `inertia/components/*` e `ui/react/pages/*`
+ * para `inertia/pages/authkit/*` (o `prefix` do `inertiaRenderer`).
+ */
+export declare function uiStubDestination(path: string): string;

package/build/commands/ui_preset.js

@@ -7,7 +7,16 @@ export function resolveUiPreset(value) {
     }
     return value;
 }
-/** Caminhos de stub (relativos ao stubsRoot) que o preset publica. */
+/**
+ * Arquivos (relativos ao stubsRoot) que o preset publica.
+ *
+ * As páginas React são TSX puro, SEM frontmatter `{{{ exports() }}}`: o
+ * `configure` as publica via `ui/react/page.stub` + `contentsFromFile` (ver
+ * `uiStubDestination`). Elas não podem passar pelo template engine dos stubs —
+ * crases e `${...}` de template literal quebram a compilação (bug #194) —, e
+ * como são `.tsx` o formatter reescrevia o frontmatter para `{ exports() }`,
+ * que o gerador nem reconhece.
+ */
 export function uiStubPaths(preset) {
     switch (preset) {
         case 'headless':
@@ -44,3 +53,17 @@ export function uiStubPaths(preset) {
             ];
     }
 }
+/**
+ * Destino, relativo à raiz do app, de um arquivo de `uiStubPaths('react')`:
+ * `ui/react/components/*` vai para `inertia/components/*` e `ui/react/pages/*`
+ * para `inertia/pages/authkit/*` (o `prefix` do `inertiaRenderer`).
+ */
+export function uiStubDestination(path) {
+    if (path.startsWith('ui/react/components/')) {
+        return `inertia/components/${path.slice('ui/react/components/'.length)}`;
+    }
+    if (path.startsWith('ui/react/pages/')) {
+        return `inertia/pages/authkit/${path.slice('ui/react/pages/'.length)}`;
+    }
+    throw new Error(`authkit: stub de UI sem destino conhecido: ${path}`);
+}

package/build/stubs/ui/react/components/auth_shell.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/components/auth_shell.tsx') });
-}
-
 import type { ReactNode } from 'react';
 
 export interface AuthBrand {

package/build/stubs/ui/react/page.stub

@@ -0,0 +1,3 @@
+{{{
+  exports({ to: app.makePath(destination) })
+}}}

package/build/stubs/ui/react/pages/account/login.tsx

@@ -1,6 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/account/login.tsx') });
-}
 interface Props {
   csrfToken: string;
   error?: string;

package/build/stubs/ui/react/pages/account/mfa.tsx

@@ -1,6 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/account/mfa.tsx') });
-}
 interface Props {
   csrfToken: string;
   enabled: boolean;

package/build/stubs/ui/react/pages/account/tokens.tsx

@@ -1,6 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/account/tokens.tsx') });
-}
 interface TokenRow {
   id: string;
   name: string;

package/build/stubs/ui/react/pages/consent.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/consent.tsx') });
-}
-
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 
 export default function AuthkitConsent({

package/build/stubs/ui/react/pages/forgot.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/forgot.tsx') });
-}
-
 import AuthShell from '../../components/auth_shell';
 
 const inputClass =

package/build/stubs/ui/react/pages/login.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/login.tsx') });
-}
-
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 
 const inputClass =

package/build/stubs/ui/react/pages/mfa-challenge.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/mfa-challenge.tsx') });
-}
-
 import { useRef, useState } from 'react';
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 

package/build/stubs/ui/react/pages/reset.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/reset.tsx') });
-}
-
 import AuthShell from '../../components/auth_shell';
 
 const inputClass =

package/build/stubs/ui/react/pages/signup.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/signup.tsx') });
-}
-
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 
 const inputClass =

package/build/stubs/ui/react/pages/verify-email.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/verify-email.tsx') });
-}
-
 import AuthShell from '../../components/auth_shell';
 
 export default function AuthkitVerifyEmail({ verified }: { verified?: boolean }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonis-agora/authkit-server",
-  "version": "0.80.0",
+  "version": "0.80.2",
   "description": "AdonisJS OIDC/OAuth2 provider (Identity Provider) toolkit: ejectable auth server with sessions, rate-limiting, MFA/TOTP, audit log, federated logout and OpenTelemetry metrics.",
   "license": "MIT",
   "author": "dudousxd",
@@ -60,17 +60,17 @@
     "@adonis-agora/durable": ">=0.7.0 <1.0.0",
     "@adonis-agora/media": ">=0.5.0 <1.0.0",
     "@adonis-agora/telescope": ">=0.1.0 <1.0.0",
-    "@adonisjs/ally": "6.3.0",
-    "@adonisjs/auth": "10.1.0",
-    "@adonisjs/core": "7.5.0",
-    "@adonisjs/drive": "4.0.0",
-    "@adonisjs/lock": "2.1.0",
-    "@adonisjs/lucid": "22.4.2",
-    "@adonisjs/redis": "11.0.0",
-    "@adonisjs/session": "8.1.0",
-    "@adonisjs/shield": "9.0.0",
-    "@vinejs/vine": "4.4.0",
-    "edge.js": "6.5.1"
+    "@adonisjs/ally": "^6.3.0",
+    "@adonisjs/auth": "^10.1.0",
+    "@adonisjs/core": "^7.5.0",
+    "@adonisjs/drive": "^4.0.0",
+    "@adonisjs/lock": "^2.1.0",
+    "@adonisjs/lucid": "^22.4.2",
+    "@adonisjs/redis": "^9.2.0 || ^10.0.0 || ^11.0.0",
+    "@adonisjs/session": "^8.1.0",
+    "@adonisjs/shield": "^9.0.0",
+    "@vinejs/vine": "^4.4.0",
+    "edge.js": "^6.5.1"
   },
   "peerDependenciesMeta": {
     "@adonis-agora/durable": {
@@ -113,7 +113,7 @@
     "qrcode": "1.5.4"
   },
   "devDependencies": {
-    "@adonis-agora/authkit-react": "0.24.0",
+    "@adonis-agora/authkit-react": "0.24.1",
     "@adonis-agora/durable": "0.40.0",
     "@adonis-agora/telescope": "0.21.1",
     "@adonisjs/ally": "6.3.0",

package/skills/authkit-interactions/SKILL.md

@@ -145,7 +145,7 @@ JWKS, and fakes the authenticator for controller tests:
 
 ```ts
 import { mintTestIdToken, serveJwks, fakeAuthenticator } from '@adonis-agora/authkit-testing'
-import { resolvers } from '@adonis-agora/authkit-client'
+import { conventionEndpoints, resolvers } from '@adonis-agora/authkit-client'
 
 const { token, jwks } = await mintTestIdToken({
   issuer: 'https://idp.test',
@@ -160,6 +160,8 @@ const resolver = await factory.resolver({
   clientId: 'my-app',
   sessionKey: 'authkit',
   globalRolesClaim: 'roles',
+  endpoints: async () => conventionEndpoints('https://idp.test'),
+  logger: { warn: () => {} },
 })
 const ctx = { auth: fakeAuthenticator({ identity: null }) } // anonymous request fake
 await served.close()

package/stubs/ui/react/components/auth_shell.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/components/auth_shell.tsx') });
-}
-
 import type { ReactNode } from 'react';
 
 export interface AuthBrand {

package/stubs/ui/react/page.stub

@@ -0,0 +1,3 @@
+{{{
+  exports({ to: app.makePath(destination) })
+}}}

package/stubs/ui/react/pages/account/login.tsx

@@ -1,6 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/account/login.tsx') });
-}
 interface Props {
   csrfToken: string;
   error?: string;

package/stubs/ui/react/pages/account/mfa.tsx

@@ -1,6 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/account/mfa.tsx') });
-}
 interface Props {
   csrfToken: string;
   enabled: boolean;

package/stubs/ui/react/pages/account/tokens.tsx

@@ -1,6 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/account/tokens.tsx') });
-}
 interface TokenRow {
   id: string;
   name: string;

package/stubs/ui/react/pages/consent.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/consent.tsx') });
-}
-
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 
 export default function AuthkitConsent({

package/stubs/ui/react/pages/forgot.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/forgot.tsx') });
-}
-
 import AuthShell from '../../components/auth_shell';
 
 const inputClass =

package/stubs/ui/react/pages/login.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/login.tsx') });
-}
-
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 
 const inputClass =

package/stubs/ui/react/pages/mfa-challenge.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/mfa-challenge.tsx') });
-}
-
 import { useRef, useState } from 'react';
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 

package/stubs/ui/react/pages/reset.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/reset.tsx') });
-}
-
 import AuthShell from '../../components/auth_shell';
 
 const inputClass =

package/stubs/ui/react/pages/signup.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/signup.tsx') });
-}
-
 import AuthShell, { type AuthBrand } from '../../components/auth_shell';
 
 const inputClass =

package/stubs/ui/react/pages/verify-email.tsx

@@ -1,7 +1,3 @@
-{
-  exports({ to: app.makePath('inertia/pages/authkit/verify-email.tsx') });
-}
-
 import AuthShell from '../../components/auth_shell';
 
 export default function AuthkitVerifyEmail({ verified }: { verified?: boolean }) {