Merge branch 'dev' into feat/oidc

# Conflicts:
#	portabase.config.ts
#	src/env.mjs

src/lib/auth/auth.ts

@@ -269,6 +269,8 @@ export const auth = betterAuth({
         session: {
             create: {
                 before: async (session, context) => {
+
+
                     const userId = session.userId;
 
                     let memberships = await db.query.member.findMany({
@@ -308,6 +310,9 @@ export const auth = betterAuth({
                 //     }
                 // },
                 after: async (session) => {
+
+                    console.log("session", session);
+
                     const user = await db.query.user.findFirst({
                         where: eq(drizzleDb.schemas.user.id, session.userId),
                     });
@@ -321,6 +326,12 @@ export const auth = betterAuth({
                         return;
                     }
 
+                    const lastDiff = user.lastConnectedAt
+                        ? new Date(session.createdAt).getTime() - new Date(user.lastConnectedAt).getTime()
+                        : Infinity;
+
+                    if (lastDiff < 30000) return;
+
                     if (user.role === "pending") return;
 
                     const deviceInfo = getDeviceDetails(session.userAgent);
@@ -605,7 +616,8 @@ export const checkSlugOrganization = async (slug: string) => {
         });
 
         return status;
-    } catch {}
+    } catch {
+    }
 };
 
 export const getActiveMember = async () => {
@@ -628,5 +640,6 @@ export const setActiveOrganization = async (slug: string) => {
                 organizationSlug: slug,
             },
         });
-    } catch  {}
+    } catch {
+    }
 };

src/lib/tasks/cleaning/index.ts

@@ -0,0 +1,28 @@
+import {db} from "@/db";
+import {and, eq, isNotNull, isNull} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {withUpdatedAt} from "@/db/utils";
+
+export const backupCleanTask = async () => {
+    try {
+        const backups = await db.query.backup.findMany({
+            where: and(
+                isNotNull(drizzleDb.schemas.backup.deletedAt),
+                eq(drizzleDb.schemas.backup.status, "ongoing")
+            )
+        });
+
+        console.log(`Backups to clean: ${backups.length}`);
+
+        for (const backup of backups) {
+            await db.update(drizzleDb.schemas.backup).set(withUpdatedAt({
+                status: "failed",
+            }))
+                .where(eq(drizzleDb.schemas.backup.id, backup.id));
+        }
+
+    } catch (e: any) {
+        console.error("Backup cleanup failed:", e);
+        throw e;
+    }
+};

src/lib/tasks/database/utils/delete.ts

@@ -70,6 +70,8 @@ export const deleteBackupCronAction = action
                 .update(drizzleDb.schemas.backup)
                 .set(withUpdatedAt({
                     deletedAt: new Date(),
+                    status: backup.status == "ongoing" ? "failed" : backup.status
+
                 }))
                 .where(and(eq(drizzleDb.schemas.backup.id, parsedInput.backupId), eq(drizzleDb.schemas.backup.databaseId, parsedInput.databaseId)))
 

src/lib/tasks/index.ts

@@ -1,6 +1,7 @@
 import cron from "node-cron";
 import {retentionCleanTask} from "@/lib/tasks/database";
 import {env} from "@/env.mjs";
+import {backupCleanTask} from "@/lib/tasks/cleaning";
 
 
 export const retentionJob = cron.schedule(env.RETENTION_CRON, async () => {
@@ -10,4 +11,13 @@ export const retentionJob = cron.schedule(env.RETENTION_CRON, async () => {
     } catch (err) {
         console.error(`[CRON] Error:`, err);
     }
+});
+
+export const cleaningJob = cron.schedule("* * * * *", async () => {
+    try {
+        console.log("Cleaning Job : Starting task");
+        await backupCleanTask();
+    } catch (err) {
+        console.error(`[CRON] Error:`, err);
+    }
 });