@sentry/junior-dashboard 0.97.0 → 0.97.1

package/dist/app.js

@@ -54,7 +54,7 @@ function stripTrailingSlashes(value) {
   return end === value.length ? value : value.slice(0, end);
 }
 function resolveDashboardBaseURL(config = {}) {
-  const explicit = config.baseURL ?? process.env.BETTER_AUTH_URL ?? process.env.JUNIOR_BASE_URL;
+  const explicit = config.baseURL ?? process.env.JUNIOR_BASE_URL;
   if (explicit?.trim()) {
     return stripTrailingSlashes(withHttps(explicit.trim()));
   }
@@ -1912,9 +1912,9 @@ function requestedReturnPath(url, basePath) {
   }
   return `${returnUrl.pathname}${returnUrl.search}`;
 }
-function dashboardLoginUrl(request, basePath) {
+function dashboardLoginUrl(request, basePath, canonicalBaseURL) {
   const requestUrl = new URL(request.url);
-  const url = new URL(request.url);
+  const url = canonicalBaseURL ? new URL(canonicalBaseURL) : new URL(request.url);
   url.pathname = dashboardLoginPath(basePath);
   url.search = "";
   const returnPath = dashboardReturnPath(requestUrl, basePath);
@@ -1923,6 +1923,19 @@ function dashboardLoginUrl(request, basePath) {
   }
   return url.toString();
 }
+function canonicalLoginUrl(request, canonicalBaseURL) {
+  if (!canonicalBaseURL) {
+    return void 0;
+  }
+  const requestUrl = new URL(request.url);
+  const canonicalUrl = new URL(canonicalBaseURL);
+  if (requestUrl.origin === canonicalUrl.origin) {
+    return void 0;
+  }
+  canonicalUrl.pathname = requestUrl.pathname;
+  canonicalUrl.search = requestUrl.search;
+  return canonicalUrl.toString();
+}
 function dashboardLoginPath(basePath) {
   return basePath === "/" ? "/auth/login" : `${basePath}/auth/login`;
 }
@@ -1950,11 +1963,14 @@ function isAuthorized(session, allowedDomains, allowedEmails) {
     session.user.emailVerified && domain && allowedDomains.includes(domain)
   );
 }
