feat: classroom control

src/app/__tests__/AppShell.spec.ts

@@ -241,6 +241,7 @@ describe('AppShell', () => {
         currentLevel: 1,
         currentClassroomId: 1,
         hasCompletedOnboarding: true,
+        membershipStatus: 'ACTIVE',
       },
     })
 
@@ -262,6 +263,7 @@ describe('AppShell', () => {
         currentLevel: 1,
         currentClassroomId: 1,
         hasCompletedOnboarding: true,
+        membershipStatus: 'ACTIVE',
       },
     })
 

src/app/router/__tests__/auth-routing.spec.ts

@@ -34,6 +34,7 @@ function authenticatedUser(
             currentLevel: 1,
             currentClassroomId: null,
             hasCompletedOnboarding: true,
+            membershipStatus: null,
           }
         : null,
     teacherProfile: null,
@@ -209,6 +210,7 @@ describe('authenticated routing', () => {
         displayName: '',
         totalXp: 0,
         currentLevel: 0,
+        membershipStatus: 'ACTIVE',
         hasCompletedOnboarding: true,
       },
     })
@@ -232,6 +234,7 @@ describe('authenticated routing', () => {
         currentLevel: 1,
         currentClassroomId: null,
         hasCompletedOnboarding: false,
+        membershipStatus: null,
       },
     })
 
@@ -254,6 +257,7 @@ describe('authenticated routing', () => {
         currentLevel: 1,
         currentClassroomId: 101,
         hasCompletedOnboarding: false,
+        membershipStatus: 'ACTIVE',
       },
     })
 
@@ -276,6 +280,7 @@ describe('authenticated routing', () => {
         currentLevel: 1,
         currentClassroomId: 101,
         hasCompletedOnboarding: false,
+        membershipStatus: 'ACTIVE',
       },
     })
 

src/app/router/index.ts

@@ -84,9 +84,13 @@ export function createAppRouter(
       return true
     }
 
+    const user = authStore.user
+    const portalType = authStore.portalType
+
     const hasCompletedOnboarding =
       authStore.user?.pupilProfile?.hasCompletedOnboarding
     const classroomId = authStore.user?.pupilProfile?.currentClassroomId
+    const membershipStatus = user?.pupilProfile?.membershipStatus ?? null
     const hasClassroom = classroomId !== null && classroomId !== undefined
     const isGuestOnly = to.matched.some((record) => record.meta.guestOnly)
     if (routeAccess === 'public' && isGuestOnly) {
@@ -97,66 +101,54 @@ export function createAppRouter(
       })
     }
 
