@commonpub/layer 0.8.6 → 0.8.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/layer",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "type": "module",
   "main": "./nuxt.config.ts",
   "files": [
@@ -53,13 +53,13 @@
     "vue": "^3.4.0",
     "vue-router": "^4.3.0",
     "zod": "^4.3.6",
-    "@commonpub/auth": "0.5.1",
     "@commonpub/docs": "0.6.2",
     "@commonpub/config": "0.9.1",
     "@commonpub/editor": "0.7.9",
     "@commonpub/learning": "0.5.0",
-    "@commonpub/protocol": "0.9.9",
-    "@commonpub/ui": "0.8.5"
+    "@commonpub/auth": "0.5.1",
+    "@commonpub/ui": "0.8.5",
+    "@commonpub/protocol": "0.9.9"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",

package/server/api/auth/federated/link.post.ts

@@ -1,4 +1,6 @@
 import { linkFederatedAccount, consumePendingLink } from '@commonpub/server';
+import { eq, and, isNull } from 'drizzle-orm';
+import { users } from '@commonpub/schema';
 import { z } from 'zod';
 
 const linkSchema = z.object({
@@ -30,12 +32,18 @@ export default defineEventHandler(async (event) => {
   }
 
   // Step 2: Resolve identity to email
-  const { email } = await $fetch<{ email: string }>('/api/resolve-identity', {
-    method: 'POST',
-    body: { identity: body.identity },
-  }).catch(() => {
-    throw createError({ statusCode: 401, statusMessage: 'Invalid credentials.' });
-  });
+  let email = body.identity;
+  if (!body.identity.includes('@')) {
+    const [user] = await db
+      .select({ email: users.email })
+      .from(users)
+      .where(and(eq(users.username, body.identity), isNull(users.deletedAt)))
+      .limit(1);
+    if (!user) {
+      throw createError({ statusCode: 401, statusMessage: 'Invalid credentials.' });
+    }
+    email = user.email;
+  }
 
   // Step 3: Authenticate via Better Auth sign-in (also creates session + sets cookie)
   const signInResponse = await $fetch<{ user?: { id: string }; session?: { token: string; expiresAt: string } }>(

package/server/middleware/auth.ts

@@ -110,10 +110,13 @@ export default defineEventHandler(async (event) => {
     return;
   }
 
-  // Handle auth API routes — skip our custom federated/oauth2 routes (Nitro handles those)
-  const isBetterAuthRoute = pathname.startsWith('/api/auth')
-    && !pathname.startsWith('/api/auth/federated/')
-    && !pathname.startsWith('/api/auth/oauth2/');
+  // Handle auth API routes — skip custom routes that Nitro handles directly
+  const isCustomAuthRoute = pathname.startsWith('/api/auth/federated/')
+    || pathname.startsWith('/api/auth/oauth2/')
+    || pathname === '/api/auth/sign-in-username'
+    || pathname === '/api/auth/delete-user'
+    || pathname === '/api/auth/export-data';
+  const isBetterAuthRoute = pathname.startsWith('/api/auth') && !isCustomAuthRoute;
 
   if (isBetterAuthRoute) {
     try {