Fix public URLs

admin/server/billing.go

@@ -233,17 +233,16 @@ func (s *Server) CancelBillingSubscription(ctx context.Context, req *adminv1.Can
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	//
-	//err = s.admin.Email.SendSubscriptionCancelled(&email.SubscriptionCancelled{
-	//	ToEmail:  org.BillingEmail,
-	//	ToName:   org.Name,
-	//	OrgName:  org.Name,
-	//	PlanName: "Team Plan", // TODO: will this ever be different?
-	//	EndDate:  endDate,
-	//})
-	//if err != nil {
-	//	return nil, status.Error(codes.Internal, err.Error())
-	//}
+	// err = s.admin.Email.SendSubscriptionCancelled(&email.SubscriptionCancelled{
+	// 	ToEmail:  org.BillingEmail,
+	// 	ToName:   org.Name,
+	// 	OrgName:  org.Name,
+	// 	PlanName: "Team Plan", // TODO: will this ever be different?
+	// 	EndDate:  endDate,
+	// })
+	// if err != nil {
+	// 	return nil, status.Error(codes.Internal, err.Error())
+	// }
 
 	s.logger.Named("billing").Warn("subscription cancelled", zap.String("org_id", org.ID), zap.String("org_name", org.Name))
 

web-admin/src/features/authentication/checkUserAccess.ts

@@ -1,10 +1,16 @@
+import { goto } from "$app/navigation";
 import {
   adminServiceGetCurrentUser,
   getAdminServiceGetCurrentUserQueryKey,
   type V1GetCurrentUserResponse,
 } from "@rilldata/web-admin/client";
 import { redirectToLogin } from "@rilldata/web-admin/client/redirect-utils";
+import {
+  isProjectRequestAccessPage,
+  withinProject,
+} from "@rilldata/web-admin/features/navigation/nav-utils";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+import type { Page } from "@sveltejs/kit";
 
 export async function redirectToLoginIfNotLoggedIn() {
   // Check for a logged-in user
@@ -21,3 +27,16 @@ export async function redirectToLoginIfNotLoggedIn() {
   redirectToLogin();
   return true;
 }
+
+export async function redirectToLoginOrRequestAccess(page: Page) {
+  const didRedirect = await redirectToLoginIfNotLoggedIn();
+  if (didRedirect) return true;
+  if (withinProject(page) && !isProjectRequestAccessPage(page)) {
+    // if not in request access page (approve or deny routes) then go to a page to get access
+    await goto(
+      `/-/request-project-access/?organization=${page.params.organization}&project=${page.params.project}`,
+    );
+    return true;
+  }
+  return false;
+}

web-admin/src/features/errors/error-utils.ts

@@ -1,15 +1,13 @@
-import { goto } from "$app/navigation";
 import { page } from "$app/stores";
 import { redirectToLogin } from "@rilldata/web-admin/client/redirect-utils";
 import { isAdminServerQuery } from "@rilldata/web-admin/client/utils";
-import { redirectToLoginIfNotLoggedIn } from "@rilldata/web-admin/features/authentication/checkUserAccess";
+import { redirectToLoginOrRequestAccess } from "@rilldata/web-admin/features/authentication/checkUserAccess";
 import {
   isAlertPage,
   isMetricsExplorerPage,
   isProjectPage,
   isProjectRequestAccessPage,
   isPublicURLPage,
-  withinProject,
 } from "@rilldata/web-admin/features/navigation/nav-utils";
 import { errorEventHandler } from "@rilldata/web-common/metrics/initMetrics";
 import {
@@ -52,18 +50,8 @@ export function createGlobalErrorCallback(queryClient: QueryClient) {
 
     // If an anonymous user hits a 403 error, redirect to the login page
     if (error.response?.status === 403) {
-      if (!(await redirectToLoginIfNotLoggedIn())) {
-        if (
-          withinProject(pageState) &&
-          !isProjectRequestAccessPage(pageState)
-        ) {
-          // if not in request access page (approve or deny routes) then go to a page to get access
-          await goto(
-            `/-/request-project-access/?organization=${pageState.params.organization}&project=${pageState.params.project}`,
-          );
-          return;
-        }
-      }
+      const didRedirect = await redirectToLoginOrRequestAccess(pageState);
+      if (didRedirect) return;
     }
 
     // If unauthorized to the admin server, redirect to login page

web-admin/src/routes/+layout.ts

@@ -11,14 +11,10 @@ import {
   type V1OrganizationPermissions,
   type V1ProjectPermissions,
 } from "@rilldata/web-admin/client";
-import { redirectToLoginIfNotLoggedIn } from "@rilldata/web-admin/features/authentication/checkUserAccess";
-import {
-  isProjectRequestAccessPage,
-  withinProject,
-} from "@rilldata/web-admin/features/navigation/nav-utils";
+import { redirectToLoginOrRequestAccess } from "@rilldata/web-admin/features/authentication/checkUserAccess";
 import { fetchOrganizationPermissions } from "@rilldata/web-admin/features/organizations/selectors";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.js";
-import { error, type Page, redirect } from "@sveltejs/kit";
+import { error, type Page } from "@sveltejs/kit";
 import type { QueryFunction, QueryKey } from "@tanstack/svelte-query";
 import {
   adminServiceGetProjectWithBearerToken,
@@ -27,6 +23,11 @@ import {
 
 export const load = async ({ params, url, route }) => {
   const { organization, project, token: routeToken } = params;
+  const pageState = {
+    url,
+    route,
+    params,
+  } as Page;
 
   let searchParamToken: string | undefined;
   if (url.searchParams.has("token")) {
@@ -40,20 +41,11 @@ export const load = async ({ params, url, route }) => {
       organizationPermissions =
         await fetchOrganizationPermissions(organization);
     } catch (e) {
-      if (
-        e.response?.status !== 403 ||
-        (await redirectToLoginIfNotLoggedIn())
-      ) {
-        if (
-          withinProject({ url, route } as Page) &&
-          !isProjectRequestAccessPage({ url, route } as Page)
-        ) {
-          // if not in request access page (approve or deny routes) then go to a page to get access
-          throw redirect(
-            307,
-            `/-/request-project-access/?organization=${organization}&project=${project}`,
-          );
-        }
+      if (e.response?.status !== 403) {
+        throw error(e.response.status, "Error fetching organization");
+      }
+      const didRedirect = await redirectToLoginOrRequestAccess(pageState);
+      if (!didRedirect) {
         throw error(e.response.status, "Error fetching organization");
       }
     }
@@ -107,18 +99,12 @@ export const load = async ({ params, url, route }) => {
       projectPermissions,
     };
   } catch (e) {
-    if (e.response?.status !== 403 || (await redirectToLoginIfNotLoggedIn())) {
-      if (
-        withinProject({ url, route } as Page) &&
-        !isProjectRequestAccessPage({ url, route } as Page)
-      ) {
-        // if not in request access page (approve or deny routes) then go to a page to get access
-        throw redirect(
-          307,
-          `/-/request-project-access/?organization=${organization}&project=${project}`,
-        );
-      }
+    if (e.response?.status !== 403) {
       throw error(e.response.status, "Error fetching deployment");
     }
+    const didRedirect = await redirectToLoginOrRequestAccess(pageState);
+    if (!didRedirect) {
+      throw error(e.response.status, "Error fetching organization");
+    }
   }
 };

web-admin/src/routes/[organization]/+layout.ts

@@ -7,11 +7,24 @@ export const load = async ({ params: { organization }, parent }) => {
   const { organizationPermissions } = await parent();
 
   let issues: V1BillingIssue[] = [];
-  try {
-    issues = await fetchOrganizationBillingIssues(organization);
-  } catch (e) {
-    if (e.response?.status !== 403 || (await redirectToLoginIfNotLoggedIn())) {
-      throw error(e.response.status, "Error fetching billing issues");
+  if (organizationPermissions.readOrg) {
+    // only try to get issues if the user can read org
+    try {
+      issues = await fetchOrganizationBillingIssues(organization);
+    } catch (e) {
+      if (e.response?.status !== 403) {
+        throw error(e.response.status, "Error fetching billing issues");
+      }
+      const didRedirect = await redirectToLoginIfNotLoggedIn();
+      if (!didRedirect) {
+        throw error(e.response.status, "Error fetching billing issues");
+      }
+      if (
+        e.response?.status !== 403 ||
+        (await redirectToLoginIfNotLoggedIn())
+      ) {
+        throw error(e.response.status, "Error fetching billing issues");
+      }
     }
   }
 

web-admin/src/routes/[organization]/-/settings/billing/payment/+page.ts

@@ -11,7 +11,11 @@ export const load: PageLoad = async ({ params: { organization }, url }) => {
       `${url.protocol}//${url.host}/${organization}`,
     );
   } catch (e) {
-    if (e.response?.status !== 403 || (await redirectToLoginIfNotLoggedIn())) {
+    if (e.response?.status !== 403) {
+      throw error(e.response.status, "Error redirecting to payment portal");
+    }
+    const didRedirect = await redirectToLoginIfNotLoggedIn();
+    if (!didRedirect) {
       throw error(e.response.status, "Error redirecting to payment portal");
     }
   }

web-admin/src/routes/[organization]/-/settings/billing/upgrade/+page.ts

@@ -1,27 +1,24 @@
-import { redirectToLoginIfNotLoggedIn } from "@rilldata/web-admin/features/authentication/checkUserAccess";
 import { getPaymentIssues } from "@rilldata/web-admin/features/billing/issues/getMessageForPaymentIssues";
 import { fetchPaymentsPortalURL } from "@rilldata/web-admin/features/billing/plans/selectors";
-import { fetchOrganizationBillingIssues } from "@rilldata/web-admin/features/billing/selectors";
-import { error, redirect } from "@sveltejs/kit";
+import { redirect } from "@sveltejs/kit";
 import type { PageLoad } from "./$types";
 
-export const load: PageLoad = async ({ params: { organization }, url }) => {
-  let redirectUrl = `/${organization}`;
-  try {
-    const issues = await fetchOrganizationBillingIssues(organization);
-    const paymentIssues = getPaymentIssues(issues);
-    if (paymentIssues.length) {
-      redirectUrl = await fetchPaymentsPortalURL(
+export const load: PageLoad = async ({
+  params: { organization },
+  url,
+  parent,
+}) => {
+  const { issues } = await parent();
+  const paymentIssues = getPaymentIssues(issues);
+  if (paymentIssues.length) {
+    throw redirect(
+      307,
+      await fetchPaymentsPortalURL(
         organization,
         `${url.protocol}//${url.host}/${organization}`,
-      );
-    } else {
-      redirectUrl = `/${organization}/-/settings/billing/callback`;
-    }
-  } catch (e) {
-    if (e.response?.status !== 403 || (await redirectToLoginIfNotLoggedIn())) {
-      throw error(e.response.status, "Error fetching billing issues");
-    }
+      ),
+    );
+  } else {
+    throw redirect(307, `/${organization}/-/settings/billing/callback`);
   }
-  throw redirect(307, redirectUrl);
 };

web-admin/src/routes/[organization]/[project]/+layout.ts

@@ -1,20 +1,16 @@
-import {
-  fetchOrganizationBillingIssues,
-  hasBlockerIssues,
-} from "@rilldata/web-admin/features/billing/selectors";
+import { hasBlockerIssues } from "@rilldata/web-admin/features/billing/selectors";
 import { fetchAllProjectsHibernating } from "@rilldata/web-admin/features/organizations/selectors";
 import { error, redirect } from "@sveltejs/kit";
 
 export const load = async ({ params: { organization }, parent }) => {
-  const { organizationPermissions } = await parent();
+  const { organizationPermissions, issues } = await parent();
   if (!organizationPermissions.manageOrg) {
     return;
   }
 
   let shouldRedirectToProjectsList = false;
 
   try {
-    const issues = await fetchOrganizationBillingIssues(organization);
     // if all projects were hibernated due to a blocker issue on org then take the user to projects page
     if (
       hasBlockerIssues(issues) &&

web-common/src/lib/openPopupWindow.ts

@@ -51,7 +51,7 @@ export class PopupWindow {
         // no-op
       }
       if (this.timer) clearInterval(this.timer);
-      this.window = PopupWindow.open(url, "popupWindow");
+      this.window = PopupWindow.open(url, "rillDataPopupWindow");
 
       // periodically check if the new window was closed
       this.timer = setInterval(() => {