fix: Register me hook always to provider expires timestamp (#12)

Author: CrawlerCode

packages/payload-authjs/src/payload/collection/hooks/me.ts

@@ -6,23 +6,18 @@ import { getAllVirtualFields } from "../../utils/getAllVirtualFields";
 import { getUserAttributes } from "../../utils/getUserAttributes";
 
 /**
- * Add me hook to override the me endpoint to include virtual fields
+ * Add me hook to override the me endpoint to include 'exp' and virtual fields
  *
  * @see https://payloadcms.com/docs/hooks/collections#me
  * @see https://github.com/payloadcms/payload/blob/main/packages/payload/src/auth/operations/me.ts
  */
 export const meHook: (
   collection: CollectionConfig,
   pluginOptions: AuthjsPluginConfig,
-) => CollectionMeHook | undefined = (collection, pluginOptions) => {
+) => CollectionMeHook = (collection, pluginOptions) => {
   // Get all virtual fields
   const virtualFields = getAllVirtualFields(collection.fields);
 
-  // If no virtual fields exist, no need to override the me endpoint
-  if (virtualFields.length === 0) {
-    return undefined;
-  }
-
   // Return the me hook
   return async ({ args: { req }, user }) => {
     // Get session from authjs

packages/payload-authjs/src/payload/collection/hooks/refresh.ts

@@ -14,7 +14,7 @@ import { getUserAttributes } from "../../utils/getUserAttributes";
 export const refreshHook: (
   collection: CollectionConfig,
   pluginOptions: AuthjsPluginConfig,
-) => CollectionRefreshHook | undefined = (collection, pluginOptions) => {
+) => CollectionRefreshHook = (collection, pluginOptions) => {
   // Get all virtual fields
   const virtualFields = getAllVirtualFields(collection.fields);
 

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

@@ -93,12 +93,10 @@ export const generateUsersCollection = (
   };
 
   // Add hooks to users collection
-  const _meHook = meHook(collection, pluginOptions);
-  const _refreshHook = refreshHook(collection, pluginOptions);
   collection.hooks = {
     ...collection.hooks,
-    me: [...(collection.hooks?.me || []), ...(_meHook ? [_meHook] : [])],
-    refresh: [...(collection.hooks?.refresh || []), ...(_refreshHook ? [_refreshHook] : [])],
+    me: [...(collection.hooks?.me || []), meHook(collection, pluginOptions)],
+    refresh: [...(collection.hooks?.refresh || []), refreshHook(collection, pluginOptions)],
   };
 
   // Add custom endpoints to users collection