From 605bd735615bc49bbdd114dbe0721ce027bb872a Mon Sep 17 00:00:00 2001
From: jableader <jacobdunk@gmail.com>
Date: Sat, 1 Nov 2025 17:47:42 +1100
Subject: [PATCH] chore(auth/tests): remove legacy username login from tests;
 align mocks with email/password-only auth and keep suite green

---
 frontend-spec.md                    |  2 ++
 src/api/auth.ts                     |  6 +----
 src/components/LoginPage.vue        | 38 ++++-------------------------
 src/composables/useAuth.ts          |  9 +++----
 tests/useAuth.createAccount.test.ts |  1 -
 tests/useAuth.multitenant.test.ts   |  6 -----
 6 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/frontend-spec.md b/frontend-spec.md
index 14bc1ab..675e4ce 100644
--- a/frontend-spec.md
+++ b/frontend-spec.md
@@ -245,3 +245,5 @@ Google OAuth is planned next.
 - Replace temporary raw fetch calls (persons, parse, members listing) with typed endpoints when available.
 - Implement Google OAuth login and account creation flows.
 - Review `MyShoppingPage` usage and remove legacy `getMyShoppingList/saveMyShoppingList` stubs when UI is refactored or removed.
+- Remove the legacy username login shim (`login(username: string)`) and any fallback UI; standardize on email/password (and Google) only.
+- Rollout flag: default `VUE_APP_MULTITENANT_ENABLED` to true across environments and plan removal of legacy flat routes and related tests once stable.
diff --git a/src/api/auth.ts b/src/api/auth.ts
index 0cf099d..763ed87 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -38,11 +38,7 @@ export async function currentUser(): Promise<User | null> {
   }
 }
 
