Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Polish program access guard naming and session loading

Kiran K966f119cb189
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsx
index 69349115b4..0bbbf044e5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsx
@@ -1,6 +1,6 @@
"use client";
-import { canAccessDubPartners } from "@/lib/auth/product-access-guard";
+import { canAccessProgram } from "@/lib/auth/product-access-guard";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
@@ -15,27 +15,31 @@ import { ReactNode } from "react";
import { PartnersUpgradeCTA } from "./partners-upgrade-cta";
export default function ProgramAuth({ children }: { children: ReactNode }) {
- const { data: session } = useSession();
const {
id: workspaceId,
slug,
plan,
defaultProgramId,
partnersLimit,
- loading,
+ loading: workspaceLoading,
} = useWorkspace();
const { loading: programLoading } = useProgram();
+ const { data: session, status } = useSession();
- if (loading || (defaultProgramId && programLoading)) {
+ if (
+ workspaceLoading ||
+ status === "loading" ||
+ (defaultProgramId && programLoading)
+ ) {
return <LayoutLoader />;
}
- const hasProgramAccess = canAccessDubPartners({
+ const hasProgramAccess = canAccessProgram({
workspaceId,
userId: session?.user.id,
});
- // TEMPORARY: block Dub Partners access for restricted workspace users
+ // TEMPORARY: block program access for restricted workspace users
if (!hasProgramAccess && slug) {
return <AccessDenied slug={slug} />;
}
@@ -68,7 +72,7 @@ function AccessDenied({ slug }: { slug: string }) {
}
addButton={
<Link
- href={slug ? `/${slug}/links` : "/links"}
+ href={`/${slug}/links`}
className={cn(
buttonVariants({ variant: "primary" }),
"flex h-9 items-center whitespace-nowrap rounded-lg border px-4 text-sm",
diff --git a/apps/web/lib/auth/product-access-guard.ts b/apps/web/lib/auth/product-access-guard.ts
index 9ac0fcbd66..e9969ee378 100644
--- a/apps/web/lib/auth/product-access-guard.ts
+++ b/apps/web/lib/auth/product-access-guard.ts
@@ -1,11 +1,10 @@
-// TEMPORARY: hardcoded restriction of Dub Partners access per workspace user.
-// Maps workspace ID -> user IDs that should NOT have access to Dub Partners.
-export const DUB_PARTNERS_ACCESS_BLOCKLIST: Record<string, string[]> = {
+// Hardcoded restriction of program access per workspace user.
+// Maps workspace ID -> user IDs that should NOT have access to the program.
+export const PROGRAM_ACCESS_BLOCKLIST: Record<string, string[]> = {
// "ws_xxx": ["user_aaa", "user_bbb"],
- ws_1KETZ919F83ZJH6A80HWEHW6E: ["user_cludszk1h0000wmd2e0ea2b0p"],
};
-export const canAccessDubPartners = ({
+export const canAccessProgram = ({
workspaceId,
userId,
}: {
@@ -16,14 +15,14 @@ export const canAccessDubPartners = ({
return true; // no info -> don't restrict
}
- const blocked = DUB_PARTNERS_ACCESS_BLOCKLIST[workspaceId];
+ const blocked = PROGRAM_ACCESS_BLOCKLIST[workspaceId];
return blocked ? !blocked.includes(userId) : true;
};
-// API path namespaces that belong to Dub Partners.
+// API path namespaces that belong to the program product.
// Centralized here so the restricted surface is easy to review/adjust.
-export const DUB_PARTNERS_API_PATHS = [
+export const PROGRAM_API_PATHS = [
"/api/programs",
"/api/partners",
"/api/commissions",
@@ -39,7 +38,5 @@ export const DUB_PARTNERS_API_PATHS = [
"/api/email-domains",
];
-export const isProgramsApiPath = (pathname: string): boolean =>
- DUB_PARTNERS_API_PATHS.some(
- (p) => pathname === p || pathname.startsWith(`${p}/`),
- );
+export const isProgramApiPath = (pathname: string): boolean =>
+ PROGRAM_API_PATHS.some((p) => pathname === p || pathname.startsWith(`${p}/`));
diff --git a/apps/web/lib/auth/workspace.ts b/apps/web/lib/auth/workspace.ts
index dcdcf03474..2920c4e28a 100644
--- a/apps/web/lib/auth/workspace.ts
+++ b/apps/web/lib/auth/workspace.ts
@@ -18,10 +18,7 @@ import { normalizeWorkspaceId } from "../api/workspaces/workspace-id";
import { withAxiomBodyLog } from "../axiom/server";
import { getFeatureFlags } from "../edge-config";
import { hashToken } from "./hash-token";
-import {
- canAccessDubPartners,
- isProgramsApiPath,
-} from "./product-access-guard";
+import { canAccessProgram, isProgramApiPath } from "./product-access-guard";
import { rateLimitRequest } from "./rate-limit-request";
import { TokenCacheItem, tokenCache } from "./token-cache";
import { Session, getSession } from "./utils";
@@ -476,18 +473,18 @@ export const withWorkspace = (
});
}
- // TEMPORARY: block Dub Partners access for restricted workspace users
- const isProgramsPath = isProgramsApiPath(url.pathname);
- const hasProgramAccess = canAccessDubPartners({
+ // TEMPORARY: block program access for restricted workspace users
+ const isProgramPath = isProgramApiPath(url.pathname);
+ const hasProgramAccess = canAccessProgram({
workspaceId: workspace.id,
userId: session.user.id,
});
- if (isProgramsPath && !hasProgramAccess) {
+ if (isProgramPath && !hasProgramAccess) {
throw new DubApiError({
code: "forbidden",
message:
- "You don't have access to Dub Partners in this workspace. Please contact your workspace owner to get access.",
+ "You don't have access to Dub Partners in this workspace. Please contact your workspace admin to get access.",
});
}
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index c61756207d..abd1cb52c7 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -1,6 +1,6 @@
"use client";
-import { canAccessDubPartners } from "@/lib/auth/product-access-guard";
+import { canAccessProgram } from "@/lib/auth/product-access-guard";
import { usePartnerMessagesCount } from "@/lib/messages/hooks/use-partner-messages-count";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { SUBMITTED_LEADS_ENABLED_PROGRAM_IDS } from "@/lib/submitted-leads/constants";
@@ -78,14 +78,14 @@ type SidebarNavData = {
pendingLeadsCount?: number;
showConversionGuides?: boolean;
partnerNetworkEnabled?: boolean;
- canAccessProgram?: boolean;
+ hasProgramAccess?: boolean;
};
const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
slug,
pathname,
defaultProgramId,
- canAccessProgram,
+ hasProgramAccess,
}) => {
const programGroup = {
id: "program",
@@ -113,8 +113,8 @@ const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
active: pathname.startsWith(`/${slug}/links`),
};
- // TEMPORARY: hide the Dub Partners tab for restricted workspace users
- if (!canAccessProgram) {
+ // TEMPORARY: hide the program tab for restricted workspace users
+ if (hasProgramAccess === false) {
return [linksGroup];
}
@@ -506,7 +506,7 @@ export function AppSidebarNav({
const { slug } = useParams() as { slug?: string };
const pathname = usePathname();
const { getQueryString } = useRouterStuff();
- const { data: session } = useSession();
+ const { data: session, status } = useSession();
const {
id: workspaceId,
plan,
@@ -514,10 +514,13 @@ export function AppSidebarNav({
trialEndsAt,
} = useWorkspace();
- const canAccessProgram = canAccessDubPartners({
- workspaceId,
- userId: session?.user.id,
- });
+ const hasProgramAccess =
+ status === "loading"
+ ? false
+ : canAccessProgram({
+ workspaceId,
+ userId: session?.user.id,
+ });
const currentArea = useMemo(() => {
return pathname.startsWith("/account/settings")
@@ -609,7 +612,7 @@ export function AppSidebarNav({
canTrackConversions && pathname.startsWith(`/${slug}/links`),
partnerNetworkEnabled:
program && program.partnerNetworkEnabledAt !== null,
- canAccessProgram,
+ hasProgramAccess,
}}
toolContent={toolContent}
newsContent={