payload-zitadel-plugin 0.1.1 → 0.1.3

package/README.md

@@ -17,10 +17,9 @@ pnpm add payload-zitadel-plugin@0.1.0
 
 Initialize the plugin in Payload Config File. Change the parameters to connect to your Zitadel Instance.
 
-#### payload.config.ts
+#### zitadel-plugin.ts
 
 ```typescript
-import {buildConfig} from 'payload/config'
 import {ZitadelPluginProvider} from 'payload-zitadel-plugin'
 
 export const {zitadelPlugin, nextauthHandler} = ZitadelPluginProvider({
@@ -31,6 +30,9 @@ export const {zitadelPlugin, nextauthHandler} = ZitadelPluginProvider({
     // interpolation text for the Login Button - "sign in with ..."
     // externalProviderName: 'ZITADEL',
 
+    // set to true if you do not want to use the IdP Profile as the Avatar
+    // disableAvatar: true
+    
     // set to true if you want to use your own custom login button
     // disableDefaultLoginButton: true
 
@@ -55,6 +57,13 @@ export const {zitadelPlugin, nextauthHandler} = ZitadelPluginProvider({
     // apiKey: process.env.ZITADEL_API_KEY
 })
 
+```
+
+#### payload.config.ts
+
+```typescript
+import {buildConfig} from 'payload/config'
+
 export default buildConfig({
     ...,
     plugins: [
@@ -69,18 +78,18 @@ Optionally you could use an `.env.local` file for parameters:
 #### .env.local
 
 ```dotenv
-NEXTAUTH_URL: 'http://localhost',
-NEXTAUTH_SECRET: 'mQ46qpFwfE1BHuqMC+qlm19qBAD9fVPgh28werwe3ASFlAfnKjM=',
-ZITADEL_URL: 'https://idp.zitadel.url',
-ZITADEL_CLIENT_ID: '123456789012345678@project_name',
-ZITADEL_API_CLIENT_ID: '123456789123456789@project_name',
-ZITADEL_API_KEY_ID: '123456789012345678',
-ZITADEL_API_KEY: '-----BEGIN RSA PRIVATE KEY----- ... ----END RSA PRIVATE KEY-----'
+NEXTAUTH_URL=http://localhost
+NEXTAUTH_SECRET=pMvElMzVrLvGL4tHyqtDlVP/90wQdxGBy94ISifi62I=
+ZITADEL_URL=https://idp.zitadel.url
+ZITADEL_CLIENT_ID=123456789012345678@project_name
+ZITADEL_API_CLIENT_ID=123456789123456789@project_name
+ZITADEL_API_KEY_ID=123456789012345678
+ZITADEL_API_KEY='-----BEGIN RSA PRIVATE KEY----- ... ----END RSA PRIVATE KEY-----'
 ```
 
 or use the Next.js Config file:
 
-#### next.config.mjs
+#### next.config.js
 
 ```typescript
 import {withPayload} from '@payloadcms/next/withPayload'
@@ -108,9 +117,36 @@ Unfortunately you need to manually create the following NextAuth.js route in you
 ### (nextauth)/api/auth/[...nextauth]/route.ts
 
 ```typescript
-import {nextauthHandler} from '@payload-config'
+import {nextauthHandler} from '@/config/zitadel-plugin'
 
 export {nextauthHandler as GET, nextauthHandler as POST}
 ```
 
+### add profile picture url to accepted Next.js assets
+
+If you want to use the Zitadel profile picture as the avatar in PayloadCMS (`disableAvatar != true`), 
+you have to manually add the asset URL to the Next.js config file.
+
+#### next.config.js
+
+```typescript
+import {withPayload} from '@payloadcms/next/withPayload'
+
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+    images: {
+        remotePatterns: [
+            {
+                //protocol: new URL(process.env.ZITADEL_URL).protocol,
+                hostname: new URL(process.env.ZITADEL_URL).hostname,
+                //port: new URL(process.env.ZITADEL_URL).port,
+                pathname: '/assets/**'
+            }
+        ]
+    }
+}
+
+export default withPayload(nextConfig)
+```
+
 ## For an example look in this repository at the `dev` directory!

package/dist/components/Avatar/index.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export declare const Avatar: (props: {
+    active: boolean;
+}) => React.JSX.Element;
+//# sourceMappingURL=index.d.ts.map

package/dist/components/Avatar/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Avatar/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,eAAO,MAAM,MAAM,UAAW;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,sBAWhD,CAAA"}

package/dist/components/Avatar/index.js

@@ -0,0 +1,20 @@
+'use client';
+import * as React from 'react';
+import Image from 'next/image.js';
+import { DefaultAccountIcon } from '@payloadcms/ui/graphics/Account/Default';
+import { useSession } from 'next-auth/react';
+export const Avatar = (props)=>{
+    const session = useSession();
+    const imageUrl = session?.data?.user?.image;
+    return imageUrl ? /*#__PURE__*/ React.createElement("div", {
+        className: "avatar"
+    }, /*#__PURE__*/ React.createElement(Image.default, {
+        src: imageUrl,
+        alt: "Profile Picture",
+        fill: true
+    })) : /*#__PURE__*/ React.createElement(DefaultAccountIcon, {
+        active: props.active
+    });
+};
+
+//# sourceMappingURL=index.js.map

package/dist/components/Avatar/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/components/Avatar/index.tsx"],"sourcesContent":["'use client'\n\nimport * as React from 'react'\nimport Image from 'next/image.js'\nimport {DefaultAccountIcon} from '@payloadcms/ui/graphics/Account/Default'\nimport {useSession} from 'next-auth/react'\n\n\nexport const Avatar = (props: { active: boolean }) => {\n\n    const session = useSession()\n\n    const imageUrl = session?.data?.user?.image\n\n    return imageUrl ? (\n        <div className=\"avatar\">\n            <Image.default src={imageUrl} alt=\"Profile Picture\" fill/>\n        </div>\n    ) : <DefaultAccountIcon active={props.active}/>\n}"],"names":["React","Image","DefaultAccountIcon","useSession","Avatar","props","session","imageUrl","data","user","image","div","className","default","src","alt","fill","active"],"rangeMappings":";;;;;;;;;;;;;;;;;","mappings":"AAAA;AAEA,YAAYA,WAAW,QAAO;AAC9B,OAAOC,WAAW,gBAAe;AACjC,SAAQC,kBAAkB,QAAO,0CAAyC;AAC1E,SAAQC,UAAU,QAAO,kBAAiB;AAG1C,OAAO,MAAMC,SAAS,CAACC;IAEnB,MAAMC,UAAUH;IAEhB,MAAMI,WAAWD,SAASE,MAAMC,MAAMC;IAEtC,OAAOH,yBACH,oBAACI;QAAIC,WAAU;qBACX,oBAACX,MAAMY,OAAO;QAACC,KAAKP;QAAUQ,KAAI;QAAkBC,MAAAA;wBAExD,oBAACd;QAAmBe,QAAQZ,MAAMY,MAAM;;AAChD,EAAC"}

