feat: update references

packages/server/src/db/schema/account.ts

@@ -1,6 +1,7 @@
 import { boolean, pgTable, text, timestamp } from "drizzle-orm/pg-core";
 import { nanoid } from "nanoid";
 import { users_temp } from "./user";
+import { relations } from "drizzle-orm";
 
 export const account = pgTable("account", {
 	id: text("id")
@@ -29,6 +30,13 @@ export const account = pgTable("account", {
 	confirmationExpiresAt: text("confirmationExpiresAt"),
 });
 
+export const accountRelations = relations(account, ({ one }) => ({
+	user: one(users_temp, {
+		fields: [account.userId],
+		references: [users_temp.id],
+	}),
+}));
+
 export const verification = pgTable("verification", {
 	id: text("id").primaryKey(),
 	identifier: text("identifier").notNull(),
@@ -52,6 +60,13 @@ export const organization = pgTable("organization", {
 		.references(() => users_temp.id),
 });
 
+export const organizationRelations = relations(organization, ({ one }) => ({
+	owner: one(users_temp, {
+		fields: [organization.ownerId],
+		references: [users_temp.id],
+	}),
+}));
+
 export const member = pgTable("member", {
 	id: text("id")
 		.primaryKey()
@@ -66,6 +81,17 @@ export const member = pgTable("member", {
 	createdAt: timestamp("created_at").notNull(),
 });
 
+export const memberRelations = relations(member, ({ one }) => ({
+	organization: one(organization, {
+		fields: [member.organizationId],
+		references: [organization.id],
+	}),
+	user: one(users_temp, {
+		fields: [member.userId],
+		references: [users_temp.id],
+	}),
+}));
+
 export const invitation = pgTable("invitation", {
 	id: text("id").primaryKey(),
 	organizationId: text("organization_id")
@@ -79,3 +105,10 @@ export const invitation = pgTable("invitation", {
 		.notNull()
 		.references(() => users_temp.id),
 });
+
+export const invitationRelations = relations(invitation, ({ one }) => ({
+	organization: one(organization, {
+		fields: [invitation.organizationId],
+		references: [organization.id],
+	}),
+}));

packages/server/src/db/schema/bitbucket.ts

@@ -61,5 +61,5 @@ export const apiUpdateBitbucket = createSchema.extend({
 	name: z.string().min(1),
 	bitbucketUsername: z.string().optional(),
 	bitbucketWorkspaceName: z.string().optional(),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });

packages/server/src/db/schema/notification.ts

@@ -3,7 +3,6 @@ import { boolean, integer, pgEnum, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
-import { admins } from "./admin";
 import { users_temp } from "./user";
 // import { user } from "./user";
 
@@ -153,7 +152,7 @@ export const apiCreateSlack = notificationsSchema
 export const apiUpdateSlack = apiCreateSlack.partial().extend({
 	notificationId: z.string().min(1),
 	slackId: z.string(),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestSlackConnection = apiCreateSlack.pick({
@@ -180,7 +179,7 @@ export const apiCreateTelegram = notificationsSchema
 export const apiUpdateTelegram = apiCreateTelegram.partial().extend({
 	notificationId: z.string().min(1),
 	telegramId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestTelegramConnection = apiCreateTelegram.pick({
@@ -207,7 +206,7 @@ export const apiCreateDiscord = notificationsSchema
 export const apiUpdateDiscord = apiCreateDiscord.partial().extend({
 	notificationId: z.string().min(1),
 	discordId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestDiscordConnection = apiCreateDiscord
@@ -241,7 +240,7 @@ export const apiCreateEmail = notificationsSchema
 export const apiUpdateEmail = apiCreateEmail.partial().extend({
 	notificationId: z.string().min(1),
 	emailId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestEmailConnection = apiCreateEmail.pick({
@@ -273,7 +272,7 @@ export const apiCreateGotify = notificationsSchema
 export const apiUpdateGotify = apiCreateGotify.partial().extend({
 	notificationId: z.string().min(1),
 	gotifyId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestGotifyConnection = apiCreateGotify

packages/server/src/db/schema/user.ts

@@ -196,8 +196,8 @@ export const usersRelations = relations(users, ({ one }) => ({
 	// }),
 }));
 
-const createSchema = createInsertSchema(users, {
-	userId: z.string().min(1),
+const createSchema = createInsertSchema(users_temp, {
+	id: z.string().min(1),
 	// authId: z.string().min(1),
 	token: z.string().min(1),
 	isRegistered: z.boolean().optional(),
@@ -218,7 +218,7 @@ export const apiCreateUserInvitation = createSchema.pick({}).extend({
 
 export const apiRemoveUser = createSchema
 	.pick({
-		// authId: true,
+		id: true,
 	})
 	.required();
 
@@ -230,7 +230,7 @@ export const apiFindOneToken = createSchema
 
 export const apiAssignPermissions = createSchema
 	.pick({
-		userId: true,
+		id: true,
 		canCreateProjects: true,
 		canCreateServices: true,
 		canDeleteProjects: true,
@@ -247,7 +247,7 @@ export const apiAssignPermissions = createSchema
 
 export const apiFindOneUser = createSchema
 	.pick({
-		userId: true,
+		id: true,
 	})
 	.required();
 

packages/server/src/lib/auth.ts

@@ -44,6 +44,9 @@ export const auth = betterAuth({
 			role: {
 				type: "string",
 			},
+			ownerId: {
+				type: "string",
+			},
 		},
 	},
 	plugins: [organization()],
@@ -56,7 +59,20 @@ export const validateRequest = async (request: IncomingMessage) => {
 		}),
 	});
 
-	console.log(session);
+	if (session?.user.role === "user") {
+		const owner = await db.query.member.findFirst({
+			where: eq(schema.member.userId, session.user.id),
+			with: {
+				organization: true,
+			},
+		});
+
+		if (owner) {
+			session.user.ownerId = owner.organization.ownerId;
+		}
+	} else {
+		session.user.ownerId = session?.user.id;
+	}
 
 	if (!session?.session || !session.user) {
 		return {

packages/server/src/services/admin.ts

@@ -11,7 +11,7 @@ import * as bcrypt from "bcrypt";
 import { eq } from "drizzle-orm";
 import { IS_CLOUD } from "../constants";
 
-export type Admin = typeof admins.$inferSelect;
+export type Admin = typeof users_temp.$inferSelect;
 export const createInvitation = async (
 	input: typeof apiCreateUserInvitation._type,
 	adminId: string,
@@ -48,33 +48,30 @@ export const createInvitation = async (
 	});
 };
 
-export const findAdminById = async (adminId: string) => {
-	const admin = await db.query.admins.findFirst({
-		where: eq(admins.adminId, adminId),
+export const findUserById = async (userId: string) => {
+	const user = await db.query.users_temp.findFirst({
+		where: eq(users_temp.id, userId),
 	});
-	if (!admin) {
+	if (!user) {
 		throw new TRPCError({
 			code: "NOT_FOUND",
-			message: "Admin not found",
+			message: "User not found",
 		});
 	}
-	return admin;
+	return user;
 };
 
-export const updateAdmin = async (
-	authId: string,
-	adminData: Partial<Admin>,
-) => {
-	const admin = await db
-		.update(admins)
+export const updateUser = async (userId: string, userData: Partial<Admin>) => {
+	const user = await db
+		.update(users_temp)
 		.set({
-			...adminData,
+			...userData,
 		})
-		.where(eq(admins.authId, authId))
+		.where(eq(users_temp.id, userId))
 		.returning()
 		.then((res) => res[0]);
 
-	return admin;
+	return user;
 };
 
 export const updateAdminById = async (
@@ -93,6 +90,13 @@ export const updateAdminById = async (
 	return admin;
 };
 
+export const findAdminById = async (userId: string) => {
+	const admin = await db.query.admins.findFirst({
+		where: eq(admins.userId, userId),
+	});
+	return admin;
+};
+
 export const isAdminPresent = async () => {
 	const admin = await db.query.user.findFirst({
 		where: eq(user.role, "admin"),
@@ -154,10 +158,10 @@ export const getUserByToken = async (token: string) => {
 	};
 };
 
-export const removeUserByAuthId = async (authId: string) => {
+export const removeUserById = async (userId: string) => {
 	await db
-		.delete(auth)
-		.where(eq(auth.id, authId))
+		.delete(users_temp)
+		.where(eq(users_temp.id, userId))
 		.returning()
 		.then((res) => res[0]);
 };
@@ -170,7 +174,7 @@ export const removeAdminByAuthId = async (authId: string) => {
 	const users = admin.users;
 
 	for (const user of users) {
-		await removeUserByAuthId(user.authId);
+		await removeUserById(user.id);
 	}
 	// Then delete the auth record which will cascade delete the admin
 	return await db

packages/server/src/services/bitbucket.ts

@@ -12,14 +12,14 @@ export type Bitbucket = typeof bitbucket.$inferSelect;
 
 export const createBitbucket = async (
 	input: typeof apiCreateBitbucket._type,
-	adminId: string,
+	userId: string,
 ) => {
 	return await db.transaction(async (tx) => {
 		const newGitProvider = await tx
 			.insert(gitProvider)
 			.values({
 				providerType: "bitbucket",
-				adminId: adminId,
+				userId: userId,
 				name: input.name,
 			})
 			.returning()
@@ -74,12 +74,12 @@ export const updateBitbucket = async (
 			.where(eq(bitbucket.bitbucketId, bitbucketId))
 			.returning();
 
-		if (input.name || input.adminId) {
+		if (input.name || input.userId) {
 			await tx
 				.update(gitProvider)
 				.set({
 					name: input.name,
-					adminId: input.adminId,
+					userId: input.userId,
 				})
 				.where(eq(gitProvider.gitProviderId, input.gitProviderId))
 				.returning();

packages/server/src/services/github.ts

@@ -12,14 +12,14 @@ import { updatePreviewDeployment } from "./preview-deployment";
 export type Github = typeof github.$inferSelect;
 export const createGithub = async (
 	input: typeof apiCreateGithub._type,
-	adminId: string,
+	userId: string,
 ) => {
 	return await db.transaction(async (tx) => {
 		const newGitProvider = await tx
 			.insert(gitProvider)
 			.values({
 				providerType: "github",
-				adminId: adminId,
+				userId: userId,
 				name: input.name,
 			})
 			.returning()

packages/server/src/services/notification.ts

@@ -24,7 +24,7 @@ export type Notification = typeof notifications.$inferSelect;
 
 export const createSlackNotification = async (
 	input: typeof apiCreateSlack._type,
-	adminId: string,
+	userId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newSlack = await tx
@@ -54,7 +54,7 @@ export const createSlackNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "slack",
-				adminId: adminId,
+				userId: userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -84,7 +84,7 @@ export const updateSlackNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				adminId: input.adminId,
+				userId: input.userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -114,7 +114,7 @@ export const updateSlackNotification = async (
 
 export const createTelegramNotification = async (
 	input: typeof apiCreateTelegram._type,
-	adminId: string,
+	userId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newTelegram = await tx
@@ -144,7 +144,7 @@ export const createTelegramNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "telegram",
-				adminId: adminId,
+				userId: userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -174,7 +174,7 @@ export const updateTelegramNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				adminId: input.adminId,
+				userId: input.userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -204,7 +204,7 @@ export const updateTelegramNotification = async (
 
 export const createDiscordNotification = async (
 	input: typeof apiCreateDiscord._type,
-	adminId: string,
+	userId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newDiscord = await tx
@@ -234,7 +234,7 @@ export const createDiscordNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "discord",
-				adminId: adminId,
+				userId: userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -264,7 +264,7 @@ export const updateDiscordNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				adminId: input.adminId,
+				userId: input.userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -294,7 +294,7 @@ export const updateDiscordNotification = async (
 
 export const createEmailNotification = async (
 	input: typeof apiCreateEmail._type,
-	adminId: string,
+	userId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newEmail = await tx
@@ -328,7 +328,7 @@ export const createEmailNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "email",
-				adminId: adminId,
+				userId: userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -358,7 +358,7 @@ export const updateEmailNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				adminId: input.adminId,
+				userId: input.userId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -392,7 +392,7 @@ export const updateEmailNotification = async (
 
 export const createGotifyNotification = async (
 	input: typeof apiCreateGotify._type,
-	adminId: string,
+	userId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newGotify = await tx
@@ -424,7 +424,7 @@ export const createGotifyNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "gotify",
-				adminId: adminId,
+				userId: userId,
 			})
 			.returning()
 			.then((value) => value[0]);
@@ -453,7 +453,7 @@ export const updateGotifyNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				adminId: input.adminId,
+				userId: input.userId,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
 			.returning()

packages/server/src/services/registry.ts

@@ -12,14 +12,14 @@ export type Registry = typeof registry.$inferSelect;
 
 export const createRegistry = async (
 	input: typeof apiCreateRegistry._type,
-	adminId: string,
+	userId: string,
 ) => {
 	return await db.transaction(async (tx) => {
 		const newRegistry = await tx
 			.insert(registry)
 			.values({
 				...input,
-				adminId: adminId,
+				userId: userId,
 			})
 			.returning()
 			.then((value) => value[0]);
@@ -135,9 +135,9 @@ export const findRegistryById = async (registryId: string) => {
 	return registryResponse;
 };
 
-export const findAllRegistryByAdminId = async (adminId: string) => {
+export const findAllRegistryByUserId = async (userId: string) => {
 	const registryResponse = await db.query.registry.findMany({
-		where: eq(registry.adminId, adminId),
+		where: eq(registry.userId, userId),
 	});
 	return registryResponse;
 };

packages/server/src/services/server.ts

@@ -7,13 +7,13 @@ export type Server = typeof server.$inferSelect;
 
 export const createServer = async (
 	input: typeof apiCreateServer._type,
-	adminId: string,
+	userId: string,
 ) => {
 	const newServer = await db
 		.insert(server)
 		.values({
 			...input,
-			adminId: adminId,
+			userId: userId,
 		})
 		.returning()
 		.then((value) => value[0]);
@@ -45,9 +45,9 @@ export const findServerById = async (serverId: string) => {
 	return currentServer;
 };
 
-export const findServersByAdminId = async (adminId: string) => {
+export const findServersByUserId = async (userId: string) => {
 	const servers = await db.query.server.findMany({
-		where: eq(server.adminId, adminId),
+		where: eq(server.userId, userId),
 		orderBy: desc(server.createdAt),
 	});