@payloadcms/plugin-multi-tenant 4.0.0-internal.9496957 → 4.0.0-internal.970009e

package/package.json

@@ -1,21 +1,16 @@
 {
   "name": "@payloadcms/plugin-multi-tenant",
-  "version": "4.0.0-internal.9496957",
+  "version": "4.0.0-internal.970009e",
   "description": "Multi Tenant plugin for Payload",
   "keywords": [
-    "payload",
     "cms",
+    "multi-tenant",
+    "nextjs",
+    "payload",
     "plugin",
-    "typescript",
     "react",
-    "multi-tenant",
-    "nextjs"
+    "typescript"
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/payloadcms/payload.git",
-    "directory": "packages/plugin-multi-tenant"
-  },
   "license": "MIT",
   "author": "Payload <dev@payloadcms.com> (https://payloadcms.com)",
   "maintainers": [
@@ -25,10 +20,22 @@
       "url": "https://payloadcms.com"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/payloadcms/payload.git",
+    "directory": "packages/plugin-multi-tenant"
+  },
+  "files": [
+    "dist",
+    "types.js",
+    "types.d.ts"
+  ],
+  "type": "module",
   "sideEffects": [
     "*.css"
   ],
-  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "import": "./dist/index.js",
@@ -71,22 +78,14 @@
       "default": "./dist/translations/languages/*.js"
     }
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist",
-    "types.js",
-    "types.d.ts"
-  ],
   "devDependencies": {
-    "@payloadcms/eslint-config": "3.28.0",
-    "@payloadcms/ui": "4.0.0-internal.9496957",
-    "payload": "4.0.0-internal.9496957",
-    "@payloadcms/translations": "4.0.0-internal.9496957"
+    "@payloadcms/translations": "4.0.0-internal.970009e",
+    "@payloadcms/ui": "4.0.0-internal.970009e",
+    "payload": "4.0.0-internal.970009e"
   },
   "peerDependencies": {
-    "@payloadcms/ui": "4.0.0-internal.9496957",
-    "payload": "4.0.0-internal.9496957"
+    "@payloadcms/ui": "4.0.0-internal.970009e",
+    "payload": "4.0.0-internal.970009e"
   },
   "homepage:": "https://payloadcms.com",
   "scripts": {
@@ -95,9 +94,7 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
-    "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
+    "copyfiles": "copyfiles -u 1 -e \"**/*.spec.*\" \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
     "pack:plugin": "pnpm build && pnpm pack"
   }
 }

package/dist/index.spec.js

@@ -1,70 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { multiTenantPlugin } from './index.js';
-describe('multiTenantPlugin', ()=>{
-    it('applies tenant assignment access defaults', async ()=>{
-        let hasAllTenantAccess = false;
-        const plugin = multiTenantPlugin({
-            collections: {},
-            userHasAccessToAllTenants: ()=>hasAllTenantAccess
-        });
-        const config = await plugin({
-            collections: [
-                {
-                    slug: 'users',
-                    auth: true,
-                    fields: []
-                },
-                {
-                    slug: 'tenants',
-                    fields: []
-                }
-            ]
-        });
-        const usersCollection = config.collections?.find(({ slug })=>slug === 'users');
-        const tenantsField = usersCollection?.fields.find((field)=>'name' in field && field.name === 'tenants');
-        const accessArgs = {
-            req: {
-                user: {
-                    id: 'test-user'
-                }
-            }
-        };
-        expect(await tenantsField?.access?.create?.(accessArgs)).toBe(false);
-        expect(await tenantsField?.access?.update?.(accessArgs)).toBe(false);
-        hasAllTenantAccess = true;
-        expect(await tenantsField?.access?.create?.(accessArgs)).toBe(true);
-        expect(await tenantsField?.access?.update?.(accessArgs)).toBe(true);
-    });
-    it('retains configured tenant assignment access callbacks', async ()=>{
-        const createAccess = ()=>false;
-        const updateAccess = ()=>true;
-        const plugin = multiTenantPlugin({
-            collections: {},
-            tenantsArrayField: {
-                arrayFieldAccess: {
-                    create: createAccess,
-                    update: updateAccess
-                }
-            }
-        });
-        const config = await plugin({
-            collections: [
-                {
-                    slug: 'users',
-                    auth: true,
-                    fields: []
-                },
-                {
-                    slug: 'tenants',
-                    fields: []
-                }
-            ]
-        });
-        const usersCollection = config.collections?.find(({ slug })=>slug === 'users');
-        const tenantsField = usersCollection?.fields.find((field)=>'name' in field && field.name === 'tenants');
-        expect(tenantsField?.access?.create).toBe(createAccess);
-        expect(tenantsField?.access?.update).toBe(updateAccess);
-    });
-});
-
-//# sourceMappingURL=index.spec.js.map