package/dist/components/LoginButton/button.d.ts

@@ -0,0 +1,3 @@
+import { CustomComponent } from 'payload';
+export declare const _LoginButton: CustomComponent;
+//# sourceMappingURL=button.d.ts.map

package/dist/components/LoginButton/button.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"button.d.ts","sourceRoot":"","sources":["../../../src/components/LoginButton/button.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAA;AAMvC,eAAO,MAAM,YAAY,EAAE,eAe1B,CAAA"}

package/dist/components/LoginButton/button.js

@@ -0,0 +1,21 @@
+'use client';
+import React from 'react';
+import { signIn } from 'next-auth/react';
+//import {NestedKeysStripped} from '@payloadcms/translations'
+import { Button } from '@payloadcms/ui/client';
+//import {useTranslation} from '@payloadcms/ui/providers/Translation'
+//import {translations} from '../../translations.js'
+export const _LoginButton = ({ internalProviderName, externalProviderName })=>{
+    //currently not working
+    //const {t} = useTranslation<typeof translations.en, NestedKeysStripped<typeof translations.en>>()
+    return /*#__PURE__*/ React.createElement("div", {
+        style: {
+            display: 'flex',
+            justifyContent: 'center'
+        }
+    }, /*#__PURE__*/ React.createElement(Button, {
+        onClick: ()=>signIn(internalProviderName)
+    }, externalProviderName));
+};
+
+//# sourceMappingURL=button.js.map

package/dist/components/LoginButton/button.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/components/LoginButton/button.tsx"],"sourcesContent":["'use client'\n\nimport React from 'react'\nimport {signIn} from 'next-auth/react'\nimport {CustomComponent} from 'payload'\n//import {NestedKeysStripped} from '@payloadcms/translations'\nimport {Button} from '@payloadcms/ui/client'\n//import {useTranslation} from '@payloadcms/ui/providers/Translation'\n//import {translations} from '../../translations.js'\n\nexport const _LoginButton: CustomComponent = ({internalProviderName, externalProviderName}: {\n    internalProviderName: string,\n    externalProviderName: string\n}) => {\n    //currently not working\n    //const {t} = useTranslation<typeof translations.en, NestedKeysStripped<typeof translations.en>>()\n\n    return (\n        <div style={{display: 'flex', justifyContent: 'center'}}>\n            <Button onClick={() => signIn(internalProviderName)}>\n                {/*t('zitadelPlugin:signIn', {externalProviderName})*/}\n                {externalProviderName}\n            </Button>\n        </div>\n    )\n}"],"names":["React","signIn","Button","_LoginButton","internalProviderName","externalProviderName","div","style","display","justifyContent","onClick"],"rangeMappings":";;;;;;;;;;;;;;;;;;","mappings":"AAAA;AAEA,OAAOA,WAAW,QAAO;AACzB,SAAQC,MAAM,QAAO,kBAAiB;AAEtC,6DAA6D;AAC7D,SAAQC,MAAM,QAAO,wBAAuB;AAC5C,qEAAqE;AACrE,oDAAoD;AAEpD,OAAO,MAAMC,eAAgC,CAAC,EAACC,oBAAoB,EAAEC,oBAAoB,EAGxF;IACG,uBAAuB;IACvB,kGAAkG;IAElG,qBACI,oBAACC;QAAIC,OAAO;YAACC,SAAS;YAAQC,gBAAgB;QAAQ;qBAClD,oBAACP;QAAOQ,SAAS,IAAMT,OAAOG;OAEzBC;AAIjB,EAAC"}

package/dist/components/LoginButton/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/LoginButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,eAAO,MAAM,WAAW,mDAAkD;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAA;CAC/B,4BAAkH,CAAA"}

package/dist/components/LoginButton/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/components/LoginButton/index.tsx"],"sourcesContent":["import React from 'react'\nimport {_LoginButton} from './button.js'\n\nexport const LoginButton = ({internalProviderName, externalProviderName}: {\n    internalProviderName: string,\n    externalProviderName: string\n}) => () => <_LoginButton internalProviderName={internalProviderName} externalProviderName={externalProviderName}/>"],"names":["React","_LoginButton","LoginButton","internalProviderName","externalProviderName"],"rangeMappings":";;;;;","mappings":"AAAA,OAAOA,WAAW,QAAO;AACzB,SAAQC,YAAY,QAAO,cAAa;AAExC,OAAO,MAAMC,cAAc,CAAC,EAACC,oBAAoB,EAAEC,oBAAoB,EAGtE,GAAK,kBAAM,oBAACH;YAAaE,sBAAsBA;YAAsBC,sBAAsBA;WAAuB"}

package/dist/components/Session/index.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { PropsWithChildren } from 'react';
+export declare const Session: ({ children }: PropsWithChildren) => React.JSX.Element;
+//# sourceMappingURL=index.d.ts.map

package/dist/components/Session/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Session/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAA;AAGvC,eAAO,MAAM,OAAO,iBAAgB,iBAAiB,sBAAkD,CAAA"}

package/dist/components/Session/index.js

@@ -0,0 +1,6 @@
+'use client';
+import * as React from 'react';
+import { SessionProvider } from 'next-auth/react';
+export const Session = ({ children })=>/*#__PURE__*/ React.createElement(SessionProvider, null, children);
+
+//# sourceMappingURL=index.js.map

