@payloadcms/plugin-multi-tenant 4.0.0-internal.2fddfc0 → 4.0.0-internal.314c594

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-multi-tenant",
-  "version": "4.0.0-internal.2fddfc0",
+  "version": "4.0.0-internal.314c594",
   "description": "Multi Tenant plugin for Payload",
   "keywords": [
     "payload",
@@ -26,7 +26,6 @@
     }
   ],
   "sideEffects": [
-    "*.scss",
     "*.css"
   ],
   "type": "module",
@@ -80,14 +79,14 @@
     "types.d.ts"
   ],
   "devDependencies": {
-    "@payloadcms/translations": "4.0.0-internal.2fddfc0",
-    "@payloadcms/ui": "4.0.0-internal.2fddfc0",
-    "payload": "4.0.0-internal.2fddfc0",
-    "@payloadcms/eslint-config": "3.28.0"
+    "@payloadcms/eslint-config": "3.28.0",
+    "@payloadcms/translations": "4.0.0-internal.314c594",
+    "@payloadcms/ui": "4.0.0-internal.314c594",
+    "payload": "4.0.0-internal.314c594"
   },
   "peerDependencies": {
-    "@payloadcms/ui": "4.0.0-internal.2fddfc0",
-    "payload": "4.0.0-internal.2fddfc0"
+    "@payloadcms/ui": "4.0.0-internal.314c594",
+    "payload": "4.0.0-internal.314c594"
   },
   "homepage:": "https://payloadcms.com",
   "scripts": {

package/dist/@types/assets.d.js

@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=assets.d.js.map

package/dist/@types/assets.d.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/@types/assets.d.ts"],"names":[],"mappings":""}

package/dist/utilities/combineWhereConstraints.d.ts

@@ -1,3 +0,0 @@
-import type { Where } from 'payload';
-export declare function combineWhereConstraints(constraints: Array<Where>): Where;
-//# sourceMappingURL=combineWhereConstraints.d.ts.map

package/dist/utilities/combineWhereConstraints.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"combineWhereConstraints.d.ts","sourceRoot":"","sources":["../../src/utilities/combineWhereConstraints.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAgBxE"}

package/dist/utilities/combineWhereConstraints.js

@@ -1,19 +0,0 @@
-export function combineWhereConstraints(constraints) {
-    if (constraints.length === 0) {
-        return {};
-    }
-    if (constraints.length === 1 && constraints[0]) {
-        return constraints[0];
-    }
-    const andConstraint = {
-        and: []
-    };
-    constraints.forEach((constraint)=>{
-        if (andConstraint.and && constraint && typeof constraint === 'object') {
-            andConstraint.and.push(constraint);
-        }
-    });
-    return andConstraint;
-}
-
-//# sourceMappingURL=combineWhereConstraints.js.map

package/dist/utilities/combineWhereConstraints.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utilities/combineWhereConstraints.ts"],"sourcesContent":["import type { Where } from 'payload'\n\nexport function combineWhereConstraints(constraints: Array<Where>): Where {\n  if (constraints.length === 0) {\n    return {}\n  }\n  if (constraints.length === 1 && constraints[0]) {\n    return constraints[0]\n  }\n  const andConstraint: Where = {\n    and: [],\n  }\n  constraints.forEach((constraint) => {\n    if (andConstraint.and && constraint && typeof constraint === 'object') {\n      andConstraint.and.push(constraint)\n    }\n  })\n  return andConstraint\n}\n"],"names":["combineWhereConstraints","constraints","length","andConstraint","and","forEach","constraint","push"],"mappings":"AAEA,OAAO,SAASA,wBAAwBC,WAAyB;IAC/D,IAAIA,YAAYC,MAAM,KAAK,GAAG;QAC5B,OAAO,CAAC;IACV;IACA,IAAID,YAAYC,MAAM,KAAK,KAAKD,WAAW,CAAC,EAAE,EAAE;QAC9C,OAAOA,WAAW,CAAC,EAAE;IACvB;IACA,MAAME,gBAAuB;QAC3BC,KAAK,EAAE;IACT;IACAH,YAAYI,OAAO,CAAC,CAACC;QACnB,IAAIH,cAAcC,GAAG,IAAIE,cAAc,OAAOA,eAAe,UAAU;YACrEH,cAAcC,GAAG,CAACG,IAAI,CAACD;QACzB;IACF;IACA,OAAOH;AACT"}

package/dist/utilities/withTenantAccess.d.ts

@@ -1,16 +0,0 @@
-import type { Access, AccessArgs, AccessResult, CollectionConfig } from 'payload';
-import type { AllAccessKeys, MultiTenantPluginConfig } from '../types.js';
-type Args<ConfigType> = {
-    accessFunction?: Access;
-    accessKey: AllAccessKeys[number];
-    accessResultCallback?: MultiTenantPluginConfig<ConfigType>['usersAccessResultOverride'];
-    adminUsersSlug: string;
-    collection: CollectionConfig;
-    fieldName: string;
-    tenantsArrayFieldName?: string;
-    tenantsArrayTenantFieldName?: string;
-    userHasAccessToAllTenants: Required<MultiTenantPluginConfig<ConfigType>>['userHasAccessToAllTenants'];
-};
-export declare const withTenantAccess: <ConfigType>({ accessFunction, accessKey, accessResultCallback, adminUsersSlug, collection, fieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, userHasAccessToAllTenants, }: Args<ConfigType>) => (args: AccessArgs) => Promise<AccessResult>;
-export {};
-//# sourceMappingURL=withTenantAccess.d.ts.map

package/dist/utilities/withTenantAccess.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"withTenantAccess.d.ts","sourceRoot":"","sources":["../../src/utilities/withTenantAccess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,gBAAgB,EAAoB,MAAM,SAAS,CAAA;AAEnG,OAAO,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAwB,MAAM,aAAa,CAAA;AAK/F,KAAK,IAAI,CAAC,UAAU,IAAI;IACtB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAChC,oBAAoB,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC,2BAA2B,CAAC,CAAA;IACvF,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,2BAA2B,CAAC,EAAE,MAAM,CAAA;IACpC,yBAAyB,EAAE,QAAQ,CACjC,uBAAuB,CAAC,UAAU,CAAC,CACpC,CAAC,2BAA2B,CAAC,CAAA;CAC/B,CAAA;AACD,eAAO,MAAM,gBAAgB,GAC1B,UAAU,EAAE,4KAUV,IAAI,CAAC,UAAU,CAAC,MACZ,MAAM,UAAU,KAAG,OAAO,CAAC,YAAY,CAoF7C,CAAA"}

package/dist/utilities/withTenantAccess.js

@@ -1,76 +0,0 @@
-import { combineWhereConstraints } from './combineWhereConstraints.js';
-import { getTenantAccess } from './getTenantAccess.js';
-export const withTenantAccess = ({ accessFunction, accessKey, accessResultCallback, adminUsersSlug, collection, fieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, userHasAccessToAllTenants })=>async (args)=>{
-        const constraints = [];
-        const accessFn = typeof accessFunction === 'function' ? accessFunction : ({ req })=>Boolean(req.user);
-        const accessResult = await accessFn(args);
-        if (accessResult === false) {
-            if (accessResultCallback) {
-                return accessResultCallback({
-                    accessKey,
-                    accessResult: false,
-                    ...args
-                });
-            } else {
-                return false;
-            }
-        } else if (accessResult && typeof accessResult === 'object') {
-            constraints.push(accessResult);
-        }
-        if (args.req.user && args.req.user.collection === adminUsersSlug && !userHasAccessToAllTenants(args.req.user)) {
-            const tenantConstraint = getTenantAccess({
-                fieldName,
-                tenantsArrayFieldName,
-                tenantsArrayTenantFieldName,
-                user: args.req.user
-            });
-            // User with no tenants should have no access to tenant-scoped documents
-            // except for their own user document
-            if (tenantConstraint[fieldName]?.in.length === 0) {
-                const result = collection.slug === args.req.user.collection ? {
-                    id: {
-                        equals: args.req.user.id
-                    }
-                } : false;
-                return accessResultCallback ? accessResultCallback({
-                    accessKey,
-                    accessResult: result,
-                    ...args
-                }) : result;
-            }
-            if (collection.slug === args.req.user.collection) {
-                constraints.push({
-                    or: [
-                        {
-                            id: {
-                                equals: args.req.user.id
-                            }
-                        },
-                        tenantConstraint
-                    ]
-                });
-            } else {
-                constraints.push(tenantConstraint);
-            }
-            if (accessResultCallback) {
-                return accessResultCallback({
-                    accessKey,
-                    accessResult: combineWhereConstraints(constraints),
-                    ...args
-                });
-            } else {
-                return combineWhereConstraints(constraints);
-            }
-        }
-        if (accessResultCallback) {
-            return accessResultCallback({
-                accessKey,
-                accessResult,
-                ...args
-            });
-        } else {
-            return accessResult;
-        }
-    };
-
-//# sourceMappingURL=withTenantAccess.js.map

package/dist/utilities/withTenantAccess.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utilities/withTenantAccess.ts"],"sourcesContent":["import type { Access, AccessArgs, AccessResult, CollectionConfig, TypedUser, Where } from 'payload'\n\nimport type { AllAccessKeys, MultiTenantPluginConfig, UserWithTenantsField } from '../types.js'\n\nimport { combineWhereConstraints } from './combineWhereConstraints.js'\nimport { getTenantAccess } from './getTenantAccess.js'\n\ntype Args<ConfigType> = {\n  accessFunction?: Access\n  accessKey: AllAccessKeys[number]\n  accessResultCallback?: MultiTenantPluginConfig<ConfigType>['usersAccessResultOverride']\n  adminUsersSlug: string\n  collection: CollectionConfig\n  fieldName: string\n  tenantsArrayFieldName?: string\n  tenantsArrayTenantFieldName?: string\n  userHasAccessToAllTenants: Required<\n    MultiTenantPluginConfig<ConfigType>\n  >['userHasAccessToAllTenants']\n}\nexport const withTenantAccess =\n  <ConfigType>({\n    accessFunction,\n    accessKey,\n    accessResultCallback,\n    adminUsersSlug,\n    collection,\n    fieldName,\n    tenantsArrayFieldName,\n    tenantsArrayTenantFieldName,\n    userHasAccessToAllTenants,\n  }: Args<ConfigType>) =>\n  async (args: AccessArgs): Promise<AccessResult> => {\n    const constraints: Where[] = []\n    const accessFn =\n      typeof accessFunction === 'function'\n        ? accessFunction\n        : ({ req }: AccessArgs): AccessResult => Boolean(req.user)\n    const accessResult: AccessResult = await accessFn(args)\n\n    if (accessResult === false) {\n      if (accessResultCallback) {\n        return accessResultCallback({\n          accessKey,\n          accessResult: false,\n          ...args,\n        })\n      } else {\n        return false\n      }\n    } else if (accessResult && typeof accessResult === 'object') {\n      constraints.push(accessResult)\n    }\n\n    if (\n      args.req.user &&\n      args.req.user.collection === adminUsersSlug &&\n      !userHasAccessToAllTenants(\n        args.req.user as ConfigType extends { user: unknown } ? ConfigType['user'] : TypedUser,\n      )\n    ) {\n      const tenantConstraint = getTenantAccess({\n        fieldName,\n        tenantsArrayFieldName,\n        tenantsArrayTenantFieldName,\n        user: args.req.user as UserWithTenantsField,\n      })\n\n      // User with no tenants should have no access to tenant-scoped documents\n      // except for their own user document\n      if (tenantConstraint[fieldName]?.in.length === 0) {\n        const result: AccessResult =\n          collection.slug === args.req.user.collection\n            ? { id: { equals: args.req.user.id } }\n            : false\n\n        return accessResultCallback\n          ? accessResultCallback({ accessKey, accessResult: result, ...args })\n          : result\n      }\n\n      if (collection.slug === args.req.user.collection) {\n        constraints.push({\n          or: [\n            {\n              id: {\n                equals: args.req.user.id,\n              },\n            },\n            tenantConstraint,\n          ],\n        })\n      } else {\n        constraints.push(tenantConstraint)\n      }\n\n      if (accessResultCallback) {\n        return accessResultCallback({\n          accessKey,\n          accessResult: combineWhereConstraints(constraints),\n          ...args,\n        })\n      } else {\n        return combineWhereConstraints(constraints)\n      }\n    }\n\n    if (accessResultCallback) {\n      return accessResultCallback({\n        accessKey,\n        accessResult,\n        ...args,\n      })\n    } else {\n      return accessResult\n    }\n  }\n"],"names":["combineWhereConstraints","getTenantAccess","withTenantAccess","accessFunction","accessKey","accessResultCallback","adminUsersSlug","collection","fieldName","tenantsArrayFieldName","tenantsArrayTenantFieldName","userHasAccessToAllTenants","args","constraints","accessFn","req","Boolean","user","accessResult","push","tenantConstraint","in","length","result","slug","id","equals","or"],"mappings":"AAIA,SAASA,uBAAuB,QAAQ,+BAA8B;AACtE,SAASC,eAAe,QAAQ,uBAAsB;AAetD,OAAO,MAAMC,mBACX,CAAa,EACXC,cAAc,EACdC,SAAS,EACTC,oBAAoB,EACpBC,cAAc,EACdC,UAAU,EACVC,SAAS,EACTC,qBAAqB,EACrBC,2BAA2B,EAC3BC,yBAAyB,EACR,GACnB,OAAOC;QACL,MAAMC,cAAuB,EAAE;QAC/B,MAAMC,WACJ,OAAOX,mBAAmB,aACtBA,iBACA,CAAC,EAAEY,GAAG,EAAc,GAAmBC,QAAQD,IAAIE,IAAI;QAC7D,MAAMC,eAA6B,MAAMJ,SAASF;QAElD,IAAIM,iBAAiB,OAAO;YAC1B,IAAIb,sBAAsB;gBACxB,OAAOA,qBAAqB;oBAC1BD;oBACAc,cAAc;oBACd,GAAGN,IAAI;gBACT;YACF,OAAO;gBACL,OAAO;YACT;QACF,OAAO,IAAIM,gBAAgB,OAAOA,iBAAiB,UAAU;YAC3DL,YAAYM,IAAI,CAACD;QACnB;QAEA,IACEN,KAAKG,GAAG,CAACE,IAAI,IACbL,KAAKG,GAAG,CAACE,IAAI,CAACV,UAAU,KAAKD,kBAC7B,CAACK,0BACCC,KAAKG,GAAG,CAACE,IAAI,GAEf;YACA,MAAMG,mBAAmBnB,gBAAgB;gBACvCO;gBACAC;gBACAC;gBACAO,MAAML,KAAKG,GAAG,CAACE,IAAI;YACrB;YAEA,wEAAwE;YACxE,qCAAqC;YACrC,IAAIG,gBAAgB,CAACZ,UAAU,EAAEa,GAAGC,WAAW,GAAG;gBAChD,MAAMC,SACJhB,WAAWiB,IAAI,KAAKZ,KAAKG,GAAG,CAACE,IAAI,CAACV,UAAU,GACxC;oBAAEkB,IAAI;wBAAEC,QAAQd,KAAKG,GAAG,CAACE,IAAI,CAACQ,EAAE;oBAAC;gBAAE,IACnC;gBAEN,OAAOpB,uBACHA,qBAAqB;oBAAED;oBAAWc,cAAcK;oBAAQ,GAAGX,IAAI;gBAAC,KAChEW;YACN;YAEA,IAAIhB,WAAWiB,IAAI,KAAKZ,KAAKG,GAAG,CAACE,IAAI,CAACV,UAAU,EAAE;gBAChDM,YAAYM,IAAI,CAAC;oBACfQ,IAAI;wBACF;4BACEF,IAAI;gCACFC,QAAQd,KAAKG,GAAG,CAACE,IAAI,CAACQ,EAAE;4BAC1B;wBACF;wBACAL;qBACD;gBACH;YACF,OAAO;gBACLP,YAAYM,IAAI,CAACC;YACnB;YAEA,IAAIf,sBAAsB;gBACxB,OAAOA,qBAAqB;oBAC1BD;oBACAc,cAAclB,wBAAwBa;oBACtC,GAAGD,IAAI;gBACT;YACF,OAAO;gBACL,OAAOZ,wBAAwBa;YACjC;QACF;QAEA,IAAIR,sBAAsB;YACxB,OAAOA,qBAAqB;gBAC1BD;gBACAc;gBACA,GAAGN,IAAI;YACT;QACF,OAAO;YACL,OAAOM;QACT;IACF,EAAC"}