From 1313a458791926e781b6b440d4be8abf5170b26c Mon Sep 17 00:00:00 2001
From: Manus Sandbox <sandbox@manus.ai>
Date: Wed, 19 Nov 2025 08:34:55 -0500
Subject: [PATCH] Rollback to a1d67c74

---
 client/src/const.ts                |  11 -
 client/src/pages/Login.tsx         |  22 +-
 drizzle/0011_talented_toad_men.sql |   3 -
 drizzle/meta/0011_snapshot.json    | 793 -----------------------------
 drizzle/meta/_journal.json         |   7 -
 drizzle/schema.ts                  |   6 +-
 server/_core/context.ts            |  21 +-
 server/_core/oauth.ts              |  15 +-
 server/db.ts                       |  80 ---
 todo.md                            |  15 -
 10 files changed, 11 insertions(+), 962 deletions(-)
 delete mode 100644 drizzle/0011_talented_toad_men.sql
 delete mode 100644 drizzle/meta/0011_snapshot.json

diff --git a/client/src/const.ts b/client/src/const.ts
index 68fbec9..414e678 100644
--- a/client/src/const.ts
+++ b/client/src/const.ts
@@ -6,14 +6,3 @@ export const APP_LOGO = "https://placehold.co/128x128/E1E7EF/1F2937?text=App";
 
 // Retourne l'URL de la page de connexion locale
 export const getLoginUrl = () => "/login";
-
-// Retourne l'URL de connexion OAuth Manus
-export const getOAuthLoginUrl = () => {
-  const appId = import.meta.env.VITE_APP_ID;
-  const portalUrl = import.meta.env.VITE_OAUTH_PORTAL_URL;
-  // Toujours rediriger vers /admin après OAuth
-  const redirectAfterAuth = `${window.location.origin}/admin`;
-  const redirectUri = `${window.location.origin}/api/oauth/callback`;
-  const state = btoa(redirectAfterAuth);
-  return `${portalUrl}?appId=${appId}&redirectUri=${encodeURIComponent(redirectUri)}&state=${encodeURIComponent(state)}&responseType=code`;
-};
diff --git a/client/src/pages/Login.tsx b/client/src/pages/Login.tsx
index 89ab129..928cf3e 100644
--- a/client/src/pages/Login.tsx
+++ b/client/src/pages/Login.tsx
@@ -6,7 +6,7 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
 import { Alert, AlertDescription } from "@/components/ui/alert";
