replace NOW() with more robust check

netlify/functions/infrastructure/database/DatabaseService.ts

···
   async cleanupExpiredSessions(): Promise<void> {
     try {
       const statesDeleted = await this
-        .sql`DELETE FROM oauth_states WHERE expires_at < NOW()`;
+        .sql`DELETE FROM oauth_states WHERE expires_at < ${new Date().toISOString()}`;
       const sessionsDeleted = await this
-        .sql`DELETE FROM oauth_sessions WHERE expires_at < NOW()`;
+        .sql`DELETE FROM oauth_sessions WHERE expires_at < ${new Date().toISOString()}`;
       const userSessionsDeleted = await this
-        .sql`DELETE FROM user_sessions WHERE expires_at < NOW()`;
+        .sql`DELETE FROM user_sessions WHERE expires_at < ${new Date().toISOString()}`;
 
       console.log("🧹 Cleanup:", {
         states: (statesDeleted as any).length,

netlify/functions/infrastructure/oauth/stores/SessionStore.ts

···
   async get(key: string): Promise<SessionData | undefined> {
     const result = await this.sql`
       SELECT data FROM oauth_sessions
-      WHERE key = ${key} AND expires_at > NOW()
+      WHERE key = ${key} AND expires_at > ${new Date().toISOString()}
     `;
     const rows = result as OAuthSessionRow[];
 

netlify/functions/infrastructure/oauth/stores/StateStore.ts

···
   async get(key: string): Promise<StateData | undefined> {
     const result = await this.sql`
       SELECT data FROM oauth_states
-      WHERE key = ${key} AND expires_at > NOW()
+      WHERE key = ${key} AND expires_at > ${new Date().toISOString()}
     `;
     const rows = result as OAuthStateRow[];
 

netlify/functions/infrastructure/oauth/stores/UserSessionStore.ts

···
   private sql = getDbClient();
 
   async get(sessionId: string): Promise<UserSessionData | undefined> {
-    const result = await this.sql`
-      SELECT did, fingerprint FROM user_sessions
-      WHERE session_id = ${sessionId} AND expires_at > NOW()
-    `;
-    const rows = result as UserSessionRow[];
-    return rows[0]
-      ? { did: rows[0].did, fingerprint: rows[0].fingerprint }
-      : undefined;
+    const fetchSession = async () => {
+      const result = await this.sql`
+            SELECT did FROM user_sessions
+            WHERE session_id = ${sessionId} AND expires_at > ${new Date().toISOString()}
+          `;
+      const rows = result as UserSessionRow[];
+      return rows[0] ? { did: rows[0].did } : undefined;
+    };
+
+    // Try once, if not found retry twice with small delays
+    let session = await fetchSession();
+
+    if (!session) {
+      console.log(
+        `[UserSessionStore] Session ${sessionId} not found, retrying...`,
+      );
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      session = await fetchSession();
+    }
+
+    if (!session) {
+      console.log(
+        `[UserSessionStore] Session ${sessionId} still not found, final retry...`,
+      );
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      session = await fetchSession();
+    }
+
+    return session;
   }
 
   async set(sessionId: string, data: UserSessionData): Promise<void> {

netlify/functions/oauth-callback.ts

···
   const isDev = config.clientType === "loopback";
 
   let currentUrl = isDev
-    ? "http://127.0.0.1:8888"
+    ? config.redirectUri.replace("/.netlify/functions/oauth-callback", "")
     : config.redirectUri.replace("/.netlify/functions/oauth-callback", "");
 
   const params = new URLSearchParams(event.rawUrl.split("?")[1] || "");