@cat-factory/app 0.317.0 → 0.317.2

package/app/components/auth/LoginScreen.vue

@@ -5,7 +5,7 @@ import SecretInput from '~/components/common/SecretInput.vue'
 import type { VcsProvider } from '~/types/domain'
 import { VCS_PROVIDER_ICONS, VCS_PROVIDER_LABELS, vcsTokenCreateUrl } from '~/utils/vcs'
 import { SSO_ERROR_MESSAGE_KEYS } from '~/utils/sso'
-import { postSignInUrl } from '~/utils/postSignIn'
+import { signInThenReload } from '~/utils/postSignIn'
 
 const auth = useAuthStore()
 const { t } = useI18n()
@@ -62,8 +62,7 @@ async function submitPat(provider: PatProvider) {
   patError.value = null
   patBusy.value = true
   try {
-    await auth.patLogin({ provider })
-    if (typeof window !== 'undefined') window.location.assign(postSignInUrl(window.location))
+    await signInThenReload(() => auth.patLogin({ provider }))
   } catch (e) {
     patError.value = apiErrorEnvelope(e)?.message ?? t('auth.localMode.failed')
   } finally {
@@ -95,18 +94,17 @@ async function submitPassword() {
   error.value = null
   busy.value = true
   try {
-    if (mode.value === 'signup') {
-      await auth.signup({
-        email: email.value,
-        password: password.value,
-        name: name.value || undefined,
-        invite: invite.value,
-      })
-    } else {
-      await auth.passwordLogin({ email: email.value, password: password.value })
-    }
     // Reload so the app boots with the new session.
-    if (typeof window !== 'undefined') window.location.assign(postSignInUrl(window.location))
+    await signInThenReload(() =>
+      mode.value === 'signup'
+        ? auth.signup({
+            email: email.value,
+            password: password.value,
+            name: name.value || undefined,
+            invite: invite.value,
+          })
+        : auth.passwordLogin({ email: email.value, password: password.value }),
+    )
   } catch (e) {
     error.value = apiErrorEnvelope(e)?.message ?? t('auth.login.signInFailed')
   } finally {
@@ -177,8 +175,9 @@ async function submitRemotePat() {
   remotePatError.value = null
   remotePatBusy.value = true
   try {
-    await auth.patLogin({ provider: remotePatProvider.value, token: remotePatToken.value.trim() })
-    if (typeof window !== 'undefined') window.location.assign(postSignInUrl(window.location))
+    await signInThenReload(() =>
+      auth.patLogin({ provider: remotePatProvider.value, token: remotePatToken.value.trim() }),
+    )
   } catch (e) {
     remotePatError.value = apiErrorEnvelope(e)?.message ?? t('auth.login.signInFailed')
   } finally {

package/app/components/github/AddServiceFromRepoModal.vue

@@ -306,11 +306,25 @@ watch(
     if (!isOpen) return
     resetSelection()
     void loadRepos()
-    if (ui.addServicePrefill) repoSearch.value = ui.addServicePrefill.repo
   },
   { immediate: true },
 )
 
+// A deep link's repository is typed into the search once the picker's menu has MOUNTED, and after
+// the tick it mounted in: Nuxt UI's InputMenu clears its own search term on that tick, so a term set
+// on open is wiped (the picker mounts with the window, or later behind the connect prompt). The
+// prefill is spent once its repository is selected below, so nothing is typed after that.
+const repoMenu = ref<unknown>(null)
+watch(
+  repoMenu,
+  async (menu) => {
+    if (menu === null || !ui.addServicePrefill) return
+    await nextTick()
+    if (ui.addServicePrefill) repoSearch.value = ui.addServicePrefill.repo
+  },
+  { flush: 'post' },
+)
+
 // A deep link names one repository: select it as soon as the search lists it, once. A repository
 // the connection cannot reach never lists, which leaves the search's own empty state (and its
 // grant-access remedy) in front of the person.
@@ -497,6 +511,7 @@ function done() {
                  to forward the attribute to. -->
             <div class="space-y-1.5" data-testid="add-service-repo-search">
               <UInputMenu
+                ref="repoMenu"
                 v-model="selectedRepoId"
                 v-model:search-term="repoSearch"
                 :items="repoMenuItems"

package/app/composables/useAddRepoDeepLink.ts

@@ -10,7 +10,7 @@
  * /api/v1/deployment`; the format is published at
  * https://catfactory.ai/extend/public-api.html#sending-a-person-to-add-a-repository
  *
- * Signing in first keeps the query (`postSignInUrl`), so a signed-out person lands here too.
+ * Signing in first keeps the query (`signInThenReload`), so a signed-out person lands here too.
  */
 import { watch } from 'vue'
 import type { GitHubAvailableRepo } from '~/types/domain'

package/app/utils/postSignIn.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { postSignInUrl } from './postSignIn'
+import { postSignInUrl, signInThenReload } from './postSignIn'
 
 // The regression this exists for: every sign-in path reloaded to `location.pathname`, so a flow
 // whose subject rides the query string lost it the moment a person signed in. The MCP consent
@@ -27,3 +27,30 @@ describe('postSignInUrl', () => {
     expect(postSignInUrl({ pathname: '/boards', search: '?a=1' })).toBe('/boards?a=1')
   })
 })
+
+describe('signInThenReload', () => {
+  function location(search: string) {
+    const assigned: string[] = []
+    const at = { pathname: '/', search, assign: (url: string) => void assigned.push(url) }
+    return { at, assigned }
+  }
+
+  it('reloads to the URL as it was BEFORE the sign-in, query included', async () => {
+    // What the board does as the session lands: it consumes `?addRepo=` and strips it from the URL.
+    const { at, assigned } = location('?addRepo=octo%2Fdemo&provider=github')
+    await signInThenReload(async () => {
+      at.search = ''
+    }, at)
+    expect(assigned).toEqual(['/?addRepo=octo%2Fdemo&provider=github'])
+  })
+
+  it('does not reload when the sign-in is refused', async () => {
+    const { at, assigned } = location('?addRepo=octo%2Fdemo')
+    await expect(
+      signInThenReload(async () => {
+        throw new Error('refused')
+      }, at),
+    ).rejects.toThrow('refused')
+    expect(assigned).toEqual([])
+  })
+})

package/app/utils/postSignIn.ts

@@ -27,3 +27,23 @@ export function postSignInUrl(location: { pathname: string; search: string }): s
   const query = params.toString()
   return query ? `${location.pathname}?${query}` : location.pathname
 }
+
+/** The part of `window.location` a sign-in reads and reloads through. */
+type SignInLocation = Pick<Location, 'pathname' | 'search' | 'assign'>
+
+/**
+ * Run a sign-in, then reload to where the person was.
+ *
+ * The destination is read BEFORE the call. A sign-in that succeeds mounts the board in place, and
+ * the board's deep-link handlers strip the query they act on (`?addRepo=` among them) as they
+ * consume it, so a destination read after the call is the stripped URL and the reload lands on a
+ * board that no longer knows what the link asked for.
+ */
+export async function signInThenReload(
+  signIn: () => Promise<unknown>,
+  location: SignInLocation | null = typeof window === 'undefined' ? null : window.location,
+): Promise<void> {
+  const destination = location === null ? null : postSignInUrl(location)
+  await signIn()
+  if (location !== null && destination !== null) location.assign(destination)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cat-factory/app",
-  "version": "0.317.0",
+  "version": "0.317.2",
   "description": "Reusable Nuxt layer for the Agent Architecture Board SPA (components, stores, composables, pages). Consume it from a thin deployment app via `extends: ['@cat-factory/app']` and point it at your backend with NUXT_PUBLIC_API_BASE. See deploy/frontend for an example.",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@cat-factory/contracts": "0.371.0",
+    "@cat-factory/contracts": "0.372.0",
     "@modular-frontend/core": "0.6.0",
     "@modular-vue/core": "^1.5.0",
     "@modular-vue/journeys": "^1.4.0",