Merge remote-tracking branch 'dokploy/canary' into check-for-updates

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

@@ -188,9 +188,9 @@ export const authRouter = createTRPCRouter({
 		.mutation(async ({ ctx, input }) => {
 			const currentAuth = await findAuthByEmail(ctx.user.email);
 
-			if (input.password) {
+			if (input.currentPassword || input.password) {
 				const correctPassword = bcrypt.compareSync(
-					input.password,
+					input.currentPassword || "",
 					currentAuth?.password || "",
 				);
 				if (!correctPassword) {
@@ -268,7 +268,9 @@ export const authRouter = createTRPCRouter({
 
 		return auth;
 	}),
-
+	verifyToken: protectedProcedure.mutation(async () => {
+		return true;
+	}),
 	one: adminProcedure.input(apiFindOneAuth).query(async ({ input }) => {
 		const auth = await findAuthById(input.id);
 		return auth;

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

@@ -269,11 +269,11 @@ export const settingsRouter = createTRPCRouter({
 						message: "You are not authorized to access this admin",
 					});
 				}
-				await updateAdmin(ctx.user.authId, {
+				const adminUpdated = await updateAdmin(ctx.user.authId, {
 					enableDockerCleanup: input.enableDockerCleanup,
 				});
 
-				if (admin.enableDockerCleanup) {
+				if (adminUpdated?.enableDockerCleanup) {
 					scheduleJob("docker-cleanup", "0 0 * * *", async () => {
 						console.log(
 							`Docker Cleanup ${new Date().toLocaleString()}] Running...`,