@payloadcms/figma 0.0.1-alpha.6 → 0.0.1-alpha.7

package/dist/oauth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/oauth/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkC,MAAM,EAAE,MAAM,SAAS,CAAA;AAErE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAc/C,eAAO,MAAM,YAAY,kBACP,aAAa,KAAG,MAiP/B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/oauth/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoD,MAAM,EAAE,MAAM,SAAS,CAAA;AAEvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAc/C,eAAO,MAAM,YAAY,kBACP,aAAa,KAAG,MAwP/B,CAAA"}

package/dist/oauth/index.js

@@ -84,23 +84,29 @@ export const oAuth2Plugin = (pluginOptions)=>(config)=>{
                 if (collectionOptions.usePayloadJWT) {
                     cookieName = `${config.cookiePrefix || 'payload'}-token`;
                 }
-                const usernameField = getUsernameField({
-                    collection: existingCollection,
-                    collectionOptions
-                });
                 // Check if email field exists, if not add it
                 const hasEmailField = existingCollection.fields.some((field)=>'name' in field && field.name === 'email');
-                const fields = [
-                    ...existingCollection.fields,
-                    ...typeof adminCollectionOptions.usernameField === 'string' ? [] : [
-                        usernameField
-                    ],
-                    ...!hasEmailField ? [
+                // Add email field to collection before getting username field
+                // This ensures getUsernameField can find the email field if it's configured as the username
+                const collectionWithEmail = hasEmailField ? existingCollection : {
+                    ...existingCollection,
+                    fields: [
+                        ...existingCollection.fields,
                         {
                             name: 'email',
                             type: 'email'
                         }
-                    ] : []
+                    ]
+                };
+                const usernameField = getUsernameField({
+                    collection: collectionWithEmail,
+                    collectionOptions
+                });
+                const fields = [
+                    ...collectionWithEmail.fields,
+                    ...typeof adminCollectionOptions.usernameField === 'string' ? [] : [
+                        usernameField
+                    ]
                 ];
                 if (disabled) {
                     return {

package/dist/oauth/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/oauth/index.ts"],"sourcesContent":["import type { AuthStrategy, IncomingAuthType, Plugin } from 'payload'\n\nimport type { PluginOptions } from './types.js'\n\nimport { defaultVerify } from './defaults.js'\nimport { getLoginEndpoint } from './endpoints/getLoginEndpoint.js'\nimport { getLogoutEndpoint } from './endpoints/getLogoutEndpoint.js'\nimport { getMetaEndpoint } from './endpoints/getMetaEndpoint.js'\nimport { getRedirectToLoginEndpoint } from './endpoints/getRedirectToLoginEndpoint.js'\nimport { getAfterLogout } from './hooks/afterLogout.js'\nimport { getMeHook } from './hooks/me.js'\nimport { getRefreshHook } from './hooks/refresh.js'\nimport { Strategy } from './strategy/index.js'\nimport { getAdminCollectionSlug } from './utilities/getAdminCollectionSlug.js'\nimport { getUsernameField } from './utilities/getUsernameField.js'\n\nexport const oAuth2Plugin =\n  (pluginOptions: PluginOptions): Plugin =>\n  (config) => {\n    const { collections: allCollectionOptions, debug, disabled } = pluginOptions\n\n    const strategyName = pluginOptions?.strategyName || 'oauth'\n    // Defaults to sso, but can be overridden to accommodate multiple strategies on one collection\n    const endpointSlug = pluginOptions?.strategyName || 'sso'\n\n    const adminCollectionSlug = getAdminCollectionSlug(config)\n    const adminCollectionOptions = allCollectionOptions.find(\n      ({ slug }) => slug === adminCollectionSlug,\n    )\n\n    if (!adminCollectionOptions) {\n      throw new Error(\n        `Can't find collection options for the admin collection ${adminCollectionSlug}.`,\n      )\n    }\n\n    let LoginButton = null\n\n    if (adminCollectionOptions.LoginButton === false) {\n      LoginButton = null\n    } else if (typeof adminCollectionOptions.LoginButton === 'string') {\n      LoginButton = {\n        clientProps: {\n          disabled,\n          endpointSlug,\n        },\n        path: adminCollectionOptions.LoginButton,\n      }\n    } else if (typeof adminCollectionOptions.LoginButton === 'object') {\n      LoginButton = {\n        ...adminCollectionOptions.LoginButton,\n        clientProps: {\n          ...adminCollectionOptions.LoginButton.clientProps,\n          disabled,\n          endpointSlug,\n        },\n      }\n    } else {\n      // Default to the provided LoginButton component path\n      LoginButton = {\n        clientProps: {\n          disabled,\n          endpointSlug,\n        },\n        path: '@payloadcms/figma/client#DefaultLoginButton',\n      }\n    }\n\n    return {\n      ...config,\n      admin: {\n        ...(config.admin || {}),\n        components: {\n          ...(typeof config.admin === 'object' && typeof config.admin.components === 'object'\n            ? config.admin.components\n            : {}),\n          ...(adminCollectionOptions.endOAuthSessionOnLogout\n            ? {\n                logout: {\n                  Button: {\n                    clientProps: {\n                      disabled,\n                      endpointSlug,\n                    },\n                    path: '@payloadcms/figma/client#LogoutButton',\n                  },\n                },\n              }\n            : {}),\n          beforeLogin: [\n            ...(typeof config.admin === 'object' &&\n            typeof config.admin.components === 'object' &&\n            Array.isArray(config.admin.components.beforeLogin)\n              ? config.admin.components.beforeLogin\n              : []),\n            ...(LoginButton ? [LoginButton] : []),\n          ],\n        },\n      },\n      collections: (config.collections || []).map((existingCollection) => {\n        const collectionOptions = allCollectionOptions.find(\n          ({ slug }) => slug === existingCollection.slug,\n        )\n\n        if (!collectionOptions) {\n          return existingCollection\n        }\n\n        let cookieName = pluginOptions?.cookieName || `payload-${strategyName}-token`\n        // If the usePayloadJWT option is enabled, use the default cookie name from Payload\n        if (collectionOptions.usePayloadJWT) {\n          cookieName = `${config.cookiePrefix || 'payload'}-token`\n        }\n\n        const usernameField = getUsernameField({\n          collection: existingCollection,\n          collectionOptions,\n        })\n\n        // Check if email field exists, if not add it\n        const hasEmailField = existingCollection.fields.some(\n          (field) => 'name' in field && field.name === 'email',\n        )\n\n        const fields = [\n          ...existingCollection.fields,\n          ...(typeof adminCollectionOptions.usernameField === 'string' ? [] : [usernameField]),\n          ...(!hasEmailField\n            ? [\n                {\n                  name: 'email',\n                  type: 'email' as const,\n                },\n              ]\n            : []),\n        ]\n\n        if (disabled) {\n          return {\n            ...existingCollection,\n            fields,\n          }\n        }\n\n        const strategy = new Strategy({\n          clientID: collectionOptions.clientID,\n          clientSecret: collectionOptions.clientSecret,\n          collection: existingCollection,\n          collectionOptions,\n          cookieName,\n          debug,\n          identityMetadata: collectionOptions.identityMetadata,\n          pluginOptions,\n          strategyName,\n          verify:\n            collectionOptions.verify ??\n            defaultVerify({\n              collection: existingCollection,\n              strategyName,\n              usernameField,\n            }),\n        })\n\n        const authStrategy: AuthStrategy = {\n          name: `${existingCollection.slug}-${strategyName}`,\n          // Bind 'this' to ensure the authenticate function has the correct context\n          authenticate: strategy.authenticate.bind(strategy),\n        }\n\n        let disableLocalStrategy: IncomingAuthType['disableLocalStrategy']\n\n        if (collectionOptions.disableLocalStrategy === false) {\n          // When the plugin collection option has disableLocalStrategy option set to false, do not disable the local strategy\n          disableLocalStrategy = undefined\n        } else if (collectionOptions.disableLocalStrategy) {\n          // use the configured disableLocalStrategy which can include `enableFields`, etc.\n          disableLocalStrategy = collectionOptions.disableLocalStrategy\n        } else {\n          // by default disableLocalStrategy\n          disableLocalStrategy = true\n        }\n\n        return {\n          ...existingCollection,\n          auth: {\n            ...(typeof existingCollection.auth === 'object' ? existingCollection.auth : {}),\n            disableLocalStrategy,\n            strategies: [\n              ...(typeof existingCollection.auth === 'object' &&\n              Array.isArray(existingCollection.auth.strategies)\n                ? existingCollection.auth.strategies\n                : []),\n              authStrategy,\n            ],\n          },\n          endpoints: [\n            ...(existingCollection.endpoints || []),\n            getLoginEndpoint({\n              collection: existingCollection,\n              collectionOptions,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n            getMetaEndpoint({\n              collection: existingCollection,\n              collectionOptions,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n            getLogoutEndpoint({\n              collection: existingCollection,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n            getRedirectToLoginEndpoint({\n              collection: existingCollection,\n              collectionOptions,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n          ],\n          fields,\n          hooks: {\n            ...(existingCollection.hooks || {}),\n            afterLogout: [\n              ...(typeof existingCollection.hooks === 'object' &&\n              Array.isArray(existingCollection.hooks.afterLogout)\n                ? existingCollection.hooks.afterLogout\n                : []),\n              getAfterLogout({\n                collection: existingCollection,\n                cookieName,\n                pluginOptions,\n              }),\n            ],\n            me: [\n              ...(typeof existingCollection.hooks === 'object' &&\n              Array.isArray(existingCollection.hooks.me)\n                ? existingCollection.hooks.me\n                : []),\n              // Do not inject the me hook if the usePayloadJWT option is enabled\n              ...(!collectionOptions.usePayloadJWT ? [getMeHook({ cookieName })] : []),\n            ],\n            refresh: [\n              ...(typeof existingCollection.hooks === 'object' &&\n              Array.isArray(existingCollection.hooks.refresh)\n                ? existingCollection.hooks.refresh\n                : []),\n              getRefreshHook({ pluginOptions, strategy }),\n            ],\n          },\n        }\n      }),\n    }\n  }\n"],"names":["defaultVerify","getLoginEndpoint","getLogoutEndpoint","getMetaEndpoint","getRedirectToLoginEndpoint","getAfterLogout","getMeHook","getRefreshHook","Strategy","getAdminCollectionSlug","getUsernameField","oAuth2Plugin","pluginOptions","config","collections","allCollectionOptions","debug","disabled","strategyName","endpointSlug","adminCollectionSlug","adminCollectionOptions","find","slug","Error","LoginButton","clientProps","path","admin","components","endOAuthSessionOnLogout","logout","Button","beforeLogin","Array","isArray","map","existingCollection","collectionOptions","cookieName","usePayloadJWT","cookiePrefix","usernameField","collection","hasEmailField","fields","some","field","name","type","strategy","clientID","clientSecret","identityMetadata","verify","authStrategy","authenticate","bind","disableLocalStrategy","undefined","auth","strategies","endpoints","hooks","afterLogout","me","refresh"],"mappings":"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"}
+{"version":3,"sources":["../../src/oauth/index.ts"],"sourcesContent":["import type { AuthStrategy, CollectionConfig, IncomingAuthType, Plugin } from 'payload'\n\nimport type { PluginOptions } from './types.js'\n\nimport { defaultVerify } from './defaults.js'\nimport { getLoginEndpoint } from './endpoints/getLoginEndpoint.js'\nimport { getLogoutEndpoint } from './endpoints/getLogoutEndpoint.js'\nimport { getMetaEndpoint } from './endpoints/getMetaEndpoint.js'\nimport { getRedirectToLoginEndpoint } from './endpoints/getRedirectToLoginEndpoint.js'\nimport { getAfterLogout } from './hooks/afterLogout.js'\nimport { getMeHook } from './hooks/me.js'\nimport { getRefreshHook } from './hooks/refresh.js'\nimport { Strategy } from './strategy/index.js'\nimport { getAdminCollectionSlug } from './utilities/getAdminCollectionSlug.js'\nimport { getUsernameField } from './utilities/getUsernameField.js'\n\nexport const oAuth2Plugin =\n  (pluginOptions: PluginOptions): Plugin =>\n  (config) => {\n    const { collections: allCollectionOptions, debug, disabled } = pluginOptions\n\n    const strategyName = pluginOptions?.strategyName || 'oauth'\n    // Defaults to sso, but can be overridden to accommodate multiple strategies on one collection\n    const endpointSlug = pluginOptions?.strategyName || 'sso'\n\n    const adminCollectionSlug = getAdminCollectionSlug(config)\n    const adminCollectionOptions = allCollectionOptions.find(\n      ({ slug }) => slug === adminCollectionSlug,\n    )\n\n    if (!adminCollectionOptions) {\n      throw new Error(\n        `Can't find collection options for the admin collection ${adminCollectionSlug}.`,\n      )\n    }\n\n    let LoginButton = null\n\n    if (adminCollectionOptions.LoginButton === false) {\n      LoginButton = null\n    } else if (typeof adminCollectionOptions.LoginButton === 'string') {\n      LoginButton = {\n        clientProps: {\n          disabled,\n          endpointSlug,\n        },\n        path: adminCollectionOptions.LoginButton,\n      }\n    } else if (typeof adminCollectionOptions.LoginButton === 'object') {\n      LoginButton = {\n        ...adminCollectionOptions.LoginButton,\n        clientProps: {\n          ...adminCollectionOptions.LoginButton.clientProps,\n          disabled,\n          endpointSlug,\n        },\n      }\n    } else {\n      // Default to the provided LoginButton component path\n      LoginButton = {\n        clientProps: {\n          disabled,\n          endpointSlug,\n        },\n        path: '@payloadcms/figma/client#DefaultLoginButton',\n      }\n    }\n\n    return {\n      ...config,\n      admin: {\n        ...(config.admin || {}),\n        components: {\n          ...(typeof config.admin === 'object' && typeof config.admin.components === 'object'\n            ? config.admin.components\n            : {}),\n          ...(adminCollectionOptions.endOAuthSessionOnLogout\n            ? {\n                logout: {\n                  Button: {\n                    clientProps: {\n                      disabled,\n                      endpointSlug,\n                    },\n                    path: '@payloadcms/figma/client#LogoutButton',\n                  },\n                },\n              }\n            : {}),\n          beforeLogin: [\n            ...(typeof config.admin === 'object' &&\n            typeof config.admin.components === 'object' &&\n            Array.isArray(config.admin.components.beforeLogin)\n              ? config.admin.components.beforeLogin\n              : []),\n            ...(LoginButton ? [LoginButton] : []),\n          ],\n        },\n      },\n      collections: (config.collections || []).map((existingCollection) => {\n        const collectionOptions = allCollectionOptions.find(\n          ({ slug }) => slug === existingCollection.slug,\n        )\n\n        if (!collectionOptions) {\n          return existingCollection\n        }\n\n        let cookieName = pluginOptions?.cookieName || `payload-${strategyName}-token`\n        // If the usePayloadJWT option is enabled, use the default cookie name from Payload\n        if (collectionOptions.usePayloadJWT) {\n          cookieName = `${config.cookiePrefix || 'payload'}-token`\n        }\n\n        // Check if email field exists, if not add it\n        const hasEmailField = existingCollection.fields.some(\n          (field) => 'name' in field && field.name === 'email',\n        )\n\n        // Add email field to collection before getting username field\n        // This ensures getUsernameField can find the email field if it's configured as the username\n        const collectionWithEmail: CollectionConfig = hasEmailField\n          ? existingCollection\n          : {\n              ...existingCollection,\n              fields: [\n                ...existingCollection.fields,\n                {\n                  name: 'email',\n                  type: 'email',\n                },\n              ],\n            }\n\n        const usernameField = getUsernameField({\n          collection: collectionWithEmail,\n          collectionOptions,\n        })\n\n        const fields = [\n          ...collectionWithEmail.fields,\n          ...(typeof adminCollectionOptions.usernameField === 'string' ? [] : [usernameField]),\n        ]\n\n        if (disabled) {\n          return {\n            ...existingCollection,\n            fields,\n          }\n        }\n\n        const strategy = new Strategy({\n          clientID: collectionOptions.clientID,\n          clientSecret: collectionOptions.clientSecret,\n          collection: existingCollection,\n          collectionOptions,\n          cookieName,\n          debug,\n          identityMetadata: collectionOptions.identityMetadata,\n          pluginOptions,\n          strategyName,\n          verify:\n            collectionOptions.verify ??\n            defaultVerify({\n              collection: existingCollection,\n              strategyName,\n              usernameField,\n            }),\n        })\n\n        const authStrategy: AuthStrategy = {\n          name: `${existingCollection.slug}-${strategyName}`,\n          // Bind 'this' to ensure the authenticate function has the correct context\n          authenticate: strategy.authenticate.bind(strategy),\n        }\n\n        let disableLocalStrategy: IncomingAuthType['disableLocalStrategy']\n\n        if (collectionOptions.disableLocalStrategy === false) {\n          // When the plugin collection option has disableLocalStrategy option set to false, do not disable the local strategy\n          disableLocalStrategy = undefined\n        } else if (collectionOptions.disableLocalStrategy) {\n          // use the configured disableLocalStrategy which can include `enableFields`, etc.\n          disableLocalStrategy = collectionOptions.disableLocalStrategy\n        } else {\n          // by default disableLocalStrategy\n          disableLocalStrategy = true\n        }\n\n        return {\n          ...existingCollection,\n          auth: {\n            ...(typeof existingCollection.auth === 'object' ? existingCollection.auth : {}),\n            disableLocalStrategy,\n            strategies: [\n              ...(typeof existingCollection.auth === 'object' &&\n              Array.isArray(existingCollection.auth.strategies)\n                ? existingCollection.auth.strategies\n                : []),\n              authStrategy,\n            ],\n          },\n          endpoints: [\n            ...(existingCollection.endpoints || []),\n            getLoginEndpoint({\n              collection: existingCollection,\n              collectionOptions,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n            getMetaEndpoint({\n              collection: existingCollection,\n              collectionOptions,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n            getLogoutEndpoint({\n              collection: existingCollection,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n            getRedirectToLoginEndpoint({\n              collection: existingCollection,\n              collectionOptions,\n              endpointSlug,\n              pluginOptions,\n              strategy,\n            }),\n          ],\n          fields,\n          hooks: {\n            ...(existingCollection.hooks || {}),\n            afterLogout: [\n              ...(typeof existingCollection.hooks === 'object' &&\n              Array.isArray(existingCollection.hooks.afterLogout)\n                ? existingCollection.hooks.afterLogout\n                : []),\n              getAfterLogout({\n                collection: existingCollection,\n                cookieName,\n                pluginOptions,\n              }),\n            ],\n            me: [\n              ...(typeof existingCollection.hooks === 'object' &&\n              Array.isArray(existingCollection.hooks.me)\n                ? existingCollection.hooks.me\n                : []),\n              // Do not inject the me hook if the usePayloadJWT option is enabled\n              ...(!collectionOptions.usePayloadJWT ? [getMeHook({ cookieName })] : []),\n            ],\n            refresh: [\n              ...(typeof existingCollection.hooks === 'object' &&\n              Array.isArray(existingCollection.hooks.refresh)\n                ? existingCollection.hooks.refresh\n                : []),\n              getRefreshHook({ pluginOptions, strategy }),\n            ],\n          },\n        }\n      }),\n    }\n  }\n"],"names":["defaultVerify","getLoginEndpoint","getLogoutEndpoint","getMetaEndpoint","getRedirectToLoginEndpoint","getAfterLogout","getMeHook","getRefreshHook","Strategy","getAdminCollectionSlug","getUsernameField","oAuth2Plugin","pluginOptions","config","collections","allCollectionOptions","debug","disabled","strategyName","endpointSlug","adminCollectionSlug","adminCollectionOptions","find","slug","Error","LoginButton","clientProps","path","admin","components","endOAuthSessionOnLogout","logout","Button","beforeLogin","Array","isArray","map","existingCollection","collectionOptions","cookieName","usePayloadJWT","cookiePrefix","hasEmailField","fields","some","field","name","collectionWithEmail","type","usernameField","collection","strategy","clientID","clientSecret","identityMetadata","verify","authStrategy","authenticate","bind","disableLocalStrategy","undefined","auth","strategies","endpoints","hooks","afterLogout","me","refresh"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/figma",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
   "exports": {