package/dist/index.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/index.spec.ts"],"sourcesContent":["import type { ArrayField, Config } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { multiTenantPlugin } from './index.js'\n\ndescribe('multiTenantPlugin', () => {\n  it('applies tenant assignment access defaults', async () => {\n    let hasAllTenantAccess = false\n    const plugin = multiTenantPlugin({\n      collections: {},\n      userHasAccessToAllTenants: () => hasAllTenantAccess,\n    })\n    const config = await plugin({\n      collections: [\n        { slug: 'users', auth: true, fields: [] },\n        { slug: 'tenants', fields: [] },\n      ],\n    } as Config)\n    const usersCollection = config.collections?.find(({ slug }) => slug === 'users')\n    const tenantsField = usersCollection?.fields.find(\n      (field): field is ArrayField => 'name' in field && field.name === 'tenants',\n    )\n    const accessArgs = { req: { user: { id: 'test-user' } } } as never\n\n    expect(await tenantsField?.access?.create?.(accessArgs)).toBe(false)\n    expect(await tenantsField?.access?.update?.(accessArgs)).toBe(false)\n\n    hasAllTenantAccess = true\n\n    expect(await tenantsField?.access?.create?.(accessArgs)).toBe(true)\n    expect(await tenantsField?.access?.update?.(accessArgs)).toBe(true)\n  })\n\n  it('retains configured tenant assignment access callbacks', async () => {\n    const createAccess = () => false\n    const updateAccess = () => true\n    const plugin = multiTenantPlugin({\n      collections: {},\n      tenantsArrayField: {\n        arrayFieldAccess: {\n          create: createAccess,\n          update: updateAccess,\n        },\n      },\n    })\n    const config = await plugin({\n      collections: [\n        { slug: 'users', auth: true, fields: [] },\n        { slug: 'tenants', fields: [] },\n      ],\n    } as Config)\n    const usersCollection = config.collections?.find(({ slug }) => slug === 'users')\n    const tenantsField = usersCollection?.fields.find(\n      (field): field is ArrayField => 'name' in field && field.name === 'tenants',\n    )\n\n    expect(tenantsField?.access?.create).toBe(createAccess)\n    expect(tenantsField?.access?.update).toBe(updateAccess)\n  })\n})\n"],"names":["describe","expect","it","multiTenantPlugin","hasAllTenantAccess","plugin","collections","userHasAccessToAllTenants","config","slug","auth","fields","usersCollection","find","tenantsField","field","name","accessArgs","req","user","id","access","create","toBe","update","createAccess","updateAccess","tenantsArrayField","arrayFieldAccess"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SAASC,iBAAiB,QAAQ,aAAY;AAE9CH,SAAS,qBAAqB;IAC5BE,GAAG,6CAA6C;QAC9C,IAAIE,qBAAqB;QACzB,MAAMC,SAASF,kBAAkB;YAC/BG,aAAa,CAAC;YACdC,2BAA2B,IAAMH;QACnC;QACA,MAAMI,SAAS,MAAMH,OAAO;YAC1BC,aAAa;gBACX;oBAAEG,MAAM;oBAASC,MAAM;oBAAMC,QAAQ,EAAE;gBAAC;gBACxC;oBAAEF,MAAM;oBAAWE,QAAQ,EAAE;gBAAC;aAC/B;QACH;QACA,MAAMC,kBAAkBJ,OAAOF,WAAW,EAAEO,KAAK,CAAC,EAAEJ,IAAI,EAAE,GAAKA,SAAS;QACxE,MAAMK,eAAeF,iBAAiBD,OAAOE,KAC3C,CAACE,QAA+B,UAAUA,SAASA,MAAMC,IAAI,KAAK;QAEpE,MAAMC,aAAa;YAAEC,KAAK;gBAAEC,MAAM;oBAAEC,IAAI;gBAAY;YAAE;QAAE;QAExDnB,OAAO,MAAMa,cAAcO,QAAQC,SAASL,aAAaM,IAAI,CAAC;QAC9DtB,OAAO,MAAMa,cAAcO,QAAQG,SAASP,aAAaM,IAAI,CAAC;QAE9DnB,qBAAqB;QAErBH,OAAO,MAAMa,cAAcO,QAAQC,SAASL,aAAaM,IAAI,CAAC;QAC9DtB,OAAO,MAAMa,cAAcO,QAAQG,SAASP,aAAaM,IAAI,CAAC;IAChE;IAEArB,GAAG,yDAAyD;QAC1D,MAAMuB,eAAe,IAAM;QAC3B,MAAMC,eAAe,IAAM;QAC3B,MAAMrB,SAASF,kBAAkB;YAC/BG,aAAa,CAAC;YACdqB,mBAAmB;gBACjBC,kBAAkB;oBAChBN,QAAQG;oBACRD,QAAQE;gBACV;YACF;QACF;QACA,MAAMlB,SAAS,MAAMH,OAAO;YAC1BC,aAAa;gBACX;oBAAEG,MAAM;oBAASC,MAAM;oBAAMC,QAAQ,EAAE;gBAAC;gBACxC;oBAAEF,MAAM;oBAAWE,QAAQ,EAAE;gBAAC;aAC/B;QACH;QACA,MAAMC,kBAAkBJ,OAAOF,WAAW,EAAEO,KAAK,CAAC,EAAEJ,IAAI,EAAE,GAAKA,SAAS;QACxE,MAAMK,eAAeF,iBAAiBD,OAAOE,KAC3C,CAACE,QAA+B,UAAUA,SAASA,MAAMC,IAAI,KAAK;QAGpEf,OAAOa,cAAcO,QAAQC,QAAQC,IAAI,CAACE;QAC1CxB,OAAOa,cAAcO,QAAQG,QAAQD,IAAI,CAACG;IAC5C;AACF"}

