Add admin user

SeeuSim · SeeuSim · commit c94dd71115a2 · 2024-11-07T16:53:24.000+08:00
Signed-off-by: SeeuSim &lt;seeusimong@gmail.com&gt;
diff --git a/backend/user/drizzle/0001_add_admin_user.sql b/backend/user/drizzle/0001_add_admin_user.sql
@@ -0,0 +1 @@
+ALTER TABLE "users" ADD COLUMN "is_admin" boolean DEFAULT false;
diff --git a/backend/user/drizzle/meta/0001_snapshot.json b/backend/user/drizzle/meta/0001_snapshot.json
@@ -0,0 +1,143 @@
+{
+  "id": "5293f5bb-f4d5-43a4-b2bf-f6ebb241dde1",
+  "prevId": "f01e3d91-1038-48b8-a073-a6a9a8a308fd",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.admin": {
+      "name": "admin",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "action": {
+          "name": "action",
+          "type": "action",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "password": {
+          "name": "password",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "failed_attempts": {
+          "name": "failed_attempts",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "unlock_time": {
+          "name": "unlock_time",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempted_questions": {
+          "name": "attempted_questions",
+          "type": "integer[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_admin": {
+          "name": "is_admin",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        },
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "username"
+          ]
+        }
+      }
+    }
+  },
+  "enums": {
+    "public.action": {
+      "name": "action",
+      "schema": "public",
+      "values": [
+        "SEED"
+      ]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/backend/user/drizzle/meta/_journal.json b/backend/user/drizzle/meta/_journal.json
@@ -8,6 +8,13 @@
       "when": 1728143079049,
       "tag": "0000_initial_schema",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "7",
+      "when": 1730968227580,
+      "tag": "0001_add_admin_user",
+      "breakpoints": true
     }
   ]
 }
diff --git a/backend/user/src/controllers/auth-check/index.ts b/backend/user/src/controllers/auth-check/index.ts
@@ -16,7 +16,7 @@ export const checkIsAuthed: IRouteHandler = async (req, res) => {
       '[/auth-check/check-is-authed]: Expires At ' + new Date(expireTimeInMillis).toLocaleString()
     );
     const user = await db
-      .select({ name: users.username })
+      .select({ name: users.username, isAdmin: users.isAdmin, email: users.email })
       .from(users)
       .where(eq(users.id, decoded.id))
       .limit(1);
@@ -25,6 +25,8 @@ export const checkIsAuthed: IRouteHandler = async (req, res) => {
       expiresAt: expireTimeInMillis,
       userId: decoded.id,
       username: user.length > 0 ? user[0].name : undefined,
+      email: user.length > 0 ? user[0].email : undefined,
+      isAdmin: user.length > 0 ? user[0].isAdmin : undefined,
     });
   }
 
