chore: wip

Author: glennmichael123

storage/framework/core/auth/src/authentication.ts

@@ -104,11 +104,13 @@ export class Auth {
       })
       .executeTakeFirst()
 
-    if (!result?.insertId)
+    const insertId = Number(result?.insertId) || Number(result?.numInsertedOrUpdatedRows)
+
+    if (!insertId)
       throw new HttpError(500, 'Failed to create token')
 
     // Encrypt the token ID using client secret
-    const encryptedId = encrypt(result.insertId.toString(), clientSecret)
+    const encryptedId = encrypt(insertId.toString(), clientSecret)
 
     // Combine into final token format with JWT first
     return `${jwtToken}:${encryptedId}` as AuthToken

storage/framework/core/auth/src/register.ts

@@ -1,17 +1,15 @@
 import type { NewUser } from '@stacksjs/orm'
 import type { AuthToken } from './token'
 import { db } from '@stacksjs/database'
+import { User } from '@stacksjs/orm'
 import { makeHash } from '@stacksjs/security'
 import { Auth } from './authentication'
 
 export async function register(credentials: NewUser): Promise<{ token: AuthToken } | null> {
   const { email, password, name } = credentials
 
   // Check if user already exists
-  const existingUser = await db.selectFrom('users')
-    .where('email', '=', email)
-    .selectAll()
-    .executeTakeFirst()
+  const existingUser = await User.where('email', '=', email).first()
 
   if (existingUser)
     return null
@@ -34,10 +32,7 @@ export async function register(credentials: NewUser): Promise<{ token: AuthToken
     return null
 
   // Get the created user
-  const user = await db.selectFrom('users')
-    .where('id', '=', insertId)
-    .selectAll()
-    .executeTakeFirst()
+  const user = await User.find(insertId)
 
   if (!user)
     return null