package/dist/components/Session/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/components/Session/index.tsx"],"sourcesContent":["'use client'\n\nimport * as React from 'react'\nimport {SessionProvider} from 'next-auth/react'\nimport {PropsWithChildren} from 'react'\n\n\nexport const Session = ({children}: PropsWithChildren) => <SessionProvider>{children}</SessionProvider>"],"names":["React","SessionProvider","Session","children"],"rangeMappings":";;;","mappings":"AAAA;AAEA,YAAYA,WAAW,QAAO;AAC9B,SAAQC,eAAe,QAAO,kBAAiB;AAI/C,OAAO,MAAMC,UAAU,CAAC,EAACC,QAAQ,EAAoB,iBAAK,oBAACF,uBAAiBE,UAA2B"}

package/dist/components/index.d.ts

@@ -0,0 +1,4 @@
+export { Avatar } from './Avatar/index.js';
+export { LoginButton } from './LoginButton/index.js';
+export { Session } from './Session/index.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAA"}

package/dist/components/index.js

@@ -0,0 +1,5 @@
+export { Avatar } from './Avatar/index.js';
+export { LoginButton } from './LoginButton/index.js';
+export { Session } from './Session/index.js';
+
+//# sourceMappingURL=index.js.map

package/dist/components/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/components/index.ts"],"sourcesContent":["export {Avatar} from './Avatar/index.js'\nexport {LoginButton} from './LoginButton/index.js'\nexport {Session} from './Session/index.js'"],"names":["Avatar","LoginButton","Session"],"rangeMappings":";;","mappings":"AAAA,SAAQA,MAAM,QAAO,oBAAmB;AACxC,SAAQC,WAAW,QAAO,yBAAwB;AAClD,SAAQC,OAAO,QAAO,qBAAoB"}

package/dist/index.d.ts

@@ -1,5 +1,3 @@
-import { LoginButton } from './LoginButton/index.js';
 import { ZitadelPluginProviderType } from './types.js';
-export { LoginButton };
 export declare const ZitadelPluginProvider: ZitadelPluginProviderType;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAGlD,OAAO,EAA0B,yBAAyB,EAAC,MAAM,YAAY,CAAA;AAI7E,OAAO,EAAC,WAAW,EAAC,CAAA;AAEpB,eAAO,MAAM,qBAAqB,EAAE,yBAoInC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0B,yBAAyB,EAAC,MAAM,YAAY,CAAA;AAI7E,eAAO,MAAM,qBAAqB,EAAE,yBAoKnC,CAAA"}

package/dist/index.js

@@ -1,11 +1,10 @@
-import NextAuth from 'next-auth';
+import NextAuth, { getServerSession } from 'next-auth';
 import { signOut } from 'next-auth/react';
-import { LoginButton } from './LoginButton/index.js';
 import { authOptions } from './options.js';
 import { zitadelStrategy } from './strategy.js';
 import { translations } from './translations.js';
