Skip to content

fix(backend): satisfy prettier + eslint on CORS helper (unblock main CI) #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ianlintner wants to merge 3 commits into
base: main
Choose a base branch
from
+206 −117
Open

fix(backend): satisfy prettier + eslint on CORS helper (unblock main CI) #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
087e365
fix(backend): satisfy prettier + eslint on CORS helper
ianlintner Apr 23, 2026
f97ef39
fix(embed): remove unused inputRowEl property to fix TS6133 type error
Copilot May 5, 2026
33c3a31
fix(embed): remove unused inputRowEl property to fix TS6133 type erro…
Copilot May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 10 additions & 27 deletions backend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 14 additions & 6 deletions backend/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ debugLog('Express app and HTTP server created');
// 3. Allows localhost ports in development for local dev convenience.
// 4. Falls back to the FRONTEND_URL env var when set (useful in staging).
// ---------------------------------------------------------------------------
const CAT_HERDING_ORIGIN_RE =
/^https:\/\/([\w-]+\.)?cat-herding\.net(:\d+)?$/;
const CAT_HERDING_ORIGIN_RE = /^https:\/\/([\w-]+\.)?cat-herding\.net(:\d+)?$/;

const DEV_LOCALHOST_ORIGINS = new Set([
'http://localhost:5173',
Expand All @@ -114,12 +113,21 @@ const DEV_LOCALHOST_ORIGINS = new Set([
]);

function isAllowedOrigin(origin: string | undefined): boolean {
if (!origin) return true; // server-to-server / curl — no Origin header
if (CAT_HERDING_ORIGIN_RE.test(origin)) return true;
if (process.env.NODE_ENV !== 'production' && DEV_LOCALHOST_ORIGINS.has(origin))
if (!origin) {
return true; // server-to-server / curl — no Origin header
}
if (CAT_HERDING_ORIGIN_RE.test(origin)) {
return true;
if (process.env.FRONTEND_URL && origin === process.env.FRONTEND_URL)
}
if (
process.env.NODE_ENV !== 'production' &&
DEV_LOCALHOST_ORIGINS.has(origin)
) {
return true;
}
if (process.env.FRONTEND_URL && origin === process.env.FRONTEND_URL) {
return true;
}
return false;
}

Expand Down
2 changes: 0 additions & 2 deletions embed/src/widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export class ChatWidget {
private statusEl!: HTMLDivElement;
/** Optional sign-in upgrade banner shown to unauthed users. */
private signInEl: HTMLDivElement | null = null;
private inputRowEl: HTMLFormElement | null = null;
private typingEl: HTMLDivElement | null = null;
private socket: Socket | null = null;
private conversationId: string | null = null;
Expand Down Expand Up @@ -263,7 +262,6 @@ export class ChatWidget {
e.preventDefault();
this.handleSend();
});
this.inputRowEl = inputRow;
panel.appendChild(inputRow);

if (this.opts.footerHtml) {
Expand Down
Loading
Loading