-export async function login(username: string): Promise<User> {
-  // Legacy compatibility shim: avoid network call; will be removed with new LoginPage
-  cachedUser = { id: -1, email: '', displayName: username }
-  return cachedUser
-}
+// Legacy username login has been removed; use loginWithPassword instead.
 
 // New multitenant-ready API surface
 export async function loginWithPassword(email: string, password: string): Promise<User> {
diff --git a/src/components/LoginPage.vue b/src/components/LoginPage.vue
index 8e6a7e9..e8abab9 100644
--- a/src/components/LoginPage.vue
+++ b/src/components/LoginPage.vue
@@ -37,22 +37,9 @@
       </form>
     </div>
 
-    <!-- Legacy: Person quick-login list -->
+    <!-- Legacy quick-login removed -->
     <div v-else>
-      <ul class="button-group">
-        <li
-          v-for="(person, index) in persons"
-          :key="person.id ?? index"
-        >
-          <button
-            type="button"
-            class="btn btn-primary"
-            @click="onLegacyLogin(person)"
-          >
-            {{ person.name }}
-          </button>
-        </li>
-      </ul>
+      <p>This environment is configured without multi-tenancy enabled.</p>
     </div>
   </div>
 </template>
@@ -60,9 +47,7 @@
 <script setup lang="ts">
 import { ref, onMounted, computed } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import { getPersonsInHome } from '@/api/sdk'
-import { login as legacyLogin, loginWithPassword } from '@/api/auth'
-import type { Person } from '@/domain/types'
+import { loginWithPassword } from '@/api/auth'
 import { useAuth } from '@/composables/useAuth'
 
 const props = defineProps({
@@ -71,18 +56,12 @@ const props = defineProps({
 
 const router = useRouter()
 const route = useRoute()
-const persons = ref<Person[]>([])
 const email = ref('')
 const password = ref('')
 const isMultitenant = computed(() => typeof process !== 'undefined' && process.env?.VUE_APP_MULTITENANT_ENABLED === 'true')
 const { user } = useAuth()
 
-onMounted(async () => {
-  if (!isMultitenant.value) {
-    const page = await getPersonsInHome()
-    persons.value = page.items
-  }
-})
+onMounted(async () => {})
 
 function afterLoginNavigate() {
   const q = route.query?.redirect
@@ -103,14 +82,7 @@ async function onSubmitLogin() {
   }
 }
 
-async function onLegacyLogin(selectedPerson: Person) {
-  const u = await legacyLogin(selectedPerson.name)
-  if (u?.id !== undefined) {
-    afterLoginNavigate()
-    return
-  }
-  alert('Login failed')
-}
+// legacy login removed
 </script>
 
 <style scoped>
diff --git a/src/composables/useAuth.ts b/src/composables/useAuth.ts
index d23526b..15943ed 100644
--- a/src/composables/useAuth.ts
+++ b/src/composables/useAuth.ts
@@ -1,5 +1,5 @@
 import { ref } from 'vue'
-import { currentUser as apiCurrentUser, login as apiLogin, loginWithPassword as apiLoginWithPassword, logout as apiLogout, createAccount as apiCreateAccount } from '@/api/auth'
+import { currentUser as apiCurrentUser, loginWithPassword as apiLoginWithPassword, logout as apiLogout, createAccount as apiCreateAccount } from '@/api/auth'
 import { api } from '@/api/client'
 import type { User } from '@/domain/types'
 
@@ -18,10 +18,7 @@ export async function loadUser() {
   return user.value
 }
 
-export async function login(username: string) {
-  user.value = await apiLogin(username)
-  return user.value
-}
+// Legacy username login removed; use loginWithPassword instead.
 
 export async function loginWithPassword(email: string, password: string) {
   user.value = await apiLoginWithPassword(email, password)
@@ -76,5 +73,5 @@ export function useAuth() {
     return u
   }
 
-  return { user, households, activeHousehold, loadUser, login, loginWithPassword, logout, setHouseholds, setActiveHousehold, fetchHouseholds, createHousehold, createAccount }
+  return { user, households, activeHousehold, loadUser, loginWithPassword, logout, setHouseholds, setActiveHousehold, fetchHouseholds, createHousehold, createAccount }
 }
diff --git a/tests/useAuth.createAccount.test.ts b/tests/useAuth.createAccount.test.ts
index d51bad7..42efe62 100644
--- a/tests/useAuth.createAccount.test.ts
+++ b/tests/useAuth.createAccount.test.ts
@@ -3,7 +3,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 vi.mock('@/api/auth', () => {
   return {
     currentUser: vi.fn(async () => null),
-    login: vi.fn(async () => ({ id: 1, email: 'legacy@example.com', displayName: 'Legacy' })),
     loginWithPassword: vi.fn(async (email: string) => ({ id: 2, email, displayName: email })),
     createAccount: vi.fn(async (email: string, displayName: string) => ({ id: 77, email, displayName })),
     logout: vi.fn(async () => {}),
diff --git a/tests/useAuth.multitenant.test.ts b/tests/useAuth.multitenant.test.ts
index b6344ab..6e9aa04 100644
--- a/tests/useAuth.multitenant.test.ts
+++ b/tests/useAuth.multitenant.test.ts
@@ -3,7 +3,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 vi.mock('@/api/auth', () => {
   return {
     currentUser: vi.fn(async () => ({ id: 42, email: 'grace@example.com', displayName: 'Grace Hopper' })),
-    login: vi.fn(async (username: string) => ({ id: 7, email: '', displayName: username })),
     loginWithPassword: vi.fn(async (email: string) => ({ id: 8, email, displayName: email })),
     logout: vi.fn(async () => {}),
     createAccount: vi.fn(async () => {
@@ -54,9 +53,4 @@ describe('useAuth (multitenant state)', () => {
     expect(user.value).toBeNull()
   })
 
-  it('keeps legacy login(username) available for now', async () => {
-    const { user, login } = useAuth()
-  await login('legacy-user')
-  expect(user.value?.displayName).toBe('legacy-user')
-  })
 })