-export { LoginButton };
-export const ZitadelPluginProvider = ({ authSlug = 'users', associatedIdFieldName = 'idp_id', disableLocalStrategy, disableDefaultLoginButton, internalProviderName = 'zitadel', externalProviderName = 'ZITADEL', issuerUrl, clientId, enableAPI, apiClientId, apiKeyId, apiKey })=>{
+import { Avatar, LoginButton, Session } from './components/index.js';
+export const ZitadelPluginProvider = ({ authSlug = 'users', associatedIdFieldName = 'idp_id', disableAvatar, disableLocalStrategy, disableDefaultLoginButton, internalProviderName = 'zitadel', externalProviderName = 'ZITADEL', issuerUrl, clientId, enableAPI, apiClientId, apiKeyId, apiKey })=>{
     if ((issuerUrl ?? '').length == 0) throw new Error('ZITADEL-PLUGIN: ISSUER-URL IS EMPTY');
     if ((clientId ?? '').length == 0) throw new Error('ZITADEL-PLUGIN: CLIENT-ID IS EMPTY');
     if (enableAPI) {
@@ -23,6 +22,9 @@ export const ZitadelPluginProvider = ({ authSlug = 'users', associatedIdFieldNam
                 ...incomingConfig,
                 admin: {
                     ...incomingConfig.admin,
+                    ...disableAvatar ? {} : {
+                        avatar: Avatar
+                    },
                     components: {
                         ...incomingConfig.admin?.components,
                         afterLogin: [
@@ -33,6 +35,9 @@ export const ZitadelPluginProvider = ({ authSlug = 'users', associatedIdFieldNam
                                     externalProviderName
                                 })
                             ]
+                        ],
+                        providers: [
+                            Session
                         ]
                     }
                 },
@@ -66,6 +71,32 @@ export const ZitadelPluginProvider = ({ authSlug = 'users', associatedIdFieldNam
                                     type: 'text',
                                     unique: true,
                                     required: true
+                                },
+                                {
+                                    name: 'email',
+                                    type: 'email',
+                                    admin: {
+                                        readOnly: true
+                                    },
+                                    access: {},
+                                    hooks: {
+                                        afterRead: [
+                                            async ()=>(await getServerSession())?.user?.email
+                                        ]
+                                    }
+                                },
+                                {
+                                    name: 'name',
+                                    type: 'text',
+                                    admin: {
+                                        readOnly: true
+                                    },
+                                    access: {},
+                                    hooks: {
+                                        afterRead: [
+                                            async ()=>(await getServerSession())?.user?.name
+                                        ]
+                                    }
                                 }
                             ],
                             hooks: {
@@ -105,12 +136,13 @@ export const ZitadelPluginProvider = ({ authSlug = 'users', associatedIdFieldNam
                 i18n: {
                     ...incomingConfig.i18n,
                     translations: {
+                        ...incomingConfig.i18n?.translations,
                         de: {
-                            ...incomingConfig.i18n?.translations?.de ?? {},
+                            ...incomingConfig.i18n?.translations?.de,
                             ...translations.de
                         },
                         en: {
-                            ...incomingConfig.i18n?.translations?.en ?? {},
+                            ...incomingConfig.i18n?.translations?.en,
                             ...translations.en
                         }
                     }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import NextAuth from 'next-auth'\nimport {signOut} from 'next-auth/react'\nimport {LoginButton} from './LoginButton/index.js'\nimport {authOptions} from './options.js'\nimport {zitadelStrategy} from './strategy.js'\nimport {ZitadelAuthOptionsProps, ZitadelPluginProviderType} from './types.js'\nimport {translations} from './translations.js'\n\n\nexport {LoginButton}\n\nexport const ZitadelPluginProvider: ZitadelPluginProviderType = ({\n                                                                     authSlug = 'users',\n                                                                     associatedIdFieldName = 'idp_id',\n                                                                     disableLocalStrategy,\n                                                                     disableDefaultLoginButton,\n                                                                     internalProviderName = 'zitadel',\n                                                                     externalProviderName = 'ZITADEL',\n                                                                     issuerUrl,\n                                                                     clientId,\n                                                                     enableAPI,\n                                                                     apiClientId,\n                                                                     apiKeyId,\n                                                                     apiKey\n                                                                 }) => {\n    if ((issuerUrl ?? '').length == 0)\n        throw new Error('ZITADEL-PLUGIN: ISSUER-URL IS EMPTY')\n    if ((clientId ?? '').length == 0)\n        throw new Error('ZITADEL-PLUGIN: CLIENT-ID IS EMPTY')\n    if (enableAPI) {\n        if ((apiClientId ?? '').length == 0)\n            throw new Error('ZITADEL-PLUGIN: API ENABLED, BUT API-CLIENT-ID IS EMPTY')\n        if ((apiKeyId ?? '').length == 0)\n            throw new Error('ZITADEL-PLUGIN: API ENABLED, BUT API-KEY-ID IS EMPTY')\n        if ((apiKey ?? '').length == 0)\n            throw new Error('ZITADEL-PLUGIN: API ENABLED, BUT API-KEY IS EMPTY')\n    }\n    const authOptionsProps: ZitadelAuthOptionsProps = {\n        internalProviderName: internalProviderName,\n        issuerUrl: issuerUrl!,\n        clientId: clientId!\n    }\n    return {\n        zitadelPlugin: (incomingConfig) => ({\n            ...incomingConfig,\n            admin: {\n                ...incomingConfig.admin,\n                components: {\n                    ...incomingConfig.admin?.components,\n                    afterLogin: [\n                        ...incomingConfig.admin?.components?.afterLogin || [],\n                        ...(disableDefaultLoginButton ? [] : [LoginButton({\n                            internalProviderName,\n                            externalProviderName\n                        })])\n                    ]\n                }\n            },\n            collections: (incomingConfig.collections || []).map((collection) => ({\n                ...collection,\n                ...collection.slug == authSlug ? {\n                    auth: {\n                        ...(typeof collection.auth == 'boolean' ? {} : collection.auth),\n                        disableLocalStrategy: disableLocalStrategy ? disableLocalStrategy : (typeof collection.auth == 'boolean' ? {} : collection.auth)?.disableLocalStrategy,\n                        strategies: [\n                            ...(typeof collection.auth == 'boolean' ? {} : collection.auth)?.strategies ?? [],\n                            zitadelStrategy({\n                                authSlug,\n                                associatedIdFieldName,\n                                ...authOptionsProps,\n                                ...(enableAPI ? {\n                                    enableAPI: true,\n                                    apiClientId: apiClientId!,\n                                    apiKeyId: apiClientId!,\n                                    apiKey: apiKey!\n                                } : {enableAPI: undefined})\n                            })\n                        ]\n                    },\n                    fields: [\n                        ...collection.fields,\n                        {\n                            name: associatedIdFieldName,\n                            type: 'text',\n                            unique: true,\n                            required: true\n                        }\n                    ],\n                    hooks: {\n                        afterLogout: [\n                            () => signOut()\n                        ]\n                    }\n                } : {}\n            })),\n            //would be a more developer-friendly alternative\n            //currently not working, maybe in future update\n            /*endpoints: [\n                ...incomingConfig.endpoints || [],\n                ...['get', 'post'].map(method => ({\n                    handler: NextAuth.default(authOptions(authOptionsProps)),\n                    method: method as 'get' | 'post',\n                    path: 'api/auth/*'\n                }))\n            ],*/\n\n            //current work around on creating a non-functional first user\n            async onInit(payload) {\n                if (incomingConfig.onInit)\n                    await incomingConfig.onInit(payload)\n\n                const existingUsers = await payload.find({\n                    collection: authSlug,\n                    limit: 1\n                })\n\n                if (existingUsers.docs.length === 0) {\n                    await payload.create({\n                        collection: authSlug,\n                        data: {\n                            email: 'delete.me@now.com',\n                            password: 'password',\n                            [associatedIdFieldName]: 'DELETE_ME'\n                        }\n                    })\n                }\n            },\n            i18n: {\n                ...incomingConfig.i18n,\n                translations: {\n                    de: {\n                        ...incomingConfig.i18n?.translations?.de ?? {},\n                        ...translations.de\n                    },\n                    en: {\n                        ...incomingConfig.i18n?.translations?.en ?? {},\n                        ...translations.en\n                    }\n                }\n            }\n        }),\n        nextauthHandler: NextAuth.default(authOptions(authOptionsProps))\n    }\n}"],"names":["NextAuth","signOut","LoginButton","authOptions","zitadelStrategy","translations","ZitadelPluginProvider","authSlug","associatedIdFieldName","disableLocalStrategy","disableDefaultLoginButton","internalProviderName","externalProviderName","issuerUrl","clientId","enableAPI","apiClientId","apiKeyId","apiKey","length","Error","authOptionsProps","zitadelPlugin","incomingConfig","admin","components","afterLogin","collections","map","collection","slug","auth","strategies","undefined","fields","name","type","unique","required","hooks","afterLogout","onInit","payload","existingUsers","find","limit","docs","create","data","email","password","i18n","de","en","nextauthHandler","default"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import NextAuth, {getServerSession} from 'next-auth'\nimport {signOut} from 'next-auth/react'\nimport {authOptions} from './options.js'\nimport {zitadelStrategy} from './strategy.js'\nimport {ZitadelAuthOptionsProps, ZitadelPluginProviderType} from './types.js'\nimport {translations} from './translations.js'\nimport {Avatar, LoginButton, Session} from './components/index.js'\n\nexport const ZitadelPluginProvider: ZitadelPluginProviderType = ({\n                                                                     authSlug = 'users',\n                                                                     associatedIdFieldName = 'idp_id',\n                                                                     disableAvatar,\n                                                                     disableLocalStrategy,\n                                                                     disableDefaultLoginButton,\n                                                                     internalProviderName = 'zitadel',\n                                                                     externalProviderName = 'ZITADEL',\n                                                                     issuerUrl,\n                                                                     clientId,\n                                                                     enableAPI,\n                                                                     apiClientId,\n                                                                     apiKeyId,\n                                                                     apiKey\n                                                                 }) => {\n    if ((issuerUrl ?? '').length == 0)\n        throw new Error('ZITADEL-PLUGIN: ISSUER-URL IS EMPTY')\n    if ((clientId ?? '').length == 0)\n        throw new Error('ZITADEL-PLUGIN: CLIENT-ID IS EMPTY')\n    if (enableAPI) {\n        if ((apiClientId ?? '').length == 0)\n            throw new Error('ZITADEL-PLUGIN: API ENABLED, BUT API-CLIENT-ID IS EMPTY')\n        if ((apiKeyId ?? '').length == 0)\n            throw new Error('ZITADEL-PLUGIN: API ENABLED, BUT API-KEY-ID IS EMPTY')\n        if ((apiKey ?? '').length == 0)\n            throw new Error('ZITADEL-PLUGIN: API ENABLED, BUT API-KEY IS EMPTY')\n    }\n    const authOptionsProps: ZitadelAuthOptionsProps = {\n        internalProviderName: internalProviderName,\n        issuerUrl: issuerUrl!,\n        clientId: clientId!\n    }\n    return {\n        zitadelPlugin: (incomingConfig) => ({\n            ...incomingConfig,\n            admin: {\n                ...incomingConfig.admin,\n                ...(disableAvatar ? {} : {avatar: Avatar}),\n                components: {\n                    ...incomingConfig.admin?.components,\n                    afterLogin: [\n                        ...incomingConfig.admin?.components?.afterLogin || [],\n                        ...(disableDefaultLoginButton ? [] : [LoginButton({\n                            internalProviderName,\n                            externalProviderName\n                        })])\n                    ],\n                    providers: [\n                        Session\n                    ]\n                }\n            },\n            collections: (incomingConfig.collections || []).map((collection) => ({\n                ...collection,\n                ...collection.slug == authSlug ? {\n                    auth: {\n                        ...(typeof collection.auth == 'boolean' ? {} : collection.auth),\n                        disableLocalStrategy: disableLocalStrategy ? disableLocalStrategy : (typeof collection.auth == 'boolean' ? {} : collection.auth)?.disableLocalStrategy,\n                        strategies: [\n                            ...(typeof collection.auth == 'boolean' ? {} : collection.auth)?.strategies ?? [],\n                            zitadelStrategy({\n                                authSlug,\n                                associatedIdFieldName,\n                                ...authOptionsProps,\n                                ...(enableAPI ? {\n                                    enableAPI: true,\n                                    apiClientId: apiClientId!,\n                                    apiKeyId: apiClientId!,\n                                    apiKey: apiKey!\n                                } : {enableAPI: undefined})\n                            })\n                        ]\n                    },\n                    fields: [\n                        ...collection.fields,\n                        {\n                            name: associatedIdFieldName,\n                            type: 'text',\n                            unique: true,\n                            required: true\n                        },\n                        {\n                            name: 'email',\n                            type: 'email',\n                            admin: {\n                                readOnly: true\n                            },\n                            access: {},\n                            hooks: {\n                                afterRead: [\n                                    async () => (await getServerSession())?.user?.email\n                                ]\n                            }\n                        },\n                        {\n                            name: 'name',\n                            type: 'text',\n                            admin: {\n                                readOnly: true\n                            },\n                            access: {},\n                            hooks: {\n                                afterRead: [\n                                    async () => (await getServerSession())?.user?.name\n                                ]\n                            }\n                        }\n                    ],\n                    hooks: {\n                        afterLogout: [\n                            () => signOut()\n                        ]\n                    }\n                } : {}\n            })),\n            //would be a more developer-friendly alternative\n            //currently not working, maybe in future update\n            /*endpoints: [\n                ...incomingConfig.endpoints || [],\n                ...['get', 'post'].map(method => ({\n                    handler: NextAuth.default(authOptions(authOptionsProps)),\n                    method: method as 'get' | 'post',\n                    path: 'api/auth/*'\n                }))\n            ],*/\n\n            //current work around on creating a non-functional first user\n            async onInit(payload) {\n                if (incomingConfig.onInit)\n                    await incomingConfig.onInit(payload)\n\n                const existingUsers = await payload.find({\n                    collection: authSlug,\n                    limit: 1\n                })\n\n                if (existingUsers.docs.length === 0) {\n                    await payload.create({\n                        collection: authSlug,\n                        data: {\n                            email: 'delete.me@now.com',\n                            password: 'password',\n                            [associatedIdFieldName]: 'DELETE_ME'\n                        }\n                    })\n                }\n            },\n            i18n: {\n                ...incomingConfig.i18n,\n                translations: {\n                    ...incomingConfig.i18n?.translations,\n                    de: {\n                        ...incomingConfig.i18n?.translations?.de,\n                        ...translations.de\n                    },\n                    en: {\n                        ...incomingConfig.i18n?.translations?.en,\n                        ...translations.en\n                    }\n                }\n            }\n        }),\n        nextauthHandler: NextAuth.default(authOptions(authOptionsProps))\n    }\n}"],"names":["NextAuth","getServerSession","signOut","authOptions","zitadelStrategy","translations","Avatar","LoginButton","Session","ZitadelPluginProvider","authSlug","associatedIdFieldName","disableAvatar","disableLocalStrategy","disableDefaultLoginButton","internalProviderName","externalProviderName","issuerUrl","clientId","enableAPI","apiClientId","apiKeyId","apiKey","length","Error","authOptionsProps","zitadelPlugin","incomingConfig","admin","avatar","components","afterLogin","providers","collections","map","collection","slug","auth","strategies","undefined","fields","name","type","unique","required","readOnly","access","hooks","afterRead","user","email","afterLogout","onInit","payload","existingUsers","find","limit","docs","create","data","password","i18n","de","en","nextauthHandler","default"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAC,MAAM,YAAY,CAAA;AAEjD,eAAO,MAAM,WAAW,EAAE,sBAuCxB,CAAA"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAC,MAAM,YAAY,CAAA;AAEjD,eAAO,MAAM,WAAW,EAAE,sBA4CxB,CAAA"}

package/dist/options.js

@@ -28,6 +28,11 @@ export const authOptions = ({ internalProviderName, issuerUrl, clientId })=>({
                         loginName: profile.preferred_username,
                         image: profile.picture
                     }),
+                userinfo: {
+                    async request (context) {
+                        return await context.client.userinfo(context.tokens.access_token);
+                    }
+                },
                 clientId
             }
         ],
@@ -35,8 +40,8 @@ export const authOptions = ({ internalProviderName, issuerUrl, clientId })=>({
             session: async ({ session, token })=>({
                     ...session,
                     user: {
-                        ...session.user,
-                        id: token.sub
+                        id: token.sub,
+                        ...session.user
                     }
                 })
         }

package/dist/options.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/options.ts"],"sourcesContent":["import {ZitadelAuthOptionsType} from './types.js'\n\nexport const authOptions: ZitadelAuthOptionsType = ({internalProviderName, issuerUrl, clientId}) => ({\n    providers: [\n        {\n            id: internalProviderName,\n            name: internalProviderName,\n            type: 'oauth',\n            version: '2',\n            wellKnown: issuerUrl,\n            authorization: {\n                params: {\n                    scope: 'openid email profile'\n                }\n            },\n            idToken: true,\n            checks: ['pkce', 'state'],\n            client: {\n                token_endpoint_auth_method: 'none'\n            },\n            profile: async (profile) => ({\n                id: profile.sub,\n                name: profile.name,\n                firstName: profile.given_name,\n                lastName: profile.family_name,\n                email: profile.email,\n                loginName: profile.preferred_username,\n                image: profile.picture\n            }),\n            clientId\n        }\n    ],\n    callbacks: {\n        session: async ({session, token}) => ({\n            ...session,\n            user: {\n                ...session.user,\n                id: token.sub\n            }\n        })\n    }\n})"],"names":["authOptions","internalProviderName","issuerUrl","clientId","providers","id","name","type","version","wellKnown","authorization","params","scope","idToken","checks","client","token_endpoint_auth_method","profile","sub","firstName","given_name","lastName","family_name","email","loginName","preferred_username","image","picture","callbacks","session","token","user"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAO,MAAMA,cAAsC,CAAC,EAACC,oBAAoB,EAAEC,SAAS,EAAEC,QAAQ,EAAC,GAAM,CAAA;QACjGC,WAAW;YACP;gBACIC,IAAIJ;gBACJK,MAAML;gBACNM,MAAM;gBACNC,SAAS;gBACTC,WAAWP;gBACXQ,eAAe;oBACXC,QAAQ;wBACJC,OAAO;oBACX;gBACJ;gBACAC,SAAS;gBACTC,QAAQ;oBAAC;oBAAQ;iBAAQ;gBACzBC,QAAQ;oBACJC,4BAA4B;gBAChC;gBACAC,SAAS,OAAOA,UAAa,CAAA;wBACzBZ,IAAIY,QAAQC,GAAG;wBACfZ,MAAMW,QAAQX,IAAI;wBAClBa,WAAWF,QAAQG,UAAU;wBAC7BC,UAAUJ,QAAQK,WAAW;wBAC7BC,OAAON,QAAQM,KAAK;wBACpBC,WAAWP,QAAQQ,kBAAkB;wBACrCC,OAAOT,QAAQU,OAAO;oBAC1B,CAAA;gBACAxB;YACJ;SACH;QACDyB,WAAW;YACPC,SAAS,OAAO,EAACA,OAAO,EAAEC,KAAK,EAAC,GAAM,CAAA;oBAClC,GAAGD,OAAO;oBACVE,MAAM;wBACF,GAAGF,QAAQE,IAAI;wBACf1B,IAAIyB,MAAMZ,GAAG;oBACjB;gBACJ,CAAA;QACJ;IACJ,CAAA,EAAE"}
+{"version":3,"sources":["../src/options.ts"],"sourcesContent":["import {ZitadelAuthOptionsType} from './types.js'\n\nexport const authOptions: ZitadelAuthOptionsType = ({internalProviderName, issuerUrl, clientId}) => ({\n    providers: [\n        {\n            id: internalProviderName,\n            name: internalProviderName,\n            type: 'oauth',\n            version: '2',\n            wellKnown: issuerUrl,\n            authorization: {\n                params: {\n                    scope: 'openid email profile'\n                }\n            },\n            idToken: true,\n            checks: ['pkce', 'state'],\n            client: {\n                token_endpoint_auth_method: 'none'\n            },\n            profile: async (profile) => ({\n                id: profile.sub,\n                name: profile.name,\n                firstName: profile.given_name,\n                lastName: profile.family_name,\n                email: profile.email,\n                loginName: profile.preferred_username,\n                image: profile.picture\n            }),\n            userinfo: {\n                async request(context) {\n                    return await context.client.userinfo(context.tokens.access_token!)\n                }\n            },\n            clientId\n        }\n    ],\n    callbacks: {\n        session: async ({session, token}) => ({\n            ...session,\n            user: {\n                id: token.sub,\n                ...session.user\n            }\n        })\n    }\n})"],"names":["authOptions","internalProviderName","issuerUrl","clientId","providers","id","name","type","version","wellKnown","authorization","params","scope","idToken","checks","client","token_endpoint_auth_method","profile","sub","firstName","given_name","lastName","family_name","email","loginName","preferred_username","image","picture","userinfo","request","context","tokens","access_token","callbacks","session","token","user"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAO,MAAMA,cAAsC,CAAC,EAACC,oBAAoB,EAAEC,SAAS,EAAEC,QAAQ,EAAC,GAAM,CAAA;QACjGC,WAAW;YACP;gBACIC,IAAIJ;gBACJK,MAAML;gBACNM,MAAM;gBACNC,SAAS;gBACTC,WAAWP;gBACXQ,eAAe;oBACXC,QAAQ;wBACJC,OAAO;oBACX;gBACJ;gBACAC,SAAS;gBACTC,QAAQ;oBAAC;oBAAQ;iBAAQ;gBACzBC,QAAQ;oBACJC,4BAA4B;gBAChC;gBACAC,SAAS,OAAOA,UAAa,CAAA;wBACzBZ,IAAIY,QAAQC,GAAG;wBACfZ,MAAMW,QAAQX,IAAI;wBAClBa,WAAWF,QAAQG,UAAU;wBAC7BC,UAAUJ,QAAQK,WAAW;wBAC7BC,OAAON,QAAQM,KAAK;wBACpBC,WAAWP,QAAQQ,kBAAkB;wBACrCC,OAAOT,QAAQU,OAAO;oBAC1B,CAAA;gBACAC,UAAU;oBACN,MAAMC,SAAQC,OAAO;wBACjB,OAAO,MAAMA,QAAQf,MAAM,CAACa,QAAQ,CAACE,QAAQC,MAAM,CAACC,YAAY;oBACpE;gBACJ;gBACA7B;YACJ;SACH;QACD8B,WAAW;YACPC,SAAS,OAAO,EAACA,OAAO,EAAEC,KAAK,EAAC,GAAM,CAAA;oBAClC,GAAGD,OAAO;oBACVE,MAAM;wBACF/B,IAAI8B,MAAMjB,GAAG;wBACb,GAAGgB,QAAQE,IAAI;oBACnB;gBACJ,CAAA;QACJ;IACJ,CAAA,EAAE"}

package/dist/types.d.ts

@@ -1,7 +1,8 @@
 import { NextAuthOptions } from 'next-auth';
-import { AuthStrategy } from 'payload/auth';
-import { Config } from 'payload/config';
+import { AuthStrategy } from 'payload';
+import { Config } from 'payload';
 export type ZitadelPluginProps = {
+    disableAvatar?: true | undefined;
     disableLocalStrategy?: true | undefined;
     disableDefaultLoginButton?: true | undefined;
     defaultLoginButtonTitle?: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAA;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAA;AACzC,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAErC,MAAM,MAAM,kBAAkB,GAAG;IAC7B,oBAAoB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;IACvC,yBAAyB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;IAC5C,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAChC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEjC,MAAM,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK;IACnE,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,MAAM,CAAC;IAClD,eAAe,EAAE,GAAG,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IAClC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,uBAAuB,KAAK,eAAe,CAAA;AAExF,MAAM,MAAM,eAAe,GAAG;IAC1B,SAAS,EAAE,IAAI,CAAA;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,GAAG;IACzD,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;CACjC,GAAG,CAAC,eAAe,GAAG;IACnB,SAAS,CAAC,EAAE,SAAS,CAAA;CACxB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;AAE7B,MAAM,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,YAAY,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAA;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAA;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAA;AAE9B,MAAM,MAAM,kBAAkB,GAAG;IAC7B,aAAa,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;IAChC,oBAAoB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;IACvC,yBAAyB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;IAC5C,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAChC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEjC,MAAM,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK;IACnE,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,MAAM,CAAC;IAClD,eAAe,EAAE,GAAG,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IAClC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,uBAAuB,KAAK,eAAe,CAAA;AAExF,MAAM,MAAM,eAAe,GAAG;IAC1B,SAAS,EAAE,IAAI,CAAA;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,GAAG;IACzD,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;CACjC,GAAG,CAAC,eAAe,GAAG;IACnB,SAAS,CAAC,EAAE,SAAS,CAAA;CACxB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;AAE7B,MAAM,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,YAAY,CAAA"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import {NextAuthOptions} from 'next-auth'\nimport {AuthStrategy} from 'payload/auth'\nimport {Config} from 'payload/config'\n\nexport type ZitadelPluginProps = {\n    disableLocalStrategy?: true | undefined\n    disableDefaultLoginButton?: true | undefined\n    defaultLoginButtonTitle?: string\n    externalProviderName?: string\n} & Partial<ZitadelStrategyProps>\n\nexport type ZitadelPluginProviderType = (props: ZitadelPluginProps) => {\n    zitadelPlugin: (incomingConfig: Config) => Config,\n    nextauthHandler: any\n}\n\nexport type ZitadelAuthOptionsProps = {\n    internalProviderName: string,\n    issuerUrl: string,\n    clientId: string\n}\n\nexport type ZitadelAuthOptionsType = (props: ZitadelAuthOptionsProps) => NextAuthOptions\n\nexport type ZitadelAPIProps = {\n    enableAPI: true\n    apiClientId: string,\n    apiKeyId: string,\n    apiKey: string\n}\n\nexport type ZitadelStrategyProps = ZitadelAuthOptionsProps & {\n    authSlug: string,\n    associatedIdFieldName: string,\n} & (ZitadelAPIProps | {\n    enableAPI?: undefined\n} & Partial<ZitadelAPIProps>)\n\nexport type ZitadelStrategyType = (props: ZitadelStrategyProps) => AuthStrategy"],"names":[],"rangeMappings":"","mappings":"AAsCA,WAA+E"}
+{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import {NextAuthOptions} from 'next-auth'\nimport {AuthStrategy} from 'payload'\nimport {Config} from 'payload'\n\nexport type ZitadelPluginProps = {\n    disableAvatar?: true | undefined\n    disableLocalStrategy?: true | undefined\n    disableDefaultLoginButton?: true | undefined\n    defaultLoginButtonTitle?: string\n    externalProviderName?: string\n} & Partial<ZitadelStrategyProps>\n\nexport type ZitadelPluginProviderType = (props: ZitadelPluginProps) => {\n    zitadelPlugin: (incomingConfig: Config) => Config,\n    nextauthHandler: any\n}\n\nexport type ZitadelAuthOptionsProps = {\n    internalProviderName: string,\n    issuerUrl: string,\n    clientId: string\n}\n\nexport type ZitadelAuthOptionsType = (props: ZitadelAuthOptionsProps) => NextAuthOptions\n\nexport type ZitadelAPIProps = {\n    enableAPI: true\n    apiClientId: string,\n    apiKeyId: string,\n    apiKey: string\n}\n\nexport type ZitadelStrategyProps = ZitadelAuthOptionsProps & {\n    authSlug: string,\n    associatedIdFieldName: string,\n} & (ZitadelAPIProps | {\n    enableAPI?: undefined\n} & Partial<ZitadelAPIProps>)\n\nexport type ZitadelStrategyType = (props: ZitadelStrategyProps) => AuthStrategy"],"names":[],"rangeMappings":"","mappings":"AAuCA,WAA+E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-zitadel-plugin",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "plugin for Payload CMS, which enables authentication via Zitadel IdP",
   "type": "module",
   "license": "MIT",
@@ -36,24 +36,24 @@
     "dist"
   ],
   "dependencies": {
-    "@payloadcms/translations": "3.0.0-beta.47",
-    "@payloadcms/ui": "3.0.0-beta.47",
+    "@payloadcms/translations": "3.0.0-beta.52",
+    "@payloadcms/ui": "3.0.0-beta.52",
     "jsonwebtoken": "^9.0.2",
     "next": "^15.0.0-rc.0",
     "next-auth": "^4.24.7",
-    "payload": "3.0.0-beta.47",
-    "react": "^19.0.0-rc-dfd30974ab-20240613",
-    "react-dom": "^19.0.0-rc-dfd30974ab-20240613"
+    "payload": "3.0.0-beta.52",
+    "react": "^19.0.0-rc-1434af3d22-20240618",
+    "react-dom": "^19.0.0-rc-1434af3d22-20240618"
   },
   "devDependencies": {
     "@swc/cli": "^0.3.12",
-    "@swc/core": "^1.5.29",
+    "@swc/core": "^1.6.1",
     "@types/jsonwebtoken": "^9.0.6",
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.5",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "rimraf": "^5.0.7",
-    "typescript": "^5.6.0-dev.20240614"
+    "typescript": "^5.6.0-dev.20240618"
   },
   "engines": {
     "node": "^22.3.0"

package/dist/LoginButton/button.d.ts

@@ -1,3 +0,0 @@
-import { CustomComponent } from 'payload/config';
-export declare const _LoginButton: CustomComponent;
-//# sourceMappingURL=button.d.ts.map

package/dist/LoginButton/button.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"button.d.ts","sourceRoot":"","sources":["../../src/LoginButton/button.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAA;AAM9C,eAAO,MAAM,YAAY,EAAE,eAa1B,CAAA"}

package/dist/LoginButton/button.js

@@ -1,20 +0,0 @@
-'use client';
-import React from 'react';
-import { signIn } from 'next-auth/react';
-import { Button } from '@payloadcms/ui/elements';
-import { useTranslation } from '@payloadcms/ui/providers/Translation';
-export const _LoginButton = ({ internalProviderName, externalProviderName })=>{
-    const { t } = useTranslation();
-    return /*#__PURE__*/ React.createElement("div", {
-        style: {
-            display: 'flex',
-            justifyContent: 'center'
-        }
-    }, /*#__PURE__*/ React.createElement(Button, {
-        onClick: ()=>signIn(internalProviderName)
-    }, t('zitadelPlugin:signIn', {
-        externalProviderName
-    })));
-};
-
-//# sourceMappingURL=button.js.map

package/dist/LoginButton/button.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/LoginButton/button.tsx"],"sourcesContent":["'use client'\n\nimport React from 'react'\nimport {signIn} from 'next-auth/react'\nimport {CustomComponent} from 'payload/config'\nimport {NestedKeysStripped} from '@payloadcms/translations'\nimport {Button} from '@payloadcms/ui/elements'\nimport {useTranslation} from '@payloadcms/ui/providers/Translation'\nimport {translations} from '../translations.js'\n\nexport const _LoginButton: CustomComponent = ({internalProviderName, externalProviderName}: {\n    internalProviderName: string,\n    externalProviderName: string\n}) => {\n    const {t} = useTranslation<typeof translations.en, NestedKeysStripped<typeof translations.en>>()\n\n    return (\n        <div style={{display: 'flex', justifyContent: 'center'}}>\n            <Button onClick={() => signIn(internalProviderName)}>\n                {t('zitadelPlugin:signIn', {externalProviderName})}\n            </Button>\n        </div>\n    )\n}"],"names":["React","signIn","Button","useTranslation","_LoginButton","internalProviderName","externalProviderName","t","div","style","display","justifyContent","onClick"],"rangeMappings":";;;;;;;;;;;;;;;;;","mappings":"AAAA;AAEA,OAAOA,WAAW,QAAO;AACzB,SAAQC,MAAM,QAAO,kBAAiB;AAGtC,SAAQC,MAAM,QAAO,0BAAyB;AAC9C,SAAQC,cAAc,QAAO,uCAAsC;AAGnE,OAAO,MAAMC,eAAgC,CAAC,EAACC,oBAAoB,EAAEC,oBAAoB,EAGxF;IACG,MAAM,EAACC,CAAC,EAAC,GAAGJ;IAEZ,qBACI,oBAACK;QAAIC,OAAO;YAACC,SAAS;YAAQC,gBAAgB;QAAQ;qBAClD,oBAACT;QAAOU,SAAS,IAAMX,OAAOI;OACzBE,EAAE,wBAAwB;QAACD;IAAoB;AAIhE,EAAC"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/LoginButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,eAAO,MAAM,WAAW,mDAAkD;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAA;CAC/B,4BAAkH,CAAA"}

package/dist/LoginButton/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/LoginButton/index.tsx"],"sourcesContent":["import React from 'react'\nimport {_LoginButton} from './button.js'\n\nexport const LoginButton = ({internalProviderName, externalProviderName}: {\n    internalProviderName: string,\n    externalProviderName: string\n}) => () => <_LoginButton internalProviderName={internalProviderName} externalProviderName={externalProviderName}/>"],"names":["React","_LoginButton","LoginButton","internalProviderName","externalProviderName"],"rangeMappings":";;;;;","mappings":"AAAA,OAAOA,WAAW,QAAO;AACzB,SAAQC,YAAY,QAAO,cAAa;AAExC,OAAO,MAAMC,cAAc,CAAC,EAACC,oBAAoB,EAAEC,oBAAoB,EAGtE,GAAK,kBAAM,oBAACH;YAAaE,sBAAsBA;YAAsBC,sBAAsBA;WAAuB"}