+ {isCloud && (
+
+ Already have account?
+
+ Sign in
+
+
+ )}
+
+
+ Need help?
+
+ Contact us
- )}
-
-
- Need help?
-
- Contact us
-
@@ -221,11 +227,13 @@ const Register = ({ hasAdmin }: Props) => {
export default Register;
export async function getServerSideProps() {
- // if (IS_CLOUD) {
- // return {
- // props: {},
- // };
- // }
+ if (IS_CLOUD) {
+ return {
+ props: {
+ isCloud: true,
+ },
+ };
+ }
const hasAdmin = await isAdminPresent();
if (hasAdmin) {
@@ -239,6 +247,7 @@ export async function getServerSideProps() {
return {
props: {
hasAdmin,
+ isCloud: false,
},
};
}
diff --git a/apps/dokploy/server/api/routers/auth.ts b/apps/dokploy/server/api/routers/auth.ts
index 0bded385..1e99c8db 100644
--- a/apps/dokploy/server/api/routers/auth.ts
+++ b/apps/dokploy/server/api/routers/auth.ts
@@ -23,6 +23,7 @@ import {
lucia,
validateRequest,
luciaToken,
+ IS_CLOUD,
} from "@dokploy/builders";
import {
adminProcedure,
@@ -36,15 +37,15 @@ export const authRouter = createTRPCRouter({
.input(apiCreateAdmin)
.mutation(async ({ ctx, input }) => {
try {
- // if (!IS_CLOUD) {
- const admin = await db.query.admins.findFirst({});
- if (admin) {
- throw new TRPCError({
- code: "BAD_REQUEST",
- message: "Admin already exists",
- });
+ if (!IS_CLOUD) {
+ const admin = await db.query.admins.findFirst({});
+ if (admin) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: "Admin already exists",
+ });
+ }
}
- // }
const newAdmin = await createAdmin(input);
const session = await lucia.createSession(newAdmin.id || "", {});
diff --git a/apps/dokploy/server/api/routers/ssh-key.ts b/apps/dokploy/server/api/routers/ssh-key.ts
index 73d0d4de..cbee6640 100644
--- a/apps/dokploy/server/api/routers/ssh-key.ts
+++ b/apps/dokploy/server/api/routers/ssh-key.ts
@@ -6,6 +6,7 @@ import {
apiGenerateSSHKey,
apiRemoveSshKey,
apiUpdateSshKey,
+ sshKeys,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
@@ -15,13 +16,17 @@ import {
removeSSHKeyById,
updateSSHKeyById,
} from "@dokploy/builders";
+import { eq } from "drizzle-orm";
export const sshRouter = createTRPCRouter({
create: protectedProcedure
.input(apiCreateSshKey)
- .mutation(async ({ input }) => {
+ .mutation(async ({ input, ctx }) => {
try {
- await createSshKey(input);
+ await createSshKey({
+ ...input,
+ adminId: ctx.user.adminId,
+ });
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
@@ -46,8 +51,10 @@ export const sshRouter = createTRPCRouter({
const sshKey = await findSSHKeyById(input.sshKeyId);
return sshKey;
}),
- all: protectedProcedure.query(async () => {
- return await db.query.sshKeys.findMany({});
+ all: protectedProcedure.query(async ({ ctx }) => {
+ return await db.query.sshKeys.findMany({
+ where: eq(sshKeys.adminId, ctx.user.adminId),
+ });
}),
generate: protectedProcedure
.input(apiGenerateSSHKey)
diff --git a/apps/dokploy/server/api/routers/user.ts b/apps/dokploy/server/api/routers/user.ts
index 8a8c0018..8a0f58d4 100644
--- a/apps/dokploy/server/api/routers/user.ts
+++ b/apps/dokploy/server/api/routers/user.ts
@@ -1,11 +1,10 @@
import { apiFindOneUser, apiFindOneUserByAuth } from "@/server/db/schema";
import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
-
import { findUserByAuthId, findUserById, findUsers } from "@dokploy/builders";
export const userRouter = createTRPCRouter({
- all: adminProcedure.query(async () => {
- return await findUsers();
+ all: adminProcedure.query(async ({ ctx }) => {
+ return await findUsers(ctx.user.adminId);
}),
byAuthId: protectedProcedure
.input(apiFindOneUserByAuth)
diff --git a/packages/builders/src/db/schema/admin.ts b/packages/builders/src/db/schema/admin.ts
index 861b1ce8..4cfa4aff 100644
--- a/packages/builders/src/db/schema/admin.ts
+++ b/packages/builders/src/db/schema/admin.ts
@@ -7,6 +7,7 @@ import { auth } from "./auth";
import { registry } from "./registry";
import { certificateType } from "./shared";
import { users } from "./user";
+import { sshKeys } from "./ssh-key";
export const admins = pgTable("admin", {
adminId: text("adminId")
@@ -35,6 +36,7 @@ export const adminsRelations = relations(admins, ({ one, many }) => ({
}),
users: many(users),
registry: many(registry),
+ sshKeys: many(sshKeys),
}));
const createSchema = createInsertSchema(admins, {
diff --git a/packages/builders/src/db/schema/ssh-key.ts b/packages/builders/src/db/schema/ssh-key.ts
index d032000b..bb235dfe 100644
--- a/packages/builders/src/db/schema/ssh-key.ts
+++ b/packages/builders/src/db/schema/ssh-key.ts
@@ -6,6 +6,7 @@ import { pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid";
import { server } from "./server";
+import { admins } from "./admin";
export const sshKeys = pgTable("ssh-key", {
sshKeyId: text("sshKeyId")
@@ -20,12 +21,19 @@ export const sshKeys = pgTable("ssh-key", {
.notNull()
.$defaultFn(() => new Date().toISOString()),
lastUsedAt: text("lastUsedAt"),
+ adminId: text("adminId").references(() => admins.adminId, {
+ onDelete: "cascade",
+ }),
});
-export const sshKeysRelations = relations(sshKeys, ({ many }) => ({
+export const sshKeysRelations = relations(sshKeys, ({ many, one }) => ({
applications: many(applications),
compose: many(compose),
servers: many(server),
+ admin: one(admins, {
+ fields: [sshKeys.adminId],
+ references: [admins.adminId],
+ }),
}));
const createSchema = createInsertSchema(
@@ -40,6 +48,7 @@ export const apiCreateSshKey = createSchema
description: true,
privateKey: true,
publicKey: true,
+ adminId: true,
})
.merge(sshKeyCreate.pick({ privateKey: true }));
diff --git a/packages/builders/src/services/user.ts b/packages/builders/src/services/user.ts
index 044bc3cb..87149cd3 100644
--- a/packages/builders/src/services/user.ts
+++ b/packages/builders/src/services/user.ts
@@ -34,8 +34,9 @@ export const findUserByAuthId = async (authId: string) => {
return user;
};
-export const findUsers = async () => {
- const users = await db.query.users.findMany({
+export const findUsers = async (adminId: string) => {
+ const currentUsers = await db.query.users.findMany({
+ where: eq(users.adminId, adminId),
with: {
auth: {
columns: {
@@ -44,7 +45,7 @@ export const findUsers = async () => {
},
},
});
- return users;
+ return currentUsers;
};
export const addNewProject = async (authId: string, projectId: string) => {