-import { APP_LOGO, APP_TITLE, getOAuthLoginUrl } from "@/const";
+import { APP_LOGO, APP_TITLE } from "@/const";
 import { Loader2 } from "lucide-react";
 
 export default function Login() {
@@ -102,26 +102,6 @@ export default function Login() {
               Se connecter
             </Button>
 
-            <div className="relative">
-              <div className="absolute inset-0 flex items-center">
-                <span className="w-full border-t" />
-              </div>
-              <div className="relative flex justify-center text-xs uppercase">
-                <span className="bg-background px-2 text-muted-foreground">
-                  Ou
-                </span>
-              </div>
-            </div>
-
-            <Button
-              type="button"
-              variant="outline"
-              className="w-full"
-              onClick={() => window.location.href = getOAuthLoginUrl()}
-            >
-              Se connecter avec Manus OAuth
-            </Button>
-
             <div className="text-sm text-center text-muted-foreground">
               Pas encore de compte ?{" "}
               <button
diff --git a/drizzle/0011_talented_toad_men.sql b/drizzle/0011_talented_toad_men.sql
deleted file mode 100644
index 3beec54..0000000
--- a/drizzle/0011_talented_toad_men.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `users` MODIFY COLUMN `password` varchar(255);--> statement-breakpoint
-ALTER TABLE `users` ADD `openId` varchar(64);--> statement-breakpoint
-ALTER TABLE `users` ADD CONSTRAINT `users_openId_unique` UNIQUE(`openId`);
\ No newline at end of file
diff --git a/drizzle/meta/0011_snapshot.json b/drizzle/meta/0011_snapshot.json
deleted file mode 100644
index 0138615..0000000
--- a/drizzle/meta/0011_snapshot.json
+++ /dev/null
@@ -1,793 +0,0 @@
-{
-  "version": "5",
-  "dialect": "mysql",
-  "id": "f5aefc56-4bb4-42a1-a7f3-2b872c62eb11",
-  "prevId": "e34c8fec-5308-4ce7-b687-d27c3093036c",
-  "tables": {
-    "apprenants": {
-      "name": "apprenants",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "nom": {
-          "name": "nom",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "prenom": {
-          "name": "prenom",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "varchar(320)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "codeEtablissement": {
-          "name": "codeEtablissement",
-          "type": "varchar(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "fonction": {
-          "name": "fonction",
-          "type": "enum('directeur','chef_service','autre')",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "apprenants_id": {
-          "name": "apprenants_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "apprenants_email_unique": {
-          "name": "apprenants_email_unique",
-          "columns": [
-            "email"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "datesFormation": {
-      "name": "datesFormation",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "sequenceId": {
-          "name": "sequenceId",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dateDebut": {
-          "name": "dateDebut",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dateFin": {
-          "name": "dateFin",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ordre": {
-          "name": "ordre",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "datesFormation_id": {
-          "name": "datesFormation_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "emailConfig": {
-      "name": "emailConfig",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "provider": {
-          "name": "provider",
-          "type": "varchar(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'resend'"
-        },
-        "apiKey": {
-          "name": "apiKey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "fromEmail": {
-          "name": "fromEmail",
-          "type": "varchar(320)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "fromName": {
-          "name": "fromName",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'Formation Manager Itinova'"
-        },
-        "mode": {
-          "name": "mode",
-          "type": "enum('simulation','production')",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'simulation'"
-        },
-        "domainVerified": {
-          "name": "domainVerified",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "active": {
-          "name": "active",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "emailConfig_id": {
-          "name": "emailConfig_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "emailTemplates": {
-      "name": "emailTemplates",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "type": {
-          "name": "type",
-          "type": "varchar(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "logoUrl": {
-          "name": "logoUrl",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "primaryColor": {
-          "name": "primaryColor",
-          "type": "varchar(7)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'#2563eb'"
-        },
-        "headerBgColor": {
-          "name": "headerBgColor",
-          "type": "varchar(7)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'#2563eb'"
-        },
-        "headerTextColor": {
-          "name": "headerTextColor",
-          "type": "varchar(7)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'#ffffff'"
-        },
-        "headerTitle": {
-          "name": "headerTitle",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'Formation Manager Itinova'"
-        },
-        "footerText": {
-          "name": "footerText",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "active": {
-          "name": "active",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "emailTemplates_id": {
-          "name": "emailTemplates_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "emailTemplates_type_unique": {
-          "name": "emailTemplates_type_unique",
-          "columns": [
-            "type"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "formations": {
-      "name": "formations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "nom": {
-          "name": "nom",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "lienUnique": {
-          "name": "lienUnique",
-          "type": "varchar(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "actif": {
-          "name": "actif",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "formations_id": {
-          "name": "formations_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "formations_lienUnique_unique": {
-          "name": "formations_lienUnique_unique",
-          "columns": [
-            "lienUnique"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "inscriptions": {
-      "name": "inscriptions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "apprenantId": {
-          "name": "apprenantId",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sequenceId": {
-          "name": "sequenceId",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "statut": {
-          "name": "statut",
-          "type": "enum('confirmee','liste_attente','annulee')",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dateInscription": {
-          "name": "dateInscription",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "inscriptions_id": {
-          "name": "inscriptions_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "passwordResetTokens": {
-      "name": "passwordResetTokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "userId": {
-          "name": "userId",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "used": {
-          "name": "used",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "passwordResetTokens_id": {
-          "name": "passwordResetTokens_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "passwordResetTokens_token_unique": {
-          "name": "passwordResetTokens_token_unique",
-          "columns": [
-            "token"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "sequences": {
-      "name": "sequences",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "formationId": {
-          "name": "formationId",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "nom": {
-          "name": "nom",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "lieu": {
-          "name": "lieu",
-          "type": "varchar(500)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "publicCible": {
-          "name": "publicCible",
-          "type": "enum('directeur','chef_service','autre')",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "capaciteMax": {
-          "name": "capaciteMax",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 12
-        },
-        "dateBlocage": {
-          "name": "dateBlocage",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "statut": {
-          "name": "statut",
-          "type": "enum('ouverte','bloquee','terminee')",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'ouverte'"
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "sequences_id": {
-          "name": "sequences_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "openId": {
-          "name": "openId",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "varchar(320)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "emailVerified": {
-          "name": "emailVerified",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "role": {
-          "name": "role",
-          "type": "enum('user','admin')",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'user'"
-        },
-        "isActive": {
-          "name": "isActive",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "lastSignedIn": {
-          "name": "lastSignedIn",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "users_id": {
-          "name": "users_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "users_openId_unique": {
-          "name": "users_openId_unique",
-          "columns": [
-            "openId"
-          ]
-        },
-        "users_email_unique": {
-          "name": "users_email_unique",
-          "columns": [
-            "email"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    }
-  },
-  "views": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "tables": {},
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
index df5d7b0..37d6a79 100644
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -78,13 +78,6 @@
       "when": 1763544545719,
       "tag": "0010_flat_clint_barton",
       "breakpoints": true
-    },
-    {
-      "idx": 11,
-      "version": "5",
-      "when": 1763553528196,
-      "tag": "0011_talented_toad_men",
-      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/drizzle/schema.ts b/drizzle/schema.ts
index 49af670..1acdefc 100644
--- a/drizzle/schema.ts
+++ b/drizzle/schema.ts
@@ -11,12 +11,10 @@ export const users = mysqlTable("users", {
    * Use this for relations between tables.
    */
   id: int("id").autoincrement().primaryKey(),
-  /** Identifiant OAuth Manus (optionnel, pour connexion OAuth) */
-  openId: varchar("openId", { length: 64 }).unique(),
   /** Email unique pour la connexion */
   email: varchar("email", { length: 320 }).notNull().unique(),
-  /** Mot de passe hashé avec bcrypt (optionnel, pour connexion locale) */
-  password: varchar("password", { length: 255 }),
+  /** Mot de passe hashé avec bcrypt */
+  password: varchar("password", { length: 255 }).notNull(),
   name: text("name"),
   /** Email vérifié ou non */
   emailVerified: boolean("emailVerified").default(false).notNull(),
diff --git a/server/_core/context.ts b/server/_core/context.ts
index a2be77c..744496d 100644
--- a/server/_core/context.ts
+++ b/server/_core/context.ts
@@ -1,9 +1,8 @@
 import type { CreateExpressContextOptions } from "@trpc/server/adapters/express";
 import type { User } from "../../drizzle/schema";
 import { verifyToken } from "./auth";
-import { getUserById, getUserByOpenId } from "../db";
+import { getUserById } from "../db";
 import { COOKIE_NAME } from "@shared/const";
-import { sdk } from "./sdk";
 
 export type TrpcContext = {
   req: CreateExpressContextOptions["req"];
@@ -29,18 +28,12 @@ export async function createContext(
     }
     
     if (token) {
-      // Essayer d'abord l'authentification locale (JWT avec userId)
-      try {
-        const decoded = verifyToken(token);
-        if (decoded && decoded.userId) {
-          user = await getUserById(decoded.userId) || null;
-        }
-      } catch (localAuthError) {
-        // Si l'authentification locale échoue, essayer OAuth
-        const session = await sdk.verifySession(token);
-        if (session && session.openId) {
-          user = await getUserByOpenId(session.openId) || null;
-        }
+      // Vérifier et décoder le token
+      const decoded = verifyToken(token);
+      
+      if (decoded) {
+        // Récupérer l'utilisateur depuis la base de données
+        user = await getUserById(decoded.userId) || null;
       }
     }
   } catch (error) {
diff --git a/server/_core/oauth.ts b/server/_core/oauth.ts
index 0ae8313..fd45373 100644
--- a/server/_core/oauth.ts
+++ b/server/_core/oauth.ts
@@ -44,20 +44,7 @@ export function registerOAuthRoutes(app: Express) {
       const cookieOptions = getSessionCookieOptions(req);
       res.cookie(COOKIE_NAME, sessionToken, { ...cookieOptions, maxAge: ONE_YEAR_MS });
 
-      // Décoder le state pour obtenir l'URL de redirection
-      let redirectUrl = "/";
-      try {
-        redirectUrl = Buffer.from(state, 'base64').toString('utf-8');
-        // Si c'est une URL complète, extraire seulement le path
-        if (redirectUrl.startsWith('http')) {
-          const url = new URL(redirectUrl);
-          redirectUrl = url.pathname;
-        }
-      } catch (error) {
-        console.warn("[OAuth] Failed to decode state, redirecting to /", error);
-      }
-
-      res.redirect(302, redirectUrl);
+      res.redirect(302, "/");
     } catch (error) {
       console.error("[OAuth] Callback failed", error);
       res.status(500).json({ error: "OAuth callback failed" });
diff --git a/server/db.ts b/server/db.ts
index 2163775..0c3466c 100644
--- a/server/db.ts
+++ b/server/db.ts
@@ -95,86 +95,6 @@ export async function getUserById(id: number) {
   return result.length > 0 ? result[0] : undefined;
 }
 
-/**
- * Récupère un utilisateur par son openId (OAuth)
- */
-export async function getUserByOpenId(openId: string) {
-  const db = await getDb();
-  if (!db) {
-    console.warn("[Database] Cannot get user: database not available");
-    return undefined;
-  }
-
-  const result = await db.select().from(users).where(eq(users.openId, openId)).limit(1);
-  return result.length > 0 ? result[0] : undefined;
-}
-
-/**
- * Crée ou met à jour un utilisateur OAuth
- */
-export async function upsertUser(user: InsertUser): Promise<void> {
-  if (!user.openId && !user.email) {
-    throw new Error("User openId or email is required for upsert");
-  }
-
-  const db = await getDb();
-  if (!db) {
-    console.warn("[Database] Cannot upsert user: database not available");
-    return;
-  }
-
-  try {
-    const values: InsertUser = {
-      openId: user.openId,
-      email: user.email || '',
-    };
-    const updateSet: Record<string, unknown> = {};
-
-    const textFields = ["name", "email"] as const;
-    type TextField = (typeof textFields)[number];
-
-    const assignNullable = (field: TextField) => {
-      const value = user[field];
-      if (value === undefined) return;
-      const normalized = value ?? null;
-      values[field] = normalized;
-      updateSet[field] = normalized;
-    };
-
-    textFields.forEach(assignNullable);
-
-    if (user.lastSignedIn !== undefined) {
-      values.lastSignedIn = user.lastSignedIn;
-      updateSet.lastSignedIn = user.lastSignedIn;
-    }
-    if (user.role !== undefined) {
-      values.role = user.role;
-      updateSet.role = user.role;
-    } else if (user.openId === ENV.ownerOpenId) {
-      values.role = 'admin';
-      updateSet.role = 'admin';
-    }
-
-    if (!values.lastSignedIn) {
-      values.lastSignedIn = new Date();
-    }
-
-    if (Object.keys(updateSet).length === 0) {
-      updateSet.lastSignedIn = new Date();
-    }
-
-    // Utiliser openId comme clé unique pour OAuth
-    if (user.openId) {
-      await db.insert(users).values(values).onDuplicateKeyUpdate({
-        set: updateSet,
-      });
-    }
-  } catch (error) {
-    console.error("[Database] Failed to upsert user:", error);
-    throw error;
-  }
-}
-
 /**
  * Met à jour le dernier login d'un utilisateur
  */
diff --git a/todo.md b/todo.md
index 6db74e4..f072830 100644
--- a/todo.md
+++ b/todo.md
@@ -290,18 +290,3 @@
 - [x] Modifier le client tRPC pour envoyer le token dans le header Authorization
 - [x] Tester la connexion dans l'environnement de preview Manus
 - [x] Vérifier que la solution fonctionne aussi en production
-
-## Cohabitation OAuth Manus + Authentification locale
-
-- [x] Modifier la page de connexion pour proposer les deux options (OAuth Manus et locale)
-- [x] Adapter le contexte tRPC pour gérer les deux types d'authentification (openId OAuth + userId local)
-- [x] Tester la connexion avec OAuth Manus
-- [x] Tester la connexion avec authentification locale
-- [x] Vérifier que les deux modes fonctionnent en production
-
-## Correction redirection OAuth
-
-- [x] Diagnostiquer pourquoi l'utilisateur est redirigé vers le tableau de bord Manus au lieu de l'application
-- [x] Vérifier la configuration de redirectUri dans le flux OAuth
-- [x] Corriger la redirection dans /api/oauth/callback pour revenir à l'application
-- [x] Tester le flux OAuth complet (clic sur bouton → auth Manus → retour à l'application)