space/pr-preview
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: correct route registration - use full paths in rjweb-server path.http() calls

Browse Source 
rjweb-server path.http() second argument is the FULL path, not relative to prefix.
Changed all routes from server.path('/prefix', path => path.http(method, '/suffix', ...))
to server.path('/', path => path.http(method, '/prefix/suffix', ...)).

Also fixed:
- Duplicate createContext import in useAuth.ts
- notFound handler now excludes /webhook paths from SPA fallback

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Space
2026-07-25 00:28:14 +02:00
parent 46cd910079
commit 55332097a7
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/index.ts
+37 -37
View File
@@ -44,44 +44,44 @@ export const server = new Server(
);
// Auth
server.path("/api/auth", (path) => path
.http("POST", "/login", (http) => http.onRequest(loginHandler))
.http("POST", "/logout", (http) => http.onRequest(logoutHandler))
.http("GET", "/me", (http) => http.onRequest(meHandler))
.http("GET", "/setup-status", (http) => http.onRequest(setupStatusHandler))
.http("POST", "/first-user", (http) => http.onRequest(firstUserHandler))
server.path("/", (path) => path
.http("POST", "/api/auth/login", (http) => http.onRequest(loginHandler))
.http("POST", "/api/auth/logout", (http) => http.onRequest(logoutHandler))
.http("GET", "/api/auth/me", (http) => http.onRequest(meHandler))
.http("GET", "/api/auth/setup-status", (http) => http.onRequest(setupStatusHandler))
.http("POST", "/api/auth/first-user", (http) => http.onRequest(firstUserHandler))
);
// Webhook
server.path("/webhook", (path) => path
.http("POST", "/:userId", (http) => http.onRequest(webhookHandler))
server.path("/", (path) => path
.http("POST", "/webhook/:userId", (http) => http.onRequest(webhookHandler))
);
// User settings
server.path("/api/user", (path) => path
.http("GET", "/settings", (http) => http.onRequest(getUserSettings))
.http("PATCH", "/username", (http) => http.onRequest(updateUsername))
.http("PATCH", "/password", (http) => http.onRequest(updatePassword))
.http("PUT", "/gitea", (http) => http.onRequest(updateGitea))
.http("PUT", "/aws", (http) => http.onRequest(updateAws))
.http("GET", "/webhook-secret", (http) => http.onRequest(getWebhookSecret))
.http("POST", "/webhook-secret/regenerate", (http) => http.onRequest(regenerateWebhookSecret))
server.path("/", (path) => path
.http("GET", "/api/user/settings", (http) => http.onRequest(getUserSettings))
.http("PATCH", "/api/user/username", (http) => http.onRequest(updateUsername))
.http("PATCH", "/api/user/password", (http) => http.onRequest(updatePassword))
.http("PUT", "/api/user/gitea", (http) => http.onRequest(updateGitea))
.http("PUT", "/api/user/aws", (http) => http.onRequest(updateAws))
.http("GET", "/api/user/webhook-secret", (http) => http.onRequest(getWebhookSecret))
.http("POST", "/api/user/webhook-secret/regenerate", (http) => http.onRequest(regenerateWebhookSecret))
);
// Repos
server.path("/api/repos", (path) => path
.http("GET", "/", (http) => http.onRequest(listRepos))
.http("POST", "/config", (http) => http.onRequest(saveRepoConfig))
.http("POST", "/toggle", (http) => http.onRequest(toggleRepoEnabled))
.http("GET", "/:owner/:repo/config", (http) => http.onRequest(getRepoConfig))
server.path("/", (path) => path
.http("GET", "/api/repos", (http) => http.onRequest(listRepos))
.http("POST", "/api/repos/config", (http) => http.onRequest(saveRepoConfig))
.http("POST", "/api/repos/toggle", (http) => http.onRequest(toggleRepoEnabled))
.http("GET", "/api/repos/:owner/:repo/config", (http) => http.onRequest(getRepoConfig))
);
// Previews
server.path("/api/previews", (path) => path
.http("GET", "/", (http) => http.onRequest(listPreviews))
.http("GET", "/:id", (http) => http.onRequest(getPreview))
.http("POST", "/:id/stop", (http) => http.onRequest(stopPreviewRoute))
.ws("/:id/logs", (ws) => ws
server.path("/", (path) => path
.http("GET", "/api/previews", (http) => http.onRequest(listPreviews))
.http("GET", "/api/previews/:id", (http) => http.onRequest(getPreview))
.http("POST", "/api/previews/:id/stop", (http) => http.onRequest(stopPreviewRoute))
.ws("/api/previews/:id/logs", (ws) => ws
.onOpen(previewLogsWs)
.onMessage(async () => {})
.onClose(async () => {})
@@ -89,25 +89,25 @@ server.path("/api/previews", (path) => path
);
// Admin
server.path("/api/admin", (path) => path
.http("GET", "/users", (http) => http.onRequest(listUsers))
.http("POST", "/users", (http) => http.onRequest(createUser))
.http("PATCH", "/users/:id", (http) => http.onRequest(updateUser))
.http("DELETE", "/users/:id", (http) => http.onRequest(deleteUser))
.http("GET", "/settings", (http) => http.onRequest(getSettings))
.http("PUT", "/settings", (http) => http.onRequest(updateSettings))
.http("GET", "/previews", (http) => http.onRequest(adminListPreviews))
.http("POST", "/previews/:id/stop", (http) => http.onRequest(adminStopPreview))
server.path("/", (path) => path
.http("GET", "/api/admin/users", (http) => http.onRequest(listUsers))
.http("POST", "/api/admin/users", (http) => http.onRequest(createUser))
.http("PATCH", "/api/admin/users/:id", (http) => http.onRequest(updateUser))
.http("DELETE", "/api/admin/users/:id", (http) => http.onRequest(deleteUser))
.http("GET", "/api/admin/settings", (http) => http.onRequest(getSettings))
.http("PUT", "/api/admin/settings", (http) => http.onRequest(updateSettings))
.http("GET", "/api/admin/previews", (http) => http.onRequest(adminListPreviews))
.http("POST", "/api/admin/previews/:id/stop", (http) => http.onRequest(adminStopPreview))
);
// Static UI
// Static UI — must come AFTER API routes
if (hasUiBuild) {
server.path("/", (path) => path.static(uiBuildPath));
}
server.notFound(async (ctr) => {
const STATIC_EXT = /\.(js|mjs|css|png|jpg|jpeg|gif|svg|ico|woff2?|ttf|eot|map|json|txt|xml|webp|avif)(\?.*)?$/i;
if (!ctr.url.path.startsWith("/api") && !STATIC_EXT.test(ctr.url.path) && existsSync(uiIndexPath)) {
if (!ctr.url.path.startsWith("/api") && !ctr.url.path.startsWith("/webhook") && !STATIC_EXT.test(ctr.url.path) && existsSync(uiIndexPath)) {
return ctr.status(200).printFile(uiIndexPath, { addTypes: true });
}
return makeResponse({ ctr, content: { code: ERROR_MESSAGES.NOT_FOUND.code, message: ERROR_MESSAGES.NOT_FOUND.message } });