EVERYTHING WORKING PERFECTLY

3 files changed, 21 insertions, 59 deletions

diff --git a/apps/web/src/server/auth.ts b/apps/web/src/server/auth.ts
index 3b8d749e..2a6f61b9 100644
--- a/apps/web/src/server/auth.ts
+++ b/apps/web/src/server/auth.ts
@@ -1,18 +1,17 @@
 import { env } from "@/env";
-import { DrizzleAdapter } from "@auth/drizzle-adapter";
-import NextAuth, { DefaultSession } from "next-auth";
-import { Adapter } from "next-auth/adapters";
+import NextAuth from "next-auth";
 import Google from "next-auth/providers/google";
+import { DrizzleAdapter } from "@auth/drizzle-adapter"
 import { db } from "./db";
-import { createTable } from "./db/schema";
 
 export const {
   handlers: { GET, POST },
   auth,
 } = NextAuth({
   secret: env.NEXTAUTH_SECRET,
+  trustHost: true,
   callbacks: {
-    session: ({session, token}) => ({
+    session: ({ session, token }) => ({
       ...session,
       user: {
         ...session.user,
@@ -21,17 +20,11 @@ export const {
       },
     })
   },
-  adapter: DrizzleAdapter(db, createTable) as Adapter,
+  adapter: DrizzleAdapter(db),
   providers: [
     Google({
       clientId: env.GOOGLE_CLIENT_ID,
       clientSecret: env.GOOGLE_CLIENT_SECRET,
-      authorization: {
-        params: {
-          prompt: "consent",
-          response_type: "code",
-        },
-      },
     }),
   ],
 });
diff --git a/apps/web/src/server/db/index.ts b/apps/web/src/server/db/index.ts
index bdfa2968..6eea27b2 100644
--- a/apps/web/src/server/db/index.ts
+++ b/apps/web/src/server/db/index.ts
@@ -2,7 +2,9 @@ import { drizzle } from 'drizzle-orm/d1';
 
 import * as schema from "./schema";
 
+console.log(process.env.DATABASE);
+
 export const db = drizzle(
-  process.env!.D1Database! as unknown as D1Database,
-  { schema }
+  process.env.DATABASE,
+  { schema, logger: true }
 );
diff --git a/apps/web/src/server/db/schema.ts b/apps/web/src/server/db/schema.ts
index 7de02f15..888445ae 100644
--- a/apps/web/src/server/db/schema.ts
+++ b/apps/web/src/server/db/schema.ts
@@ -14,50 +14,27 @@ import { type AdapterAccount } from "next-auth/adapters";
  *
  * @see https://orm.drizzle.team/docs/goodies#multi-project-schema
  */
-export const createTable = sqliteTableCreator((name) => `anycontext_${name}`);
-
-export const posts = createTable(
-  "post",
-  {
-    id: int("id", { mode: "number" }).primaryKey({ autoIncrement: true }),
-    name: text("name", { length: 256 }),
-    createdById: text("createdById", { length: 255 })
-      .notNull()
-      .references(() => users.id),
-    createdAt: int("created_at", { mode: "timestamp" })
-      .default(sql`CURRENT_TIMESTAMP`)
-      .notNull(),
-    updatedAt: int("updatedAt", { mode: "timestamp" }),
-  },
-  (example) => ({
-    createdByIdIdx: index("createdById_idx").on(example.createdById),
-    nameIndex: index("name_idx").on(example.name),
-  })
-);
+export const createTable = sqliteTableCreator((name) => `${name}`);
 
 export const users = createTable("user", {
   id: text("id", { length: 255 }).notNull().primaryKey(),
   name: text("name", { length: 255 }),
   email: text("email", { length: 255 }).notNull(),
-  emailVerified: int("emailVerified", {
-    mode: "timestamp",
-  }).default(sql`CURRENT_TIMESTAMP`),
+  emailVerified: int("emailVerified", { mode: "timestamp" }).default(sql`CURRENT_TIMESTAMP`),
   image: text("image", { length: 255 }),
 });
 
 export const usersRelations = relations(users, ({ many }) => ({
   accounts: many(accounts),
+  sessions: many(sessions),
 }));
 
 export const accounts = createTable(
   "account",
   {
-    userId: text("userId", { length: 255 })
-      .notNull()
-      .references(() => users.id),
-    type: text("type", { length: 255 })
-      .$type<AdapterAccount["type"]>()
-      .notNull(),
+    id: text("id", { length: 255 }).notNull().primaryKey(),
+    userId: text("userId", { length: 255 }).notNull().references(() => users.id),
+    type: text("type", { length: 255 }).notNull(),
     provider: text("provider", { length: 255 }).notNull(),
     providerAccountId: text("providerAccountId", { length: 255 }).notNull(),
     refresh_token: text("refresh_token"),
@@ -67,26 +44,20 @@ export const accounts = createTable(
     scope: text("scope", { length: 255 }),
     id_token: text("id_token"),
     session_state: text("session_state", { length: 255 }),
+    oauth_token_secret: text("oauth_token_secret"),
+    oauth_token: text("oauth_token"),
   },
   (account) => ({
-    compoundKey: primaryKey({
-      columns: [account.provider, account.providerAccountId],
-    }),
     userIdIdx: index("account_userId_idx").on(account.userId),
   })
 );
 
-export const accountsRelations = relations(accounts, ({ one }) => ({
-  user: one(users, { fields: [accounts.userId], references: [users.id] }),
-}));
-
 export const sessions = createTable(
   "session",
   {
-    sessionToken: text("sessionToken", { length: 255 }).notNull().primaryKey(),
-    userId: text("userId", { length: 255 })
-      .notNull()
-      .references(() => users.id),
+    id: text("id", { length: 255 }).notNull().primaryKey(),
+    sessionToken: text("sessionToken", { length: 255 }).notNull(),
+    userId: text("userId", { length: 255 }).notNull().references(() => users.id),
     expires: int("expires", { mode: "timestamp" }).notNull(),
   },
   (session) => ({
@@ -94,10 +65,6 @@ export const sessions = createTable(
   })
 );
 
-export const sessionsRelations = relations(sessions, ({ one }) => ({
-  user: one(users, { fields: [sessions.userId], references: [users.id] }),
-}));
-
 export const verificationTokens = createTable(
   "verificationToken",
   {
@@ -108,4 +75,4 @@ export const verificationTokens = createTable(
   (vt) => ({
     compoundKey: primaryKey({ columns: [vt.identifier, vt.token] }),
   })
-);
+);
\ No newline at end of file