diff --git a/Websites/jefes-nextjs/app/api/auth/[...nextauth]/route.ts b/Websites/jefes-nextjs/app/api/auth/[...nextauth]/route.ts index 89581c1..6f5df4a 100644 --- a/Websites/jefes-nextjs/app/api/auth/[...nextauth]/route.ts +++ b/Websites/jefes-nextjs/app/api/auth/[...nextauth]/route.ts @@ -43,7 +43,7 @@ const handler = NextAuth({ console.log({ passwordCheck }); if (passwordCheck) { - return users; + return response[0]; } return null; }, diff --git a/Websites/jefes-nextjs/db/schema.ts b/Websites/jefes-nextjs/db/schema.ts index ac902b3..bfbd65f 100644 --- a/Websites/jefes-nextjs/db/schema.ts +++ b/Websites/jefes-nextjs/db/schema.ts @@ -1,23 +1,24 @@ // db/schema.ts // pnpm drizzle-kit generate:mysql // pnpm tsx db/migrate.ts -// import { -// index, -// int, -// mysqlTable, -// bigint, -// varchar, -// timestamp, -// mysqlSchema, -// } from "drizzle-orm/mysql-core"; +import { + index, + int, + mysqlTable, + bigint, + varchar, + timestamp, + mysqlSchema, +} from "drizzle-orm/mysql-core"; // export const mySchema = mysqlSchema("drizzle_jefes") for creating a new db -// export const users = mysqlTable("users", { -// id: int("id").primaryKey().autoincrement(), -// email: varchar("email", { length: 256 }).notNull(), -// password: varchar("password", { length: 256 }).notNull(), -// }); +export const users = mysqlTable("users", { + // id: int("id").primaryKey().autoincrement(), + id: varchar("id", { length: 255 }).notNull().primaryKey(), + email: varchar("email", { length: 256 }).notNull(), + password: varchar("password", { length: 256 }).notNull(), +}); // export const menuItems = mysqlTable("menu_item", { // id: bigint("id", { mode: "number" }).primaryKey().autoincrement(), @@ -25,66 +26,66 @@ // itemDescription: varchar("item_description", { length: 256 }), // }); -import { - int, - timestamp, - mysqlTable, - primaryKey, - varchar, -} from "drizzle-orm/mysql-core"; -import type { AdapterAccount } from "@auth/core/adapters"; +// import { +// int, +// timestamp, +// mysqlTable, +// primaryKey, +// varchar, +// } from "drizzle-orm/mysql-core"; +// import type { AdapterAccount } from "@auth/core/adapters"; -export const users = mysqlTable("user", { - id: varchar("id", { length: 255 }).notNull().primaryKey(), - name: varchar("name", { length: 255 }), - email: varchar("email", { length: 255 }).notNull(), - emailVerified: timestamp("emailVerified", { - mode: "date", - fsp: 3, - }).defaultNow(), - image: varchar("image", { length: 255 }), -}); +// export const users = mysqlTable("user", { +// id: varchar("id", { length: 255 }).notNull().primaryKey(), +// name: varchar("name", { length: 255 }), +// email: varchar("email", { length: 255 }).notNull(), +// emailVerified: timestamp("emailVerified", { +// mode: "date", +// fsp: 3, +// }).defaultNow(), +// image: varchar("image", { length: 255 }), +// }); -export const accounts = mysqlTable( - "account", - { - userId: varchar("userId", { length: 255 }) - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - type: varchar("type", { length: 255 }) - .$type() - .notNull(), - provider: varchar("provider", { length: 255 }).notNull(), - providerAccountId: varchar("providerAccountId", { length: 255 }).notNull(), - refresh_token: varchar("refresh_token", { length: 255 }), - access_token: varchar("access_token", { length: 255 }), - expires_at: int("expires_at"), - token_type: varchar("token_type", { length: 255 }), - scope: varchar("scope", { length: 255 }), - id_token: varchar("id_token", { length: 2048 }), - session_state: varchar("session_state", { length: 255 }), - }, - (account) => ({ - compoundKey: primaryKey(account.provider, account.providerAccountId), - }) -); +// export const accounts = mysqlTable( +// "account", +// { +// userId: varchar("userId", { length: 255 }) +// .notNull() +// .references(() => users.id, { onDelete: "cascade" }), +// type: varchar("type", { length: 255 }) +// .$type() +// .notNull(), +// provider: varchar("provider", { length: 255 }).notNull(), +// providerAccountId: varchar("providerAccountId", { length: 255 }).notNull(), +// refresh_token: varchar("refresh_token", { length: 255 }), +// access_token: varchar("access_token", { length: 255 }), +// expires_at: int("expires_at"), +// token_type: varchar("token_type", { length: 255 }), +// scope: varchar("scope", { length: 255 }), +// id_token: varchar("id_token", { length: 2048 }), +// session_state: varchar("session_state", { length: 255 }), +// }, +// (account) => ({ +// compoundKey: primaryKey(account.provider, account.providerAccountId), +// }) +// ); -export const sessions = mysqlTable("session", { - sessionToken: varchar("sessionToken", { length: 255 }).notNull().primaryKey(), - userId: varchar("userId", { length: 255 }) - .notNull() - .references(() => users.id, { onDelete: "cascade" }), - expires: timestamp("expires", { mode: "date" }).notNull(), -}); +// export const sessions = mysqlTable("session", { +// sessionToken: varchar("sessionToken", { length: 255 }).notNull().primaryKey(), +// userId: varchar("userId", { length: 255 }) +// .notNull() +// .references(() => users.id, { onDelete: "cascade" }), +// expires: timestamp("expires", { mode: "date" }).notNull(), +// }); -export const verificationTokens = mysqlTable( - "verificationToken", - { - identifier: varchar("identifier", { length: 255 }).notNull(), - token: varchar("token", { length: 255 }).notNull(), - expires: timestamp("expires", { mode: "date" }).notNull(), - }, - (vt) => ({ - compoundKey: primaryKey(vt.identifier, vt.token), - }) -); +// export const verificationTokens = mysqlTable( +// "verificationToken", +// { +// identifier: varchar("identifier", { length: 255 }).notNull(), +// token: varchar("token", { length: 255 }).notNull(), +// expires: timestamp("expires", { mode: "date" }).notNull(), +// }, +// (vt) => ({ +// compoundKey: primaryKey(vt.identifier, vt.token), +// }) +// ); diff --git a/Websites/jefes-nextjs/drizzle/migrations/0000_charming_silhouette.sql b/Websites/jefes-nextjs/drizzle/migrations/0000_acoustic_kitty_pryde.sql similarity index 79% rename from Websites/jefes-nextjs/drizzle/migrations/0000_charming_silhouette.sql rename to Websites/jefes-nextjs/drizzle/migrations/0000_acoustic_kitty_pryde.sql index 9d045b8..5d1f771 100644 --- a/Websites/jefes-nextjs/drizzle/migrations/0000_charming_silhouette.sql +++ b/Websites/jefes-nextjs/drizzle/migrations/0000_acoustic_kitty_pryde.sql @@ -1,5 +1,5 @@ CREATE TABLE `users` ( - `id` int AUTO_INCREMENT NOT NULL, + `id` varchar(255) NOT NULL, `email` varchar(256) NOT NULL, `password` varchar(256) NOT NULL, CONSTRAINT `users_id` PRIMARY KEY(`id`) diff --git a/Websites/jefes-nextjs/drizzle/migrations/meta/0000_snapshot.json b/Websites/jefes-nextjs/drizzle/migrations/meta/0000_snapshot.json index 9e41c70..5a155f5 100644 --- a/Websites/jefes-nextjs/drizzle/migrations/meta/0000_snapshot.json +++ b/Websites/jefes-nextjs/drizzle/migrations/meta/0000_snapshot.json @@ -1,7 +1,7 @@ { "version": "5", "dialect": "mysql", - "id": "9e600bcf-c5c3-4ba9-9a1f-0d981d718812", + "id": "d0040233-edf3-434f-baa4-d49255b2e089", "prevId": "00000000-0000-0000-0000-000000000000", "tables": { "users": { @@ -9,10 +9,10 @@ "columns": { "id": { "name": "id", - "type": "int", + "type": "varchar(255)", "primaryKey": false, "notNull": true, - "autoincrement": true + "autoincrement": false }, "email": { "name": "email", diff --git a/Websites/jefes-nextjs/drizzle/migrations/meta/_journal.json b/Websites/jefes-nextjs/drizzle/migrations/meta/_journal.json index 636f1ce..5ae3875 100644 --- a/Websites/jefes-nextjs/drizzle/migrations/meta/_journal.json +++ b/Websites/jefes-nextjs/drizzle/migrations/meta/_journal.json @@ -5,8 +5,8 @@ { "idx": 0, "version": "5", - "when": 1702012909346, - "tag": "0000_charming_silhouette", + "when": 1702017992075, + "tag": "0000_acoustic_kitty_pryde", "breakpoints": true } ]