package/dist/utilities/addCollectionAccess.spec.js

@@ -1,134 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { addCollectionAccess } from './addCollectionAccess.js';
-const createScope = (collection, accessResultCallback)=>({
-        accessResultCallback,
-        adminUsersSlug: 'users',
-        collection,
-        fieldName: 'tenant',
-        userHasAccessToAllTenants: ()=>false
-    });
-const createArgs = (slug = 'posts')=>({
-        req: {
-            user: {
-                collection: 'users',
-                id: 'user-1',
-                tenants: [
-                    {
-                        tenant: 'tenant-1'
-                    }
-                ]
-            }
-        },
-        slug
-    });
-describe('addCollectionAccess', ()=>{
-    it('adds tenant constraints through base access without replacing collection access', async ()=>{
-        const documentRead = vi.fn(()=>({
-                published: {
-                    equals: true
-                }
-            }));
-        const collection = {
-            slug: 'posts',
-            access: {
-                read: documentRead
-            },
-            fields: []
-        };
-        const config = {
-            baseAccess: {
-                collections: {
-                    read: ()=>({
-                            archived: {
-                                not_equals: true
-                            }
-                        })
-                }
-            }
-        };
-        addCollectionAccess({
-            config,
-            scopes: [
-                createScope(collection)
-            ]
-        });
-        expect(collection.access?.read).toBe(documentRead);
-        await expect(config.baseAccess?.collections?.read?.(createArgs())).resolves.toEqual({
-            and: [
-                {
-                    archived: {
-                        not_equals: true
-                    }
-                },
-                {
-                    tenant: {
-                        in: [
-                            'tenant-1'
-                        ]
-                    }
-                }
-            ]
-        });
-        await expect(config.baseAccess?.collections?.read?.(createArgs('pages'))).resolves.toEqual({
-            archived: {
-                not_equals: true
-            }
-        });
-        expect(documentRead).not.toHaveBeenCalled();
-    });
-    it('returns a boolean tenant result for collection create access', async ()=>{
-        const collection = {
-            slug: 'posts',
-            fields: []
-        };
-        const config = {};
-        addCollectionAccess({
-            config,
-            scopes: [
-                createScope(collection)
-            ]
-        });
-        await expect(config.baseAccess?.collections?.create?.(createArgs())).resolves.toBe(true);
-    });
-    it('keeps callback wrapping when an access result override is configured', async ()=>{
-        const documentResult = {
-            published: {
-                equals: true
-            }
-        };
-        const documentRead = vi.fn(()=>documentResult);
-        const accessResultCallback = vi.fn(({ accessResult })=>accessResult);
-        const collection = {
-            slug: 'posts',
-            access: {
-                read: documentRead
-            },
-            fields: []
-        };
-        const config = {};
-        addCollectionAccess({
-            config,
-            scopes: [
-                createScope(collection, accessResultCallback)
-            ]
-        });
-        expect(config.baseAccess).toBeUndefined();
-        await expect(collection.access?.read?.(createArgs())).resolves.toEqual({
-            and: [
-                documentResult,
-                {
-                    tenant: {
-                        in: [
-                            'tenant-1'
-                        ]
-                    }
-                }
-            ]
-        });
-        expect(accessResultCallback).toHaveBeenCalledWith(expect.objectContaining({
-            accessKey: 'read'
-        }));
-    });
-});
-
-//# sourceMappingURL=addCollectionAccess.spec.js.map

