fix: Remove email field duplication if enableLocalStrategy (#29)

Author: CrawlerCode

packages/dev/src/payload-types.ts

@@ -131,7 +131,6 @@ export interface UserAuthOperations {
  */
 export interface User {
   id: string;
-  email: string;
   emailVerified?: string | null;
   name?: string | null;
   image?: string | null;
@@ -170,6 +169,7 @@ export interface User {
   enableAPIKey?: boolean | null;
   apiKey?: string | null;
   apiKeyIndex?: string | null;
+  email: string;
   username?: string | null;
   resetPasswordToken?: string | null;
   resetPasswordExpiration?: string | null;
@@ -253,7 +253,6 @@ export interface PayloadMigration {
  */
 export interface UsersSelect<T extends boolean = true> {
   id?: T;
-  email?: T;
   emailVerified?: T;
   name?: T;
   image?: T;
@@ -294,6 +293,7 @@ export interface UsersSelect<T extends boolean = true> {
   enableAPIKey?: T;
   apiKey?: T;
   apiKeyIndex?: T;
+  email?: T;
   username?: T;
   resetPasswordToken?: T;
   resetPasswordExpiration?: T;

packages/payload-authjs/src/payload/collection/fields/general.ts

@@ -1,27 +1,37 @@
 import type { Field } from "payload";
+import type { AuthjsPluginConfig } from "src/payload/plugin";
 
 /**
  * General fields for a user
  *
  * @see https://authjs.dev/concepts/database-models
  */
-export const generalFields: Field[] = [
-  {
-    type: "row",
-    fields: [
-      {
-        name: "email",
-        type: "email",
-        required: true,
-        unique: true,
-        index: true,
-      },
-      {
-        name: "emailVerified",
-        type: "date",
-      },
-    ],
-  },
+export const generalFields = (pluginOptions: AuthjsPluginConfig): Field[] => [
+  ...(pluginOptions.enableLocalStrategy
+    ? ([
+        {
+          name: "emailVerified",
+          type: "date",
+        },
+      ] satisfies Field[])
+    : ([
+        {
+          type: "row",
+          fields: [
+            {
+              name: "email",
+              type: "email",
+              required: true,
+              unique: true,
+              index: true,
+            },
+            {
+              name: "emailVerified",
+              type: "date",
+            },
+          ],
+        },
+      ] satisfies Field[])),
   {
     name: "name",
     type: "text",

packages/payload-authjs/src/payload/collection/index.ts

@@ -50,7 +50,7 @@ export const generateUsersCollection = (
         tabs: [
           {
             label: "General",
-            fields: generalFields,
+            fields: generalFields(pluginOptions),
           },
           {
             label: "Accounts",