test: fix ts errors

Author: rrd108

playground/nuxt.config.ts

@@ -16,8 +16,8 @@ export default defineNuxtConfig({
         admin: ['*'],
       }, */
       google: {
-        clientId: process.env.GOOGLE_CLIENT_ID || 'demo-client-id',
-        clientSecret: process.env.GOOGLE_CLIENT_SECRET || 'demo-client-secret',
+        clientId: process.env.GOOGLE_CLIENT_ID || 'google-client-id',
+        clientSecret: process.env.GOOGLE_CLIENT_SECRET || 'google-client-secret',
         successRedirect: '/',
         errorRedirect: '/login?error=oauth_failed'
       }

src/module.ts

@@ -60,12 +60,15 @@ export default defineNuxtModule<RuntimeModuleOptions>({
 
     // Add runtime config (server-side)
     // Priority: runtimeConfig (strongest) > top-level app config > default options (weakest)
-    const runtimeConfigOptions = defu(nuxt.options.runtimeConfig.nuxtUsers || {}, options, defaultOptions)
+    const runtimeConfigOptions = defu(nuxt.options.runtimeConfig.nuxtUsers || {}, options, defaultOptions) as ModuleOptions
 
     nuxt.options.runtimeConfig.nuxtUsers = {
       ...runtimeConfigOptions,
       auth: {
-        ...runtimeConfigOptions.auth,
+        tokenExpiration: runtimeConfigOptions.auth.tokenExpiration,
+        rememberMeExpiration: runtimeConfigOptions.auth.rememberMeExpiration,
+        permissions: runtimeConfigOptions.auth.permissions,
+        ...(runtimeConfigOptions.auth.google && { google: runtimeConfigOptions.auth.google }),
         whitelist: (() => {
           const combinedWhitelist = [...(defaultOptions.auth?.whitelist || []), ...(runtimeConfigOptions.auth?.whitelist || [])]
           const apiBasePath = runtimeConfigOptions.apiBasePath || defaultOptions.apiBasePath
@@ -102,7 +105,7 @@ export default defineNuxtModule<RuntimeModuleOptions>({
           return combinedWhitelist
         })()
       },
-    }
+    } as unknown as typeof nuxt.options.runtimeConfig.nuxtUsers
 
     // Add public runtime config for client-side access
     nuxt.options.runtimeConfig.public = nuxt.options.runtimeConfig.public || {}

src/runtime/components/NUsersGoogleLoginButton.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import type { ModuleOptions } from 'nuxt-users/utils'
-import { useRuntimeConfig } from '#imports'
+import { useRuntimeConfig, navigateTo } from '#imports'
 
 interface Props {
   /**

src/runtime/middleware/authorization.client.ts

@@ -30,7 +30,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
   const { isAuthenticated, user, fetchUser } = useAuthentication()
 
   // If not authenticated but oauth_success flag is present, fetch user using SSR
-  if (!isAuthenticated.value && to.query.oauth_success === 'true') {
+  if (!isAuthenticated.value && to.query?.oauth_success === 'true') {
     try {
       await fetchUser(true) // Use SSR to properly handle httpOnly cookies
     }

src/runtime/server/utils/google-oauth.ts

@@ -54,7 +54,7 @@ export async function getGoogleUserFromCode(oauth2Client: any, code: string): Pr
     id: data.id!,
     email: data.email,
     name: data.name || data.email.split('@')[0],
-    picture: data.picture,
+    picture: data.picture || undefined,
     verified_email: data.verified_email
   }
 }

test/cli/migrate.test.ts

@@ -79,21 +79,23 @@ describe('CLI: Migrate', () => {
     expect(appliedMigrations).toContain('create_users_table')
     expect(appliedMigrations).toContain('create_personal_access_tokens_table')
     expect(appliedMigrations).toContain('create_password_reset_tokens_table')
-    expect(appliedMigrations).toHaveLength(5)
+    expect(appliedMigrations).toContain('add_active_to_users')
+    expect(appliedMigrations).toContain('add_google_oauth_fields')
+    expect(appliedMigrations).toHaveLength(6)
   })
 
   it('should not run migrations twice', async () => {
     // Run migrations first time
     await runMigrations(testOptions)
 
     const firstRunMigrations = await getAppliedMigrations(testOptions)
-    expect(firstRunMigrations).toHaveLength(5)
+    expect(firstRunMigrations).toHaveLength(6)
 
     // Run migrations second time
     await runMigrations(testOptions)
 
     const secondRunMigrations = await getAppliedMigrations(testOptions)
-    expect(secondRunMigrations).toHaveLength(5)
+    expect(secondRunMigrations).toHaveLength(6)
 
     // Should be the same migrations
     expect(secondRunMigrations).toEqual(firstRunMigrations)
@@ -184,12 +186,13 @@ describe('CLI: Migrate', () => {
     // Test migrations table structure
     const migrationsResult2 = await db.sql`SELECT id, name, executed_at FROM migrations ORDER BY id`
     const migrations = migrationsResult2.rows || []
-    expect(migrations).toHaveLength(5)
+    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')
   })
 
   it('should handle partial migrations correctly', async () => {
@@ -233,6 +236,7 @@ describe('CLI: Migrate', () => {
     expect(appliedMigrations).toContain('create_personal_access_tokens_table')
     expect(appliedMigrations).toContain('create_password_reset_tokens_table')
     expect(appliedMigrations).toContain('add_active_to_users')
-    expect(appliedMigrations).toHaveLength(5)
+    expect(appliedMigrations).toContain('add_google_oauth_fields')
+    expect(appliedMigrations).toHaveLength(6)
   })
 })

test/google-oauth-flow.test.ts

@@ -228,11 +228,12 @@ describe('Google OAuth Complete Flow Integration', () => {
       // User will be found (returns user object)
       const user = await findOrCreateGoogleUser(mockGoogleUser, testOptions)
       expect(user).toBeDefined()
-      expect(user?.active).toBeFalsy()
+      expect(user).not.toBeNull()
+      expect(user!.active).toBeFalsy()
 
       // The callback handler should reject this user
       // Simulating what happens in callback.get.ts
-      if (!user?.active) {
+      if (user && !user.active) {
         // Should redirect to error page instead of creating token
         expect(user.active).toBeFalsy()
         // No token should be created - verify

test/unit/middleware.google-oauth.test.ts

@@ -94,7 +94,8 @@ describe('Google OAuth Client Middleware', () => {
         query: { oauth_success: 'true' }
       }
 
-      await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      await authorizationMiddleware.default(to as any, from)
 
       // Should call fetchUser with SSR enabled
       expect(mockFetchUser).toHaveBeenCalledWith(true)
@@ -129,7 +130,8 @@ describe('Google OAuth Client Middleware', () => {
         query: { oauth_success: 'true' }
       }
 
-      await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      await authorizationMiddleware.default(to as any, from)
 
       expect(mockFetchUser).toHaveBeenCalledWith(true)
       // After fetch, should NOT redirect to login
@@ -150,7 +152,8 @@ describe('Google OAuth Client Middleware', () => {
         query: { oauth_success: 'true' }
       }
 
-      await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      await authorizationMiddleware.default(to as any, from)
 
       expect(mockFetchUser).toHaveBeenCalledWith(true)
       // After failed fetch, should redirect to login
@@ -177,7 +180,8 @@ describe('Google OAuth Client Middleware', () => {
         query: { oauth_success: 'true' }
       }
 
-      await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      await authorizationMiddleware.default(to as any, from)
 
       // Should not fetch user if already authenticated
       expect(mockFetchUser).not.toHaveBeenCalled()
@@ -199,7 +203,8 @@ describe('Google OAuth Client Middleware', () => {
         query: {}
       }
 
-      await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      await authorizationMiddleware.default(to as any, from)
 
       // Should NOT fetch user without oauth_success flag
       expect(mockFetchUser).not.toHaveBeenCalled()
@@ -223,7 +228,8 @@ describe('Google OAuth Client Middleware', () => {
         query: { oauth_success: 'true' }
       }
 
-      await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      await authorizationMiddleware.default(to as any, from)
 
       // Should call with true to enable SSR (critical for httpOnly cookies)
       expect(mockFetchUser).toHaveBeenCalledWith(true)
@@ -254,7 +260,8 @@ describe('Google OAuth Client Middleware', () => {
         query: {}
       }
 
-      const result = await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      const result = await authorizationMiddleware.default(to as any, from)
 
       expect(result).toBeUndefined() // Middleware allows passage
       expect(mockNavigateTo).not.toHaveBeenCalled()
@@ -283,7 +290,8 @@ describe('Google OAuth Client Middleware', () => {
         query: {}
       }
 
-      await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      await authorizationMiddleware.default(to as any, from)
 
       expect(mockNavigateTo).toHaveBeenCalledWith('/login')
     })
@@ -305,7 +313,8 @@ describe('Google OAuth Client Middleware', () => {
         query: { oauth_success: 'true' }
       }
 
-      const result = await authorizationMiddleware.default(to as any)
+      const from = { path: '/login' } as any
+      const result = await authorizationMiddleware.default(to as any, from)
 
       // Should not fetch user or redirect
       expect(mockFetchUser).not.toHaveBeenCalled()