fix: Enforce stricter types

- Only allow auth enabled collection slugs
- Transform adapter objects and payload objects back and forth
- Use generated types
- Stricter type for the accounts.type field
- Make payload session expires field optional

Author: CrawlerCode

examples/basic/src/payload-types.ts

@@ -125,7 +125,7 @@ export interface User {
     | {
         provider: string;
         providerAccountId: string;
-        type: string;
+        type: 'oidc' | 'oauth' | 'email' | 'webauthn';
         id?: string | null;
       }[]
     | null;

examples/multiple-auth-collections/src/payload-types.ts

@@ -151,7 +151,7 @@ export interface Customer {
     | {
         provider: string;
         providerAccountId: string;
-        type: string;
+        type: 'oidc' | 'oauth' | 'email' | 'webauthn';
         id?: string | null;
       }[]
     | null;
@@ -172,7 +172,7 @@ export interface Admin {
     | {
         provider: string;
         providerAccountId: string;
-        type: string;
+        type: 'oidc' | 'oauth' | 'email' | 'webauthn';
         id?: string | null;
       }[]
     | null;

examples/with-payload-local-strategy/src/payload-types.ts

@@ -124,7 +124,7 @@ export interface User {
     | {
         provider: string;
         providerAccountId: string;
-        type: string;
+        type: 'oidc' | 'oauth' | 'email' | 'webauthn';
         id?: string | null;
       }[]
     | null;

packages/dev/src/auth/base.config.ts

@@ -1,28 +1,5 @@
 import jwt from "jsonwebtoken";
 import type { NextAuthConfig, Session } from "next-auth";
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import type { JWT } from "next-auth/jwt";
-import type { PayloadAuthjsUser } from "payload-authjs";
-import type { User as PayloadUser } from "../payload-types";
-
-declare module "next-auth" {
-  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-  interface User extends PayloadAuthjsUser<PayloadUser> {}
-}
-declare module "next-auth/jwt" {
-  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-  interface JWT
-    extends Partial<
-      Pick<
-        PayloadUser,
-        | "id"
-        | "additionalUserDatabaseField"
-        | "additionalUserVirtualField"
-        | "roles"
-        | "currentAccount"
-      >
-    > {}
-}
 
 export const SESSION_STRATEGY: NonNullable<NonNullable<NextAuthConfig["session"]>["strategy"]> =
   "jwt";
@@ -46,7 +23,6 @@ export const authConfig: NextAuthConfig = {
         if (user.id) {
           token.id = user.id;
         }
-        token.additionalUserDatabaseField = user.additionalUserDatabaseField;
       }
 
       // Add virtual field to the token
@@ -157,7 +133,6 @@ export const authConfig: NextAuthConfig = {
           session.user.id = token.id;
         }
 
-        session.user.additionalUserDatabaseField = token.additionalUserDatabaseField;
         session.user.additionalUserVirtualField = token.additionalUserVirtualField;
 
         session.user.roles = token.roles;

packages/dev/src/auth/types.d.ts

@@ -0,0 +1,14 @@
+/* eslint-disable @typescript-eslint/no-empty-object-type */
+import type { User as PayloadUser } from "@/payload-types";
+import "next-auth/jwt";
+import type { PayloadAuthjsUser } from "payload-authjs";
+
+declare module "next-auth" {
+  interface User extends PayloadAuthjsUser<PayloadUser> {}
+}
+declare module "next-auth/jwt" {
+  interface JWT
+    extends Partial<
+      Pick<PayloadUser, "id" | "additionalUserVirtualField" | "roles" | "currentAccount">
+    > {}
+}

packages/dev/src/payload-types.ts

@@ -142,7 +142,7 @@ export interface User {
     | {
         provider: string;
         providerAccountId: string;
-        type: string;
+        type: 'oidc' | 'oauth' | 'email' | 'webauthn';
         additionalAccountDatabaseField: string;
         createdAt: string;
         id?: string | null;

packages/payload-authjs/project.json

@@ -16,11 +16,17 @@
             "input": "packages/payload-authjs/src",
             "glob": "**/*.css",
             "output": "."
+          },
+          {
+            "input": "packages/payload-authjs/src",
+            "glob": "**/.npmignore",
+            "output": "."
           }
         ],
         "clean": false
       },
-      "cache": true
+      "cache": true,
+      "dependsOn": ["generate:types"]
     },
     "yalc:publish": {
       "executor": "nx:run-commands",
@@ -29,6 +35,16 @@
         "command": "pnpx yalc publish"
       },
       "dependsOn": ["build"]
+    },
+    "generate:types": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/payload-authjs",
+        "command": "payload generate:types",
+        "env": {
+          "PAYLOAD_CONFIG_PATH": "src/types/payload.config.ts"
+        }
+      }
     }
   }
 }