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: update role and validation handling across multiple pages

Browse Source
This commit is contained in:
Mauricio Siu
2025-02-16 03:06:22 -06:00
parent e7db0ccb70
commit 27736c7c97
16 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -674,8 +674,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

6
apps/dokploy/pages/dashboard/settings/certificates.tsx
View File

@@ -24,7 +24,7 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { req, res } = ctx;
const { user, session } = await validateRequest(req, res);
const { user, session } = await validateRequest(req);
if (!user || user.role === "member") {
return {
redirect: {
@@ -40,8 +40,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

6
apps/dokploy/pages/dashboard/settings/cluster.tsx
View File

@@ -33,7 +33,7 @@ export async function getServerSideProps(
},
};
}
const { user, session } = await validateRequest(ctx.req, ctx.res);
const { user, session } = await validateRequest(ctx.req);
if (!user || user.role === "member") {
return {
redirect: {
@@ -48,8 +48,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

6
apps/dokploy/pages/dashboard/settings/destinations.tsx
View File

@@ -25,7 +25,7 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { req, res } = ctx;
const { user, session } = await validateRequest(req, res);
const { user, session } = await validateRequest(req);
if (!user || user.role === "member") {
return {
redirect: {
@@ -41,8 +41,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

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

@@ -24,7 +24,7 @@ Page.getLayout = (page: ReactElement) => {
export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { user, session } = await validateRequest(ctx.req, ctx.res);
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
@@ -40,8 +40,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});
@@ -49,14 +49,12 @@ export async function getServerSideProps(
try {
await helpers.project.all.prefetch();
await helpers.settings.isCloud.prefetch();
const auth = await helpers.auth.get.fetch();
if (auth.role === "member") {
const user = await helpers.user.byAuthId.fetch({
authId: auth.id,
if (user.role === "member") {
const userR = await helpers.user.get.fetch({
userId: user.id,
});
if (!user.canAccessToGitProviders) {
if (!userR.canAccessToGitProviders) {
return {
redirect: {
permanent: true,

6
apps/dokploy/pages/dashboard/settings/index.tsx
View File

@@ -181,7 +181,7 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { req, res } = ctx;
const { user, session } = await validateRequest(ctx.req, ctx.res);
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
@@ -205,8 +205,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

6
apps/dokploy/pages/dashboard/settings/notifications.tsx
View File

@@ -25,7 +25,7 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { req, res } = ctx;
const { user, session } = await validateRequest(req, res);
const { user, session } = await validateRequest(req);
if (!user || user.role === "member") {
return {
redirect: {
@@ -41,8 +41,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

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

@@ -14,12 +14,12 @@ import superjson from "superjson";
const Page = () => {
const { data } = api.auth.get.useQuery();
const { data: user } = api.user.byAuthId.useQuery(
const { data: user } = api.user.get.useQuery(
{
authId: data?.id || "",
},
{
enabled: !!data?.id && data?.role === "user",
enabled: !!data?.id && data?.role === "member",
},
);
@@ -46,7 +46,7 @@ export async function getServerSideProps(
) {
const { req, res } = ctx;
const locale = getLocale(req.cookies);
const { user, session } = await validateRequest(req, res);
const { user, session } = await validateRequest(req);
const helpers = createServerSideHelpers({
router: appRouter,
@@ -54,18 +54,21 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});
await helpers.settings.isCloud.prefetch();
await helpers.auth.get.prefetch();
if (user?.role === "user") {
await helpers.user.byAuthId.prefetch({
authId: user.authId,
});
if (user?.role === "member") {
// const userR = await helpers.user.get.fetch({
// userId: user.id,
// });
// await helpers.user.byAuthId.prefetch({
// authId: user.authId,
// });
}
if (!user) {

6
apps/dokploy/pages/dashboard/settings/registry.tsx
View File

@@ -25,7 +25,7 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { req, res } = ctx;
const { user, session } = await validateRequest(req, res);
const { user, session } = await validateRequest(req);
if (!user || user.role === "member") {
return {
redirect: {
@@ -40,8 +40,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

6
apps/dokploy/pages/dashboard/settings/server.tsx
View File

@@ -98,7 +98,7 @@ export async function getServerSideProps(
},
};
}
const { user, session } = await validateRequest(ctx.req, ctx.res);
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
@@ -122,8 +122,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

6
apps/dokploy/pages/dashboard/settings/servers.tsx
View File

@@ -27,7 +27,7 @@ export async function getServerSideProps(
) {
const { req, res } = ctx;
const locale = await getLocale(req.cookies);
const { user, session } = await validateRequest(req, res);
const { user, session } = await validateRequest(req);
if (!user) {
return {
redirect: {
@@ -51,8 +51,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

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

@@ -24,7 +24,7 @@ Page.getLayout = (page: ReactElement) => {
export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { user, session } = await validateRequest(ctx.req, ctx.res);
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
@@ -40,23 +40,22 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});
try {
await helpers.project.all.prefetch();
const auth = await helpers.auth.get.fetch();
await helpers.settings.isCloud.prefetch();
if (auth.role === "member") {
const user = await helpers.user.byAuthId.fetch({
authId: auth.id,
if (user.role === "member") {
const userR = await helpers.user.get.fetch({
userId: user.id,
});
if (!user.canAccessToSSHKeys) {
if (!userR.canAccessToSSHKeys) {
return {
redirect: {
permanent: true,

6
apps/dokploy/pages/dashboard/settings/users.tsx
View File

@@ -25,7 +25,7 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { req, res } = ctx;
const { user, session } = await validateRequest(req, res);
const { user, session } = await validateRequest(req);
if (!user || user.role === "member") {
return {
redirect: {
@@ -41,8 +41,8 @@ export async function getServerSideProps(
req: req as any,
res: res as any,
db: null as any,
session: session,
user: user,
session: session as any,
user: user as any,
},
transformer: superjson,
});

2
apps/dokploy/pages/register.tsx
View File

@@ -274,7 +274,7 @@ Register.getLayout = (page: ReactElement) => {
};
export async function getServerSideProps(context: GetServerSidePropsContext) {
if (IS_CLOUD) {
const { user } = await validateRequest(context.req, context.res);
const { user } = await validateRequest(context.req);
if (user) {
return {