Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
fix(open-knowledge): set-identity nudge no longer forces a re-auth (#1586)
miles-kt-inkeepb6d9d6741438
diff --git a/.changeset/fix-set-identity-skips-device-auth.md b/.changeset/fix-set-identity-skips-device-auth.mdnew file mode 100644index 000000000..91b3f9c37--- /dev/null+++ b/.changeset/fix-set-identity-skips-device-auth.md@@ -0,0 +1,9 @@+---+"@inkeep/open-knowledge": patch+"@inkeep/open-knowledge-core": patch+"@inkeep/open-knowledge-server": patch+"@inkeep/open-knowledge-app": patch+"@inkeep/open-knowledge-desktop": patch+---++Fix the sync popover's "Set identity" button forcing a re-authentication. The auth modal now probes sign-in status on open: an already-signed-in user is taken straight to the git Name/Email fields (pre-filled from their GitHub profile) instead of through the GitHub device flow. It only falls back to sign-in when the user is genuinely not authenticated, and then still lands on the identity fields so the git identity actually gets set.diff --git a/packages/app/src/components/AuthModal.dom.test.tsx b/packages/app/src/components/AuthModal.dom.test.tsxnew file mode 100644index 000000000..bfa5538b9--- /dev/null+++ b/packages/app/src/components/AuthModal.dom.test.tsx@@ -0,0 +1,176 @@+import { afterEach, describe, expect, jest, test } from 'bun:test';+import { act, cleanup, render, screen } from '@testing-library/react';+import type { OkLocalOpAuthEvent, OkLocalOpAuthStatusResponse } from '@/lib/desktop-bridge-types';+import type { AuthQueryTransport } from '@/lib/transports/auth-query-transport';+import type { AuthTransport } from '@/lib/transports/auth-transport';+import { AuthModal } from './AuthModal';++type WindowGlobals = { NodeFilter?: typeof NodeFilter };+type GlobalWithDomShims = typeof globalThis &+ WindowGlobals & { window?: WindowGlobals; ResizeObserver?: unknown };+const globalWithDomShims = globalThis as GlobalWithDomShims;+if (+ globalWithDomShims.NodeFilter === undefined &&+ globalWithDomShims.window?.NodeFilter !== undefined+) {+ globalWithDomShims.NodeFilter = globalWithDomShims.window.NodeFilter;+}+if (globalWithDomShims.ResizeObserver === undefined) {+ class NoopResizeObserver {+ observe() {}+ unobserve() {}+ disconnect() {}+ }+ globalWithDomShims.ResizeObserver = NoopResizeObserver;+}++const CONNECTED: OkLocalOpAuthStatusResponse = {+ authenticated: true,+ host: 'github.com',+ login: 'octocat',+ tier: 'B',+ name: 'Octo Cat',+ email: '[email protected]',+};+const NOT_CONNECTED: OkLocalOpAuthStatusResponse = { authenticated: false, host: 'github.com' };++function makeQueryTransport(status: OkLocalOpAuthStatusResponse): AuthQueryTransport {+ return {+ status: async () => status,+ repos: async () => ({ ok: true, host: 'github.com', repos: [] }),+ signout: async () => ({ ok: true }),+ };+}++const noopAuthTransport: AuthTransport = {+ start: () => ({+ events: {+ [Symbol.asyncIterator]() {+ return { next: () => new Promise<IteratorResult<OkLocalOpAuthEvent>>(() => {}) };+ },+ },+ cancel() {},+ }),+};++function completingAuthTransport(result: {+ login: string;+ name?: string;+ email?: string;+}): AuthTransport {+ return {+ start: () => ({+ events: {+ async *[Symbol.asyncIterator]() {+ yield {+ type: 'complete',+ host: 'github.com',+ login: result.login,+ name: result.name,+ email: result.email,+ } satisfies OkLocalOpAuthEvent;+ },+ },+ cancel() {},+ }),+ };+}++function renderModal(props: {+ identityPrompt?: boolean;+ queryTransport: AuthQueryTransport;+ transport?: AuthTransport;+}) {+ return render(+ <AuthModal+ open+ onOpenChange={() => {}}+ identityPrompt={props.identityPrompt}+ transport={props.transport ?? noopAuthTransport}+ queryTransport={props.queryTransport}+ />,+ );+}++describe('AuthModal identityPrompt (set-identity) path', () => {+ afterEach(cleanup);++ test('signed-in user lands on the identity fields without the device flow', async () => {+ renderModal({ identityPrompt: true, queryTransport: makeQueryTransport(CONNECTED) });++ const name = await screen.findByLabelText('Name');+ const email = await screen.findByLabelText('Email');++ expect((name as HTMLInputElement).value).toBe('Octo Cat');+ expect((email as HTMLInputElement).value).toBe('[email protected]');++ expect(screen.getByText('Set git identity')).toBeDefined();+ expect(screen.getByText('Connected as @octocat')).toBeDefined();+ expect(screen.queryByText('Starting sign-in flow')).toBeNull();+ });++ test('unauthenticated user falls back to the device flow', async () => {+ renderModal({ identityPrompt: true, queryTransport: makeQueryTransport(NOT_CONNECTED) });++ expect(await screen.findByText('Starting sign-in flow')).toBeDefined();+ expect(screen.getByText('Connect GitHub')).toBeDefined();+ expect(screen.queryByLabelText('Name')).toBeNull();+ });++ test('device-flow fallback under identityPrompt still lands on the identity fields', async () => {+ renderModal({+ identityPrompt: true,+ queryTransport: makeQueryTransport(NOT_CONNECTED),+ transport: completingAuthTransport({+ login: 'octocat',+ name: 'Octo Cat',+ email: '[email protected]',+ }),+ });++ const name = await screen.findByLabelText('Name');+ expect((name as HTMLInputElement).value).toBe('Octo Cat');+ expect((screen.getByLabelText('Email') as HTMLInputElement).value).toBe('[email protected]');+ expect(screen.getByText('Connected as @octocat')).toBeDefined();+ expect(screen.getByText('Set git identity')).toBeDefined();+ });++ test('a hung status probe times out and falls back to the device flow', async () => {+ const hungQuery: AuthQueryTransport = {+ status: () => new Promise<never>(() => {}),+ repos: async () => ({ ok: true, host: 'github.com', repos: [] }),+ };++ jest.useFakeTimers();+ try {+ renderModal({ identityPrompt: true, queryTransport: hungQuery });++ expect(screen.getByText('Checking sign-in status')).toBeDefined();+ expect(screen.queryByText('Starting sign-in flow')).toBeNull();++ act(() => {+ jest.advanceTimersByTime(10_000);+ });++ expect(screen.getByText('Starting sign-in flow')).toBeDefined();+ expect(screen.getByText('Connect GitHub')).toBeDefined();+ expect(screen.queryByLabelText('Name')).toBeNull();+ } finally {+ jest.useRealTimers();+ }+ });++ test('sign-in path (no identityPrompt) goes straight to the device flow', async () => {+ const throwingQuery: AuthQueryTransport = {+ status: async () => {+ throw new Error('status must not be called for the sign-in path');+ },+ repos: async () => ({ ok: false, error: 'unused' }),+ };++ renderModal({ identityPrompt: false, queryTransport: throwingQuery });++ expect(await screen.findByText('Starting sign-in flow')).toBeDefined();+ expect(screen.getByText('Connect GitHub')).toBeDefined();+ });+});diff --git a/packages/app/src/components/AuthModal.tsx b/packages/app/src/components/AuthModal.tsxindex d0877f498..67ddcf0f3 100644--- a/packages/app/src/components/AuthModal.tsx+++ b/packages/app/src/components/AuthModal.tsx@@ -1,8 +1,12 @@import { Trans, useLingui } from '@lingui/react/macro';import { ArrowUpRight, Check, Copy } from 'lucide-react';-import { useEffect, useRef, useState } from 'react';+import { useEffect, useLayoutEffect, useRef, useState } from 'react';import { toast } from 'sonner';import { dispatchExternalLinkClick } from '@/lib/external-link';+import {+ type AuthQueryTransport,+ httpAuthQueryTransport,+} from '@/lib/transports/auth-query-transport';import { type AuthTransport, httpAuthTransport } from '@/lib/transports/auth-transport';import { Button } from './ui/button';import {@@ -35,6 +39,7 @@ interface AuthModalProps {identityPrompt?: boolean;reauth?: boolean;transport?: AuthTransport;+ queryTransport?: AuthQueryTransport;}interface DeviceFlowPanelProps {@@ -232,7 +237,9 @@ function IdentityBody({ login, name, onNameChange, email, onEmailChange }: Ident);}-type AuthStep = 'auth' | 'identity' | 'done';+type AuthStep = 'checking' | 'auth' | 'identity' | 'done';++const IDENTITY_PROBE_TIMEOUT_MS = 10_000;export function AuthModal({open,@@ -241,27 +248,66 @@ export function AuthModal({identityPrompt,reauth,transport,+ queryTransport,}: AuthModalProps) {const { t } = useLingui();const resolvedTransport = transport ?? httpAuthTransport();+ const resolvedQueryTransport = queryTransport ?? httpAuthQueryTransport();const [step, setStep] = useState<AuthStep>('auth');const [authResult, setAuthResult] = useState<AuthSuccessResult | null>(null);const [idName, setIdName] = useState('');const [idEmail, setIdEmail] = useState('');+ useLayoutEffect(() => {+ if (!open) return;+ setAuthResult(null);+ setIdName('');+ setIdEmail('');+ setStep(identityPrompt ? 'checking' : 'auth');+ }, [open, identityPrompt]);++ // biome-ignore lint/correctness/useExhaustiveDependencies: probe runs on open / identityPrompt change; resolvedQueryTransport is a fresh object each render and excluded intentionallyuseEffect(() => {- if (open) {- setStep('auth');- setAuthResult(null);- setIdName('');- setIdEmail('');- }- }, [open]);+ if (!open || !identityPrompt) return;+ let settled = false;+ const settle = (next: AuthStep) => {+ if (settled) return;+ settled = true;+ setStep(next);+ };+ const timer = setTimeout(() => settle('auth'), IDENTITY_PROBE_TIMEOUT_MS);+ void resolvedQueryTransport+ .status()+ .then((status) => {+ if (settled) return;+ if (status.authenticated) {+ setAuthResult({+ login: status.login,+ name: status.name,+ email: status.email,+ });+ setIdName(status.name ?? '');+ setIdEmail(status.email ?? '');+ settle('identity');+ } else {+ settle('auth');+ }+ })+ .catch(() => {+ settle('auth');+ });+ return () => {+ settled = true;+ clearTimeout(timer);+ };+ }, [open, identityPrompt]);function handleAuthSuccess(result: AuthSuccessResult) {setAuthResult(result);- if (identityPrompt && (!result.name || !result.email)) {+ if (identityPrompt) {+ setIdName(result.name ?? '');+ setIdEmail(result.email ?? '');setStep('identity');} else {setStep('done');@@ -305,10 +351,24 @@ export function AuthModal({<DialogContent className="sm:max-w-md"><DialogHeader><DialogTitle>- {reauth ? <Trans>Re-authenticate with GitHub</Trans> : <Trans>Connect GitHub</Trans>}+ {reauth ? (+ <Trans>Re-authenticate with GitHub</Trans>+ ) : identityPrompt && step !== 'auth' ? (+ <Trans>Set git identity</Trans>+ ) : (+ <Trans>Connect GitHub</Trans>+ )}</DialogTitle></DialogHeader>+ {step === 'checking' && (+ <DialogBody>+ <div className="flex items-center justify-center py-6 text-sm text-muted-foreground">+ <Trans>Checking sign-in status</Trans>+ </div>+ </DialogBody>+ )}+{step === 'auth' && (<><DialogBody>diff --git a/packages/app/src/components/NavigatorApp.tsx b/packages/app/src/components/NavigatorApp.tsxindex 048fd0a98..2e5eda84d 100644--- a/packages/app/src/components/NavigatorApp.tsx+++ b/packages/app/src/components/NavigatorApp.tsx@@ -272,6 +272,7 @@ export function NavigatorApp({ bridge }: { bridge: OkDesktopBridge }) {}}}transport={ipcAuthTransport(bridge)}+ queryTransport={ipcAuthQueryTransport(bridge)}identityPrompt={authInitialStep === 'identity'}onSuccess={(result) => {setAuthModalOpen(false);diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.jsonindex 12f3091e0..4c21d11eb 100644--- a/packages/app/src/locales/en/messages.json+++ b/packages/app/src/locales/en/messages.json@@ -95,6 +95,7 @@"27ANM6": ["With AI"],"27XW26": ["Clone happens in the Project Navigator. Reclick the share link there."],"29VNqC": ["Unknown error"],+ "29XZXN": ["Set git identity"],"2BBAbc": ["List"],"2FYpfJ": ["More"],"2GT3Hf": ["Global"],@@ -1274,6 +1275,7 @@"> failed to render (likely a bad prop). Copy the source to see what went wrong, or delete the block."],"g6d81C": ["Conflict: "],+ "gBbxn_": ["Checking sign-in status"],"gGVP4q": ["Click <0>+</0> <1/> <2>Create skill</2> <3/> <4>Upload skill</4>."],"gITz7o": ["Move the cursor or extend selection through CodeMirror's standard source-editor navigation keymap."diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.poindex 96d810735..4fd26c1fd 100644--- a/packages/app/src/locales/en/messages.po+++ b/packages/app/src/locales/en/messages.po@@ -888,6 +888,10 @@ msgstr "Checking GitHub connection..."msgid "Checking out files"msgstr "Checking out files"+#: src/components/AuthModal.tsx+msgid "Checking sign-in status"+msgstr "Checking sign-in status"+#: src/components/settings/AccountSection.tsxmsgid "Checking your GitHub connection"msgstr "Checking your GitHub connection"@@ -4829,6 +4833,10 @@ msgstr "Session ended — undo unavailable"#~ msgid "Set a shared value"#~ msgstr "Set a shared value"+#: src/components/AuthModal.tsx+msgid "Set git identity"+msgstr "Set git identity"+#: src/components/SyncStatusBadge.tsxmsgid "Set identity"msgstr "Set identity"diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.jsonindex abc0c53c3..88050f658 100644--- a/packages/app/src/locales/pseudo/messages.json+++ b/packages/app/src/locales/pseudo/messages.json@@ -95,6 +95,7 @@"27ANM6": ["Ŵĩţĥ ÀĨ"],"27XW26": ["Ćĺōńē ĥàƥƥēńś ĩń ţĥē ƤŕōĴēćţ Ńàvĩĝàţōŕ. Ŕēćĺĩćķ ţĥē śĥàŕē ĺĩńķ ţĥēŕē."],"29VNqC": ["Ũńķńōŵń ēŕŕōŕ"],+ "29XZXN": ["Śēţ ĝĩţ ĩďēńţĩţŷ"],"2BBAbc": ["Ĺĩśţ"],"2FYpfJ": ["Ḿōŕē"],"2GT3Hf": ["Ĝĺōƀàĺ"],@@ -1274,6 +1275,7 @@"> ƒàĩĺēď ţō ŕēńďēŕ (ĺĩķēĺŷ à ƀàď ƥŕōƥ). Ćōƥŷ ţĥē śōũŕćē ţō śēē ŵĥàţ ŵēńţ ŵŕōńĝ, ōŕ ďēĺēţē ţĥē ƀĺōćķ."],"g6d81C": ["Ćōńƒĺĩćţ: "],+ "gBbxn_": ["Ćĥēćķĩńĝ śĩĝń-ĩń śţàţũś"],"gGVP4q": ["Ćĺĩćķ <0>+</0> <1/> <2>Ćŕēàţē śķĩĺĺ</2> <3/> <4>Ũƥĺōàď śķĩĺĺ</4>."],"gITz7o": ["Ḿōvē ţĥē ćũŕśōŕ ōŕ ēxţēńď śēĺēćţĩōń ţĥŕōũĝĥ ĆōďēḾĩŕŕōŕ'ś śţàńďàŕď śōũŕćē-ēďĩţōŕ ńàvĩĝàţĩōń ķēŷḿàƥ."diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.poindex 816d91165..43fe7c8ec 100644--- a/packages/app/src/locales/pseudo/messages.po+++ b/packages/app/src/locales/pseudo/messages.po@@ -883,6 +883,10 @@ msgstr ""msgid "Checking out files"msgstr ""+#: src/components/AuthModal.tsx+msgid "Checking sign-in status"+msgstr ""+#: src/components/settings/AccountSection.tsxmsgid "Checking your GitHub connection"msgstr ""@@ -4824,6 +4828,10 @@ msgstr ""#~ msgid "Set a shared value"#~ msgstr ""+#: src/components/AuthModal.tsx+msgid "Set git identity"+msgstr ""+#: src/components/SyncStatusBadge.tsxmsgid "Set identity"msgstr ""