feat: support role

hiroppy · Feb 16, 2024 · 3731665 · 3731665
1 parent f8bf3fc
commit 3731665
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 44 deletions.
diff --git a/e2e/globalSetup.ts b/e2e/globalSetup.ts
@@ -14,6 +14,7 @@ export default async function globalSetup(config: FullConfig) {
       name: NAME,
       image: IMAGE,
       email: EMAIL,
+      role: "user",
       sessions: {
         create: {
           expires: new Date(

diff --git a/prisma/ERD.md b/prisma/ERD.md
@@ -3,27 +3,31 @@ erDiagram
 
   "accounts" {
     String id "🗝️"
-    String user_id 
-    String type 
-    String provider 
-    String provider_account_id 
+    String user_id
+    String type
+    String provider
+    String provider_account_id
     String refresh_token "❓"
     String access_token "❓"
     Int expires_at "❓"
     String token_type "❓"
     String scope "❓"
     String id_token "❓"
     String session_state "❓"
+    DateTime created_at
+    DateTime updated_at
     }
-  
+
 
   "sessions" {
     String id "🗝️"
-    String session_token 
-    String userId 
-    DateTime expires 
+    String session_token
+    String user_id
+    DateTime expires
+    DateTime created_at
+    DateTime updated_at
     }
-  
+
 
   "users" {
     String id "🗝️"
@@ -32,26 +36,29 @@ erDiagram
     DateTime email_verified "❓"
     String image "❓"
     String website "❓"
-    DateTime created_at "❓"
-    DateTime updated_at "❓"
+    DateTime created_at
+    DateTime updated_at
+    String role "❓"
     }
-  
+
 
   "verificationtokens" {
-    String identifier 
-    String token 
-    DateTime expires 
+    String identifier
+    String token
+    DateTime expires
+    DateTime created_at
+    DateTime updated_at
     }
-  
+
 
   "items" {
     String id "🗝️"
-    DateTime createdAt 
-    DateTime updatedAt 
-    String content 
-    String userId 
+    String content
+    String userId
+    DateTime created_at
+    DateTime updated_at
     }
-  
+
     "accounts" o|--|| "users" : "user"
     "sessions" o|--|| "users" : "user"
     "users" o{--}o "accounts" : "accounts"

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -11,27 +11,29 @@ generator client {
 }
 
 generator erd {
-  provider = "prisma-erd-generator"
-  theme = "forest"
-  output = "ERD.md"
+  provider                  = "prisma-erd-generator"
+  theme                     = "forest"
+  output                    = "ERD.md"
   includeRelationFromFields = true
 }
 
 // https://next-auth.js.org/v3/adapters/prisma#setup
 model Account {
-  id                String  @id @default(cuid())
-  userId            String  @map("user_id")
+  id                String   @id @default(cuid())
+  userId            String   @map("user_id")
   type              String
   provider          String
-  providerAccountId String  @map("provider_account_id")
-  refresh_token     String? @db.Text
-  access_token      String? @db.Text
+  providerAccountId String   @map("provider_account_id")
+  refresh_token     String?  @db.Text
+  access_token      String?  @db.Text
   expires_at        Int?
   token_type        String?
   scope             String?
-  id_token          String? @db.Text
+  id_token          String?  @db.Text
   session_state     String?
-  user              User    @relation(fields: [userId], references: [id], onDelete: Cascade)
+  user              User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  createdAt         DateTime @default(now()) @map("created_at")
+  updatedAt         DateTime @updatedAt @map("updated_at")
 
   @@unique([provider, providerAccountId])
   @@map("accounts")
@@ -40,9 +42,11 @@ model Account {
 model Session {
   id           String   @id @default(cuid())
   sessionToken String   @unique @map("session_token")
-  userId       String
+  userId       String   @map("user_id")
   expires      DateTime
   user         User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  createdAt    DateTime @default(now()) @map("created_at")
+  updatedAt    DateTime @updatedAt @map("updated_at")
 
   @@map("sessions")
 }
@@ -54,10 +58,12 @@ model User {
   emailVerified DateTime? @map("email_verified")
   image         String?
   website       String?
-  created_at    DateTime?
-  updated_at    DateTime?
   accounts      Account[]
   sessions      Session[]
+  createdAt     DateTime  @default(now()) @map("created_at")
+  updatedAt     DateTime  @updatedAt @map("updated_at")
+  // https://authjs.dev/guides/basics/role-based-access-control
+  role          String?
   items         Item[]
 
   @@map("users")
@@ -67,18 +73,21 @@ model VerificationToken {
   identifier String
   token      String   @unique
   expires    DateTime
+  createdAt  DateTime @default(now()) @map("created_at")
+  updatedAt  DateTime @updatedAt @map("updated_at")
 
   @@unique([identifier, token])
   @@map("verificationtokens")
 }
 
+// example model
 model Item {
   id        String   @id @default(cuid())
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  content  String
+  content   String
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
   userId    String
+  createdAt DateTime @default(now()) @map("created_at")
+  updatedAt DateTime @updatedAt @map("updated_at")
 
   @@map("items")
 }
diff --git a/src/app/_clients/nextAuth.ts b/src/app/_clients/nextAuth.ts
@@ -13,6 +13,15 @@ export const options: NextAuthOptions = {
     GoogleProvider({
       clientId: process.env.GOOGLE_CLIENT_ID || "",
       clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
+      profile(profile) {
+        return {
+          id: profile.sub,
+          name: profile.name,
+          email: profile.email,
+          image: profile.picture,
+          role: profile.role ?? "user",
+        };
+      },
     }),
   ],
   callbacks: {
@@ -22,14 +31,10 @@ export const options: NextAuthOptions = {
     session: async ({ session, token, user, trigger, newSession }) => {
       if (session?.user) {
         session.user.id = user.id;
+        session.user.role = user.role;
       }
 
-      return {
-        ...session,
-        user: {
-          ...session.user,
-        },
-      };
+      return session;
     },
   },
 };
diff --git a/src/app/globals.d.ts b/src/app/globals.d.ts
@@ -13,7 +13,12 @@ declare global {
 }
 
 declare module "next-auth" {
+  interface User {
+    id: string;
+    role: "user" | "admin";
+  }
+
   interface Session {
-    user?: DefaultUser & { id: string };
+    user: User;
   }
 }