Merge pull request #71 from wtfdivyansh/feature/authentication

update auth to better-auth v1
plura-ai · Nov 26, 2024 · 778ca58 · 778ca58
2 parents cdd9ef8 + f9c6646
commit 778ca58
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 37 deletions.
diff --git a/apps/www/components/custom/account-switcher.tsx b/apps/www/components/custom/account-switcher.tsx
@@ -1,17 +1,18 @@
 "use client";
 import { authClient } from "@/lib/auth-client";
 import { Session } from "@repo/auth";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
 interface Props {
   session: Session[] | null;
   activeSession: Session | null;
 }
 export default function AccountSwitcher({ session, activeSession }: Props) {
   const router = useRouter();
-  const onSelect = async (sessionId: string) => {
-    console.log(sessionId);
+  const onSelect = async (token: string) => {
+    console.log(token);
     const active = await authClient.multiSession.setActive({
-      sessionId: sessionId,
+      sessionToken: token,
     });
 
     console.log(active);
@@ -29,20 +30,27 @@ export default function AccountSwitcher({ session, activeSession }: Props) {
       },
     });
   };
+
   if (!activeSession || !session) {
     return <div>loading sessions</div>;
   }
+   const handleCurrentSignOut = async () => {
+     await authClient.multiSession.revoke({
+       sessionToken: activeSession?.session.token
+     });
+     window.location.reload();
+   };
   return (
     <div className="flex items-center justify-center gap-2 p-4">
       <select
         onChange={(e) => onSelect(e.target.value)}
-        value={activeSession.session.id}
+        value={activeSession.session.token}
         className="border-2 border-gray-300[0.3] rounded-md p-2"
       >
         {session.map((item) => {
           return (
-            <option key={item.session.id} value={item.session.id}>
-              {item.user.name}{" "}
+            <option key={item.session.id} value={item.session.token}>
+              {item.user.name}
             </option>
           );
         })}
@@ -51,8 +59,19 @@ export default function AccountSwitcher({ session, activeSession }: Props) {
         className="flex border border-neutral-900[0.2] bg-neutral-900/60 p-2"
         onClick={handleSignOut}
       >
-        logout
+        Logout from all
       </div>
+      <div
+        className="flex border border-neutral-900[0.2] bg-neutral-900/60 p-2"
+        onClick={handleCurrentSignOut}
+      >
+        Logout
+      </div>
+      <Link href={"/auth"}>
+        <div className="flex border border-neutral-900[0.2] bg-neutral-900/60 p-2">
+          Add Account
+        </div>
+      </Link>
     </div>
   );
 }
diff --git a/apps/www/package.json b/apps/www/package.json
@@ -30,7 +30,7 @@
     "@repo/db": "workspace:*",
     "@repo/types": "workspace:*",
     "@tabler/icons-react": "^3.21.0",
-    "better-auth": "0.8.1-beta.1",
+    "better-auth": "1.0.5",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "contentlayer2": "^0.5.3",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -10,9 +10,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@repo/typescript-config": "workspace:*",
     "@repo/db": "workspace:*",
-    "better-auth": "0.8.6-beta.4",
+    "@repo/typescript-config": "workspace:*",
+    "better-auth": "1.0.5",
     "better-call": "0.2.14-beta.3",
     "oslo": "^1.2.1"
   }

diff --git a/packages/auth/tsconfig.json b/packages/auth/tsconfig.json
@@ -1,5 +1,5 @@
 {
   "extends": "@repo/typescript-config/base.json",
   "include": ["src", "*.ts"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
 }
diff --git a/packages/database/prisma/migrations/20241126154111_final_auth/migration.sql b/packages/database/prisma/migrations/20241126154111_final_auth/migration.sql
@@ -0,0 +1,31 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `expiresAt` on the `account` table. All the data in the column will be lost.
+  - A unique constraint covering the columns `[token]` on the table `session` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `createdAt` to the `account` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `updatedAt` to the `account` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `createdAt` to the `session` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `token` to the `session` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `updatedAt` to the `session` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "account" DROP COLUMN "expiresAt",
+ADD COLUMN     "accessTokenExpiresAt" TIMESTAMP(3),
+ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL,
+ADD COLUMN     "refreshTokenExpiresAt" TIMESTAMP(3),
+ADD COLUMN     "scope" TEXT,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL;
+
+-- AlterTable
+ALTER TABLE "session" ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL,
+ADD COLUMN     "token" TEXT NOT NULL,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL;
+
+-- AlterTable
+ALTER TABLE "verification" ADD COLUMN     "updatedAt" TIMESTAMP(3),
+ALTER COLUMN "createdAt" DROP NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "session_token_key" ON "session"("token");
diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma
@@ -17,8 +17,8 @@ model User {
   image         String?
   createdAt     DateTime
   updatedAt     DateTime
-  accounts      Account[]
   sessions      Session[]
+  accounts      Account[]
 
   @@unique([email])
   @@map("user")
@@ -27,35 +27,44 @@ model User {
 model Session {
   id        String   @id
   expiresAt DateTime
+  token     String
+  createdAt DateTime
+  updatedAt DateTime
   ipAddress String?
   userAgent String?
   userId    String
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
+  @@unique([token])
   @@map("session")
 }
 
 model Account {
-  id           String    @id
-  accountId    String
-  providerId   String
-  userId       String
-  user         User      @relation(fields: [userId], references: [id], onDelete: Cascade)
-  accessToken  String?
-  refreshToken String?
-  idToken      String?
-  expiresAt    DateTime?
-  password     String?
+  id                    String    @id
+  accountId             String
+  providerId            String
+  userId                String
+  user                  User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  accessToken           String?
+  refreshToken          String?
+  idToken               String?
+  accessTokenExpiresAt  DateTime?
+  refreshTokenExpiresAt DateTime?
+  scope                 String?
+  password              String?
+  createdAt             DateTime
+  updatedAt             DateTime
 
   @@map("account")
 }
 
 model Verification {
-  id         String   @id
+  id         String    @id
   identifier String
   value      String
   expiresAt  DateTime
-  createdAt  DateTime
+  createdAt  DateTime?
+  updatedAt  DateTime?
 
   @@map("verification")
 }
@@ -65,5 +74,4 @@ model Trigger {
   name          String
   email         String
   emailVerified Boolean
-
 }
diff --git a/packages/typescript-config/base.json b/packages/typescript-config/base.json
@@ -14,6 +14,6 @@
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "strict": true,
-    "target": "ES2022"
+    "target": "ES2022",
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml