fix: ts errors

rrd108 · rrd108 · commit 44f5d9e336bf · 2025-11-02T15:28:38.000+01:00
diff --git a/src/runtime/server/api/nuxt-users/inactive.get.ts b/src/runtime/server/api/nuxt-users/inactive.get.ts
@@ -27,7 +27,7 @@ export default defineEventHandler(async (event) => {
   try {
     // Get total count for pagination
     const countResult = await db.sql`SELECT COUNT(*) as total FROM {${usersTable}} WHERE active = FALSE` as { rows: Array<{ total: number }> }
-    const total = countResult.rows[0].total
+    const total = countResult.rows[0]?.total ?? 0
 
     // Get users with pagination (excluding passwords)
     const usersResult = await db.sql`
diff --git a/src/runtime/server/api/nuxt-users/index.get.ts b/src/runtime/server/api/nuxt-users/index.get.ts
@@ -27,7 +27,7 @@ export default defineEventHandler(async (event) => {
   try {
     // Get total count for pagination
     const countResult = await db.sql`SELECT COUNT(*) as total FROM {${usersTable}} WHERE active = TRUE` as { rows: Array<{ total: number }> }
-    const total = countResult.rows[0].total
+    const total = countResult.rows[0]?.total ?? 0
 
     // Get users with pagination (excluding passwords)
     const usersResult = await db.sql`
diff --git a/src/runtime/server/api/nuxt-users/session/index.post.ts b/src/runtime/server/api/nuxt-users/session/index.post.ts
@@ -32,6 +32,13 @@ export default defineEventHandler(async (event) => {
   }
 
   const user = userResult.rows[0]
+  if (!user) {
+    throw createError({
+      statusCode: 401,
+      statusMessage: 'Invalid email or password',
+    })
+  }
+
   if (!user.active) {
     throw createError({
       statusCode: 403,
diff --git a/src/runtime/server/services/password.ts b/src/runtime/server/services/password.ts
@@ -155,9 +155,19 @@ export const resetPassword = async (
 
   // Parse the original timestamp and add expiration hours
   const [datePart, timePart] = validTokenRecord.created_at.split(/[ T]/) // Split on space or T
+  if (!datePart || !timePart) {
+    console.log(`[Nuxt Users] Invalid timestamp format for token: ${validTokenRecord.created_at}`)
+    return false
+  }
+
   const [year, month, day] = datePart.split('-').map(Number)
   const [hour, minute, second] = timePart.split(':').map(Number)
 
+  if (!year || !month || !day || hour === undefined || minute === undefined || second === undefined) {
+    console.log(`[Nuxt Users] Invalid timestamp components`)
+    return false
+  }
+
   // Calculate expiration time by adding hours
   let expirationHour = hour + TOKEN_EXPIRATION_HOURS
   let expirationDay = day
diff --git a/src/runtime/server/services/registration.ts b/src/runtime/server/services/registration.ts
@@ -62,6 +62,9 @@ export const registerUser = async (
   }
 
   const user = result.rows[0]
+  if (!user) {
+    throw new Error('Failed to retrieve created user.')
+  }
 
   // Store confirmation token (reuse the password_reset_tokens table structure for confirmation tokens)
   const passwordResetTokensTable = options.tables.passwordResetTokens
@@ -226,9 +229,19 @@ export const confirmUserEmail = async (
     : String(validTokenRecord.created_at)
 
   const [datePart, timePart] = createdAtString.split(/[ T]/)
+  if (!datePart || !timePart) {
+    console.log(`[Nuxt Users] Invalid timestamp format for token: ${createdAtString}`)
+    return false
+  }
+
   const [year, month, day] = datePart.split('-').map(Number)
   const [hour, minute, second] = timePart.split(':').map(Number)
 
+  if (!year || !month || !day || hour === undefined || minute === undefined || second === undefined) {
+    console.log(`[Nuxt Users] Invalid timestamp components`)
+    return false
+  }
+
   // Calculate expiration time by adding hours
   let expirationHour = hour + TOKEN_EXPIRATION_HOURS
   let expirationDay = day
@@ -244,7 +257,9 @@ export const confirmUserEmail = async (
     if (expirationYear % 4 === 0 && (expirationYear % 100 !== 0 || expirationYear % 400 === 0)) {
       daysInMonth[1] = 29 // leap year
     }
-    if (expirationDay > daysInMonth[expirationMonth - 1]) {
+    const monthIndex = expirationMonth - 1
+    const daysInCurrentMonth = daysInMonth[monthIndex]
+    if (daysInCurrentMonth && expirationDay > daysInCurrentMonth) {
       expirationDay = 1
       expirationMonth++
       if (expirationMonth > 12) {
diff --git a/src/runtime/server/utils/google-oauth.ts b/src/runtime/server/utils/google-oauth.ts
@@ -97,6 +97,9 @@ export async function findOrCreateGoogleUser(
 
   if (userResult.rows.length > 0) {
     const user = userResult.rows[0]
+    if (!user) {
+      return null
+    }
 
     // Update profile picture if it has changed
     if (user.profile_picture !== googleUser.picture) {
@@ -120,6 +123,10 @@ export async function findOrCreateGoogleUser(
   if (userResult.rows.length > 0) {
     // User exists with same email, link Google account
     const user = userResult.rows[0]
+    if (!user) {
+      return null
+    }
+
     await db.sql`
       UPDATE {${usersTable}} 
       SET google_id = ${googleUser.id}, 
@@ -164,7 +171,7 @@ export async function findOrCreateGoogleUser(
     WHERE google_id = ${googleUser.id}
   ` as { rows: User[] }
 
-  return createdUserResult.rows[0]
+  return createdUserResult.rows[0] ?? null
 }
 
 /**
diff --git a/src/runtime/server/utils/user.ts b/src/runtime/server/utils/user.ts
@@ -46,6 +46,9 @@ export const createUser = async (userData: CreateUserParams, options: ModuleOpti
   }
 
   const user = result.rows[0]
+  if (!user) {
+    throw new Error('Failed to retrieve created user.')
+  }
 
   // Convert Date objects to ISO strings if needed
   return {
@@ -73,6 +76,9 @@ export const findUserByEmail = async (email: string, options: ModuleOptions): Pr
   }
 
   const user = result.rows[0]
+  if (!user) {
+    return null
+  }
 
   // Convert Date objects to ISO strings if needed
   return {
@@ -105,6 +111,9 @@ export const findUserById = async <T extends boolean = false>(
   }
 
   const user = result.rows[0]
+  if (!user) {
+    return null
+  }
 
   const normalizedUser = {
     ...user,
@@ -221,7 +230,8 @@ export const hasAnyUsers = async (options: ModuleOptions) => {
     const db = await useDb(options)
 
     const users = await db.sql`SELECT COUNT(*) as count FROM {${options.tables.users}}` as CountResult
-    return users.rows?.[0]?.count > 0
+    const firstRow = users.rows?.[0]
+    return firstRow ? firstRow.count > 0 : false
   }
   catch {
     // If the table doesn't exist or connection fails, there are no users
@@ -252,7 +262,12 @@ export const getCurrentUserFromToken = async <T extends boolean = false>(
     return null
   }
 
-  const userId = tokenResult.rows[0].tokenable_id
+  const tokenRow = tokenResult.rows[0]
+  if (!tokenRow) {
+    return null
+  }
+
+  const userId = tokenRow.tokenable_id
 
   // Update last_used_at timestamp for the token
   await db.sql`
@@ -272,6 +287,9 @@ export const getCurrentUserFromToken = async <T extends boolean = false>(
   }
 
   const user = userResult.rows[0]
+  if (!user) {
+    return null
+  }
 
   if (!user.active) {
     return null
@@ -370,7 +388,12 @@ export const getLastLoginTime = async (userId: number, options: ModuleOptions):
     return null
   }
 
-  const lastLogin = result.rows[0].created_at
+  const resultRow = result.rows[0]
+  if (!resultRow) {
+    return null
+  }
+
+  const lastLogin = resultRow.created_at
 
   // Convert Date objects to ISO strings if needed
   return lastLogin instanceof Date ? lastLogin.toISOString() : lastLogin
diff --git a/test/cli/create-migrations-table.test.ts b/test/cli/create-migrations-table.test.ts
@@ -128,8 +128,8 @@ describe('CLI: Create Migrations Table', () => {
     const migrations = result.rows || []
 
     expect(migrations).toHaveLength(2)
-    expect(migrations[0].id).toBe(1)
-    expect(migrations[1].id).toBe(2)
+    expect(migrations[0]?.id).toBe(1)
+    expect(migrations[1]?.id).toBe(2)
   })
 
   it('should set default timestamp', async () => {
diff --git a/test/cli/create-password-reset-tokens-table.test.ts b/test/cli/create-password-reset-tokens-table.test.ts
@@ -130,8 +130,8 @@ describe('CLI: Create Password Reset Tokens Table', () => {
     const tokens = result.rows || []
 
     expect(tokens).toHaveLength(2)
-    expect(tokens[0].id).toBe(1)
-    expect(tokens[1].id).toBe(2)
+    expect(tokens[0]?.id).toBe(1)
+    expect(tokens[1]?.id).toBe(2)
   })
 
   it('should set default timestamp', async () => {
diff --git a/test/cli/create-personal-access-tokens-table.test.ts b/test/cli/create-personal-access-tokens-table.test.ts
@@ -135,8 +135,8 @@ describe('CLI: Create Personal Access Tokens Table', () => {
     const tokens = result.rows || []
 
     expect(tokens).toHaveLength(2)
-    expect(tokens[0].id).toBe(1)
-    expect(tokens[1].id).toBe(2)
+    expect(tokens[0]?.id).toBe(1)
+    expect(tokens[1]?.id).toBe(2)
   })
 
   it('should set default timestamps', async () => {
diff --git a/test/cli/create-user.test.ts b/test/cli/create-user.test.ts
@@ -108,9 +108,9 @@ describe('CLI: Create User', () => {
     const createdUsers = result.rows || []
 
     expect(createdUsers).toHaveLength(3)
-    expect(createdUsers[0].id).toBe(1)
-    expect(createdUsers[1].id).toBe(2)
-    expect(createdUsers[2].id).toBe(3)
+    expect(createdUsers[0]?.id).toBe(1)
+    expect(createdUsers[1]?.id).toBe(2)
+    expect(createdUsers[2]?.id).toBe(3)
   })
 
   it('should set created_at and updated_at timestamps', async () => {
diff --git a/test/cli/create-users-table.test.ts b/test/cli/create-users-table.test.ts
@@ -131,8 +131,8 @@ describe('CLI: Create Users Table', () => {
     const users = result.rows || []
 
     expect(users).toHaveLength(2)
-    expect(users[0].id).toBe(1)
-    expect(users[1].id).toBe(2)
+    expect(users[0]?.id).toBe(1)
+    expect(users[1]?.id).toBe(2)
   })
 
   it('should set default timestamps', async () => {
diff --git a/test/cli/migrate.test.ts b/test/cli/migrate.test.ts
@@ -187,12 +187,12 @@ describe('CLI: Migrate', () => {
     const migrationsResult2 = await db.sql`SELECT id, name, executed_at FROM migrations ORDER BY id`
     const migrations = migrationsResult2.rows || []
     expect(migrations).toHaveLength(6)
-    expect(migrations[0].name).toBe('create_migrations_table')
-    expect(migrations[1].name).toBe('create_users_table')
-    expect(migrations[2].name).toBe('create_personal_access_tokens_table')
-    expect(migrations[3].name).toBe('create_password_reset_tokens_table')
-    expect(migrations[4].name).toBe('add_active_to_users')
-    expect(migrations[5].name).toBe('add_google_oauth_fields')
+    expect(migrations[0]?.name).toBe('create_migrations_table')
+    expect(migrations[1]?.name).toBe('create_users_table')
+    expect(migrations[2]?.name).toBe('create_personal_access_tokens_table')
+    expect(migrations[3]?.name).toBe('create_password_reset_tokens_table')
+    expect(migrations[4]?.name).toBe('add_active_to_users')
+    expect(migrations[5]?.name).toBe('add_google_oauth_fields')
   })
 
   it('should handle partial migrations correctly', async () => {
diff --git a/test/database-sharing.test.ts b/test/database-sharing.test.ts
@@ -188,7 +188,7 @@ describe('Database Sharing Feature', () => {
       const userResult = await db.sql`SELECT id FROM {${testOptions.tables.users}} WHERE email = 'testuser@example.com'`
       expect(userResult.rows).toBeDefined()
       expect(userResult.rows?.length).toBe(1)
-      const userId = userResult.rows![0].id
+      const userId = userResult.rows?.[0]?.id
 
       // Insert post linked to user (consumer's table)
       await db.sql`
@@ -217,8 +217,8 @@ describe('Database Sharing Feature', () => {
 
       expect(joinQuery.rows).toBeDefined()
       expect(joinQuery.rows?.length).toBe(1)
-      expect(joinQuery.rows![0].name).toBe('Test User')
-      expect(joinQuery.rows![0].title).toBe('My First Post')
+      expect(joinQuery.rows?.[0]?.name).toBe('Test User')
+      expect(joinQuery.rows?.[0]?.title).toBe('My First Post')
     })
 
     it('should handle multiple consumer tables in shared database', async () => {
@@ -261,7 +261,7 @@ describe('Database Sharing Feature', () => {
       // Verify all tables were created and contain data
       for (const tableName of tables) {
         const result = await db.sql`SELECT COUNT(*) as count FROM {${tableName}}`
-        expect(Number(result.rows![0].count)).toBeGreaterThan(0)
+        expect(Number(result.rows?.[0]?.count)).toBeGreaterThan(0)
       }
 
       // Clean up the additional tables
@@ -305,7 +305,7 @@ describe('Database Sharing Feature', () => {
       await customSetup.db.sql`INSERT INTO custom_test (message) VALUES ('Custom database works!')`
 
       const result = await customSetup.db.sql`SELECT message FROM custom_test`
-      expect(result.rows![0].message).toBe('Custom database works!')
+      expect(result.rows?.[0]?.message).toBe('Custom database works!')
 
       // Clean up
       await cleanupTestSetup('sqlite', customSetup.db, [customConfig.connector.options.path!], 'custom_test')
@@ -322,7 +322,7 @@ describe('Database Sharing Feature', () => {
       `
 
       const userResult = await db.sql`SELECT COUNT(*) as count FROM {${testOptions.tables.users}}`
-      expect(Number(userResult.rows![0].count)).toBe(1)
+      expect(Number(userResult.rows?.[0]?.count)).toBe(1)
 
       // The afterEach hook should clean this up automatically
       // Next test should start with a clean database
@@ -366,7 +366,7 @@ describe('Database Sharing Feature', () => {
 
       expect(result.rows).toBeDefined()
       expect(result.rows?.length).toBe(1)
-      expect(result.rows![0].name).toBe(`${dbType} test`)
+      expect(result.rows?.[0]?.name).toBe(`${dbType} test`)
 
       // Clean up
       await cleanupTestSetup(dbType, db, [testOptions.connector!.options.path!], 'type_test')
diff --git a/test/google-oauth-flow.test.ts b/test/google-oauth-flow.test.ts
@@ -118,9 +118,9 @@ describe('Google OAuth Complete Flow Integration', () => {
       ` as { rows: PersonalAccessToken[] }
 
       expect(tokens.rows).toHaveLength(1)
-      expect(tokens.rows[0].tokenable_id).toBe(user!.id)
-      expect(tokens.rows[0].tokenable_type).toBe('user')
-      expect(tokens.rows[0].name).toBe('oauth_auth_token')
+      expect(tokens.rows[0]?.tokenable_id).toBe(user!.id)
+      expect(tokens.rows[0]?.tokenable_type).toBe('user')
+      expect(tokens.rows[0]?.name).toBe('oauth_auth_token')
 
       // Step 5: Simulate /me endpoint (verify token works)
       const { getCurrentUserFromToken } = await import('../src/runtime/server/utils/user')
@@ -142,7 +142,7 @@ describe('Google OAuth Complete Flow Integration', () => {
       `
 
       const existingUsers = await db.sql`SELECT * FROM users WHERE email = 'existing@example.com'` as { rows: User[] }
-      const existingUserId = existingUsers.rows[0].id
+      const existingUserId = existingUsers.rows[0]?.id
 
       // OAuth flow with same email
       const { findOrCreateGoogleUser, createAuthTokenForUser } = await import('../src/runtime/server/utils/google-oauth')
@@ -260,7 +260,7 @@ describe('Google OAuth Complete Flow Integration', () => {
 
       // Verify token expiration
       const tokens = await db.sql`SELECT expires_at FROM personal_access_tokens WHERE token = ${token}` as { rows: PersonalAccessToken[] }
-      const expiresAt = new Date(tokens.rows[0].expires_at!)
+      const expiresAt = new Date(tokens.rows[0]?.expires_at!)
       const now = new Date()
       const daysDifference = Math.floor((expiresAt.getTime() - now.getTime()) / (1000 * 60 * 60 * 24))
 
@@ -312,15 +312,15 @@ describe('Google OAuth Complete Flow Integration', () => {
 
       // Verify last_used_at is null initially
       let tokens = await db.sql`SELECT last_used_at FROM personal_access_tokens WHERE token = ${token}` as { rows: PersonalAccessToken[] }
-      expect(tokens.rows[0].last_used_at).toBeNull()
+      expect(tokens.rows[0]?.last_used_at).toBeNull()
 
       // Use the token (simulating API call)
       const { getCurrentUserFromToken } = await import('../src/runtime/server/utils/user')
       await getCurrentUserFromToken(token, testOptions)
 
       // Verify last_used_at was updated
       tokens = await db.sql`SELECT last_used_at FROM personal_access_tokens WHERE token = ${token}` as { rows: PersonalAccessToken[] }
-      expect(tokens.rows[0].last_used_at).not.toBeNull()
+      expect(tokens.rows[0]?.last_used_at).not.toBeNull()
     })
   })
 
diff --git a/test/login.test.ts b/test/login.test.ts
@@ -93,8 +93,8 @@ describe('Login API Route', async () => {
     const db = createDatabase(connector(testOptions.connector!.options))
     const tokenRecord = await db.sql`SELECT * FROM personal_access_tokens WHERE tokenable_id = ${testUser.id}` as { rows: Array<{ name: string, tokenable_type: string, token: string }> }
     expect(tokenRecord.rows.length).toBe(1)
-    expect(tokenRecord.rows[0].name).toBe('auth_token')
-    expect(tokenRecord.rows[0].tokenable_type).toBe('user')
+    expect(tokenRecord.rows[0]?.name).toBe('auth_token')
+    expect(tokenRecord.rows[0]?.tokenable_type).toBe('user')
   })
 
   it('should return 401 for incorrect email', async () => {
diff --git a/test/unit/api.users-list.test.ts b/test/unit/api.users-list.test.ts
diff --git a/test/unit/utils.google-oauth.test.ts b/test/unit/utils.google-oauth.test.ts
diff --git a/test/utils.user.test.ts b/test/utils.user.test.ts
