@etus/bhono-app 0.1.5 → 0.1.7

package/templates/base/{src/server/__tests__/mocks/__tests__ → tests/unit/server/mocks}/db.test.ts

@@ -6,7 +6,7 @@ import {
   setMockDefaultResult,
   clearMockQueryResults,
   type MockD1Database,
-} from '../db'
+} from '@tests/mocks/db'
 
 describe('MockD1Database', () => {
   let db: MockD1Database

package/templates/base/{src/server/__tests__/mocks/__tests__ → tests/unit/server/mocks}/kv.test.ts

@@ -1,6 +1,6 @@
 // src/server/__tests__/mocks/__tests__/kv.test.ts
 import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { createMockKV, seedMockKV, clearMockKV, type MockKVNamespace } from '../kv'
+import { createMockKV, seedMockKV, clearMockKV, type MockKVNamespace } from '@tests/mocks/kv'
 
 describe('MockKVNamespace', () => {
   let kv: MockKVNamespace

package/templates/base/{src/server/__tests__/mocks/__tests__ → tests/unit/server/mocks}/r2.test.ts

@@ -1,6 +1,6 @@
 // src/server/__tests__/mocks/__tests__/r2.test.ts
 import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { createMockR2, seedMockR2, clearMockR2, type MockR2Bucket } from '../r2'
+import { createMockR2, seedMockR2, clearMockR2, type MockR2Bucket } from '@tests/mocks/r2'
 
 describe('MockR2Bucket', () => {
   let r2: MockR2Bucket

package/templates/base/{src/server/routes/accounts/__tests__ → tests/unit/server/routes/accounts}/handlers.test.ts

@@ -1,14 +1,14 @@
 // src/server/routes/accounts/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { accounts } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
+import type { HonoEnv } from '@server/types'
+import { accounts } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
 import {
   createUserFixture,
   createAccountFixture,
-} from '../../../__tests__/fixtures'
-import { NotFoundError } from '../../../lib/errors'
+} from '@tests/fixtures/server'
+import { NotFoundError } from '@server/lib/errors'
 
 // Test UUIDs
 const TEST_ACCOUNT_ID = '550e8400-e29b-41d4-a716-446655440001'
@@ -17,7 +17,7 @@ const TEST_USER_ID = '550e8400-e29b-41d4-a716-446655440101'
 const NON_EXISTENT_ID = '550e8400-e29b-41d4-a716-446655440999'
 
 // Mock the accounts service
-vi.mock('../../../services', () => ({
+vi.mock('@server/services', () => ({
   accountsService: {
     findAll: vi.fn(),
     findById: vi.fn(),
@@ -28,7 +28,7 @@ vi.mock('../../../services', () => ({
   },
 }))
 
-import { accountsService } from '../../../services'
+import { accountsService } from '@server/services'
 
 describe('Accounts Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>
@@ -139,7 +139,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(200)
       expect(accountsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),
@@ -174,7 +174,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(200)
       expect(accountsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           query: 'search',
@@ -232,7 +232,7 @@ describe('Accounts Routes', () => {
       })
 
       expect(accountsService.findById).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
           user: expect.objectContaining({ id: testUser.id }),
@@ -295,7 +295,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(201)
       expect(accountsService.create).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           name: 'Domain Account',
@@ -389,7 +389,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(204)
       expect(accountsService.delete).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         TEST_ACCOUNT_ID
       )

package/templates/base/{src/server/routes/audits/__tests__ → tests/unit/server/routes/audits}/handlers.test.ts

@@ -1,23 +1,23 @@
 // src/server/routes/audits/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { audits } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
-import { createUserFixture, createAccountFixture } from '../../../__tests__/fixtures'
+import type { HonoEnv } from '@server/types'
+import { audits } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
+import { createUserFixture, createAccountFixture } from '@tests/fixtures/server'
 
 // Test UUIDs
 const TEST_USER_ID = '550e8400-e29b-41d4-a716-446655440001'
 const TEST_ACCOUNT_ID = '550e8400-e29b-41d4-a716-446655440101'
 
 // Mock the audits service
-vi.mock('../../../services/audits', () => ({
+vi.mock('@server/services/audits', () => ({
   auditsService: {
     findAll: vi.fn(),
   },
 }))
 
-import { auditsService } from '../../../services/audits'
+import { auditsService } from '@server/services/audits'
 
 describe('Audits Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>
@@ -149,7 +149,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),
@@ -192,7 +192,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),
@@ -230,7 +230,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           page: 1,
@@ -263,7 +263,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           page: 2,
@@ -310,7 +310,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),

package/templates/base/{src/server/routes/auth/__tests__ → tests/unit/server/routes/auth}/handlers.test.ts

@@ -1,16 +1,16 @@
 // src/server/routes/auth/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { auth } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
+import type { HonoEnv } from '@server/types'
+import { auth } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
 import {
   createUserFixture,
   createSessionFixture,
-} from '../../../__tests__/fixtures'
+} from '@tests/fixtures/server'
 
 // Mock the session module
-vi.mock('../../../lib/session', async (importOriginal) => {
+vi.mock('@server/lib/session', async (importOriginal) => {
   const original = await importOriginal<typeof import('../../../lib/session')>()
   return {
     ...original,
@@ -21,7 +21,7 @@ vi.mock('../../../lib/session', async (importOriginal) => {
 })
 
 // Mock the oauth module
-vi.mock('../../../lib/oauth', () => ({
+vi.mock('@server/lib/oauth', () => ({
   generateCodeVerifier: vi.fn(() => 'test-code-verifier'),
   generateCodeChallenge: vi.fn(async () => 'test-code-challenge'),
   generateState: vi.fn(() => 'test-state'),
@@ -31,12 +31,12 @@ vi.mock('../../../lib/oauth', () => ({
 }))
 
 // Mock audit module
-vi.mock('../../../lib/audit', () => ({
+vi.mock('@server/lib/audit', () => ({
   logAuthEvent: vi.fn().mockResolvedValue(),
 }))
 
 // Mock auth service
-vi.mock('../../../services/auth', () => ({
+vi.mock('@server/services/auth', () => ({
   authService: {
     findOrCreateUser: vi.fn(),
     refreshAccessToken: vi.fn(),
@@ -44,20 +44,20 @@ vi.mock('../../../services/auth', () => ({
 }))
 
 // Mock invitations service
-vi.mock('../../../services/invitations', () => ({
+vi.mock('@server/services/invitations', () => ({
   invitationsService: {
     getByToken: vi.fn(),
     accept: vi.fn(),
   },
 }))
 
-import { getSession, destroySession } from '../../../lib/session'
-import { authService } from '../../../services/auth'
-import { invitationsService } from '../../../services/invitations'
+import { getSession, destroySession } from '@server/lib/session'
+import { authService } from '@server/services/auth'
+import { invitationsService } from '@server/services/invitations'
 import {
   exchangeCodeForTokens,
   decodeIdToken,
-} from '../../../lib/oauth'
+} from '@server/lib/oauth'
 
 describe('Auth Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>
@@ -167,6 +167,20 @@ describe('Auth Routes', () => {
       expect(body).toContain('Invalid state parameter')
     })
 
+    it('returns 400 when oauth_state cookie is invalid JSON', async () => {
+      const app = createApp()
+      const res = await app.request('/auth/callback?code=test-code&state=test-state', {
+        method: 'GET',
+        headers: {
+          Cookie: 'oauth_state=invalid-json-string',
+        },
+      })
+
+      expect(res.status).toBe(400)
+      const body = await res.text()
+      expect(body).toContain('Invalid OAuth state cookie')
+    })
+
     it('creates session on successful callback', async () => {
       const testUser = createUserFixture({ id: 'user-123', email: 'test@example.com' })
 
@@ -207,6 +221,103 @@ describe('Auth Routes', () => {
       expect(res.status).toBe(302)
       expect(res.headers.get('Location')).toContain('/dashboard')
     })
+
+    it('accepts pending invitation during callback', async () => {
+      const testUser = createUserFixture({ id: 'user-123', email: 'test@example.com' })
+
+      vi.mocked(exchangeCodeForTokens).mockResolvedValue({
+        access_token: 'test-access-token',
+        id_token: 'test-id-token',
+        refresh_token: 'test-refresh-token',
+        expires_in: 3600,
+        token_type: 'Bearer',
+      })
+
+      vi.mocked(decodeIdToken).mockReturnValue({
+        sub: 'google-123',
+        email: 'test@example.com',
+        name: 'Test User',
+        picture: 'https://example.com/avatar.jpg',
+        email_verified: true,
+      })
+
+      vi.mocked(authService.findOrCreateUser).mockResolvedValue({
+        user: testUser,
+        isNew: false,
+      })
+
+      vi.mocked(invitationsService.getByToken).mockResolvedValue({
+        id: 'invite-123',
+        token: 'valid-invite-token',
+        email: 'test@example.com',
+        role: 'VIEWER',
+        accountId: 'account-1',
+        status: 'pending',
+        expiresAt: new Date(Date.now() + 86400000).toISOString(),
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+      })
+
+      vi.mocked(invitationsService.accept).mockResolvedValue()
+
+      const app = createApp()
+      const res = await app.request('/auth/callback?code=test-code&state=test-state', {
+        method: 'GET',
+        headers: {
+          Cookie: 'oauth_state=' + encodeURIComponent(JSON.stringify({
+            codeVerifier: 'test-verifier',
+            state: 'test-state',
+            redirect: null,
+          })) + '; pending_invitation=valid-invite-token',
+        },
+        redirect: 'manual',
+      })
+
+      expect(res.status).toBe(302)
+      expect(invitationsService.getByToken).toHaveBeenCalledWith(expect.anything(), 'valid-invite-token')
+      expect(invitationsService.accept).toHaveBeenCalled()
+    })
+
+    it('uses custom redirect from oauth state', async () => {
+      const testUser = createUserFixture({ id: 'user-123', email: 'test@example.com' })
+
+      vi.mocked(exchangeCodeForTokens).mockResolvedValue({
+        access_token: 'test-access-token',
+        id_token: 'test-id-token',
+        refresh_token: 'test-refresh-token',
+        expires_in: 3600,
+        token_type: 'Bearer',
+      })
+
+      vi.mocked(decodeIdToken).mockReturnValue({
+        sub: 'google-123',
+        email: 'test@example.com',
+        name: 'Test User',
+        picture: 'https://example.com/avatar.jpg',
+        email_verified: true,
+      })
+
+      vi.mocked(authService.findOrCreateUser).mockResolvedValue({
+        user: testUser,
+        isNew: false,
+      })
+
+      const app = createApp()
+      const res = await app.request('/auth/callback?code=test-code&state=test-state', {
+        method: 'GET',
+        headers: {
+          Cookie: 'oauth_state=' + encodeURIComponent(JSON.stringify({
+            codeVerifier: 'test-verifier',
+            state: 'test-state',
+            redirect: '/settings',
+          })),
+        },
+        redirect: 'manual',
+      })
+
+      expect(res.status).toBe(302)
+      expect(res.headers.get('Location')).toContain('/settings')
+    })
   })
 
   describe('POST /auth/logout', () => {

package/templates/base/{src/server/routes/health/__tests__ → tests/unit/server/routes/health}/handlers.test.ts

@@ -1,9 +1,9 @@
 // src/server/routes/health/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { health } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
+import type { HonoEnv } from '@server/types'
+import { health } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
 
 describe('Health Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>
@@ -13,19 +13,15 @@ describe('Health Routes', () => {
     mockEnv = createMockEnv()
   })
 
-  // Helper to create app with specific db mock
-  function createApp(dbMock?: any) {
+  // Helper to create app with environment overrides
+  function createApp(envOverrides?: Partial<typeof mockEnv>) {
     const app = new Hono<HonoEnv>()
 
     // Setup middleware to inject mock environment
     app.use('*', async (c, next) => {
+      const env = { ...mockEnv, ...(envOverrides ?? {}) }
       // Set environment bindings by mutating c.env
-      ;(c as any).env = mockEnv
-      // Create mock db that supports sql template literal
-      const mockDb = dbMock ?? {
-        run: vi.fn().mockResolvedValue({ rows: [{ 1: 1 }] }),
-      }
-      c.set('db', mockDb)
+      ;(c as any).env = env
       await next()
     })
 
@@ -64,9 +60,11 @@ describe('Health Routes', () => {
 
       // Create app with failing db
       const failingDb = {
-        run: vi.fn().mockRejectedValue(new Error('DB connection failed')),
-      }
-      const app = createApp(failingDb)
+        prepare: vi.fn(() => {
+          throw new Error('DB connection failed')
+        }),
+      } as D1Database
+      const app = createApp({ DB: failingDb })
 
       const res = await app.request('/health', {
         method: 'GET',
@@ -125,9 +123,11 @@ describe('Health Routes', () => {
 
       // Create app with failing db
       const failingDb = {
-        run: vi.fn().mockRejectedValue(new Error('DB connection failed')),
-      }
-      const app = createApp(failingDb)
+        prepare: vi.fn(() => {
+          throw new Error('DB connection failed')
+        }),
+      } as D1Database
+      const app = createApp({ DB: failingDb })
 
       const res = await app.request('/health', {
         method: 'GET',
@@ -156,9 +156,11 @@ describe('Health Routes', () => {
     it('returns 503 when db is down', async () => {
       // Create app with failing db
       const failingDb = {
-        run: vi.fn().mockRejectedValue(new Error('DB connection failed')),
-      }
-      const app = createApp(failingDb)
+        prepare: vi.fn(() => {
+          throw new Error('DB connection failed')
+        }),
+      } as D1Database
+      const app = createApp({ DB: failingDb })
 
       const res = await app.request('/health/ready', {
         method: 'GET',
@@ -196,9 +198,11 @@ describe('Health Routes', () => {
     it('returns alive even when db is down', async () => {
       // Create app with failing db
       const failingDb = {
-        run: vi.fn().mockRejectedValue(new Error('DB connection failed')),
-      }
-      const app = createApp(failingDb)
+        prepare: vi.fn(() => {
+          throw new Error('DB connection failed')
+        }),
+      } as D1Database
+      const app = createApp({ DB: failingDb })
 
       const res = await app.request('/health/live', {
         method: 'GET',

package/templates/base/{src/server/routes/invitations/__tests__ → tests/unit/server/routes/invitations}/handlers.test.ts

@@ -1,11 +1,11 @@
 // src/server/routes/invitations/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { invitationsRouter } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
-import { createUserFixture, createAccountFixture } from '../../../__tests__/fixtures'
-import { NotFoundError, ConflictError, ForbiddenError } from '../../../lib/errors'
+import type { HonoEnv } from '@server/types'
+import { invitationsRouter } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
+import { createUserFixture, createAccountFixture } from '@tests/fixtures/server'
+import { NotFoundError, ConflictError, ForbiddenError } from '@server/lib/errors'
 
 // Test UUIDs
 const TEST_USER_ID = '550e8400-e29b-41d4-a716-446655440001'
@@ -14,7 +14,7 @@ const TEST_INVITATION_ID = '550e8400-e29b-41d4-a716-446655440201'
 const NON_EXISTENT_ID = '550e8400-e29b-41d4-a716-446655440999'
 
 // Mock the invitations service
-vi.mock('../../../services/invitations', () => ({
+vi.mock('@server/services/invitations', () => ({
   invitationsService: {
     create: vi.fn(),
     list: vi.fn(),
@@ -22,7 +22,7 @@ vi.mock('../../../services/invitations', () => ({
   },
 }))
 
-import { invitationsService } from '../../../services/invitations'
+import { invitationsService } from '@server/services/invitations'
 
 describe('Invitations Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>
@@ -214,7 +214,7 @@ describe('Invitations Routes', () => {
       })
 
       expect(invitationsService.create).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         mockEnv,
         expect.objectContaining({
           accountId: testAccount.id,
@@ -289,7 +289,7 @@ describe('Invitations Routes', () => {
       })
 
       expect(invitationsService.list).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
           user: expect.objectContaining({ id: testUser.id }),
@@ -311,7 +311,7 @@ describe('Invitations Routes', () => {
 
       expect(res.status).toBe(204)
       expect(invitationsService.revoke).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
           user: expect.objectContaining({ id: testUser.id }),
@@ -363,9 +363,11 @@ describe('Invitations Routes', () => {
       const brokenApp = new Hono<HonoEnv>()
       const testUser = createUserFixture({ id: TEST_USER_ID })
       const testAccount = createAccountFixture({ id: TEST_ACCOUNT_ID })
+      const mockEnv = createMockEnv()
+      ;(mockEnv as any).DB = undefined
 
       brokenApp.use('*', async (c, next) => {
-        ;(c as any).env = createMockEnv()
+        ;(c as any).env = mockEnv
         c.set('db', null) // No database
         c.set('transactionId', 'test-transaction-id')
         c.set('ip', '127.0.0.1')
@@ -388,12 +390,7 @@ describe('Invitations Routes', () => {
 
       brokenApp.use('*', async (c, next) => {
         ;(c as any).env = mockEnv
-        c.set('db', {
-          select: vi.fn().mockReturnThis(),
-          from: vi.fn().mockReturnThis(),
-          where: vi.fn().mockReturnThis(),
-          limit: vi.fn().mockResolvedValue([]),
-        })
+        c.set('db', mockEnv.DB)
         c.set('transactionId', 'test-transaction-id')
         c.set('ip', '127.0.0.1')
         c.set('userAgent', 'TestAgent/1.0')

package/templates/base/{src/server/routes/storage/__tests__ → tests/unit/server/routes/storage}/handlers.test.ts

@@ -1,13 +1,13 @@
 // src/server/routes/storage/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { storage } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
-import { createUserFixture, createAccountFixture } from '../../../__tests__/fixtures'
+import type { HonoEnv } from '@server/types'
+import { storage } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
+import { createUserFixture, createAccountFixture } from '@tests/fixtures/server'
 
 // Mock the r2-storage lib
-vi.mock('../../../lib/r2-storage', () => ({
+vi.mock('@server/lib/r2-storage', () => ({
   generateUploadUrl: vi.fn(),
   uploadFile: vi.fn(),
   deleteFile: vi.fn(),
@@ -19,7 +19,7 @@ import {
   uploadFile,
   deleteFile,
   getFileMetadata,
-} from '../../../lib/r2-storage'
+} from '@server/lib/r2-storage'
 
 // Test UUIDs
 const TEST_USER_ID = '550e8400-e29b-41d4-a716-446655440001'