External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

For release.

Browse Source
This commit is contained in:
charlesgauthereau
2025-07-28 16:53:21 +02:00
parent 85047e7509
commit 17469696ee
13 changed files with 172 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -2
View File
@@ -1,2 +1,4 @@
migrate:
docker compose run --rm app
CLUSTER_SCRIPT=docker/entrypoints/app-dev-entrypoint.sh
up:
@bash $(CLUSTER_SCRIPT)
README.md
+1 -1
View File
@@ -1,7 +1,7 @@
<br />
<div align="center">
<a href="https://portabase.io">
<img src="images/logo.png" alt="Logo" width="80" height="80">
<img src="/public/images/logo.png" alt="Logo" width="80" height="80">
</a>
<h3 align="center">Portabase</h3>
app/(auth)/layout.tsx
+2
View File
@@ -15,6 +15,8 @@ export default function Layout({children}: { children: React.ReactNode }) {
const router = useRouter();
const { data: session } = useSession();
if (session && session.user && !session.user.banned && session.user.role !== "pending") {
router.replace("/dashboard/home");
}
app/(customer)/dashboard/(organization)/settings/page.tsx
+14 -8
View File
@@ -1,7 +1,7 @@
import {PageParams} from "@/types/next";
import {Page, PageActions, PageContent, PageDescription, PageHeader, PageTitle} from "@/features/layout/page";
import {currentUser} from "@/lib/auth/current-user";
import {getOrganization} from "@/lib/auth/auth";
import {getActiveMember, getOrganization} from "@/lib/auth/auth";
import {notFound} from "next/navigation";
import {
DeleteOrganizationButton
@@ -15,27 +15,33 @@ import {
export default async function RoutePage(props: PageParams<{ slug: string }>) {
const organization = await getOrganization({});
const user = await currentUser();
const activeMember = await getActiveMember()
if (!organization) {
notFound();
}
const isMember = activeMember?.role === "member";
if (isMember) {
notFound();
}
console.log(organization);
return (
<Page>
<PageHeader>
<PageTitle className="flex items-center">
Organization settings
{organization.slug != "default" ?
<EditButtonSettings/>
: null}
{!isMember && organization.slug !== "default" && (
<EditButtonSettings />
)}
</PageTitle>
<PageActions>
{organization.slug != "default" ?
<DeleteOrganizationButton organizationSlug={organization.slug}/>
: null}
{!isMember && organization.slug !== "default" && (
<DeleteOrganizationButton organizationSlug={organization.slug} />
)}
</PageActions>
</PageHeader>
{/*<PageDescription>*/}
app/(customer)/dashboard/profile/page.tsx
+4 -7
View File
@@ -1,13 +1,11 @@
import {PageParams} from "@/types/next";
import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
import {Page, PageContent, PageTitle} from "@/features/layout/page";
import {notFound} from "next/navigation";
import {UserForm} from "@/components/wrappers/dashboard/profile/user-form/user-form";
import {Badge} from "@/components/ui/badge";
import {ButtonDeleteAccount} from "@/components/wrappers/dashboard/profile/button-delete-account/button-delete-account";
import {AvatarWithUpload} from "@/components/wrappers/dashboard/profile/avatar/avatar-with-upload";
import {currentUser} from "@/lib/auth/current-user";
import {getAccounts, getSessions} from "@/lib/auth/auth";
//import { getAccounts, getSessions } from "@/lib/auth/auth";
export default async function RoutePage(props: PageParams<{}>) {
const user = await currentUser();
@@ -16,7 +14,6 @@ export default async function RoutePage(props: PageParams<{}>) {
return notFound();
}
if (user.role !== "user" && user.role !== "admin" && user.role !== "superadmin") {
return notFound();
}
@@ -42,9 +39,9 @@ export default async function RoutePage(props: PageParams<{}>) {
{user.name}
<Badge className="ml-3 hidden lg:block">{user.role}</Badge>
</PageTitle>
<PageActions className="mt-2 hidden sm:block">
<ButtonDeleteAccount text="Delete my account"/>
</PageActions>
{/*<PageActions className="mt-2 hidden sm:block">*/}
{/* <ButtonDeleteAccount text="Delete my account"/>*/}
{/*</PageActions>*/}
</div>
<PageContent>
<UserForm
app/not-found.tsx
+8 -5
View File
@@ -1,10 +1,13 @@
import { redirect } from "next/navigation";
export default async function NotFound() {
// redirect("/dashboard/profile");
return(
<>
Error
</>
<div className="flex items-center min-h-screen px-4 py-12 sm:px-6 md:px-8 lg:px-12 xl:px-16">
<div className="w-full space-y-6 text-center">
<div className="space-y-3">
<h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">Not found</h1>
<p className="leading-7 [&:not(:first-child)]:mt-6">The content you are trying to view is not available.</p>
</div>
</div>
</div>
)
}
src/components/wrappers/dashboard/admin/columns-users.tsx
+16 -2
View File
@@ -10,7 +10,7 @@ import {Trash2} from "lucide-react";
import {deleteUserAction} from "@/components/wrappers/dashboard/profile/button-delete-account/delete-account.action";
import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
import {User} from "@/db/schema/01_user";
import {useSession} from "@/lib/auth/auth-client";
import {authClient, useSession} from "@/lib/auth/auth-client";
import {formatFrenchDate} from "@/utils/date-formatting";
export const usersColumnsAdmin: ColumnDef<User>[] = [
@@ -19,7 +19,12 @@ export const usersColumnsAdmin: ColumnDef<User>[] = [
header: "Role",
cell: ({row}) => {
const [role, setRole] = useState<string>(row.getValue("role"));
const { data: session } = useSession();
const {data: session, isPending, error} = authClient.useSession();
const isCurrentUser = session?.user.email === row.original.email;
const updateMutation = useMutation({
@@ -38,6 +43,15 @@ export const usersColumnsAdmin: ColumnDef<User>[] = [
await updateMutation.mutateAsync();
};
if (isPending) return null;
if (error || !session) {
return null;
}
return (
<Badge
className={isCurrentUser ? "cursor-not-allowed opacity-50" : "cursor-pointer"}
src/components/wrappers/dashboard/common/sidebar/menu-sidebar-main.tsx
+1
View File
@@ -22,6 +22,7 @@ export const SidebarMenuCustomMain = () => {
return null;
}
const groupContent: SidebarGroupItem["group_content"] = [
{ title: "Dashboard", url: "/home", icon: Home },
{ title: "Projects", url: "/projects", icon: Layers, details:true },
src/components/wrappers/dashboard/organization/organization.action.ts
+21 -19
View File
@@ -1,11 +1,13 @@
"use server";
import { userAction } from "@/safe-actions";
import { OrganizationSchema } from "@/components/wrappers/dashboard/organization/organization.schema";
import { ServerActionResult } from "@/types/action-type";
import { z } from "zod";
import { OrganizationFormSchema } from "@/components/wrappers/dashboard/organization/organization-form/organization-form.schema";
import { db } from "@/db";
import {userAction} from "@/safe-actions";
import {OrganizationSchema} from "@/components/wrappers/dashboard/organization/organization.schema";
import {ServerActionResult} from "@/types/action-type";
import {z} from "zod";
import {
OrganizationFormSchema
} from "@/components/wrappers/dashboard/organization/organization-form/organization-form.schema";
import {db} from "@/db";
import {and, eq, inArray} from "drizzle-orm";
import {auth, checkSlugOrganization, createOrganization, deleteOrganization} from "@/lib/auth/auth";
import {slugify} from "@/utils/slugify";
@@ -13,7 +15,7 @@ import {Organization} from "@/db/schema/02_organization";
import * as drizzleDb from "@/db";
import {headers} from "next/headers";
export const createOrganizationAction = userAction.schema(OrganizationSchema).action(async ({ parsedInput }): Promise<ServerActionResult<Organization>> => {
export const createOrganizationAction = userAction.schema(OrganizationSchema).action(async ({parsedInput}): Promise<ServerActionResult<Organization>> => {
try {
const slug = slugify(parsedInput.name);
if (!await checkSlugOrganization(slug)) {
@@ -22,7 +24,7 @@ export const createOrganizationAction = userAction.schema(OrganizationSchema).ac
actionError: {
message: "Slug is already taken",
status: 500,
messageParams: { message: "Error creating the organization" },
messageParams: {message: "Error creating the organization"},
},
};
}
@@ -39,7 +41,7 @@ export const createOrganizationAction = userAction.schema(OrganizationSchema).ac
message: authError.message || "Authentication service error.",
status: authError.status || 500,
cause: "auth_error",
messageParams: { message: authError.message },
messageParams: {message: authError.message},
},
};
}
@@ -49,7 +51,7 @@ export const createOrganizationAction = userAction.schema(OrganizationSchema).ac
value: createdOrganization,
actionSuccess: {
message: "Organization has been successfully created.",
messageParams: { organizationId: createdOrganization!.id },
messageParams: {organizationId: createdOrganization!.id},
},
};
} catch (error) {
@@ -59,7 +61,7 @@ export const createOrganizationAction = userAction.schema(OrganizationSchema).ac
actionError: {
message: "Failed to create organization.",
status: 500,
messageParams: { message: "Error creating the organization" },
messageParams: {message: "Error creating the organization"},
},
};
}
@@ -72,7 +74,7 @@ export const updateOrganizationAction = userAction
organizationId: z.string(),
})
)
.action(async ({ parsedInput, ctx }): Promise<ServerActionResult<Organization>> => {
.action(async ({parsedInput, ctx}): Promise<ServerActionResult<Organization>> => {
try {
const newUserList = parsedInput.data.users;
console.log(parsedInput);
@@ -127,7 +129,7 @@ export const updateOrganizationAction = userAction
}
if (usersToRemove.length > 0) {
await db.delete(drizzleDb.schemas.member).where(inArray(drizzleDb.schemas.member.userId, usersToRemove)).execute();
await db.delete(drizzleDb.schemas.member).where(and(inArray(drizzleDb.schemas.member.userId, usersToRemove), eq(drizzleDb.schemas.member.organizationId, organization.id))).execute();
// TODO : Do not delete, go permission error with better auth
// for (const userToRemove of usersToRemove) {
//
@@ -182,7 +184,7 @@ export const updateOrganizationAction = userAction
value: updatedOrganization as unknown as Organization,
actionSuccess: {
message: "Organization has been successfully updated.",
messageParams: { organizationId: organization.id},
messageParams: {organizationId: organization.id},
},
};
} catch (error) {
@@ -193,14 +195,14 @@ export const updateOrganizationAction = userAction
message: "Failed to update organization.",
status: 500,
cause: "server_error",
messageParams: { message: "Error updating the organization" },
messageParams: {message: "Error updating the organization"},
},
};
}
});
export const deleteOrganizationAction = userAction.schema(z.string()).action(
async ({ parsedInput, ctx }): Promise<ServerActionResult<Organization>> => {
async ({parsedInput, ctx}): Promise<ServerActionResult<Organization>> => {
try {
const org = await db.query.organization.findFirst({
where: eq(drizzleDb.schemas.organization.slug, parsedInput),
@@ -229,7 +231,7 @@ export const deleteOrganizationAction = userAction.schema(z.string()).action(
message: authError.message || "Authentication service error.",
status: authError.status || 500,
cause: "auth_error",
messageParams: { message: authError.message },
messageParams: {message: authError.message},
},
};
}
@@ -239,7 +241,7 @@ export const deleteOrganizationAction = userAction.schema(z.string()).action(
value: deletedOrganization,
actionSuccess: {
message: "Organization has been successfully deleted.",
messageParams: { organizationId: deletedOrganization.id },
messageParams: {organizationId: deletedOrganization.id},
},
};
} catch (error) {
@@ -250,7 +252,7 @@ export const deleteOrganizationAction = userAction.schema(z.string()).action(
message: "Failed to delete organization due to a server error.",
status: 500,
cause: "server_error",
messageParams: { message: "Internal server error while deleting the organization" },
messageParams: {message: "Internal server error while deleting the organization"},
},
};
}
src/components/wrappers/dashboard/settings/columns-organization-members.tsx
+34 -19
View File
@@ -1,43 +1,58 @@
"use client";
import { ColumnDef } from "@tanstack/react-table";
import {ColumnDef} from "@tanstack/react-table";
import {MemberWithUser} from "@/db/schema/02_organization";
import {useState} from "react";
import {useSession} from "@/lib/auth/auth-client";
import {authClient, useSession} from "@/lib/auth/auth-client";
import {useMutation} from "@tanstack/react-query";
import {updateUserAction} from "@/components/wrappers/dashboard/profile/user-form/user-form.action";
import {toast} from "sonner";
import {Badge} from "@/components/ui/badge";
import {updateMemberRoleAction} from "@/components/wrappers/dashboard/settings/update-member.action";
import {RoleSchemaMember} from "@/components/wrappers/dashboard/settings/member.schema";
export const organizationMemberColumns: ColumnDef<MemberWithUser>[] = [
{
accessorKey: "role",
header: "Role",
cell: ({row}) => {
cell: ({ row }) => {
const [role, setRole] = useState<string>(row.getValue("role"));
const { data: session } = useSession();
const isCurrentUser = session?.user.email === row.original.user.email;
// const updateMutation = useMutation({
// mutationFn: () => updateUserAction({id: row.original.id, data: {role: role}}),
// onSuccess: () => {
// toast.success(`User updated successfully.`);
// },
// onError: () => {
// toast.error(`An error occurred while updating user information.`);
// },
// });
const updateMutation = useMutation({
mutationFn: () =>
updateMemberRoleAction({
memberId: row.original.id,
organizationId: row.original.organizationId,
role: RoleSchemaMember.parse(role),
}),
onSuccess: () => {
toast.success(`User updated successfully.`);
},
onError: () => {
toast.error(`An error occurred while updating user information.`);
},
});
const handleUpdateRole = async () => {
// const nextRole = role === "admin" ? "pending" : role === "pending" ? "user" : "admin";
// setRole(nextRole);
// await updateMutation.mutateAsync();
const nextRole =
role === "owner" ? "admin" : role === "admin" ? "member" : "owner";
setRole(nextRole);
await updateMutation.mutateAsync();
};
const isCurrentUser = session?.user.email === row.original.user.email;
const isMember = session?.user.role === "member";
const isDisabled = isMember || isCurrentUser;
return (
<Badge
className={isCurrentUser ? "cursor-not-allowed opacity-50" : "cursor-pointer"}
onClick={isCurrentUser ? undefined : () => handleUpdateRole()}
className={isDisabled ? "cursor-not-allowed opacity-50" : "cursor-pointer"}
onClick={isDisabled ? undefined : handleUpdateRole}
variant="outline"
>
{role}
src/components/wrappers/dashboard/settings/member.schema.ts
+8
View File
@@ -0,0 +1,8 @@
import {z} from "zod";
const RoleEnum = z.enum(["member", "owner", "admin"]);
export const RoleSchemaMember = z.union([
RoleEnum,
z.array(RoleEnum)
]);
src/components/wrappers/dashboard/settings/update-member.action.ts
+51
View File
@@ -0,0 +1,51 @@
"use server";
import {userAction} from "@/safe-actions";
import {z} from "zod";
import {auth} from "@/lib/auth/auth";
import {ServerActionResult} from "@/types/action-type";
import {Member} from "better-auth/plugins";
import {RoleSchemaMember} from "@/components/wrappers/dashboard/settings/member.schema";
import {headers} from "next/headers";
export const updateMemberRoleAction = userAction.schema(
z.object({
memberId: z.string(),
organizationId: z.string(),
role: RoleSchemaMember,
})
).action(async ({parsedInput}): Promise<ServerActionResult<Member>> => {
try {
console.log(parsedInput);
const updatedMember = await auth.api.updateMemberRole({
body: {
role: parsedInput.role,
memberId: parsedInput.memberId,
organizationId: parsedInput.organizationId,
},
headers: await headers(),
});
console.log(updatedMember);
return {
success: true,
value: updatedMember,
actionSuccess: {
message: "Member has been successfully updated.",
messageParams: {},
},
};
} catch (error) {
return {
success: false,
actionError: {
message: "Failed to update member role.",
status: 500,
cause: error instanceof Error ? error.message : "Unknown error",
messageParams: {},
},
};
}
});
src/lib/auth/auth.ts
+8 -2
View File
@@ -64,6 +64,9 @@ export const auth = betterAuth({
},
},
user: {
deleteUser: {
enabled: true,
},
additionalFields: {
deletedAt: {
type: "number", //pg timestamp
@@ -88,7 +91,9 @@ export const auth = betterAuth({
};
},
async after(user, context) {
// const userCount = (await db.select({count: count()}).from(drizzleDb.schemas.user))[0].count;
const userCount = (await db.select({count: count()}).from(drizzleDb.schemas.user))[0].count;
const role = userCount === 0 ? "owner" : "admin";
const defaultOrgSlug = "default"; // change this if your default org has a different slug
const defaultOrg = await db.query.organization.findFirst({
@@ -96,10 +101,11 @@ export const auth = betterAuth({
});
if (defaultOrg) {
console.log(user)
await db.insert(drizzleDb.schemas.member).values({
userId: user.id,
organizationId: defaultOrg.id,
role: "owner",
role: role,
});
} else {
console.warn("Default organization not found. Cannot assign member.");