a80ce54b78
* fix(mcp): eager-auth flag on the Grok connector links so Grok starts OAuth Live test after #2158: pasting the Grok URL into grok.com's custom connector dialog listed all 150+ tools and never opened the sign-in. Grok probes the URL without credentials, like claude.ai, and reads the lazy 200 on initialize as an authless server; only the 401 challenge starts OAuth (#2159 fixed the same thing for the claude.ai link). - lib/onboarding/checklist.ts: mcpServerUrl() builds the server URL with an optional eagerAuth flag; sideDoorServerUrl() gives the Grok side door auth=required and keeps ChatGPT lazy; claudeConnectorLink() reuses it. SIDE_DOORS / SideDoor move here from the component. Tests for all three. - NewUserChecklist copies the door-specific URL (now with a client marker). - ApiKeysPanel's Grok row copies the flagged URL, mirroring the Claude one. - auth-mode.ts comment records the second consumer; registry entry's Grok step carries the flag; DECISIONS. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LhTJcwgzmN3TsLR8tVHwdi Signed-off-by: Emil <emilmattsson14@gmail.com> * docs(mcp): registry Claude.ai step carries auth=required too Review pass on #2167: the registry entry flagged the Grok install URL but left the Claude.ai step on the bare URL, which pre-fills "None" in claude.ai's dialog (#2159). Same file, same flag, now consistent. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LhTJcwgzmN3TsLR8tVHwdi Signed-off-by: Emil <emilmattsson14@gmail.com> --------- Signed-off-by: Emil <emilmattsson14@gmail.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
130 lines
5.7 KiB
TypeScript
130 lines
5.7 KiB
TypeScript
import type { InitialSetupPath, MomsPeriod } from '@/types'
|
|
|
|
/**
|
|
* What the Skatteverket checklist step should say about VAT deadlines.
|
|
*
|
|
* - 'date': the company's next momsdeklaration due date is known; show it.
|
|
* - 'missing_period': the company is VAT-registered but moms_period is unset,
|
|
* which makes the deadline engine silently generate ZERO VAT deadlines
|
|
* (lib/tax/deadline-config.ts conditions all require a concrete period).
|
|
* An empty deadlines query in that state means misconfiguration, not
|
|
* "no VAT duty", so the UI must prompt for the period instead of showing
|
|
* nothing.
|
|
* - null: not VAT-registered (no line), or VAT-registered with a period set
|
|
* but no upcoming row surfaced (transient or horizon gap; say nothing
|
|
* rather than guessing).
|
|
*/
|
|
export type VatDeadlineLine =
|
|
| { kind: 'date'; dueDate: string }
|
|
| { kind: 'missing_period' }
|
|
| null
|
|
|
|
export function vatDeadlineLine(input: {
|
|
vatRegistered: boolean | null | undefined
|
|
momsPeriod: MomsPeriod | null | undefined
|
|
nextVatDueDate: string | null | undefined
|
|
}): VatDeadlineLine {
|
|
if (!input.vatRegistered) return null
|
|
if (!input.momsPeriod) return { kind: 'missing_period' }
|
|
if (!input.nextVatDueDate) return null
|
|
return { kind: 'date', dueDate: input.nextVatDueDate }
|
|
}
|
|
|
|
/**
|
|
* Display ordinals for the setup checklist steps. Books and bank are always
|
|
* present; Skatteverket and the receipts/inbox step render only when their
|
|
* extensions are enabled; the assistant step is always last. `count` drives
|
|
* the "{count} steg så är bokföringen igång" title.
|
|
*/
|
|
export function checklistNumbers(gates: { hasSkatteverket: boolean; hasInbox: boolean }): {
|
|
count: number
|
|
skv: number
|
|
receipts: number
|
|
assistant: number
|
|
} {
|
|
const skv = 3
|
|
const receipts = 3 + (gates.hasSkatteverket ? 1 : 0)
|
|
const assistant = receipts + (gates.hasInbox ? 1 : 0)
|
|
return { count: assistant, skv, receipts, assistant }
|
|
}
|
|
|
|
/**
|
|
* Body of the PATCH that retires the checklist once every step is done.
|
|
* The route refuses `completed: true` without a path ("Välj först hur du
|
|
* vill komma igång"). `path` is null when the journey's books question was
|
|
* skipped and the books then arrived through /import or MCP; in that state
|
|
* step 1 can only be done via an import, so `migration` is the truthful path
|
|
* to record. Without it that cohort looped on a 400 (PR #2147 skeptic).
|
|
*/
|
|
export function completionPatchBody(
|
|
path: InitialSetupPath | null,
|
|
): { completed: true; path?: InitialSetupPath } {
|
|
return path ? { completed: true } : { completed: true, path: 'migration' }
|
|
}
|
|
|
|
/**
|
|
* Done-state for the "Anslut till Claude" step. The only thing that means
|
|
* "connected" is a live API key minted by the MCP OAuth token route: it
|
|
* exists exactly when a client (claude.ai, Claude Desktop, Claude Code)
|
|
* completed the first-call sign-in. `oauthKeyCount` is the head count of
|
|
* that user's unrevoked rows named by OAUTH_MCP_KEY_NAME (lib/auth/api-keys).
|
|
* Before issue #2133 the step ticked on the in-app AI-profile flag, which
|
|
* has nothing to do with Claude; the step could show done for a user who
|
|
* never connected and stay open for one who had.
|
|
*/
|
|
export function claudeStepDone(input: { oauthKeyCount: number | null | undefined }): boolean {
|
|
return (input.oauthKeyCount ?? 0) > 0
|
|
}
|
|
|
|
/**
|
|
* The MCP server URL we hand to a client. `tool_namespace` is load-bearing
|
|
* (without it the server hands out legacy `gnubok_` tool names), `client`
|
|
* is a telemetry-only distribution marker, and the origin comes from the
|
|
* page so self-hosted and white-label domains link to themselves.
|
|
*
|
|
* `eagerAuth` appends `auth=required` (extensions/general/mcp-server/
|
|
* auth-mode.ts). Needed for clients whose Add-connector dialog probes the
|
|
* URL without credentials and reads the lazy 200 as "no authentication":
|
|
* claude.ai pre-fills "None" and Grok lists every tool without ever opening
|
|
* the sign-in. The 401 challenge is the only answer those dialogs read as
|
|
* OAuth. ChatGPT developer mode, Claude Code, Cursor and the stdio bridge
|
|
* keep the lazy URL.
|
|
*/
|
|
export function mcpServerUrl(input: { origin: string; client: string; eagerAuth?: boolean }): string {
|
|
const eager = input.eagerAuth ? '&auth=required' : ''
|
|
return `${input.origin}/api/extensions/ext/mcp-server/mcp?tool_namespace=accounted&client=${input.client}${eager}`
|
|
}
|
|
|
|
/**
|
|
* Clients that get a collapsed "Using X?" side door under the checklist's
|
|
* Claude step. Each value keys the i18n strings step_claude_<door>_link /
|
|
* _steps and the telemetry step name. Order is display order.
|
|
*/
|
|
export const SIDE_DOORS = ['chatgpt', 'grok'] as const
|
|
export type SideDoor = (typeof SIDE_DOORS)[number]
|
|
|
|
/**
|
|
* The URL a side door copies. Grok's connector dialog behaves like
|
|
* claude.ai's (a 200 probe means "no auth", so the OAuth flow never starts)
|
|
* and needs the eager flag; ChatGPT's developer mode honours the lazy 401
|
|
* on the first protected call and keeps the plain URL.
|
|
*/
|
|
export function sideDoorServerUrl(input: { origin: string; door: SideDoor }): string {
|
|
return mcpServerUrl({ origin: input.origin, client: input.door, eagerAuth: input.door === 'grok' })
|
|
}
|
|
|
|
/**
|
|
* The claude.ai Add-custom-connector deep link the checklist's Claude step
|
|
* opens. Same shape as the Settings → API & MCP button (see mcpServerUrl for
|
|
* the query parameters). The link only prefills the dialog; the user reviews
|
|
* there.
|
|
*/
|
|
export function claudeConnectorLink(input: { origin: string; appName: string }): string {
|
|
const serverUrl = mcpServerUrl({ origin: input.origin, client: 'claude-connector', eagerAuth: true })
|
|
return (
|
|
'https://claude.ai/customize/connectors?modal=add-custom-connector' +
|
|
`&connectorName=${encodeURIComponent(input.appName)}` +
|
|
`&connectorUrl=${encodeURIComponent(serverUrl)}`
|
|
)
|
|
}
|