server/storage.ts

@@ -56,7 +56,7 @@ import {
   type InsertCcnlSetting,
 } from "@shared/schema";
 import { db } from "./db";
-import { eq, and, gte, lte, desc, or } from "drizzle-orm";
+import { eq, and, gte, lte, desc } from "drizzle-orm";
 
 export interface IStorage {
   // User operations (Replit Auth required)
@@ -163,40 +163,23 @@ export class DatabaseStorage implements IStorage {
   }
 
   async upsertUser(userData: UpsertUser): Promise<User> {
-    // Handle conflicts on both id (primary key) and email (unique constraint)
-    // Check if user exists by id or email first
-    const existingUser = await db
-      .select()
-      .from(users)
-      .where(
-        userData.id 
-          ? or(eq(users.id, userData.id), eq(users.email, userData.email || ''))
-          : eq(users.email, userData.email || '')
-      )
-      .limit(1);
-
-    if (existingUser.length > 0) {
-      // Update existing user - NEVER change the ID (it's a primary key)
-      const [updated] = await db
-        .update(users)
-        .set({
-          ...(userData.email && { email: userData.email }),
-          ...(userData.name && { name: userData.name }),
-          ...(userData.role && { role: userData.role }),
-          updatedAt: new Date(),
-        })
-        .where(eq(users.id, existingUser[0].id))
-        .returning();
-      return updated;
-    } else {
-      // Insert new user
+    // Use onConflictDoUpdate to handle both insert and update cases
+    // This handles conflicts on both id (primary key) and email (unique constraint)
     const [user] = await db
       .insert(users)
       .values(userData)
+      .onConflictDoUpdate({
+        target: users.id,
+        set: {
+          email: userData.email,
+          name: userData.name,
+          role: userData.role,
+          updatedAt: new Date(),
+        },
+      })
       .returning();
     return user;
   }
-  }
 
   async getAllUsers(): Promise<User[]> {
     return await db.select().from(users).orderBy(desc(users.createdAt));

version.json

@@ -1,13 +1,7 @@
 {
-  "version": "1.0.22",
-  "lastUpdate": "2025-10-18T08:27:14.297Z",
+  "version": "1.0.21",
+  "lastUpdate": "2025-10-18T08:18:27.659Z",
   "changelog": [
-    {
-      "version": "1.0.22",
-      "date": "2025-10-18",
-      "type": "patch",
-      "description": "Deployment automatico v1.0.22"
-    },
     {
       "version": "1.0.21",
       "date": "2025-10-18",