diff --git a/backend/user/src/lib/db/schema.ts b/backend/user/src/lib/db/schema.ts
@@ -1,4 +1,13 @@
-import { integer, pgEnum, pgTable, smallint, timestamp, uuid, varchar } from 'drizzle-orm/pg-core';
+import {
+  boolean,
+  integer,
+  pgEnum,
+  pgTable,
+  smallint,
+  timestamp,
+  uuid,
+  varchar,
+} from 'drizzle-orm/pg-core';
 
 // Define the user table
 export const users = pgTable('users', {
@@ -11,6 +20,7 @@ export const users = pgTable('users', {
   failedAttempts: smallint('failed_attempts').default(0), // Failed counts
   unlockTime: timestamp('unlock_time', { precision: 6, withTimezone: true }), // If failed counts > limit, block all attempts until this time.
   attemptedQuestions: integer('attempted_questions').array(),
+  isAdmin: boolean('is_admin').default(false),
 });
 
 export const actionEnum = pgEnum('action', ['SEED']);
diff --git a/backend/user/src/lib/db/seed.ts b/backend/user/src/lib/db/seed.ts
@@ -1,10 +1,10 @@
-import { eq } from 'drizzle-orm';
+import { eq, InferInsertModel } from 'drizzle-orm';
 
 import { generatePasswordHash } from '@/lib/passwords';
 
 import { admin as adminTable, db, users as usersTable } from '.';
 
-const TEST_USER_CREDENTIALS = [
+const TEST_USER_CREDENTIALS: Array<InferInsertModel<typeof usersTable>> = [
   {
     username: 'testuser01',
     email: 'test_user_01@email.com',
@@ -19,6 +19,14 @@ const TEST_USER_CREDENTIALS = [
     lastName: 'user02',
     password: '123456789', // For local testing purposes
   },
+  {
+    username: 'adminuser01',
+    email: 'admin_user@email.com',
+    firstName: 'admin',
+    lastName: 'user01',
+    password: 'IamPeerprepAdmin!9',
+    isAdmin: true,
+  },
 ];
 
 const main = async () => {
diff --git a/frontend/src/components/blocks/nav-bar.tsx b/frontend/src/components/blocks/nav-bar.tsx
@@ -9,8 +9,12 @@ import { UserDropdown } from '@/components/common/user-dropdown';
 import { Button } from '@/components/ui/button';
 import { useRouterLocation } from '@/lib/hooks';
 import { ROUTES } from '@/lib/routes';
+import { useAuthedRoute } from '@/stores/auth-store';
+
+import { Badge } from '../ui/badge';
 
 const NavBar = observer(() => {
+  const data = useAuthedRoute();
   const { isLogin, isUnauthedRoute } = useRouterLocation();
 
   return (
@@ -41,7 +45,14 @@ const NavBar = observer(() => {
               </Button>
             )
           ) : (
-            <UserDropdown />
+            <>
+              {data?.isAdmin && (
+                <Badge className='uppercase' variant='easy'>
+                  <span>Admin</span>
+                </Badge>
+              )}
+              <UserDropdown />
+            </>
           )}
         </div>
       </nav>
diff --git a/frontend/src/components/blocks/root-layout.tsx b/frontend/src/components/blocks/root-layout.tsx
@@ -1,14 +1,9 @@
 import { Outlet } from 'react-router-dom';
 
-import NavBar from './nav-bar';
-
 export function RootLayout() {
   return (
     <div className='text-text bg-background flex min-h-screen flex-col overscroll-contain'>
-      <NavBar />
-      <main className='flex flex-1'>
-        <Outlet />
-      </main>
+      <Outlet />
     </div>
   );
 }
diff --git a/frontend/src/components/blocks/route-guard.tsx b/frontend/src/components/blocks/route-guard.tsx
@@ -14,6 +14,7 @@ import { checkIsAuthed } from '@/services/user-service';
 import { AuthStoreProvider } from '@/stores/auth-store';
 
 import { Loading } from './loading';
+import NavBar from './nav-bar';
 
 export const loader =
   (queryClient: QueryClient) =>
@@ -61,9 +62,12 @@ export const RouteGuard = () => {
               value={{
                 userId: authedPayload.userId ?? '',
                 username: authedPayload.username ?? '',
+                email: authedPayload.email ?? '',
+                isAdmin: authedPayload.isAdmin ?? undefined,
               }}
             >
-              {isLoading ? <Loading /> : <Outlet />}
+              <NavBar />
+              <main className='flex flex-1'>{isLoading ? <Loading /> : <Outlet />}</main>
             </AuthStoreProvider>
           );
         }}
diff --git a/frontend/src/routes/login/login-form.tsx b/frontend/src/routes/login/login-form.tsx
@@ -46,7 +46,13 @@ export const LoginForm = () => {
                 <FormItem>
                   <FormLabel>Password</FormLabel>
                   <FormControl>
-                    <Input type='password' disabled={isPending} placeholder='••••••••' {...field} />
+                    <Input
+                      type='password'
+                      autoComplete='new-password'
+                      disabled={isPending}
+                      placeholder='••••••••'
+                      {...field}
+                    />
                   </FormControl>
                   <FormMessage />
                   <div className='flex w-full'>
diff --git a/frontend/src/routes/signup/signup-form.tsx b/frontend/src/routes/signup/signup-form.tsx
@@ -58,7 +58,12 @@ export const SignUpForm = () => {
                 <FormItem>
                   <FormLabel>Username</FormLabel>
                   <FormControl>
-                    <Input disabled={isDisabled} placeholder='johnSmith01' {...field} />
+                    <Input
+                      disabled={isDisabled}
+                      autoComplete='username'
+                      placeholder='johnSmith01'
+                      {...field}
+                    />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
@@ -92,6 +97,7 @@ export const SignUpForm = () => {
                     <Input
                       type='password'
                       disabled={isDisabled}
+                      autoComplete='new-password'
                       placeholder='••••••••'
                       {...field}
                     />
@@ -110,6 +116,7 @@ export const SignUpForm = () => {
                     <Input
                       type='password'
                       disabled={isDisabled}
+                      autoComplete='new-password'
                       placeholder='••••••••'
                       {...field}
                     />
diff --git a/frontend/src/services/user-service.ts b/frontend/src/services/user-service.ts
@@ -44,6 +44,8 @@ export const checkIsAuthed = (param?: { signal: AbortSignal }) => {
           expiresAt: response.data ? new Date(response.data.expiresAt) : new Date(),
           userId: response.data ? response.data.userId : undefined,
           username: response.data ? response.data.userName : undefined,
+          email: response.data ? response.data.email : undefined,
+          isAdmin: response.data?.isAdmin ?? undefined,
         };
       }
 
diff --git a/frontend/src/stores/auth-store.ts b/frontend/src/stores/auth-store.ts
@@ -1,16 +1,21 @@
 import { createContext, useContext } from 'react';
 
-const AuthStore = createContext<{ userId: string; username: string }>({
+type AuthStoreType = {
+  userId: string;
+  username: string;
+  email: string;
+  isAdmin?: boolean;
+};
+
+const AuthStore = createContext<AuthStoreType>({
   userId: '',
   username: '',
+  email: '',
 });
 
 export const AuthStoreProvider = AuthStore.Provider;
 
 export const useAuthedRoute = () => {
-  const { userId, username } = useContext(AuthStore);
-  return {
-    userId,
-    username,
-  };
+  const data = useContext(AuthStore);
+  return data;
 };

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE "users" ADD COLUMN "is_admin" boolean DEFAULT false;`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,13 @@`
`8`	`8`	`"when": 1728143079049,`
`9`	`9`	`"tag": "0000_initial_schema",`
`10`	`10`	`"breakpoints": true`
	`11`	`+ },`
	`12`	`+ {`
	`13`	`+ "idx": 1,`
	`14`	`+ "version": "7",`
	`15`	`+ "when": 1730968227580,`
	`16`	`+ "tag": "0001_add_admin_user",`
	`17`	`+ "breakpoints": true`
`11`	`18`	`}`
`12`	`19`	`]`
`13`	`20`	`}`