chore(dev): Add currentAccount field

Author: CrawlerCode

packages/dev/src/auth.config.ts

@@ -18,7 +18,11 @@ declare module "next-auth/jwt" {
     extends Partial<
       Pick<
         PayloadUser,
-        "id" | "additionalUserDatabaseField" | "additionalUserVirtualField" | "roles"
+        | "id"
+        | "additionalUserDatabaseField"
+        | "additionalUserVirtualField"
+        | "roles"
+        | "currentAccount"
       >
     > {}
 }
@@ -121,6 +125,21 @@ export const authConfig: NextAuthConfig = {
         token.roles = [...new Set(roles)];
       }
 
+      /**
+       * Add current account to the token
+       */
+      if (account) {
+        token.currentAccount = {
+          provider: account.provider,
+          providerAccountId: account.providerAccountId,
+          access_token: account.access_token,
+          refresh_token: account.refresh_token,
+          expires_at: account.expires_at
+            ? new Date(account.expires_at * 1000).toISOString()
+            : undefined,
+        };
+      }
+
       return token;
     },
     session: ({ session, token }) => {
@@ -138,6 +157,8 @@ export const authConfig: NextAuthConfig = {
         session.user.additionalUserVirtualField = token.additionalUserVirtualField;
 
         session.user.roles = token.roles;
+
+        session.user.currentAccount = token.currentAccount;
       }
 
       return session;

packages/dev/src/auth.ts

@@ -4,7 +4,7 @@ import { withPayload } from "payload-authjs";
 import { authConfig } from "./auth.config";
 
 export const { handlers, signIn, signOut, auth } = NextAuth(
-  withPayload(authConfig as any, {
+  withPayload(authConfig, {
     payloadConfig,
     events: {
       /**
@@ -18,9 +18,9 @@ export const { handlers, signIn, signOut, auth } = NextAuth(
           id: user.id,
           name: profile.name ?? (profile.login as string | undefined),
           image: profile.avatar_url as string | undefined,
-          additionalUserDatabaseField: `Create by updateUserOnSignIn at ${new Date().toISOString()}`,
+          additionalUserDatabaseField: `Create by signIn event at ${new Date().toISOString()}`,
         });
       },
     },
-  }) as any,
+  }),
 );

packages/dev/src/payload-types.ts

@@ -82,6 +82,13 @@ export interface User {
         createdAt: string;
       }[]
     | null;
+  currentAccount?: {
+    provider?: string | null;
+    providerAccountId?: string | null;
+    access_token?: string | null;
+    refresh_token?: string | null;
+    expires_at?: string | null;
+  };
   verificationTokens?:
     | {
         id?: string | null;
@@ -185,6 +192,15 @@ export interface UsersSelect<T extends boolean = true> {
         additionalAccountDatabaseField?: T;
         createdAt?: T;
       };
+  currentAccount?:
+    | T
+    | {
+        provider?: T;
+        providerAccountId?: T;
+        access_token?: T;
+        refresh_token?: T;
+        expires_at?: T;
+      };
   verificationTokens?:
     | T
     | {

packages/dev/src/payload/collections/users.ts

@@ -33,7 +33,53 @@ const Users: CollectionConfig = {
           custom: {
             originalTabLabel: "Accounts",
           },
-          fields: [],
+          fields: [
+            /**
+             * Add currentAccount field
+             * This field is virtual and will not be stored in the database
+             */
+            {
+              name: "currentAccount",
+              type: "group",
+              label: "Current Account",
+              virtual: true,
+              admin: {
+                hidden: true,
+              },
+              fields: [
+                {
+                  type: "row",
+                  fields: [
+                    {
+                      name: "provider",
+                      type: "text",
+                    },
+                    {
+                      name: "providerAccountId",
+                      type: "text",
+                    },
+                  ],
+                },
+                {
+                  type: "row",
+                  fields: [
+                    {
+                      name: "access_token",
+                      type: "text",
+                    },
+                    {
+                      name: "refresh_token",
+                      type: "text",
+                    },
+                    {
+                      name: "expires_at",
+                      type: "date",
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
         },
       ],
     },
@@ -46,11 +92,12 @@ const Users: CollectionConfig = {
           type: "text",
           label: "Account Provider", // Add label to provider field
         },
-        // Add new field to accounts
+        // Add access_token field
         {
           name: "access_token",
           type: "text",
         },
+        // Add custom field
         {
           name: "additionalAccountDatabaseField",
           type: "text",
@@ -69,12 +116,13 @@ const Users: CollectionConfig = {
       type: "array",
       fields: [createdAtField],
     },
-    // Add custom field
+    // Add custom database fields
     {
       name: "additionalUserDatabaseField",
       type: "text",
       required: true,
     },
+    // Add custom virtual field
     {
       name: "additionalUserVirtualField",
       type: "text",
@@ -83,18 +131,24 @@ const Users: CollectionConfig = {
         hidden: true,
       },
     },
+    /**
+     * Add locale field
+     */
     {
       name: "locale",
       type: "text",
     },
     /**
      * Add roles field
-     * This field will not be stored in the database
+     * This field is virtual and will not be stored in the database
      */
     {
       name: "roles",
       type: "json",
       virtual: true,
+      admin: {
+        hidden: true,
+      },
       typescriptSchema: [
         () => ({
           type: "array",
@@ -103,9 +157,6 @@ const Users: CollectionConfig = {
           },
         }),
       ],
-      admin: {
-        hidden: true,
-      },
     },
   ],
 };