-function unauthorized(request, basePath) {
+function unauthorized(request, basePath, canonicalBaseURL) {
   if (isJsonRoute(new URL(request.url).pathname)) {
     return Response.json({ error: "unauthenticated" }, { status: 401 });
   }
-  return Response.redirect(dashboardLoginUrl(request, basePath), 302);
+  return Response.redirect(
+    dashboardLoginUrl(request, basePath, canonicalBaseURL),
+    302
+  );
 }
 function forbidden(request) {
   if (!isJsonRoute(new URL(request.url).pathname)) {
@@ -2163,6 +2179,11 @@ function createDashboardApp(rawOptions) {
   const allowedDomains = normalizeValues(options.allowedGoogleDomains);
   const allowedEmails = normalizeValues(options.allowedEmails);
   const authRequired = options.authRequired !== false;
+  const configuredBaseURL = options.baseURL ?? process.env.JUNIOR_BASE_URL;
+  let canonicalBaseURL;
+  if (authRequired && (configuredBaseURL || !options.auth)) {
+    canonicalBaseURL = resolveDashboardBaseURL({ baseURL: configuredBaseURL });
+  }
   if (authRequired && allowedDomains.length === 0 && allowedEmails.length === 0) {
     throw new Error(
       "Junior dashboard auth requires allowedGoogleDomains or allowedEmails"
@@ -2177,6 +2198,10 @@ function createDashboardApp(rawOptions) {
   }) : void 0;
   const app = new Hono();
   app.get(dashboardLoginPath(basePath), async (c) => {
+    const canonicalUrl = canonicalLoginUrl(c.req.raw, canonicalBaseURL);
+    if (canonicalUrl) {
+      return Response.redirect(canonicalUrl, 302);
+    }
     const returnUrl = callbackUrl(c.req.raw, basePath);
     if (!auth) {
       return Response.redirect(returnUrl, 302);
@@ -2198,11 +2223,11 @@ function createDashboardApp(rawOptions) {
       return;
     }
     if (!auth) {
-      return unauthorized(c.req.raw, basePath);
+      return unauthorized(c.req.raw, basePath, canonicalBaseURL);
     }
     const session = await auth.getSession(c.req.raw);
     if (!session) {
-      return unauthorized(c.req.raw, basePath);
+      return unauthorized(c.req.raw, basePath, canonicalBaseURL);
     }
     if (!isAuthorized(session, allowedDomains, allowedEmails)) {
       return forbidden(c.req.raw);

package/dist/index.js

@@ -54,7 +54,7 @@ function stripTrailingSlashes(value) {
   return end === value.length ? value : value.slice(0, end);
 }
 function resolveDashboardBaseURL(config = {}) {
-  const explicit = config.baseURL ?? process.env.BETTER_AUTH_URL ?? process.env.JUNIOR_BASE_URL;
+  const explicit = config.baseURL ?? process.env.JUNIOR_BASE_URL;
   if (explicit?.trim()) {
     return stripTrailingSlashes(withHttps(explicit.trim()));
   }
@@ -1912,9 +1912,9 @@ function requestedReturnPath(url, basePath) {
   }
   return `${returnUrl.pathname}${returnUrl.search}`;
 }
-function dashboardLoginUrl(request, basePath) {
+function dashboardLoginUrl(request, basePath, canonicalBaseURL) {
   const requestUrl = new URL(request.url);
-  const url = new URL(request.url);
+  const url = canonicalBaseURL ? new URL(canonicalBaseURL) : new URL(request.url);
   url.pathname = dashboardLoginPath(basePath);
   url.search = "";
   const returnPath = dashboardReturnPath(requestUrl, basePath);
@@ -1923,6 +1923,19 @@ function dashboardLoginUrl(request, basePath) {
   }
   return url.toString();
 }
+function canonicalLoginUrl(request, canonicalBaseURL) {
+  if (!canonicalBaseURL) {
+    return void 0;
+  }
+  const requestUrl = new URL(request.url);
+  const canonicalUrl = new URL(canonicalBaseURL);
+  if (requestUrl.origin === canonicalUrl.origin) {
+    return void 0;
+  }
+  canonicalUrl.pathname = requestUrl.pathname;
+  canonicalUrl.search = requestUrl.search;
+  return canonicalUrl.toString();
+}
 function dashboardLoginPath(basePath) {
   return basePath === "/" ? "/auth/login" : `${basePath}/auth/login`;
 }
@@ -1950,11 +1963,14 @@ function isAuthorized(session, allowedDomains, allowedEmails) {
     session.user.emailVerified && domain && allowedDomains.includes(domain)
   );
 }
-function unauthorized(request, basePath) {
+function unauthorized(request, basePath, canonicalBaseURL) {
   if (isJsonRoute(new URL(request.url).pathname)) {
     return Response.json({ error: "unauthenticated" }, { status: 401 });
   }
-  return Response.redirect(dashboardLoginUrl(request, basePath), 302);
+  return Response.redirect(
+    dashboardLoginUrl(request, basePath, canonicalBaseURL),
+    302
+  );
 }
 function forbidden(request) {
   if (!isJsonRoute(new URL(request.url).pathname)) {
@@ -2163,6 +2179,11 @@ function createDashboardApp(rawOptions) {
   const allowedDomains = normalizeValues(options.allowedGoogleDomains);
   const allowedEmails = normalizeValues(options.allowedEmails);
   const authRequired = options.authRequired !== false;
+  const configuredBaseURL = options.baseURL ?? process.env.JUNIOR_BASE_URL;
+  let canonicalBaseURL;
+  if (authRequired && (configuredBaseURL || !options.auth)) {
+    canonicalBaseURL = resolveDashboardBaseURL({ baseURL: configuredBaseURL });
+  }
   if (authRequired && allowedDomains.length === 0 && allowedEmails.length === 0) {
     throw new Error(
       "Junior dashboard auth requires allowedGoogleDomains or allowedEmails"
@@ -2177,6 +2198,10 @@ function createDashboardApp(rawOptions) {
   }) : void 0;
   const app = new Hono();
   app.get(dashboardLoginPath(basePath), async (c) => {
+    const canonicalUrl = canonicalLoginUrl(c.req.raw, canonicalBaseURL);
+    if (canonicalUrl) {
+      return Response.redirect(canonicalUrl, 302);
+    }
     const returnUrl = callbackUrl(c.req.raw, basePath);
     if (!auth) {
       return Response.redirect(returnUrl, 302);
@@ -2198,11 +2223,11 @@ function createDashboardApp(rawOptions) {
       return;
     }
     if (!auth) {
-      return unauthorized(c.req.raw, basePath);
+      return unauthorized(c.req.raw, basePath, canonicalBaseURL);
     }
     const session = await auth.getSession(c.req.raw);
     if (!session) {
-      return unauthorized(c.req.raw, basePath);
+      return unauthorized(c.req.raw, basePath, canonicalBaseURL);
     }
     if (!isAuthorized(session, allowedDomains, allowedEmails)) {
       return forbidden(c.req.raw);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-dashboard",
-  "version": "0.97.0",
+  "version": "0.97.1",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -34,8 +34,8 @@
     "recharts": "^3.8.1",
     "shiki": "4.1.0",
     "zod": "^4.4.3",
-    "@sentry/junior": "0.97.0",
-    "@sentry/junior-plugin-api": "0.97.0"
+    "@sentry/junior": "0.97.1",
+    "@sentry/junior-plugin-api": "0.97.1"
   },
   "devDependencies": {
     "@tailwindcss/cli": "^4.3.0",

package/src/app.ts

@@ -32,6 +32,7 @@ import {
   readMockConversationStats,
   readMockConversationSubagent,
 } from "./mock-conversations";
+import { resolveDashboardBaseURL } from "./url";
 
 const DEFAULT_BASE_PATH = "/";
 const DEFAULT_AUTH_PATH = "/api/auth";
@@ -196,9 +197,15 @@ function requestedReturnPath(url: URL, basePath: string): string | undefined {
   return `${returnUrl.pathname}${returnUrl.search}`;
 }
 
-function dashboardLoginUrl(request: Request, basePath: string): string {
+function dashboardLoginUrl(
+  request: Request,
+  basePath: string,
+  canonicalBaseURL?: string,
+): string {
   const requestUrl = new URL(request.url);
-  const url = new URL(request.url);
+  const url = canonicalBaseURL
+    ? new URL(canonicalBaseURL)
+    : new URL(request.url);
   url.pathname = dashboardLoginPath(basePath);
   url.search = "";
   const returnPath = dashboardReturnPath(requestUrl, basePath);
@@ -208,6 +215,25 @@ function dashboardLoginUrl(request: Request, basePath: string): string {
   return url.toString();
 }
 
+function canonicalLoginUrl(
+  request: Request,
+  canonicalBaseURL: string | undefined,
+): string | undefined {
+  if (!canonicalBaseURL) {
+    return undefined;
+  }
+
+  const requestUrl = new URL(request.url);
+  const canonicalUrl = new URL(canonicalBaseURL);
+  if (requestUrl.origin === canonicalUrl.origin) {
+    return undefined;
+  }
+
+  canonicalUrl.pathname = requestUrl.pathname;
+  canonicalUrl.search = requestUrl.search;
+  return canonicalUrl.toString();
+}
+
 function dashboardLoginPath(basePath: string): string {
   return basePath === "/" ? "/auth/login" : `${basePath}/auth/login`;
 }
@@ -244,11 +270,18 @@ function isAuthorized(
   );
 }
 
-function unauthorized(request: Request, basePath: string): Response {
+function unauthorized(
+  request: Request,
+  basePath: string,
+  canonicalBaseURL?: string,
+): Response {
   if (isJsonRoute(new URL(request.url).pathname)) {
     return Response.json({ error: "unauthenticated" }, { status: 401 });
   }
-  return Response.redirect(dashboardLoginUrl(request, basePath), 302);
+  return Response.redirect(
+    dashboardLoginUrl(request, basePath, canonicalBaseURL),
+    302,
+  );
 }
 
 function forbidden(request: Request): Response {
@@ -492,6 +525,11 @@ export function createDashboardApp(
   const allowedEmails = normalizeValues(options.allowedEmails);
 
   const authRequired = options.authRequired !== false;
+  const configuredBaseURL = options.baseURL ?? process.env.JUNIOR_BASE_URL;
+  let canonicalBaseURL: string | undefined;
+  if (authRequired && (configuredBaseURL || !options.auth)) {
+    canonicalBaseURL = resolveDashboardBaseURL({ baseURL: configuredBaseURL });
+  }
 
   if (
     authRequired &&
@@ -516,6 +554,10 @@ export function createDashboardApp(
   const app = new Hono<{ Variables: Variables }>();
 
   app.get(dashboardLoginPath(basePath), async (c) => {
+    const canonicalUrl = canonicalLoginUrl(c.req.raw, canonicalBaseURL);
+    if (canonicalUrl) {
+      return Response.redirect(canonicalUrl, 302);
+    }
     const returnUrl = callbackUrl(c.req.raw, basePath);
     if (!auth) {
       return Response.redirect(returnUrl, 302);
@@ -548,11 +590,11 @@ export function createDashboardApp(
     }
 
     if (!auth) {
-      return unauthorized(c.req.raw, basePath);
+      return unauthorized(c.req.raw, basePath, canonicalBaseURL);
     }
     const session = await auth.getSession(c.req.raw);
     if (!session) {
-      return unauthorized(c.req.raw, basePath);
+      return unauthorized(c.req.raw, basePath, canonicalBaseURL);
     }
     if (!isAuthorized(session, allowedDomains, allowedEmails)) {
       return forbidden(c.req.raw);

package/src/url.ts

@@ -33,10 +33,7 @@ export function normalizeDashboardPath(
 export function resolveDashboardBaseURL(
   config: DashboardBaseURLConfig = {},
 ): string {
-  const explicit =
-    config.baseURL ??
-    process.env.BETTER_AUTH_URL ??
-    process.env.JUNIOR_BASE_URL;
+  const explicit = config.baseURL ?? process.env.JUNIOR_BASE_URL;
   if (explicit?.trim()) {
     return stripTrailingSlashes(withHttps(explicit.trim()));
   }