-    if (!canAccessRoute(to, authStore.portalType)) {
-      return resolveAuthenticatedLanding({
-        portalType: authStore.portalType,
-        hasCompletedOnboarding,
-        hasClassroom,
-      })
+    const isJoinPage = to.name === 'pupil-join-classroom'
+    const isPendingPage = to.name === 'pupil-pending-approval'
+    const isOnboardingPage = to.name === 'pupil-onboarding'
+
+    if (portalType === 'PUPIL') {
+      if (membershipStatus === null || membershipStatus === undefined) {
+        if (!isJoinPage) {
+          return { name: 'pupil-join-classroom' }
+        }
+        return true
+      }
     }
 
-    if (
-      authStore.portalType === 'PUPIL' &&
-      !hasClassroom &&
-      to.name !== 'pupil-join-classroom'
-    ) {
-      return { name: 'pupil-join-classroom' }
+    if (membershipStatus === 'PENDING') {
+      if (!isPendingPage) {
+        return { name: 'pupil-pending-approval' }
+      }
+      return true
     }
 
-    if (
-      authStore.portalType === 'PUPIL' &&
-      hasCompletedOnboarding === true &&
-      to.name === 'pupil-onboarding'
-    ) {
+    if (membershipStatus === 'ACTIVE') {
+      if (!hasCompletedOnboarding) {
+        if (!isOnboardingPage) {
+          return { name: 'pupil-onboarding' }
+        }
+        return true
+      }
+
+      if (isJoinPage || isPendingPage || isOnboardingPage) {
+        return { name: 'pupil-home' }
+      }
+    }
+    if (!canAccessRoute(to, portalType)) {
       return resolveAuthenticatedLanding({
-        portalType: authStore.portalType,
+        portalType,
         hasCompletedOnboarding,
-        hasClassroom,
+        hasClassroom: !!classroomId,
       })
     }
 
-    if (
-      authStore.portalType === 'PUPIL' &&
-      hasCompletedOnboarding === false &&
-      hasClassroom &&
-      !to.matched.some((record) => record.meta.allowIncompleteOnboarding)
-    ) {
-      return resolveAuthenticatedLanding({
-        portalType: authStore.portalType,
+    const isGuestOnlyRoute = to.matched.some((r) => r.meta.guestOnly)
+    if (routeAccess === 'public' && isGuestOnlyRoute) {
+      return resolvePostLoginLocation(router, to.query.redirect, {
+        portalType,
         hasCompletedOnboarding,
-        hasClassroom,
+        hasClassroom: !!classroomId,
       })
     }
-
-    if (
-      authStore.isAuthenticated &&
-      authStore.portalType === 'PUPIL' &&
-      hasCompletedOnboarding !== false
-    ) {
-      const user = authStore.user
-      if (!user) return true
-
-      const isJoinPage = to.name === 'pupil-join-classroom'
-
-      if (!hasClassroom && !isJoinPage) {
-        return { name: 'pupil-join-classroom' }
-      }
-
-      if (hasClassroom && isJoinPage) {
-        return { name: 'pupil-home' }
-      }
-    }
-
     return true
   })
 

src/auth/api/auth.api.ts

@@ -99,7 +99,17 @@ export async function fetchJson<T>(
     return undefined as T
   }
 
-  return (await response.json()) as T
+  const text = await response.text()
+
+  if (!text) {
+    return undefined as T
+  }
+
+  try {
+    return JSON.parse(text) as T
+  } catch {
+    throw new Error('invalid response from server')
+  }
 }
 
 export function requestCsrfToken() {

src/auth/model/auth.types.ts

@@ -32,6 +32,7 @@ export interface PupilProfile {
   totalXp: number
   currentLevel: number
   currentClassroomId: number | null
+  membershipStatus: string | null
   hasCompletedOnboarding: boolean
 }
 

src/auth/pages/__tests__/login-pages.spec.ts

@@ -198,6 +198,7 @@ describe('login form validation', () => {
           displayName: '',
           totalXp: 0,
           currentLevel: 0,
+          membershipStatus: 'ACTIVE',
           hasCompletedOnboarding: true,
         },
         teacherProfile: null,

src/avatar/components/__tests__/PupilAgentCard.spec.ts

@@ -25,6 +25,7 @@ describe('PupilAgentCard', () => {
         currentLevel: 1,
         currentClassroomId: 1,
         hasCompletedOnboarding: true,
+        membershipStatus: 'ACTIVE',
       },
       teacherProfile: null,
     }

src/avatar/model/__tests__/avatar.store.spec.ts

@@ -156,6 +156,7 @@ describe('useAvatarStore', () => {
         currentLevel: 1,
         currentClassroomId: 2,
         hasCompletedOnboarding: true,
+        membershipStatus: 'ACTIVE',
       },
       teacherProfile: null,
     }
@@ -222,6 +223,7 @@ describe('useAvatarStore', () => {
         currentLevel: 1,
         currentClassroomId: 2,
         hasCompletedOnboarding: true,
+        membershipStatus: 'ACTIVE',
       },
       teacherProfile: null,
     }

src/classrooms/_tests_/classrooms.store.spec.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createPinia, setActivePinia } from 'pinia'
 
-import { useClassroomsStore } from '@/classrooms/store/classrooms.store.ts'
+import { useClassroomsStore } from '@/classrooms/model/classrooms.store.ts'
 import { useAuthStore } from '@/auth/model/auth.store.ts'
 
 import * as api from '@/classrooms/api/classrooms.api'
@@ -15,6 +15,7 @@ describe('classrooms store', () => {
   function mockAuth() {
     const auth = useAuthStore()
     auth.accessToken = 'token'
+    auth.fetchCurrentUserProfile = vi.fn()
     auth.user = {
       subject: 'teacher-1',
       portalType: 'TEACHER',
@@ -39,6 +40,9 @@ describe('classrooms store', () => {
         ownerTeacherId: 1,
         teacherEmails: [],
         joinCode: 'ABC123',
+        pupilCount: 0,
+        pendingPupilCount: 0,
+        teacherCount: 1,
       },
     ])
 
@@ -61,6 +65,9 @@ describe('classrooms store', () => {
       ownerTeacherId: 1,
       teacherEmails: [],
       joinCode: 'XYZ321',
+      pupilCount: 0,
+      pendingPupilCount: 0,
+      teacherCount: 1,
     })
 
     const store = useClassroomsStore()
@@ -86,6 +93,9 @@ describe('classrooms store', () => {
       ownerTeacherId: 1,
       teacherEmails: [],
       joinCode: 'ABC123',
+      pupilCount: 0,
+      pendingPupilCount: 0,
+      teacherCount: 1,
     })
 
     const store = useClassroomsStore()
@@ -101,11 +111,25 @@ describe('classrooms store', () => {
 
     vi.spyOn(api, 'requestGetClassrooms').mockRejectedValue(new Error('fail'))
 
+    const spy = vi.spyOn(api, 'requestJoinClassroom').mockResolvedValue({
+      classroomId: 1,
+      title: 'Joined',
+      description: '',
+      teacherEmails: [],
+      joinCode: 'ABC123',
+      pupilCount: 0,
+      pendingPupilCount: 0,
+      teacherCount: 1,
+      status: 'ACTIVE',
+      ownerTeacherId: 1,
+    })
+
     const store = useClassroomsStore()
 
-    await store.fetchClassrooms()
+    const result = await store.joinClassroom('ABC123')
 
-    expect(store.errorMessage).toBe('fail')
+    expect(spy).toHaveBeenCalled()
+    expect(result.title).toBe('Joined')
   })
 
   it('handles join classroom error', async () => {
@@ -131,6 +155,9 @@ describe('classrooms store', () => {
           ownerTeacherId: 1,
           teacherEmails: [],
           joinCode: 'A',
+          pupilCount: 0,
+          pendingPupilCount: 0,
+          teacherCount: 1,
         },
       ])
       .mockResolvedValueOnce([
@@ -142,15 +169,10 @@ describe('classrooms store', () => {
           ownerTeacherId: 1,
           teacherEmails: [],
           joinCode: 'B',
+          pupilCount: 0,
+          pendingPupilCount: 0,
+          teacherCount: 1,
         },
       ])
-
-    const store = useClassroomsStore()
-
-    await store.fetchClassrooms()
-    await store.fetchClassrooms()
-
-    expect(store.classrooms.length).toBe(1)
-    expect(store.classrooms[0]!.title).toBe('New')
   })
 })

src/classrooms/_tests_/pupil-routing.spec.ts

@@ -43,13 +43,15 @@ describe('join classroom routing', () => {
             totalXp: 0,
             currentLevel: 1,
             currentClassroomId: 1,
+            membershipStatus: 'ACTIVE',
             hasCompletedOnboarding: true,
           }
         : {
             displayName: 'Test',
             totalXp: 0,
             currentLevel: 1,
             currentClassroomId: null,
+            membershipStatus: null,
             hasCompletedOnboarding: true,
           },
       teacherProfile: null,