Skip to content

fix: Correct AdminNav to AdminSidebar for 401 redirect handling #810

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

Merged
bokelley merged 2 commits into from
Jan 19, 2026
Merged

fix: Correct AdminNav to AdminSidebar for 401 redirect handling #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e9bc4b
fix: Correct AdminNav to AdminSidebar for 401 redirect handling
bokelley Jan 19, 2026
a6e65a8
feat: Add AdminSidebar.fetch() for shared 401 handling
bokelley Jan 19, 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
2 changes: 2 additions & 0 deletions .changeset/tiny-groups-share.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
6 changes: 3 additions & 3 deletions server/public/admin-account-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,7 +2338,7 @@ <h3 style="font-size: var(--text-sm); font-weight: 600; margin-bottom: var(--spa

if (!response.ok) {
if (response.status === 401) {
window.AdminNav?.redirectToLogin?.();
window.AdminSidebar?.redirectToLogin?.();
return;
}
const data = await response.json().catch(() => ({}));
Expand Down Expand Up @@ -2370,7 +2370,7 @@ <h3 style="font-size: var(--text-sm); font-weight: 600; margin-bottom: var(--spa

if (!response.ok) {
if (response.status === 401) {
window.AdminNav?.redirectToLogin?.();
window.AdminSidebar?.redirectToLogin?.();
return;
}
const data = await response.json().catch(() => ({}));
Expand Down Expand Up @@ -2402,7 +2402,7 @@ <h3 style="font-size: var(--text-sm); font-weight: 600; margin-bottom: var(--spa

if (!response.ok) {
if (response.status === 401) {
window.AdminNav?.redirectToLogin?.();
window.AdminSidebar?.redirectToLogin?.();
return;
}
const data = await response.json().catch(() => ({}));
Expand Down
2 changes: 1 addition & 1 deletion server/public/admin-agreements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ <h2 id="modalTitle">Edit Agreement</h2>
const response = await fetch('/api/admin/agreements');
if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load agreements');
Expand Down
6 changes: 3 additions & 3 deletions server/public/admin-domain-discovery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ <h3>No unmapped domains found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const error = await response.json();
Expand Down Expand Up @@ -548,7 +548,7 @@ <h3>No unmapped domains found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Bulk enrichment failed');
Expand Down Expand Up @@ -627,7 +627,7 @@ <h3>No unmapped domains found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const error = await response.json();
Expand Down
2 changes: 1 addition & 1 deletion server/public/admin-email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ <h2>Recent Email Sends</h2>
const response = await fetch('/api/admin/email/stats');
if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load stats');
Expand Down
2 changes: 1 addition & 1 deletion server/public/admin-feeds.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ <h2>Delete Feed</h2>
const response = await fetch('/api/admin/feeds');
if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load feeds');
Expand Down
2 changes: 1 addition & 1 deletion server/public/admin-meetings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ <h2 id="detailsTitle">Meeting Details</h2>
const response = await fetch('/api/admin/working-groups');
if (!response.ok) {
if (response.status === 401) {
window.AdminNav?.redirectToLogin();
window.AdminSidebar?.redirectToLogin();
return;
}
throw new Error('Failed to load working groups');
Expand Down
10 changes: 5 additions & 5 deletions server/public/admin-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ <h4>This action cannot be undone</h4>
console.log('[admin-members] Response status:', response.status);
if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load members');
Expand Down Expand Up @@ -709,7 +709,7 @@ <h4>This action cannot be undone</h4>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const errorData = await response.json().catch(() => ({ message: response.statusText }));
Expand Down Expand Up @@ -749,7 +749,7 @@ <h4>This action cannot be undone</h4>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to sync member data');
Expand Down Expand Up @@ -818,7 +818,7 @@ <h4>This action cannot be undone</h4>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load payment history');
Expand Down Expand Up @@ -944,7 +944,7 @@ <h4>This action cannot be undone</h4>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}

Expand Down
2 changes: 1 addition & 1 deletion server/public/admin-notification-channels.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ <h2>Delete Channel</h2>
const response = await fetch('/api/admin/notification-channels');
if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load channels');
Expand Down
35 changes: 15 additions & 20 deletions server/public/admin-org-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!orgResponse.ok) {
if (orgResponse.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
if (orgResponse.status === 404) {
Expand All @@ -1505,11 +1505,6 @@ <h2 id="discountModalTitle">Set Discount</h2>
domainsData = domainsResponse.ok ? await domainsResponse.json() : { domains: [], workos_domains: [] };
teamMembers = teamResponse.ok ? await teamResponse.json() : [];

// Get current user ID from AdminNav if available
if (window.AdminNav && window.AdminNav.user) {
currentUserId = window.AdminNav.user.id;
}

renderOrganization();
renderOwnerSelector();
populateOwnerDropdowns();
Expand Down Expand Up @@ -1799,7 +1794,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const data = await response.json();
Expand Down Expand Up @@ -2231,7 +2226,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to save changes');
Expand Down Expand Up @@ -2301,7 +2296,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to save activity');
Expand Down Expand Up @@ -2355,7 +2350,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to save follow-up');
Expand Down Expand Up @@ -2383,7 +2378,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to complete step');
Expand Down Expand Up @@ -2531,7 +2526,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (response && !response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to update owner');
Expand Down Expand Up @@ -2570,7 +2565,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to update watch status');
Expand Down Expand Up @@ -2730,7 +2725,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error(await getErrorMessage(response, 'Failed to add domain'));
Expand Down Expand Up @@ -2760,7 +2755,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error(await getErrorMessage(response, 'Failed to set primary domain'));
Expand Down Expand Up @@ -2790,7 +2785,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error(await getErrorMessage(response, 'Failed to remove domain'));
Expand Down Expand Up @@ -2822,7 +2817,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error(await getErrorMessage(response, 'Failed to verify domain'));
Expand Down Expand Up @@ -2954,7 +2949,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to save interest level');
Expand Down Expand Up @@ -3186,7 +3181,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error(await getErrorMessage(response, 'Failed to link domain'));
Expand Down Expand Up @@ -4260,7 +4255,7 @@ <h2 id="discountModalTitle">Set Discount</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
if (response.status === 503) {
Expand Down
6 changes: 3 additions & 3 deletions server/public/admin-products.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ <h2>Archive Product</h2>
const response = await fetch('/api/admin/products');
if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load products');
Expand Down Expand Up @@ -915,7 +915,7 @@ <h2>Archive Product</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const result = await response.json();
Expand Down Expand Up @@ -960,7 +960,7 @@ <h2>Archive Product</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to archive product');
Expand Down
16 changes: 8 additions & 8 deletions server/public/admin-prospects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@ <h2>Bulk Import Prospects</h2>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Failed to load prospects');
Expand Down Expand Up @@ -1772,7 +1772,7 @@ <h3>No unmapped domains found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const error = await response.json();
Expand Down Expand Up @@ -1814,7 +1814,7 @@ <h3>No unmapped domains found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
throw new Error('Bulk enrichment failed');
Expand Down Expand Up @@ -1852,7 +1852,7 @@ <h3>No unmapped domains found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const error = await response.json();
Expand Down Expand Up @@ -1944,7 +1944,7 @@ <h3>No unmapped domains found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const error = await response.json();
Expand Down Expand Up @@ -2161,7 +2161,7 @@ <h3>Search for Companies</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const error = await response.json();
Expand Down Expand Up @@ -2262,7 +2262,7 @@ <h3>No Results Found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
if (response.status === 409) {
Expand Down Expand Up @@ -3283,7 +3283,7 @@ <h3>No accounts found</h3>

if (!response.ok) {
if (response.status === 401) {
window.AdminNav.redirectToLogin();
window.AdminSidebar.redirectToLogin();
return;
}
const error = await response.json();
Expand Down
Loading