Add Admins collection and update user role checks in Categories and Tasks collections

Author: freddymu

src/collections/Admins.ts

@@ -0,0 +1,10 @@
+import type { CollectionConfig } from 'payload'
+
+export const Admins: CollectionConfig = {
+  slug: 'admins',
+  admin: {
+    useAsTitle: 'email',
+  },
+  auth: true,
+  fields: [],
+}

src/collections/Categories.ts

@@ -11,15 +11,15 @@ const Categories: CollectionConfig = {
         return false
       }
 
-      if (req.user.role === 'user') {
+      if (req.user.collection === 'users' && req.user.role === 'user') {
         return {
           user: {
             equals: req.user.id,
           },
         }
       }
 
-      if (req.user.role === 'admin') {
+      if (req.user.collection === 'admins') {
         return true
       }
 

src/collections/Tasks.ts

@@ -12,15 +12,15 @@ const Tasks: CollectionConfig = {
         return false
       }
 
-      if (req.user.role === 'user') {
+      if (req.user.collection === 'users' && req.user.role === 'user') {
         return {
           user: {
             equals: req.user.id,
           },
         }
       }
 
-      if (req.user.role === 'admin') {
+      if (req.user.collection === 'admins') {
         return true
       }
 
@@ -35,7 +35,7 @@ const Tasks: CollectionConfig = {
           throw new Error('You must be logged in to view tasks')
         }
 
-        if (req.user.role === 'user') {
+        if (req.user.collection === 'users' && req.user.role === 'user') {
           if (category) {
             query.where = {
               ...query.where,

src/payload-types.ts

@@ -8,9 +8,11 @@
 
 export interface Config {
   auth: {
+    admins: AdminAuthOperations;
     users: UserAuthOperations;
   };
   collections: {
+    admins: Admin;
     users: User;
     media: Media;
     categories: Category;
@@ -21,6 +23,7 @@ export interface Config {
   };
   collectionsJoins: {};
   collectionsSelect: {
+    admins: AdminsSelect<false> | AdminsSelect<true>;
     users: UsersSelect<false> | UsersSelect<true>;
     media: MediaSelect<false> | MediaSelect<true>;
     categories: CategoriesSelect<false> | CategoriesSelect<true>;
@@ -35,14 +38,36 @@ export interface Config {
   globals: {};
   globalsSelect: {};
   locale: null;
-  user: User & {
-    collection: 'users';
-  };
+  user:
+    | (Admin & {
+        collection: 'admins';
+      })
+    | (User & {
+        collection: 'users';
+      });
   jobs: {
     tasks: unknown;
     workflows: unknown;
   };
 }
+export interface AdminAuthOperations {
+  forgotPassword: {
+    email: string;
+    password: string;
+  };
+  login: {
+    email: string;
+    password: string;
+  };
+  registerFirstUser: {
+    email: string;
+    password: string;
+  };
+  unlock: {
+    email: string;
+    password: string;
+  };
+}
 export interface UserAuthOperations {
   forgotPassword: {
     email: string;
@@ -61,6 +86,23 @@ export interface UserAuthOperations {
     password: string;
   };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "admins".
+ */
+export interface Admin {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
@@ -157,6 +199,10 @@ export interface Task {
 export interface PayloadLockedDocument {
   id: string;
   document?:
+    | ({
+        relationTo: 'admins';
+        value: string | Admin;
+      } | null)
     | ({
         relationTo: 'users';
         value: string | User;
@@ -174,10 +220,15 @@ export interface PayloadLockedDocument {
         value: string | Task;
       } | null);
   globalSlug?: string | null;
-  user: {
-    relationTo: 'users';
-    value: string | User;
-  };
+  user:
+    | {
+        relationTo: 'admins';
+        value: string | Admin;
+      }
+    | {
+        relationTo: 'users';
+        value: string | User;
+      };
   updatedAt: string;
   createdAt: string;
 }
@@ -187,10 +238,15 @@ export interface PayloadLockedDocument {
  */
 export interface PayloadPreference {
   id: string;
-  user: {
-    relationTo: 'users';
-    value: string | User;
-  };
+  user:
+    | {
+        relationTo: 'admins';
+        value: string | Admin;
+      }
+    | {
+        relationTo: 'users';
+        value: string | User;
+      };
   key?: string | null;
   value?:
     | {
@@ -215,6 +271,21 @@ export interface PayloadMigration {
   updatedAt: string;
   createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "admins_select".
+ */
+export interface AdminsSelect<T extends boolean = true> {
+  updatedAt?: T;
+  createdAt?: T;
+  email?: T;
+  resetPasswordToken?: T;
+  resetPasswordExpiration?: T;
+  salt?: T;
+  hash?: T;
+  loginAttempts?: T;
+  lockUntil?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users_select".

src/payload.config.ts

@@ -8,6 +8,7 @@ import { buildConfig } from 'payload'
 import { fileURLToPath } from 'url'
 import sharp from 'sharp'
 
+import { Admins } from './collections/Admins'
 import { Users } from './collections/Users'
 import { Media } from './collections/Media'
 import Categories from './collections/Categories'
@@ -23,12 +24,12 @@ export default buildConfig({
     apiKey: process.env.RESEND_API_KEY ?? '',
   }),
   admin: {
-    user: Users.slug,
+    user: Admins.slug,
     importMap: {
       baseDir: path.resolve(dirname),
     },
   },
-  collections: [Users, Media, Categories, Tasks],
+  collections: [Admins, Users, Media, Categories, Tasks],
   editor: lexicalEditor(),
   secret: process.env.PAYLOAD_SECRET || '',
   typescript: {