refactor: migrate admin API calls to user router

apps/dokploy/components/dashboard/monitoring/paid/container/show-paid-container-monitoring.tsx

@@ -79,7 +79,7 @@ export const ContainerPaidMonitoring = ({ appName, baseUrl, token }: Props) => {
 		data,
 		isLoading,
 		error: queryError,
-	} = api.admin.getContainerMetrics.useQuery(
+	} = api.user.getContainerMetrics.useQuery(
 		{
 			url: baseUrl,
 			token,

apps/dokploy/components/dashboard/monitoring/paid/servers/show-paid-monitoring.tsx

@@ -73,7 +73,7 @@ export const ShowPaidMonitoring = ({
 		data,
 		isLoading,
 		error: queryError,
-	} = api.admin.getServerMetrics.useQuery(
+	} = api.user.getServerMetrics.useQuery(
 		{
 			url: BASE_URL,
 			token,

apps/dokploy/components/dashboard/projects/show.tsx

@@ -51,7 +51,7 @@ import { ProjectEnvironment } from "./project-environment";
 export const ShowProjects = () => {
 	const utils = api.useUtils();
 	const { data, isLoading } = api.project.all.useQuery();
-	const { data: auth } = api.auth.get.useQuery();
+	const { data: auth } = api.user.get.useQuery();
 	const { mutateAsync } = api.project.remove.useMutation();
 	const [searchQuery, setSearchQuery] = useState("");
 

apps/dokploy/components/dashboard/settings/billing/show-billing.tsx

@@ -39,7 +39,7 @@ export const calculatePrice = (count: number, isAnnual = false) => {
 };
 export const ShowBilling = () => {
 	const { data: servers } = api.server.all.useQuery(undefined);
-	const { data: admin } = api.admin.one.useQuery();
+	const { data: admin } = api.user.get.useQuery();
 	const { data, isLoading } = api.stripe.getProducts.useQuery();
 	const { mutateAsync: createCheckoutSession } =
 		api.stripe.createCheckoutSession.useMutation();
@@ -70,7 +70,7 @@ export const ShowBilling = () => {
 		return isAnnual ? interval === "year" : interval === "month";
 	});
 
-	const maxServers = admin?.serversQuantity ?? 1;
+	const maxServers = admin?.user.serversQuantity ?? 1;
 	const percentage = ((servers?.length ?? 0) / maxServers) * 100;
 	const safePercentage = Math.min(percentage, 100);
 
@@ -98,17 +98,17 @@ export const ShowBilling = () => {
 									<TabsTrigger value="annual">Annual</TabsTrigger>
 								</TabsList>
 							</Tabs>
-							{admin?.stripeSubscriptionId && (
+							{admin?.user.stripeSubscriptionId && (
 								<div className="space-y-2 flex flex-col">
 									<h3 className="text-lg font-medium">Servers Plan</h3>
 									<p className="text-sm text-muted-foreground">
 										You have {servers?.length} server on your plan of{" "}
-										{admin?.serversQuantity} servers
+										{admin?.user.serversQuantity} servers
 									</p>
 									<div>
 										<Progress value={safePercentage} className="max-w-lg" />
 									</div>
-									{admin && admin.serversQuantity! <= servers?.length! && (
+									{admin && admin.user.serversQuantity! <= servers?.length! && (
 										<div className="flex flex-row gap-4 p-2 bg-yellow-50 dark:bg-yellow-950 rounded-lg items-center">
 											<AlertTriangle className="text-yellow-600 dark:text-yellow-400" />
 											<span className="text-sm text-yellow-600 dark:text-yellow-400">
@@ -279,7 +279,7 @@ export const ShowBilling = () => {
 																"flex flex-row  items-center gap-2 mt-4",
 															)}
 														>
-															{admin?.stripeCustomerId && (
+															{admin?.user.stripeCustomerId && (
 																<Button
 																	variant="secondary"
 																	className="w-full"

apps/dokploy/components/dashboard/settings/billing/show-welcome-dokploy.tsx

@@ -10,7 +10,7 @@ import type React from "react";
 import { useEffect, useState } from "react";
 
 export const ShowWelcomeDokploy = () => {
-	const { data } = api.auth.get.useQuery();
+	const { data } = api.user.get.useQuery();
 	const [open, setOpen] = useState(false);
 
 	const { data: isCloud, isLoading } = api.settings.isCloud.useQuery();

apps/dokploy/components/dashboard/settings/git/bitbucket/add-bitbucket-provider.tsx

@@ -53,7 +53,7 @@ export const AddBitbucketProvider = () => {
 	const [isOpen, setIsOpen] = useState(false);
 	const url = useUrl();
 	const { mutateAsync, error, isError } = api.bitbucket.create.useMutation();
-	const { data: auth } = api.auth.get.useQuery();
+	const { data: auth } = api.user.get.useQuery();
 	const router = useRouter();
 	const form = useForm<Schema>({
 		defaultValues: {

apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx

@@ -18,7 +18,7 @@ import { useEffect, useState } from "react";
 export const AddGithubProvider = () => {
 	const [isOpen, setIsOpen] = useState(false);
 	const { data: activeOrganization } = authClient.useActiveOrganization();
-	const { data } = api.auth.get.useQuery();
+	const { data } = api.user.get.useQuery();
 	const [manifest, setManifest] = useState("");
 	const [isOrganization, setIsOrganization] = useState(false);
 	const [organizationName, setOrganization] = useState("");

apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx

@@ -55,7 +55,7 @@ export const AddGitlabProvider = () => {
 	const utils = api.useUtils();
 	const [isOpen, setIsOpen] = useState(false);
 	const url = useUrl();
-	const { data: auth } = api.auth.get.useQuery();
+	const { data: auth } = api.user.get.useQuery();
 	const { mutateAsync, error, isError } = api.gitlab.create.useMutation();
 	const webhookUrl = `${url}/api/providers/gitlab/callback`;
 

apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx

@@ -62,6 +62,7 @@ export const Disable2FA = () => {
 
 			toast.success("2FA disabled successfully");
 			utils.auth.get.invalidate();
+			setIsOpen(false);
 		} catch (error) {
 			form.setError("password", {
 				message: "Connection error. Please try again.",

apps/dokploy/components/dashboard/settings/profile/generate-token.tsx

@@ -14,7 +14,7 @@ import Link from "next/link";
 import { toast } from "sonner";
 
 export const GenerateToken = () => {
-	const { data, refetch } = api.auth.get.useQuery();
+	const { data, refetch } = api.user.get.useQuery();
 
 	const { mutateAsync: generateToken, isLoading: isLoadingToken } =
 		api.auth.generateToken.useMutation();

apps/dokploy/components/dashboard/settings/profile/profile-form.tsx

@@ -59,7 +59,7 @@ export const ProfileForm = () => {
 	const utils = api.useUtils();
 	const { mutateAsync: disable2FA, isLoading: isDisabling } =
 		api.auth.disable2FA.useMutation();
-	const { data, refetch, isLoading } = api.auth.get.useQuery();
+	const { data, refetch, isLoading } = api.user.get.useQuery();
 	const {
 		mutateAsync,
 		isLoading: isUpdating,

apps/dokploy/components/dashboard/settings/profile/remove-self-account.tsx

@@ -35,7 +35,7 @@ const profileSchema = z.object({
 type Profile = z.infer<typeof profileSchema>;
 
 export const RemoveSelfAccount = () => {
-	const { data } = api.auth.get.useQuery();
+	const { data } = api.user.get.useQuery();
 	const { mutateAsync, isLoading, error, isError } =
 		api.auth.removeSelfAccount.useMutation();
 	const { t } = useTranslation("settings");

apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx

@@ -7,7 +7,7 @@ interface Props {
 	serverId?: string;
 }
 export const ToggleDockerCleanup = ({ serverId }: Props) => {
-	const { data, refetch } = api.admin.one.useQuery(undefined, {
+	const { data, refetch } = api.user.get.useQuery(undefined, {
 		enabled: !serverId,
 	});
 
@@ -20,7 +20,7 @@ export const ToggleDockerCleanup = ({ serverId }: Props) => {
 		},
 	);
 
-	const enabled = data?.enableDockerCleanup || server?.enableDockerCleanup;
+	const enabled = data?.user.enableDockerCleanup || server?.enableDockerCleanup;
 
 	const { mutateAsync } = api.settings.updateDockerCleanup.useMutation();
 

apps/dokploy/components/dashboard/settings/servers/setup-monitoring.tsx

@@ -91,7 +91,7 @@ export const SetupMonitoring = ({ serverId }: Props) => {
 					enabled: !!serverId,
 				},
 			)
-		: api.admin.one.useQuery();
+		: api.user.get.useQuery();
 
 	const url = useUrl();
 

apps/dokploy/components/dashboard/settings/users/add-permissions.tsx

@@ -62,7 +62,7 @@ export const AddUserPermissions = ({ userId }: Props) => {
 	);
 
 	const { mutateAsync, isError, error, isLoading } =
-		api.admin.assignPermissions.useMutation();
+		api.user.assignPermissions.useMutation();
 
 	const form = useForm<AddPermissions>({
 		defaultValues: {

apps/dokploy/components/dashboard/settings/users/show-invitations.tsx

@@ -26,7 +26,7 @@ import {
 import { authClient } from "@/lib/auth-client";
 import { api } from "@/utils/api";
 import copy from "copy-to-clipboard";
-import { format } from "date-fns";
+import { format, isPast } from "date-fns";
 import { Mail, MoreHorizontal, Users } from "lucide-react";
 import { Loader2 } from "lucide-react";
 import { toast } from "sonner";
@@ -35,8 +35,6 @@ import { AddInvitation } from "./add-invitation";
 export const ShowInvitations = () => {
 	const { data, isLoading, refetch } =
 		api.organization.allInvitations.useQuery();
-	const { mutateAsync, isLoading: isRemoving } =
-		api.admin.removeUser.useMutation();
 
 	return (
 		<div className="w-full">
@@ -84,6 +82,9 @@ export const ShowInvitations = () => {
 											</TableHeader>
 											<TableBody>
 												{data?.map((invitation) => {
+													const isExpired = isPast(
+														new Date(invitation.expiresAt),
+													);
 													return (
 														<TableRow key={invitation.id}>
 															<TableCell className="w-[100px]">
@@ -104,17 +105,22 @@ export const ShowInvitations = () => {
 																<Badge
 																	variant={
 																		invitation.status === "pending"
-																			? "default"
+																			? "secondary"
 																			: invitation.status === "canceled"
 																				? "destructive"
-																				: "secondary"
+																				: "default"
 																	}
 																>
 																	{invitation.status}
 																</Badge>
 															</TableCell>
 															<TableCell className="text-center">
-																{format(new Date(invitation.expiresAt), "PPpp")}
+																{format(new Date(invitation.expiresAt), "PPpp")}{" "}
+																{isExpired ? (
+																	<span className="text-muted-foreground">
+																		(Expired)
+																	</span>
+																) : null}
 															</TableCell>
 
 															<TableCell className="text-right flex justify-end">
@@ -132,44 +138,51 @@ export const ShowInvitations = () => {
 																		<DropdownMenuLabel>
 																			Actions
 																		</DropdownMenuLabel>
+																		{!isExpired && (
+																			<>
+																				{invitation.status === "pending" && (
+																					<DropdownMenuItem
+																						className="w-full cursor-pointer"
+																						onSelect={(e) => {
+																							copy(
+																								`${origin}/invitation?token=${invitation.id}`,
+																							);
+																							toast.success(
+																								"Invitation Copied to clipboard",
+																							);
+																						}}
+																					>
+																						Copy Invitation
+																					</DropdownMenuItem>
+																				)}
 
-																		{invitation.status === "pending" && (
-																			<DropdownMenuItem
-																				className="w-full cursor-pointer"
-																				onSelect={(e) => {
-																					copy(
-																						`${origin}/invitation?token=${invitation.id}`,
-																					);
-																					toast.success(
-																						"Invitation Copied to clipboard",
-																					);
-																				}}
-																			>
-																				Copy Invitation
-																			</DropdownMenuItem>
-																		)}
+																				{invitation.status === "pending" && (
+																					<DropdownMenuItem
+																						className="w-full cursor-pointer"
+																						onSelect={async (e) => {
+																							const result =
+																								await authClient.organization.cancelInvitation(
+																									{
+																										invitationId: invitation.id,
+																									},
+																								);
 
-																		{invitation.status === "pending" && (
-																			<DropdownMenuItem
-																				className="w-full cursor-pointer"
-																				onSelect={async (e) => {
-																					const result =
-																						await authClient.organization.cancelInvitation(
-																							{
-																								invitationId: invitation.id,
-																							},
-																						);
-
-																					if (result.error) {
-																						toast.error(result.error.message);
-																					} else {
-																						toast.success("Invitation deleted");
-																						refetch();
-																					}
-																				}}
-																			>
-																				Cancel Invitation
-																			</DropdownMenuItem>
+																							if (result.error) {
+																								toast.error(
+																									result.error.message,
+																								);
+																							} else {
+																								toast.success(
+																									"Invitation deleted",
+																								);
+																								refetch();
+																							}
+																						}}
+																					>
+																						Cancel Invitation
+																					</DropdownMenuItem>
+																				)}
+																			</>
 																		)}
 																	</DropdownMenuContent>
 																</DropdownMenu>

apps/dokploy/components/dashboard/settings/users/show-users.tsx

@@ -75,9 +75,7 @@ export const ShowUsers = () => {
 													<TableHead className="w-[100px]">Email</TableHead>
 													<TableHead className="text-center">Role</TableHead>
 													<TableHead className="text-center">2FA</TableHead>
-													<TableHead className="text-center">
-														Is Registered
-													</TableHead>
+
 													<TableHead className="text-center">
 														Created At
 													</TableHead>
@@ -108,12 +106,6 @@ export const ShowUsers = () => {
 																	: "Disabled"}
 															</TableCell>
 															<TableCell className="text-center">
-																{member.user.isRegistered ||
-																member.role === "owner"
-																	? "Registered"
-																	: "Not Registered"}
-															</TableCell>
-															<TableCell className="text-right">
 																<span className="text-sm text-muted-foreground">
 																	{format(new Date(member.createdAt), "PPpp")}
 																</span>
@@ -134,22 +126,6 @@ export const ShowUsers = () => {
 																		<DropdownMenuLabel>
 																			Actions
 																		</DropdownMenuLabel>
-																		{!member.user.isRegistered &&
-																			member.role !== "owner" && (
-																				<DropdownMenuItem
-																					className="w-full cursor-pointer"
-																					onSelect={(e) => {
-																						copy(
-																							`${origin}/invitation?token=${member.user.token}`,
-																						);
-																						toast.success(
-																							"Invitation Copied to clipboard",
-																						);
-																					}}
-																				>
-																					Copy Invitation
-																				</DropdownMenuItem>
-																			)}
 
 																		{member.role !== "owner" && (
 																			<AddUserPermissions

apps/dokploy/components/dashboard/settings/web-domain.tsx

@@ -52,7 +52,7 @@ type AddServerDomain = z.infer<typeof addServerDomain>;
 
 export const WebDomain = () => {
 	const { t } = useTranslation("settings");
-	const { data, refetch } = api.auth.get.useQuery();
+	const { data, refetch } = api.user.get.useQuery();
 	const { mutateAsync, isLoading } =
 		api.settings.assignDomainServer.useMutation();
 

apps/dokploy/components/dashboard/settings/web-server.tsx

@@ -21,7 +21,7 @@ interface Props {
 }
 export const WebServer = ({ className }: Props) => {
 	const { t } = useTranslation("settings");
-	const { data } = api.admin.one.useQuery();
+	const { data } = api.user.get.useQuery();
 
 	const { data: dokployVersion } = api.settings.getDokployVersion.useQuery();
 
@@ -58,7 +58,7 @@ export const WebServer = ({ className }: Props) => {
 
 						<div className="flex items-center flex-wrap justify-between gap-4">
 							<span className="text-sm text-muted-foreground">
-								Server IP: {data?.serverIp}
+								Server IP: {data?.user.serverIp}
 							</span>
 							<span className="text-sm text-muted-foreground">
 								Version: {dokployVersion}

apps/dokploy/components/dashboard/settings/web-server/update-server-ip.tsx

@@ -54,7 +54,7 @@ export const UpdateServerIp = ({ children, serverId }: Props) => {
 
 	const form = useForm<Schema>({
 		defaultValues: {
-			serverIp: data?.serverIp || "",
+			serverIp: data?.user.serverIp || "",
 		},
 		resolver: zodResolver(schema),
 	});
@@ -62,7 +62,7 @@ export const UpdateServerIp = ({ children, serverId }: Props) => {
 	useEffect(() => {
 		if (data) {
 			form.reset({
-				serverIp: data.serverIp || "",
+				serverIp: data.user.serverIp || "",
 			});
 		}
 	}, [form, form.reset, data]);

apps/dokploy/components/layouts/side.tsx

@@ -526,7 +526,7 @@ const data = {
 function SidebarLogo() {
 	const { state } = useSidebar();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
-	const { data: user } = api.auth.get.useQuery();
+	const { data: user } = api.user.get.useQuery();
 	const { data: dokployVersion } = api.settings.getDokployVersion.useQuery();
 	const { data: session } = authClient.useSession();
 	const {
@@ -714,7 +714,7 @@ export default function Page({ children }: Props) {
 	const router = useRouter();
 	const pathname = usePathname();
 	const currentPath = router.pathname;
-	const { data: auth } = api.auth.get.useQuery();
+	const { data: auth } = api.user.get.useQuery();
 
 	const includesProjects = pathname?.includes("/dashboard/project");
 	const { data: isCloud, isLoading } = api.settings.isCloud.useQuery();

apps/dokploy/components/layouts/user-nav.tsx

@@ -30,7 +30,7 @@ const AUTO_CHECK_UPDATES_INTERVAL_MINUTES = 7;
 
 export const UserNav = () => {
 	const router = useRouter();
-	const { data } = api.auth.get.useQuery();
+	const { data } = api.user.get.useQuery();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
 	const { locale, setLocale } = useLocale();

apps/dokploy/pages/dashboard/monitoring.tsx

@@ -25,7 +25,7 @@ const Dashboard = () => {
 		false,
 	);
 
-	const { data: monitoring, isLoading } = api.admin.getMetricsToken.useQuery();
+	const { data: monitoring, isLoading } = api.user.getMetricsToken.useQuery();
 	return (
 		<div className="space-y-4 pb-10">
 			{/* <AlertBlock>

apps/dokploy/pages/dashboard/project/[projectId].tsx

@@ -200,7 +200,7 @@ const Project = (
 ) => {
 	const [isBulkActionLoading, setIsBulkActionLoading] = useState(false);
 	const { projectId } = props;
-	const { data: auth } = api.auth.get.useQuery();
+	const { data: auth } = api.user.get.useQuery();
 
 	const { data, isLoading, refetch } = api.project.one.useQuery({ projectId });
 	const router = useRouter();

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

@@ -86,8 +86,8 @@ const Service = (
 	);
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
-	const { data: auth } = api.auth.get.useQuery();
-	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
+	const { data: auth } = api.user.get.useQuery();
+	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 
 	return (
 		<div className="pb-10">

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

@@ -79,8 +79,8 @@ const Service = (
 		},
 	);
 
-	const { data: auth } = api.auth.get.useQuery();
-	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
+	const { data: auth } = api.user.get.useQuery();
+	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
 	return (

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

@@ -61,8 +61,8 @@ const Mariadb = (
 	const { projectId } = router.query;
 	const [tab, setSab] = useState<TabState>(activeTab);
 	const { data } = api.mariadb.one.useQuery({ mariadbId });
-	const { data: auth } = api.auth.get.useQuery();
-	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
+	const { data: auth } = api.user.get.useQuery();
+	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 

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

@@ -61,8 +61,8 @@ const Mongo = (
 	const [tab, setSab] = useState<TabState>(activeTab);
 	const { data } = api.mongo.one.useQuery({ mongoId });
 
-	const { data: auth } = api.auth.get.useQuery();
-	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
+	const { data: auth } = api.user.get.useQuery();
+	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 

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

@@ -60,8 +60,8 @@ const MySql = (
 	const { projectId } = router.query;
 	const [tab, setSab] = useState<TabState>(activeTab);
 	const { data } = api.mysql.one.useQuery({ mysqlId });
-	const { data: auth } = api.auth.get.useQuery();
-	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
+	const { data: auth } = api.user.get.useQuery();
+	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 

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

@@ -60,9 +60,9 @@ const Postgresql = (
 	const { projectId } = router.query;
 	const [tab, setSab] = useState<TabState>(activeTab);
 	const { data } = api.postgres.one.useQuery({ postgresId });
-	const { data: auth } = api.auth.get.useQuery();
+	const { data: auth } = api.user.get.useQuery();
 
-	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
+	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
 	return (

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

@@ -60,8 +60,8 @@ const Redis = (
 	const [tab, setSab] = useState<TabState>(activeTab);
 	const { data } = api.redis.one.useQuery({ redisId });
 
-	const { data: auth } = api.auth.get.useQuery();
-	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
+	const { data: auth } = api.user.get.useQuery();
+	const { data: monitoring } = api.user.getMetricsToken.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 

apps/dokploy/pages/dashboard/settings/index.tsx

@@ -42,9 +42,9 @@ const settings = z.object({
 type SettingsType = z.infer<typeof settings>;
 
 const Page = () => {
-	const { data, refetch } = api.admin.one.useQuery();
+	const { data, refetch } = api.user.get.useQuery();
 	const { mutateAsync, isLoading, isError, error } =
-		api.admin.update.useMutation();
+		api.user.update.useMutation();
 	const form = useForm<SettingsType>({
 		defaultValues: {
 			cleanCacheOnApplications: false,
@@ -55,9 +55,9 @@ const Page = () => {
 	});
 	useEffect(() => {
 		form.reset({
-			cleanCacheOnApplications: data?.cleanupCacheApplications || false,
-			cleanCacheOnCompose: data?.cleanupCacheOnCompose || false,
-			cleanCacheOnPreviews: data?.cleanupCacheOnPreviews || false,
+			cleanCacheOnApplications: data?.user.cleanupCacheApplications || false,
+			cleanCacheOnCompose: data?.user.cleanupCacheOnCompose || false,
+			cleanCacheOnPreviews: data?.user.cleanupCacheOnPreviews || false,
 		});
 	}, [form, form.reset, form.formState.isSubmitSuccessful, data]);
 

apps/dokploy/pages/dashboard/settings/profile.tsx

@@ -13,7 +13,7 @@ import React, { type ReactElement } from "react";
 import superjson from "superjson";
 
 const Page = () => {
-	const { data } = api.auth.get.useQuery();
+	const { data } = api.user.get.useQuery();
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 	return (

apps/dokploy/pages/dashboard/settings/server.tsx

@@ -2,19 +2,7 @@ import { SetupMonitoring } from "@/components/dashboard/settings/servers/setup-m
 import { WebDomain } from "@/components/dashboard/settings/web-domain";
 import { WebServer } from "@/components/dashboard/settings/web-server";
 import { DashboardLayout } from "@/components/layouts/dashboard-layout";
-import { DialogAction } from "@/components/shared/dialog-action";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import { Switch } from "@/components/ui/switch";
-
 import { appRouter } from "@/server/api/root";
-import { api } from "@/utils/api";
 import { getLocale, serverSideTranslations } from "@/utils/i18n";
 import { IS_CLOUD, validateRequest } from "@dokploy/server";
 import { createServerSideHelpers } from "@trpc/react-query/server";
@@ -25,8 +13,6 @@ import { toast } from "sonner";
 import superjson from "superjson";
 
 const Page = () => {
-	const { data, refetch } = api.admin.one.useQuery();
-	const { mutateAsync: update } = api.admin.update.useMutation();
 	return (
 		<div className="w-full">
 			<div className="h-full rounded-xl  max-w-5xl mx-auto flex flex-col gap-4">

apps/dokploy/pages/index.tsx

@@ -4,6 +4,14 @@ import { AlertBlock } from "@/components/shared/alert-block";
 import { Logo } from "@/components/shared/logo";
 import { Button, buttonVariants } from "@/components/ui/button";
 import { CardContent, CardDescription } from "@/components/ui/card";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
 import {
 	Form,
 	FormControl,
@@ -20,14 +28,6 @@ import {
 	InputOTPSlot,
 } from "@/components/ui/input-otp";
 import { Label } from "@/components/ui/label";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
 import { authClient } from "@/lib/auth-client";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";

apps/dokploy/pages/invitation.tsx

@@ -85,7 +85,7 @@ const Invitation = ({
 	userAlreadyExists,
 }: Props) => {
 	const router = useRouter();
-	const { data } = api.admin.getUserByToken.useQuery(
+	const { data } = api.user.getUserByToken.useQuery(
 		{
 			token,
 		},

apps/dokploy/server/api/routers/admin.ts

@@ -1,4 +1,3 @@
-import { db } from "@/server/db";
 import {
 	apiAssignPermissions,
 	apiCreateUserInvitation,
@@ -14,11 +13,9 @@ import {
 	getUserByToken,
 	removeUserById,
 	setupWebMonitoring,
-	updateAdminById,
 	updateUser,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import {
 	adminProcedure,
@@ -131,7 +128,7 @@ export const adminRouter = createTRPCRouter({
 				if (user.id !== ctx.user.ownerId) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You are not authorized to setup this server",
+						message: "You are not authorized to setup the monitoring",
 					});
 				}
 

apps/dokploy/server/api/routers/compose.ts

@@ -39,7 +39,6 @@ import {
 	createComposeByTemplate,
 	createDomain,
 	createMount,
-	findAdminById,
 	findComposeById,
 	findDomainsByComposeId,
 	findProjectById,

apps/dokploy/server/api/routers/organization.ts

@@ -1,11 +1,6 @@
 import { db } from "@/server/db";
-import {
-	invitation,
-	member,
-	organization,
-	users_temp,
-} from "@/server/db/schema";
-import { IS_CLOUD, auth } from "@dokploy/server/index";
+import { invitation, member, organization } from "@/server/db/schema";
+import { IS_CLOUD } from "@dokploy/server/index";
 import { TRPCError } from "@trpc/server";
 import { and, desc, eq, exists } from "drizzle-orm";
 import { nanoid } from "nanoid";
@@ -45,7 +40,7 @@ export const organizationRouter = createTRPCRouter({
 				});
 			}
 
-			const memberResult = await db.insert(member).values({
+			await db.insert(member).values({
 				organizationId: result.id,
 				role: "owner",
 				createdAt: new Date(),
@@ -142,7 +137,7 @@ export const organizationRouter = createTRPCRouter({
 	allInvitations: adminProcedure.query(async ({ ctx }) => {
 		return await db.query.invitation.findMany({
 			where: eq(invitation.organizationId, ctx.session.activeOrganizationId),
-			orderBy: [desc(invitation.status)],
+			orderBy: [desc(invitation.status), desc(invitation.expiresAt)],
 		});
 	}),
 	acceptInvitation: adminProcedure

apps/dokploy/server/api/routers/user.ts

@@ -1,18 +1,31 @@
 import { apiFindOneUser, apiFindOneUserByAuth } from "@/server/db/schema";
 import {
 	IS_CLOUD,
+	findOrganizationById,
 	findUserByAuthId,
 	findUserById,
+	getUserByToken,
 	removeUserById,
 	updateUser,
 	verify2FA,
 } from "@dokploy/server";
 import { db } from "@dokploy/server/db";
-import { account, apiUpdateUser, member } from "@dokploy/server/db/schema";
+import {
+	account,
+	apiAssignPermissions,
+	apiFindOneToken,
+	apiUpdateUser,
+	member,
+} from "@dokploy/server/db/schema";
 import { TRPCError } from "@trpc/server";
-import { eq } from "drizzle-orm";
+import { and, eq } from "drizzle-orm";
 import { z } from "zod";
-import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
+import {
+	adminProcedure,
+	createTRPCRouter,
+	protectedProcedure,
+	publicProcedure,
+} from "../trpc";
 export const userRouter = createTRPCRouter({
 	all: adminProcedure.query(async ({ ctx }) => {
 		return await db.query.member.findMany({
@@ -39,14 +52,36 @@ export const userRouter = createTRPCRouter({
 			return user;
 		}),
 	get: protectedProcedure.query(async ({ ctx }) => {
-		return await findUserById(ctx.user.id);
+		const memberResult = await db.query.member.findFirst({
+			where: and(
+				eq(member.userId, ctx.user.id),
+				eq(member.organizationId, ctx.session?.activeOrganizationId || ""),
+			),
+			with: {
+				user: true,
+			},
+		});
+
+		return memberResult;
 	}),
 	update: protectedProcedure
 		.input(apiUpdateUser)
 		.mutation(async ({ input, ctx }) => {
 			return await updateUser(ctx.user.id, input);
 		}),
-
+	getUserByToken: publicProcedure
+		.input(apiFindOneToken)
+		.query(async ({ input }) => {
+			return await getUserByToken(input.token);
+		}),
+	getMetricsToken: protectedProcedure.query(async ({ ctx }) => {
+		const user = await findUserById(ctx.user.ownerId);
+		return {
+			serverIp: user.serverIp,
+			enabledFeatures: user.enablePaidFeatures,
+			metricsConfig: user?.metricsConfig,
+		};
+	}),
 	remove: protectedProcedure
 		.input(
 			z.object({
@@ -59,4 +94,28 @@ export const userRouter = createTRPCRouter({
 			}
 			return await removeUserById(input.userId);
 		}),
+	assignPermissions: adminProcedure
+		.input(apiAssignPermissions)
+		.mutation(async ({ input, ctx }) => {
+			try {
+				const user = await findUserById(input.id);
+
+				const organization = await findOrganizationById(
+					ctx.session?.activeOrganizationId || "",
+				);
+
+				if (organization?.ownerId !== ctx.user.ownerId) {
+					throw new TRPCError({
+						code: "UNAUTHORIZED",
+						message: "You are not allowed to assign permissions",
+					});
+				}
+
+				await updateUser(user.id, {
+					...input,
+				});
+			} catch (error) {
+				throw error;
+			}
+		}),
 });