package/dist/utilities/addCollectionAccess.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utilities/addCollectionAccess.spec.ts"],"sourcesContent":["import type { AccessArgs, CollectionConfig, Config } from 'payload'\n\nimport { describe, expect, it, vi } from 'vitest'\n\nimport type { TenantAccessConfig } from './addCollectionAccess.js'\n\nimport { addCollectionAccess } from './addCollectionAccess.js'\n\nconst createScope = (\n  collection: CollectionConfig,\n  accessResultCallback?: TenantAccessConfig['accessResultCallback'],\n): TenantAccessConfig => ({\n  accessResultCallback,\n  adminUsersSlug: 'users',\n  collection,\n  fieldName: 'tenant',\n  userHasAccessToAllTenants: () => false,\n})\n\nconst createArgs = (slug = 'posts'): AccessArgs => ({\n  req: {\n    user: {\n      collection: 'users',\n      id: 'user-1',\n      tenants: [{ tenant: 'tenant-1' }],\n    },\n  } as unknown as AccessArgs['req'],\n  slug,\n})\n\ndescribe('addCollectionAccess', () => {\n  it('adds tenant constraints through base access without replacing collection access', async () => {\n    const documentRead = vi.fn(() => ({ published: { equals: true } }))\n    const collection: CollectionConfig = {\n      slug: 'posts',\n      access: { read: documentRead },\n      fields: [],\n    }\n    const config = {\n      baseAccess: {\n        collections: {\n          read: () => ({ archived: { not_equals: true } }),\n        },\n      },\n    } as Config\n\n    addCollectionAccess({ config, scopes: [createScope(collection)] })\n\n    expect(collection.access?.read).toBe(documentRead)\n    await expect(config.baseAccess?.collections?.read?.(createArgs())).resolves.toEqual({\n      and: [{ archived: { not_equals: true } }, { tenant: { in: ['tenant-1'] } }],\n    })\n    await expect(config.baseAccess?.collections?.read?.(createArgs('pages'))).resolves.toEqual({\n      archived: { not_equals: true },\n    })\n    expect(documentRead).not.toHaveBeenCalled()\n  })\n\n  it('returns a boolean tenant result for collection create access', async () => {\n    const collection: CollectionConfig = { slug: 'posts', fields: [] }\n    const config = {} as Config\n\n    addCollectionAccess({ config, scopes: [createScope(collection)] })\n\n    await expect(config.baseAccess?.collections?.create?.(createArgs())).resolves.toBe(true)\n  })\n\n  it('keeps callback wrapping when an access result override is configured', async () => {\n    const documentResult = { published: { equals: true } }\n    const documentRead = vi.fn(() => documentResult)\n    const accessResultCallback = vi.fn(({ accessResult }) => accessResult)\n    const collection: CollectionConfig = {\n      slug: 'posts',\n      access: { read: documentRead },\n      fields: [],\n    }\n    const config = {} as Config\n\n    addCollectionAccess({\n      config,\n      scopes: [createScope(collection, accessResultCallback)],\n    })\n\n    expect(config.baseAccess).toBeUndefined()\n    await expect(collection.access?.read?.(createArgs())).resolves.toEqual({\n      and: [documentResult, { tenant: { in: ['tenant-1'] } }],\n    })\n    expect(accessResultCallback).toHaveBeenCalledWith(\n      expect.objectContaining({ accessKey: 'read' }),\n    )\n  })\n})\n"],"names":["describe","expect","it","vi","addCollectionAccess","createScope","collection","accessResultCallback","adminUsersSlug","fieldName","userHasAccessToAllTenants","createArgs","slug","req","user","id","tenants","tenant","documentRead","fn","published","equals","access","read","fields","config","baseAccess","collections","archived","not_equals","scopes","toBe","resolves","toEqual","and","in","not","toHaveBeenCalled","create","documentResult","accessResult","toBeUndefined","toHaveBeenCalledWith","objectContaining","accessKey"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAIjD,SAASC,mBAAmB,QAAQ,2BAA0B;AAE9D,MAAMC,cAAc,CAClBC,YACAC,uBACwB,CAAA;QACxBA;QACAC,gBAAgB;QAChBF;QACAG,WAAW;QACXC,2BAA2B,IAAM;IACnC,CAAA;AAEA,MAAMC,aAAa,CAACC,OAAO,OAAO,GAAkB,CAAA;QAClDC,KAAK;YACHC,MAAM;gBACJR,YAAY;gBACZS,IAAI;gBACJC,SAAS;oBAAC;wBAAEC,QAAQ;oBAAW;iBAAE;YACnC;QACF;QACAL;IACF,CAAA;AAEAZ,SAAS,uBAAuB;IAC9BE,GAAG,mFAAmF;QACpF,MAAMgB,eAAef,GAAGgB,EAAE,CAAC,IAAO,CAAA;gBAAEC,WAAW;oBAAEC,QAAQ;gBAAK;YAAE,CAAA;QAChE,MAAMf,aAA+B;YACnCM,MAAM;YACNU,QAAQ;gBAAEC,MAAML;YAAa;YAC7BM,QAAQ,EAAE;QACZ;QACA,MAAMC,SAAS;YACbC,YAAY;gBACVC,aAAa;oBACXJ,MAAM,IAAO,CAAA;4BAAEK,UAAU;gCAAEC,YAAY;4BAAK;wBAAE,CAAA;gBAChD;YACF;QACF;QAEAzB,oBAAoB;YAAEqB;YAAQK,QAAQ;gBAACzB,YAAYC;aAAY;QAAC;QAEhEL,OAAOK,WAAWgB,MAAM,EAAEC,MAAMQ,IAAI,CAACb;QACrC,MAAMjB,OAAOwB,OAAOC,UAAU,EAAEC,aAAaJ,OAAOZ,eAAeqB,QAAQ,CAACC,OAAO,CAAC;YAClFC,KAAK;gBAAC;oBAAEN,UAAU;wBAAEC,YAAY;oBAAK;gBAAE;gBAAG;oBAAEZ,QAAQ;wBAAEkB,IAAI;4BAAC;yBAAW;oBAAC;gBAAE;aAAE;QAC7E;QACA,MAAMlC,OAAOwB,OAAOC,UAAU,EAAEC,aAAaJ,OAAOZ,WAAW,WAAWqB,QAAQ,CAACC,OAAO,CAAC;YACzFL,UAAU;gBAAEC,YAAY;YAAK;QAC/B;QACA5B,OAAOiB,cAAckB,GAAG,CAACC,gBAAgB;IAC3C;IAEAnC,GAAG,gEAAgE;QACjE,MAAMI,aAA+B;YAAEM,MAAM;YAASY,QAAQ,EAAE;QAAC;QACjE,MAAMC,SAAS,CAAC;QAEhBrB,oBAAoB;YAAEqB;YAAQK,QAAQ;gBAACzB,YAAYC;aAAY;QAAC;QAEhE,MAAML,OAAOwB,OAAOC,UAAU,EAAEC,aAAaW,SAAS3B,eAAeqB,QAAQ,CAACD,IAAI,CAAC;IACrF;IAEA7B,GAAG,wEAAwE;QACzE,MAAMqC,iBAAiB;YAAEnB,WAAW;gBAAEC,QAAQ;YAAK;QAAE;QACrD,MAAMH,eAAef,GAAGgB,EAAE,CAAC,IAAMoB;QACjC,MAAMhC,uBAAuBJ,GAAGgB,EAAE,CAAC,CAAC,EAAEqB,YAAY,EAAE,GAAKA;QACzD,MAAMlC,aAA+B;YACnCM,MAAM;YACNU,QAAQ;gBAAEC,MAAML;YAAa;YAC7BM,QAAQ,EAAE;QACZ;QACA,MAAMC,SAAS,CAAC;QAEhBrB,oBAAoB;YAClBqB;YACAK,QAAQ;gBAACzB,YAAYC,YAAYC;aAAsB;QACzD;QAEAN,OAAOwB,OAAOC,UAAU,EAAEe,aAAa;QACvC,MAAMxC,OAAOK,WAAWgB,MAAM,EAAEC,OAAOZ,eAAeqB,QAAQ,CAACC,OAAO,CAAC;YACrEC,KAAK;gBAACK;gBAAgB;oBAAEtB,QAAQ;wBAAEkB,IAAI;4BAAC;yBAAW;oBAAC;gBAAE;aAAE;QACzD;QACAlC,OAAOM,sBAAsBmC,oBAAoB,CAC/CzC,OAAO0C,gBAAgB,CAAC;YAAEC,WAAW;QAAO;IAEhD;AACF"}