@commonpub/layer 0.8.5 → 0.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/layer",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "type": "module",
   "main": "./nuxt.config.ts",
   "files": [
@@ -54,11 +54,11 @@
     "vue-router": "^4.3.0",
     "zod": "^4.3.6",
     "@commonpub/auth": "0.5.1",
-    "@commonpub/editor": "0.7.9",
     "@commonpub/docs": "0.6.2",
-    "@commonpub/protocol": "0.9.9",
     "@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"
   },
   "devDependencies": {

package/server/api/auth/sign-in-username.post.ts

@@ -1,4 +1,5 @@
-import { resolveIdentityToEmail } from '@commonpub/server';
+import { eq, and, isNull } from 'drizzle-orm';
+import { users } from '@commonpub/schema';
 import { z } from 'zod';
 
 const signInSchema = z.object({
@@ -14,11 +15,21 @@ const signInSchema = z.object({
 export default defineEventHandler(async (event) => {
   const body = await parseBody(event, signInSchema);
 
-  let email: string;
-  try {
-    email = await resolveIdentityToEmail(useDB(), body.identity);
-  } catch {
-    throw createError({ statusCode: 401, statusMessage: 'Invalid credentials' });
+  let email = body.identity;
+
+  // If identity doesn't look like an email, resolve username → email
+  if (!body.identity.includes('@')) {
+    const db = useDB();
+    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;
   }
 
   // Proxy to Better Auth's email sign-in (internal server-side call)