Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Implement authedFetchWithError for improved error handling in API requests

Bill Yang8fcfb58dc33d
diff --git a/client/src/api/admin/organizations.ts b/client/src/api/admin/organizations.ts
index 72926e048..934f1d076 100644
--- a/client/src/api/admin/organizations.ts
+++ b/client/src/api/admin/organizations.ts
@@ -1,6 +1,6 @@
import { useQuery } from "@tanstack/react-query";
import { BACKEND_URL } from "../../lib/const";
-import { authedFetch } from "../utils";
+import { authedFetch, authedFetchWithError } from "../utils";
import { APIResponse } from "../types";
export type UserOrganization = {
@@ -14,9 +14,7 @@ export type UserOrganization = {
};
export function getUserOrganizations(): Promise<UserOrganization[]> {
- return authedFetch(`${BACKEND_URL}/user/organizations`).then((res) =>
- res.json()
- );
+ return authedFetchWithError(`${BACKEND_URL}/user/organizations`);
}
export function useUserOrganizations() {
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.ts
index 40547a50b..4b44d222a 100644
--- a/client/src/api/admin/sites.ts
+++ b/client/src/api/admin/sites.ts
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query";
import { BACKEND_URL } from "../../lib/const";
import { useStore } from "../../lib/store";
-import { authedFetch, genericQuery, useGenericQuery } from "../utils";
+import { authedFetchWithError, genericQuery, useGenericQuery } from "../utils";
export type SiteResponse = {
siteId: number;
@@ -47,7 +47,7 @@ export function addSite(
saltUserIds?: boolean;
}
) {
- return authedFetch(`${BACKEND_URL}/add-site`, {
+ return authedFetchWithError(`${BACKEND_URL}/add-site`, {
method: "POST",
body: JSON.stringify({
domain,
@@ -63,13 +63,13 @@ export function addSite(
}
export function deleteSite(siteId: number) {
- return authedFetch(`${BACKEND_URL}/delete-site/${siteId}`, {
+ return authedFetchWithError(`${BACKEND_URL}/delete-site/${siteId}`, {
method: "POST",
});
}
export function changeSiteDomain(siteId: number, newDomain: string) {
- return authedFetch(`${BACKEND_URL}/change-site-domain`, {
+ return authedFetchWithError(`${BACKEND_URL}/change-site-domain`, {
method: "POST",
body: JSON.stringify({
siteId,
@@ -82,7 +82,7 @@ export function changeSiteDomain(siteId: number, newDomain: string) {
}
export function changeSitePublic(siteId: number, isPublic: boolean) {
- return authedFetch(`${BACKEND_URL}/change-site-public`, {
+ return authedFetchWithError(`${BACKEND_URL}/change-site-public`, {
method: "POST",
body: JSON.stringify({
siteId,
@@ -101,9 +101,9 @@ export function useSiteHasData(siteId: string) {
if (!siteId) {
return Promise.resolve(false);
}
- return authedFetch(`${BACKEND_URL}/site-has-data/${siteId}`)
- .then((res) => res.json())
- .then((data) => data.hasData as Boolean);
+ return authedFetchWithError(
+ `${BACKEND_URL}/site-has-data/${siteId}`
+ ).then((data) => data.hasData as Boolean);
},
refetchInterval: 5000,
staleTime: Infinity,
@@ -123,18 +123,18 @@ export function useGetSite(siteId?: string | number) {
}
// Use regular fetch instead of authedFetch to support public sites
- const response = await authedFetch(
+ return await authedFetchWithError(
`${BACKEND_URL}/get-site/${siteIdToUse}`
);
- if (!response.ok) {
- if (response.status === 404) {
- return null;
- }
- throw new Error("Failed to fetch site");
- }
+ // if (!response.ok) {
+ // if (response.status === 404) {
+ // return null;
+ // }
+ // throw new Error("Failed to fetch site");
+ // }
- return response.json() as Promise<SiteResponse>;
+ // return response.json() as Promise<SiteResponse>;
},
staleTime: 60000, // 1 minute
enabled: !!siteId,
@@ -142,7 +142,7 @@ export function useGetSite(siteId?: string | number) {
}
export function changeSiteSalt(siteId: number, saltUserIds: boolean) {
- return authedFetch(`${BACKEND_URL}/change-site-salt`, {
+ return authedFetchWithError(`${BACKEND_URL}/change-site-salt`, {
method: "POST",
body: JSON.stringify({
siteId,
diff --git a/client/src/api/utils.ts b/client/src/api/utils.ts
index 822ab9ab5..b90ab8851 100644
--- a/client/src/api/utils.ts
+++ b/client/src/api/utils.ts
@@ -85,6 +85,20 @@ export async function authedFetch(
});
}
+export async function authedFetchWithError(
+ url: string,
+ opts: RequestInit = {}
+) {
+ const res = await fetch(url, {
+ credentials: "include",
+ ...opts,
+ });
+ if (!res.ok) {
+ throw new Error(await res.text());
+ }
+ return res.json();
+}
+
export function useGenericQuery<T>(endpoint: string): UseQueryResult<T> {
return useQuery({
queryKey: [endpoint],
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index ee7065b5d..9f4c2fb97 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -10,6 +10,7 @@ import { authClient } from "../lib/auth";
import { AddSite } from "./components/AddSite";
import { CreateOrganizationDialog } from "./components/CreateOrganizationDialog";
import { StandardPage } from "../components/StandardPage";
+import { useUserOrganizations } from "../api/admin/organizations";
export default function Home() {
const {
@@ -18,6 +19,11 @@ export default function Home() {
isLoading: isLoadingSites,
} = useGetSites();
const userOrganizations = authClient.useListOrganizations();
+ const { data: userOrganizationsData } = useUserOrganizations();
+
+ const disabled =
+ !userOrganizationsData?.[0] || userOrganizationsData?.[0].role === "member";
+
const [createOrgDialogOpen, setCreateOrgDialogOpen] = useState(false);
// Check if the user has no organizations and is not in a loading state
@@ -36,7 +42,7 @@ export default function Home() {
<StandardPage>
<div className="flex justify-between items-center mb-4">
<div className="text-2xl font-bold">Websites</div>
- <AddSite disabled={hasNoOrganizations} />
+ <AddSite disabled={hasNoOrganizations || disabled} />
</div>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
@@ -63,16 +69,16 @@ export default function Home() {
)}
{/* Sites list */}
- {!hasNoOrganizations &&
- sites?.map((site) => {
- return (
- <SiteCard
- key={site.siteId}
- siteId={site.siteId}
- domain={site.domain}
- />
- );
- })}
+
+ {sites?.map((site) => {
+ return (
+ <SiteCard
+ key={site.siteId}
+ siteId={site.siteId}
+ domain={site.domain}
+ />
+ );
+ })}
{/* No websites message */}
{!hasNoOrganizations &&
@@ -86,7 +92,13 @@ export default function Home() {
</CardDescription>
<AddSite
trigger={
- <Button variant="success">
+ <Button
+ variant="success"
+ disabled={
+ !userOrganizationsData?.[0] ||
+ userOrganizationsData?.[0].role === "member"
+ }
+ >
<Plus className="h-4 w-4" />
Add Website
</Button>
diff --git a/client/src/app/settings/organizations/components/AddMemberDialog.tsx b/client/src/app/settings/organizations/components/AddMemberDialog.tsx
index 554a70e9f..a63e1e4b0 100644
--- a/client/src/app/settings/organizations/components/AddMemberDialog.tsx
+++ b/client/src/app/settings/organizations/components/AddMemberDialog.tsx
@@ -35,7 +35,7 @@ export function AddMemberDialog({
onSuccess,
}: AddMemberDialogProps) {
const [email, setEmail] = useState("");
- const [role, setRole] = useState("member");
+ const [role, setRole] = useState("admin");
const [isLoading, setIsLoading] = useState(false);
const [open, setOpen] = useState(false);
@@ -43,7 +43,7 @@ export function AddMemberDialog({
const handleInvite = async () => {
if (!email) {
- toast.error("Email is required");
+ setError("Email is required");
return;
}
@@ -68,7 +68,7 @@ export function AddMemberDialog({
setEmail("");
setRole("member");
} catch (error: any) {
- toast.error(error.message || "Failed to send invitation");
+ setError(error.message || "Failed to send invitation");
} finally {
setIsLoading(false);
}
diff --git a/server/src/api/sites/changeSiteDomain.ts b/server/src/api/sites/changeSiteDomain.ts
index 9e35b85ce..d3538bcfe 100644
--- a/server/src/api/sites/changeSiteDomain.ts
+++ b/server/src/api/sites/changeSiteDomain.ts
@@ -3,7 +3,7 @@ import { FastifyReply, FastifyRequest } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
import { loadAllowedDomains } from "../../lib/allowedDomains.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
export async function changeSiteDomain(
request: FastifyRequest<{
@@ -16,11 +16,11 @@ export async function changeSiteDomain(
) {
const { siteId, newDomain } = request.body;
- const userHasAccessToSite = await getUserHasAccessToSite(
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
request,
String(siteId)
);
- if (!userHasAccessToSite) {
+ if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/sites/changeSitePublic.ts b/server/src/api/sites/changeSitePublic.ts
index e1e745160..d75f0e8fb 100644
--- a/server/src/api/sites/changeSitePublic.ts
+++ b/server/src/api/sites/changeSitePublic.ts
@@ -2,7 +2,7 @@ import { FastifyRequest, FastifyReply } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
import { eq } from "drizzle-orm";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
import { siteConfig } from "../../lib/siteConfig.js";
interface ChangeSitePublicRequest {
@@ -18,11 +18,11 @@ export async function changeSitePublic(
) {
const { siteId, isPublic } = request.body;
- const userHasAccessToSite = await getUserHasAccessToSite(
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
request,
String(siteId)
);
- if (!userHasAccessToSite) {
+ if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
@@ -36,11 +36,6 @@ export async function changeSitePublic(
return reply.status(404).send({ error: "Site not found" });
}
- // Check if user is authorized to modify the site
- // if (site.createdBy !== userId) {
- // return reply.status(403).send({ error: "Forbidden" });
- // }
-
// Update site public status
await db
.update(sites)
diff --git a/server/src/api/sites/changeSiteSalt.ts b/server/src/api/sites/changeSiteSalt.ts
index 4dc58354f..107c61891 100644
--- a/server/src/api/sites/changeSiteSalt.ts
+++ b/server/src/api/sites/changeSiteSalt.ts
@@ -1,8 +1,8 @@
-import { FastifyRequest, FastifyReply } from "fastify";
+import { eq } from "drizzle-orm";
+import { FastifyReply, FastifyRequest } from "fastify";
import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
-import { eq } from "drizzle-orm";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
import { siteConfig } from "../../lib/siteConfig.js";
interface ChangeSiteSaltRequest {
@@ -18,11 +18,11 @@ export async function changeSiteSalt(
) {
const { siteId, saltUserIds } = request.body;
- const userHasAccessToSite = await getUserHasAccessToSite(
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
request,
String(siteId)
);
- if (!userHasAccessToSite) {
+ if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/sites/deleteSite.ts b/server/src/api/sites/deleteSite.ts
index 636088f23..5f3676bd1 100644
--- a/server/src/api/sites/deleteSite.ts
+++ b/server/src/api/sites/deleteSite.ts
@@ -1,11 +1,11 @@
import { eq } from "drizzle-orm";
import { FastifyReply, FastifyRequest } from "fastify";
+import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { db } from "../../db/postgres/postgres.js";
import { sites } from "../../db/postgres/schema.js";
import { loadAllowedDomains } from "../../lib/allowedDomains.js";
-import { getUserHasAccessToSite } from "../../lib/auth-utils.js";
+import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
import { siteConfig } from "../../lib/siteConfig.js";
-import { clickhouse } from "../../db/clickhouse/clickhouse.js";
export async function deleteSite(
request: FastifyRequest<{ Params: { id: string } }>,
@@ -13,8 +13,11 @@ export async function deleteSite(
) {
const { id } = request.params;
- const userHasAccessToSite = await getUserHasAccessToSite(request, id);
- if (!userHasAccessToSite) {
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
+ request,
+ id
+ );
+ if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/user/addUserToOrganization.ts b/server/src/api/user/addUserToOrganization.ts
index 11765a329..7d8cbec0f 100644
--- a/server/src/api/user/addUserToOrganization.ts
+++ b/server/src/api/user/addUserToOrganization.ts
@@ -38,7 +38,6 @@ export async function addUserToOrganization(
});
}
- // Check password strength
if (role !== "admin" && role !== "member" && role !== "owner") {
return reply.status(400).send({
error: "Role must be either admin, member, or owner",
@@ -53,6 +52,16 @@ export async function addUserToOrganization(
return reply.status(404).send({ error: "User not found" });
}
+ const foundMember = await db.query.member.findMany({
+ where: eq(member.userId, foundUser.id),
+ });
+
+ if (foundMember.length > 0) {
+ return reply
+ .status(400)
+ .send({ error: "user is already in an organization" });
+ }
+
await db.insert(member).values([
{
userId: foundUser.id,
diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.ts
index 0dffcdc1f..821e82dcb 100644
--- a/server/src/lib/auth-utils.ts
+++ b/server/src/lib/auth-utils.ts
@@ -22,7 +22,10 @@ export async function getSession(req: FastifyRequest) {
return session;
}
-export async function getSitesUserHasAccessTo(req: FastifyRequest) {
+export async function getSitesUserHasAccessTo(
+ req: FastifyRequest,
+ adminOnly = false
+) {
const headers = new Headers(req.headers as any);
const session = await auth!.api.getSession({ headers });
@@ -35,7 +38,7 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest) {
try {
// Get the user's organization IDs directly from the database
const memberRecords = await db
- .select({ organizationId: member.organizationId })
+ .select({ organizationId: member.organizationId, role: member.role })
.from(member)
.where(eq(member.userId, userId));
@@ -44,9 +47,9 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest) {
}
// Extract organization IDs
- const organizationIds = memberRecords.map(
- (record) => record.organizationId
- );
+ const organizationIds = memberRecords
+ .filter((record) => !adminOnly || record.role !== "member")
+ .map((record) => record.organizationId);
// Get sites for these organizations
const siteRecords = await db
@@ -80,3 +83,11 @@ export async function getUserHasAccessToSite(
const sites = await getSitesUserHasAccessTo(req);
return sites.some((site) => site.siteId === Number(siteId));
}
+
+export async function getUserHasAdminAccessToSite(
+ req: FastifyRequest,
+ siteId: string | number
+) {
+ const sites = await getSitesUserHasAccessTo(req, true);
+ return sites.some((site) => site.siteId === Number(siteId));
+}