Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: simplify user permission checks across application

Browse Source
This commit is contained in:
Mauricio Siu
2025-02-21 00:40:35 -06:00
parent 24c9d3f7ad
commit a317f0c4cc
19 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dokploy/pages/dashboard/docker.tsx
View File

@@ -58,7 +58,7 @@ export async function getServerSideProps(
userId: user.id,
});
if (!userR.canAccessToDocker) {
if (!userR?.canAccessToDocker) {
return {
redirect: {
permanent: true,

2
apps/dokploy/pages/dashboard/project/[projectId].tsx
View File

@@ -328,7 +328,7 @@ const Project = (
</CardTitle>
<CardDescription>{data?.description}</CardDescription>
</CardHeader>
{(auth?.role === "owner" || auth?.user?.canCreateServices) && (
{(auth?.role === "owner" || auth?.canCreateServices) && (
<div className="flex flex-row gap-4 flex-wrap">
<ProjectEnvironment projectId={projectId}>
<Button variant="outline">Project Environment</Button>

3
apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx
View File

@@ -178,8 +178,7 @@ const Service = (
<div className="flex flex-row gap-2 justify-end">
<UpdateApplication applicationId={applicationId} />
{(auth?.role === "owner" ||
auth?.user?.canDeleteServices) && (
{(auth?.role === "owner" || auth?.canDeleteServices) && (
<DeleteService id={applicationId} type="application" />
)}
</div>

3
apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
View File

@@ -173,8 +173,7 @@ const Service = (
<div className="flex flex-row gap-2 justify-end">
<UpdateCompose composeId={composeId} />
{(auth?.role === "owner" ||
auth?.user?.canDeleteServices) && (
{(auth?.role === "owner" || auth?.canDeleteServices) && (
<DeleteService id={composeId} type="compose" />
)}
</div>

3
apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx
View File

@@ -147,8 +147,7 @@ const Mariadb = (
</div>
<div className="flex flex-row gap-2 justify-end">
<UpdateMariadb mariadbId={mariadbId} />
{(auth?.role === "owner" ||
auth?.user?.canDeleteServices) && (
{(auth?.role === "owner" || auth?.canDeleteServices) && (
<DeleteService id={mariadbId} type="mariadb" />
)}
</div>

3
apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx
View File

@@ -148,8 +148,7 @@ const Mongo = (
<div className="flex flex-row gap-2 justify-end">
<UpdateMongo mongoId={mongoId} />
{(auth?.role === "owner" ||
auth?.user?.canDeleteServices) && (
{(auth?.role === "owner" || auth?.canDeleteServices) && (
<DeleteService id={mongoId} type="mongo" />
)}
</div>

3
apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx
View File

@@ -148,8 +148,7 @@ const MySql = (
<div className="flex flex-row gap-2 justify-end">
<UpdateMysql mysqlId={mysqlId} />
{(auth?.role === "owner" ||
auth?.user?.canDeleteServices) && (
{(auth?.role === "owner" || auth?.canDeleteServices) && (
<DeleteService id={mysqlId} type="mysql" />
)}
</div>

3
apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx
View File

@@ -147,8 +147,7 @@ const Postgresql = (
<div className="flex flex-row gap-2 justify-end">
<UpdatePostgres postgresId={postgresId} />
{(auth?.role === "owner" ||
auth?.user?.canDeleteServices) && (
{(auth?.role === "owner" || auth?.canDeleteServices) && (
<DeleteService id={postgresId} type="postgres" />
)}
</div>

3
apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx
View File

@@ -147,8 +147,7 @@ const Redis = (
<div className="flex flex-row gap-2 justify-end">
<UpdateRedis redisId={redisId} />
{(auth?.role === "owner" ||
auth?.user?.canDeleteServices) && (
{(auth?.role === "owner" || auth?.canDeleteServices) && (
<DeleteService id={redisId} type="redis" />
)}
</div>

2
apps/dokploy/pages/dashboard/settings/git-providers.tsx
View File

@@ -54,7 +54,7 @@ export async function getServerSideProps(
userId: user.id,
});
if (!userR.canAccessToGitProviders) {
if (!userR?.canAccessToGitProviders) {
return {
redirect: {
permanent: true,

4
apps/dokploy/pages/dashboard/settings/profile.tsx
View File

@@ -20,9 +20,7 @@ const Page = () => {
<div className="w-full">
<div className="h-full rounded-xl max-w-5xl mx-auto flex flex-col gap-4">
<ProfileForm />
{(data?.user?.canAccessToAPI || data?.role === "owner") && (
<GenerateToken />
)}
{(data?.canAccessToAPI || data?.role === "owner") && <GenerateToken />}
{isCloud && <RemoveSelfAccount />}
</div>

2
apps/dokploy/pages/dashboard/settings/ssh-keys.tsx
View File

@@ -55,7 +55,7 @@ export async function getServerSideProps(
userId: user.id,
});
if (!userR.canAccessToSSHKeys) {
if (!userR?.canAccessToSSHKeys) {
return {
redirect: {
permanent: true,

2
apps/dokploy/pages/dashboard/swarm.tsx
View File

@@ -58,7 +58,7 @@ export async function getServerSideProps(
userId: user.id,
});
if (!userR.canAccessToDocker) {
if (!userR?.canAccessToDocker) {
return {
redirect: {
permanent: true,

2
apps/dokploy/pages/dashboard/traefik.tsx
View File

@@ -58,7 +58,7 @@ export async function getServerSideProps(
userId: user.id,
});
if (!userR.canAccessToTraefikFiles) {
if (!userR?.canAccessToTraefikFiles) {
return {
redirect: {
permanent: true,