@payloadcms/plugin-multi-tenant 4.0.0-internal.697830c → 4.0.0-internal.77191e5

package/dist/utilities/addCollectionAccess.js

@@ -1,4 +1,4 @@
-import { withTenantAccess } from './withTenantAccess.js';
+import { getTenantAccess } from './getTenantAccess.js';
 export const collectionAccessKeys = [
     'create',
     'read',
@@ -7,26 +7,97 @@ export const collectionAccessKeys = [
     'readVersions',
     'unlock'
 ];
-/**
- * Adds tenant access constraint to collection
- * - constrains access a users assigned tenants
- */ export const addCollectionAccess = ({ accessResultCallback, adminUsersSlug, collection, fieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, userHasAccessToAllTenants })=>{
-    collectionAccessKeys.forEach((key)=>{
-        if (!collection.access) {
-            collection.access = {};
-        }
-        collection.access[key] = withTenantAccess({
-            accessFunction: collection.access?.[key],
-            accessKey: key,
-            accessResultCallback,
-            adminUsersSlug,
-            collection,
-            fieldName: key === 'readVersions' ? `version.${fieldName}` : fieldName,
-            tenantsArrayFieldName,
-            tenantsArrayTenantFieldName,
-            userHasAccessToAllTenants
-        });
+const getTenantAccessResult = ({ accessKey, accessResult, accessResultCallback, adminUsersSlug, args, collection, fieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, userHasAccessToAllTenants })=>{
+    const finish = (result)=>accessResultCallback ? accessResultCallback({
+            accessKey,
+            accessResult: result,
+            ...args
+        }) : result;
+    if (!accessResult) {
+        return finish(false);
+    }
+    const user = args.req.user;
+    if (!user || user.collection !== adminUsersSlug || userHasAccessToAllTenants(user)) {
+        return finish(accessResult);
+    }
+    const tenantConstraint = getTenantAccess({
+        fieldName,
+        tenantsArrayFieldName,
+        tenantsArrayTenantFieldName,
+        user
+    });
+    if (tenantConstraint[fieldName]?.in.length === 0) {
+        return finish(collection.slug === user.collection ? {
+            id: {
+                equals: user.id
+            }
+        } : false);
+    }
+    const tenantResult = collection.slug === user.collection ? {
+        or: [
+            {
+                id: {
+                    equals: user.id
+                }
+            },
+            tenantConstraint
+        ]
+    } : tenantConstraint;
+    return finish(accessResult === true ? tenantResult : {
+        and: [
+            accessResult,
+            tenantResult
+        ]
     });
 };
+const wrapCollectionAccess = (scope)=>{
+    scope.collection.access ??= {};
+    for (const accessKey of collectionAccessKeys){
+        const accessFunction = scope.collection.access[accessKey] ?? (({ req })=>Boolean(req.user));
+        scope.collection.access[accessKey] = async (args)=>getTenantAccessResult({
+                ...scope,
+                accessKey,
+                accessResult: await accessFunction(args),
+                args,
+                fieldName: accessKey === 'readVersions' ? `version.${scope.fieldName}` : scope.fieldName
+            });
+    }
+};
+export const addCollectionAccess = ({ config, scopes })=>{
+    const baseAccessScopes = new Map();
+    for (const scope of scopes){
+        if (scope.accessResultCallback) {
+            wrapCollectionAccess(scope);
+        } else {
+            baseAccessScopes.set(scope.collection.slug, scope);
+        }
+    }
+    if (!baseAccessScopes.size) {
+        return;
+    }
+    config.baseAccess ??= {};
+    config.baseAccess.collections ??= {};
+    for (const accessKey of collectionAccessKeys){
+        const baseAccessFunction = config.baseAccess.collections[accessKey];
+        config.baseAccess.collections[accessKey] = async (args)=>{
+            const baseResult = baseAccessFunction ? await baseAccessFunction(args) : true;
+            const scope = baseAccessScopes.get(args.slug);
+            if (!baseResult || !scope) {
+                return baseResult;
+            }
+            if (accessKey === 'create' && typeof baseResult === 'object') {
+                return baseResult;
+            }
+            const tenantResult = await getTenantAccessResult({
+                ...scope,
+                accessKey,
+                accessResult: baseResult,
+                args,
+                fieldName: accessKey === 'readVersions' ? `version.${scope.fieldName}` : scope.fieldName
+            });
+            return accessKey === 'create' ? Boolean(tenantResult) : tenantResult;
+        };
+    }
+};
 
 //# sourceMappingURL=addCollectionAccess.js.map

package/dist/utilities/addCollectionAccess.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/addCollectionAccess.ts"],"sourcesContent":["import type { CollectionConfig } from 'payload'\n\nimport type { AllAccessKeys, MultiTenantPluginConfig } from '../types.js'\n\nimport { withTenantAccess } from './withTenantAccess.js'\n\nexport const collectionAccessKeys: AllAccessKeys = [\n  'create',\n  'read',\n  'update',\n  'delete',\n  'readVersions',\n  'unlock',\n] as const\n\ntype Args = {\n  accessResultCallback?: MultiTenantPluginConfig['usersAccessResultOverride']\n  adminUsersSlug: string\n  collection: CollectionConfig\n  fieldName: string\n  tenantsArrayFieldName?: string\n  tenantsArrayTenantFieldName?: string\n  userHasAccessToAllTenants: Required<MultiTenantPluginConfig>['userHasAccessToAllTenants']\n}\n\n/**\n * Adds tenant access constraint to collection\n * - constrains access a users assigned tenants\n */\nexport const addCollectionAccess = ({\n  accessResultCallback,\n  adminUsersSlug,\n  collection,\n  fieldName,\n  tenantsArrayFieldName,\n  tenantsArrayTenantFieldName,\n  userHasAccessToAllTenants,\n}: Args): void => {\n  collectionAccessKeys.forEach((key) => {\n    if (!collection.access) {\n      collection.access = {}\n    }\n    collection.access[key] = withTenantAccess({\n      accessFunction: collection.access?.[key],\n      accessKey: key,\n      accessResultCallback,\n      adminUsersSlug,\n      collection,\n      fieldName: key === 'readVersions' ? `version.${fieldName}` : fieldName,\n      tenantsArrayFieldName,\n      tenantsArrayTenantFieldName,\n      userHasAccessToAllTenants,\n    })\n  })\n}\n"],"names":["withTenantAccess","collectionAccessKeys","addCollectionAccess","accessResultCallback","adminUsersSlug","collection","fieldName","tenantsArrayFieldName","tenantsArrayTenantFieldName","userHasAccessToAllTenants","forEach","key","access","accessFunction","accessKey"],"mappings":"AAIA,SAASA,gBAAgB,QAAQ,wBAAuB;AAExD,OAAO,MAAMC,uBAAsC;IACjD;IACA;IACA;IACA;IACA;IACA;CACD,CAAS;AAYV;;;CAGC,GACD,OAAO,MAAMC,sBAAsB,CAAC,EAClCC,oBAAoB,EACpBC,cAAc,EACdC,UAAU,EACVC,SAAS,EACTC,qBAAqB,EACrBC,2BAA2B,EAC3BC,yBAAyB,EACpB;IACLR,qBAAqBS,OAAO,CAAC,CAACC;QAC5B,IAAI,CAACN,WAAWO,MAAM,EAAE;YACtBP,WAAWO,MAAM,GAAG,CAAC;QACvB;QACAP,WAAWO,MAAM,CAACD,IAAI,GAAGX,iBAAiB;YACxCa,gBAAgBR,WAAWO,MAAM,EAAE,CAACD,IAAI;YACxCG,WAAWH;YACXR;YACAC;YACAC;YACAC,WAAWK,QAAQ,iBAAiB,CAAC,QAAQ,EAAEL,WAAW,GAAGA;YAC7DC;YACAC;YACAC;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/addCollectionAccess.ts"],"sourcesContent":["import type { AccessArgs, AccessResult, CollectionConfig, Config, User, Where } from 'payload'\n\nimport type { AllAccessKeys, MultiTenantPluginConfig } from '../types.js'\n\nimport { getTenantAccess } from './getTenantAccess.js'\n\nexport const collectionAccessKeys: AllAccessKeys = [\n  'create',\n  'read',\n  'update',\n  'delete',\n  'readVersions',\n  'unlock',\n] as const\n\nexport type TenantAccessConfig = {\n  accessResultCallback?: MultiTenantPluginConfig['usersAccessResultOverride']\n  adminUsersSlug: string\n  collection: CollectionConfig\n  fieldName: string\n  tenantsArrayFieldName?: string\n  tenantsArrayTenantFieldName?: string\n  userHasAccessToAllTenants: Required<MultiTenantPluginConfig>['userHasAccessToAllTenants']\n}\n\nconst getTenantAccessResult = ({\n  accessKey,\n  accessResult,\n  accessResultCallback,\n  adminUsersSlug,\n  args,\n  collection,\n  fieldName,\n  tenantsArrayFieldName,\n  tenantsArrayTenantFieldName,\n  userHasAccessToAllTenants,\n}: {\n  accessKey: AllAccessKeys[number]\n  accessResult: AccessResult\n  args: AccessArgs\n} & TenantAccessConfig): AccessResult | Promise<AccessResult> => {\n  const finish = (result: AccessResult): AccessResult | Promise<AccessResult> =>\n    accessResultCallback\n      ? accessResultCallback({ accessKey, accessResult: result, ...args })\n      : result\n\n  if (!accessResult) {\n    return finish(false)\n  }\n\n  const user = args.req.user\n\n  if (!user || user.collection !== adminUsersSlug || userHasAccessToAllTenants(user as User)) {\n    return finish(accessResult)\n  }\n\n  const tenantConstraint = getTenantAccess({\n    fieldName,\n    tenantsArrayFieldName,\n    tenantsArrayTenantFieldName,\n    user,\n  })\n\n  if (tenantConstraint[fieldName]?.in.length === 0) {\n    return finish(collection.slug === user.collection ? { id: { equals: user.id } } : false)\n  }\n\n  const tenantResult: Where =\n    collection.slug === user.collection\n      ? { or: [{ id: { equals: user.id } }, tenantConstraint] }\n      : tenantConstraint\n\n  return finish(accessResult === true ? tenantResult : { and: [accessResult, tenantResult] })\n}\n\nconst wrapCollectionAccess = (scope: TenantAccessConfig): void => {\n  scope.collection.access ??= {}\n\n  for (const accessKey of collectionAccessKeys) {\n    const accessFunction =\n      scope.collection.access[accessKey] ?? (({ req }: AccessArgs) => Boolean(req.user))\n\n    scope.collection.access[accessKey] = async (args) =>\n      getTenantAccessResult({\n        ...scope,\n        accessKey,\n        accessResult: await accessFunction(args),\n        args,\n        fieldName: accessKey === 'readVersions' ? `version.${scope.fieldName}` : scope.fieldName,\n      })\n  }\n}\n\nexport const addCollectionAccess = ({\n  config,\n  scopes,\n}: {\n  config: Config\n  scopes: TenantAccessConfig[]\n}): void => {\n  const baseAccessScopes = new Map<string, TenantAccessConfig>()\n\n  for (const scope of scopes) {\n    if (scope.accessResultCallback) {\n      wrapCollectionAccess(scope)\n    } else {\n      baseAccessScopes.set(scope.collection.slug, scope)\n    }\n  }\n\n  if (!baseAccessScopes.size) {\n    return\n  }\n\n  config.baseAccess ??= {}\n  config.baseAccess.collections ??= {}\n\n  for (const accessKey of collectionAccessKeys) {\n    const baseAccessFunction = config.baseAccess.collections[accessKey]\n\n    config.baseAccess.collections[accessKey] = async (args) => {\n      const baseResult = baseAccessFunction ? await baseAccessFunction(args) : true\n      const scope = baseAccessScopes.get(args.slug)\n\n      if (!baseResult || !scope) {\n        return baseResult\n      }\n\n      if (accessKey === 'create' && typeof baseResult === 'object') {\n        return baseResult\n      }\n\n      const tenantResult = await getTenantAccessResult({\n        ...scope,\n        accessKey,\n        accessResult: baseResult,\n        args,\n        fieldName: accessKey === 'readVersions' ? `version.${scope.fieldName}` : scope.fieldName,\n      })\n\n      return accessKey === 'create' ? Boolean(tenantResult) : tenantResult\n    }\n  }\n}\n"],"names":["getTenantAccess","collectionAccessKeys","getTenantAccessResult","accessKey","accessResult","accessResultCallback","adminUsersSlug","args","collection","fieldName","tenantsArrayFieldName","tenantsArrayTenantFieldName","userHasAccessToAllTenants","finish","result","user","req","tenantConstraint","in","length","slug","id","equals","tenantResult","or","and","wrapCollectionAccess","scope","access","accessFunction","Boolean","addCollectionAccess","config","scopes","baseAccessScopes","Map","set","size","baseAccess","collections","baseAccessFunction","baseResult","get"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"combineFilters.d.ts","sourceRoot":"","sources":["../../src/utilities/combineFilters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAS,MAAM,SAAS,CAAA;AAEhD,KAAK,IAAI,GAAG;IACV,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,YAAY,EAAE,UAAU,CAAA;CACzB,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACxB,8BAA8B,IAAI,KAAG,UA8BrC,CAAA"}
+{"version":3,"file":"combineFilters.d.ts","sourceRoot":"","sources":["../../src/utilities/combineFilters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAS,MAAM,SAAS,CAAA;AAEhD,KAAK,IAAI,GAAG;IACV,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,YAAY,EAAE,UAAU,CAAA;CACzB,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,cAAc,iCACM,IAAI,KAAG,UA8BrC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"extractID.d.ts","sourceRoot":"","sources":["../../src/utilities/extractID.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,MAAM,GAAG,MAAM,EACtD,YAAY,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAClC,MAMF,CAAA"}
+{"version":3,"file":"extractID.d.ts","sourceRoot":"","sources":["../../src/utilities/extractID.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,MAAM,GAAG,MAAM,cAC1C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAClC,MAMF,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"generateCookie.d.ts","sourceRoot":"","sources":["../../src/utilities/generateCookie.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;IACpC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;IACpC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,oBAAoB,GAAG,OAAO,EAC3D,MAAM,aAAa,KAClB,oBAAoB,SAAS,IAAI,GAAG,YAAY,GAAG,MA6ErD,CAAA"}
+{"version":3,"file":"generateCookie.d.ts","sourceRoot":"","sources":["../../src/utilities/generateCookie.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;IACpC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAA;IACpC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,oBAAoB,GAAG,OAAO,QACrD,aAAa,KAClB,oBAAoB,SAAS,IAAI,GAAG,YAAY,GAAG,MA6ErD,CAAA"}

package/dist/utilities/getCollectionIDType.d.ts

@@ -3,6 +3,6 @@ type Args = {
     collectionSlug: CollectionSlug;
     payload: Payload;
 };
-export declare const getCollectionIDType: ({ collectionSlug, payload }: Args) => "number" | "text";
+export declare const getCollectionIDType: ({ collectionSlug, payload }: Args) => 'number' | 'text';
 export {};
 //# sourceMappingURL=getCollectionIDType.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getCollectionIDType.d.ts","sourceRoot":"","sources":["../../src/utilities/getCollectionIDType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtD,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,cAAc,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AACD,eAAO,MAAM,mBAAmB,GAAI,6BAA6B,IAAI,KAAG,QAAQ,GAAG,MAElF,CAAA"}
+{"version":3,"file":"getCollectionIDType.d.ts","sourceRoot":"","sources":["../../src/utilities/getCollectionIDType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtD,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,cAAc,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AACD,eAAO,MAAM,mBAAmB,gCAAiC,IAAI,KAAG,QAAQ,GAAG,MAElF,CAAA"}

package/dist/utilities/getTenantIDsFromValue.d.ts

@@ -0,0 +1,2 @@
+export declare const getTenantIDsFromValue: (value: unknown) => string[];
+//# sourceMappingURL=getTenantIDsFromValue.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getTenantIDsFromValue.d.ts","sourceRoot":"","sources":["../../src/utilities/getTenantIDsFromValue.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,UAAW,OAAO,KAAG,MAAM,EAU5D,CAAA"}

package/dist/utilities/getTenantIDsFromValue.js

@@ -0,0 +1,14 @@
+import { extractID } from './extractID.js';
+export const getTenantIDsFromValue = (value)=>{
+    if (value === undefined || value === null) {
+        return [];
+    }
+    return (Array.isArray(value) ? value : [
+        value
+    ]).map((entry)=>{
+        const id = entry === null || entry === undefined ? undefined : extractID(entry);
+        return typeof id === 'number' || typeof id === 'string' ? String(id) : '';
+    });
+};
+
+//# sourceMappingURL=getTenantIDsFromValue.js.map

package/dist/utilities/getTenantIDsFromValue.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/getTenantIDsFromValue.ts"],"sourcesContent":["import type { Tenant } from '../types.js'\n\nimport { extractID } from './extractID.js'\n\nexport const getTenantIDsFromValue = (value: unknown): string[] => {\n  if (value === undefined || value === null) {\n    return []\n  }\n\n  return (Array.isArray(value) ? value : [value]).map((entry) => {\n    const id = entry === null || entry === undefined ? undefined : extractID(entry as Tenant)\n\n    return typeof id === 'number' || typeof id === 'string' ? String(id) : ''\n  })\n}\n"],"names":["extractID","getTenantIDsFromValue","value","undefined","Array","isArray","map","entry","id","String"],"mappings":"AAEA,SAASA,SAAS,QAAQ,iBAAgB;AAE1C,OAAO,MAAMC,wBAAwB,CAACC;IACpC,IAAIA,UAAUC,aAAaD,UAAU,MAAM;QACzC,OAAO,EAAE;IACX;IAEA,OAAO,AAACE,CAAAA,MAAMC,OAAO,CAACH,SAASA,QAAQ;QAACA;KAAM,AAAD,EAAGI,GAAG,CAAC,CAACC;QACnD,MAAMC,KAAKD,UAAU,QAAQA,UAAUJ,YAAYA,YAAYH,UAAUO;QAEzE,OAAO,OAAOC,OAAO,YAAY,OAAOA,OAAO,WAAWC,OAAOD,MAAM;IACzE;AACF,EAAC"}

package/dist/utilities/getTenantOptions.d.ts

@@ -7,6 +7,6 @@ export declare const getTenantOptions: ({ payload, tenantsArrayFieldName, tenant
     tenantsCollectionSlug: string;
     useAsTitle: string;
     user: User;
-    userHasAccessToAllTenants: Required<MultiTenantPluginConfig>["userHasAccessToAllTenants"];
+    userHasAccessToAllTenants: Required<MultiTenantPluginConfig>['userHasAccessToAllTenants'];
 }) => Promise<OptionObject[]>;
 //# sourceMappingURL=getTenantOptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getTenantOptions.d.ts","sourceRoot":"","sources":["../../src/utilities/getTenantOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAE1D,eAAO,MAAM,gBAAgB,GAAU,sIAQpC;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,IAAI,CAAA;IACV,yBAAyB,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,2BAA2B,CAAC,CAAA;CAC1F,KAAG,OAAO,CAAC,YAAY,EAAE,CAuDzB,CAAA"}
+{"version":3,"file":"getTenantOptions.d.ts","sourceRoot":"","sources":["../../src/utilities/getTenantOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAE1D,eAAO,MAAM,gBAAgB,yIAQ1B;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,IAAI,CAAA;IACV,yBAAyB,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,2BAA2B,CAAC,CAAA;CAC1F,KAAG,OAAO,CAAC,YAAY,EAAE,CAuDzB,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getUserTenantIDs.d.ts","sourceRoot":"","sources":["../../src/utilities/getUserTenantIDs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAK/D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,SAAS,MAAM,GAAG,MAAM,EAC7D,MAAM,IAAI,GAAG,oBAAoB,EACjC,UAAU;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,2BAA2B,CAAC,EAAE,MAAM,CAAA;CACrC,KACA,MAAM,EAoBR,CAAA"}
+{"version":3,"file":"getUserTenantIDs.d.ts","sourceRoot":"","sources":["../../src/utilities/getUserTenantIDs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAK/D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,SAAS,MAAM,GAAG,MAAM,QACvD,IAAI,GAAG,oBAAoB,YACvB;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,2BAA2B,CAAC,EAAE,MAAM,CAAA;CACrC,KACA,MAAM,EAqBR,CAAA"}

package/dist/utilities/getUserTenantIDs.js

@@ -12,8 +12,9 @@ import { extractID } from './extractID.js';
     const tenantsArrayTenantFieldName = options?.tenantsArrayTenantFieldName || defaults.tenantsArrayTenantFieldName;
     const tenantsArray = user[tenantsArrayFieldName];
     return (Array.isArray(tenantsArray) ? tenantsArray : [])?.reduce((acc, row)=>{
-        if (row[tenantsArrayTenantFieldName]) {
-            acc.push(extractID(row[tenantsArrayTenantFieldName]));
+        const tenantRow = row[tenantsArrayTenantFieldName];
+        if (tenantRow !== undefined && tenantRow !== null) {
+            acc.push(extractID(tenantRow));
         }
         return acc;
     }, []) || [];

package/dist/utilities/getUserTenantIDs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getUserTenantIDs.ts"],"sourcesContent":["import type { Tenant, UserWithTenantsField } from '../types.js'\n\nimport { defaults } from '../defaults.js'\nimport { extractID } from './extractID.js'\n\n/**\n * Returns array of all tenant IDs assigned to a user\n *\n * @param user - User object with tenants field\n */\nexport const getUserTenantIDs = <IDType extends number | string>(\n  user: null | UserWithTenantsField,\n  options?: {\n    tenantsArrayFieldName?: string\n    tenantsArrayTenantFieldName?: string\n  },\n): IDType[] => {\n  if (!user) {\n    return []\n  }\n\n  const tenantsArrayFieldName = options?.tenantsArrayFieldName || defaults.tenantsArrayFieldName\n  const tenantsArrayTenantFieldName =\n    options?.tenantsArrayTenantFieldName || defaults.tenantsArrayTenantFieldName\n\n  const tenantsArray = (user as Record<string, unknown>)[tenantsArrayFieldName]\n\n  return (\n    (Array.isArray(tenantsArray) ? tenantsArray : [])?.reduce<IDType[]>((acc, row) => {\n      if (row[tenantsArrayTenantFieldName]) {\n        acc.push(extractID<IDType>(row[tenantsArrayTenantFieldName] as Tenant<IDType>))\n      }\n\n      return acc\n    }, []) || []\n  )\n}\n"],"names":["defaults","extractID","getUserTenantIDs","user","options","tenantsArrayFieldName","tenantsArrayTenantFieldName","tenantsArray","Array","isArray","reduce","acc","row","push"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,iBAAgB;AACzC,SAASC,SAAS,QAAQ,iBAAgB;AAE1C;;;;CAIC,GACD,OAAO,MAAMC,mBAAmB,CAC9BC,MACAC;IAKA,IAAI,CAACD,MAAM;QACT,OAAO,EAAE;IACX;IAEA,MAAME,wBAAwBD,SAASC,yBAAyBL,SAASK,qBAAqB;IAC9F,MAAMC,8BACJF,SAASE,+BAA+BN,SAASM,2BAA2B;IAE9E,MAAMC,eAAe,AAACJ,IAAgC,CAACE,sBAAsB;IAE7E,OACE,AAACG,CAAAA,MAAMC,OAAO,CAACF,gBAAgBA,eAAe,EAAE,AAAD,GAAIG,OAAiB,CAACC,KAAKC;QACxE,IAAIA,GAAG,CAACN,4BAA4B,EAAE;YACpCK,IAAIE,IAAI,CAACZ,UAAkBW,GAAG,CAACN,4BAA4B;QAC7D;QAEA,OAAOK;IACT,GAAG,EAAE,KAAK,EAAE;AAEhB,EAAC"}
+{"version":3,"sources":["../../src/utilities/getUserTenantIDs.ts"],"sourcesContent":["import type { Tenant, UserWithTenantsField } from '../types.js'\n\nimport { defaults } from '../defaults.js'\nimport { extractID } from './extractID.js'\n\n/**\n * Returns array of all tenant IDs assigned to a user\n *\n * @param user - User object with tenants field\n */\nexport const getUserTenantIDs = <IDType extends number | string>(\n  user: null | UserWithTenantsField,\n  options?: {\n    tenantsArrayFieldName?: string\n    tenantsArrayTenantFieldName?: string\n  },\n): IDType[] => {\n  if (!user) {\n    return []\n  }\n\n  const tenantsArrayFieldName = options?.tenantsArrayFieldName || defaults.tenantsArrayFieldName\n  const tenantsArrayTenantFieldName =\n    options?.tenantsArrayTenantFieldName || defaults.tenantsArrayTenantFieldName\n\n  const tenantsArray = (user as Record<string, unknown>)[tenantsArrayFieldName]\n\n  return (\n    (Array.isArray(tenantsArray) ? tenantsArray : [])?.reduce<IDType[]>((acc, row) => {\n      const tenantRow = row[tenantsArrayTenantFieldName] as Tenant<IDType>\n      if (tenantRow !== undefined && tenantRow !== null) {\n        acc.push(extractID(tenantRow))\n      }\n\n      return acc\n    }, []) || []\n  )\n}\n"],"names":["defaults","extractID","getUserTenantIDs","user","options","tenantsArrayFieldName","tenantsArrayTenantFieldName","tenantsArray","Array","isArray","reduce","acc","row","tenantRow","undefined","push"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,iBAAgB;AACzC,SAASC,SAAS,QAAQ,iBAAgB;AAE1C;;;;CAIC,GACD,OAAO,MAAMC,mBAAmB,CAC9BC,MACAC;IAKA,IAAI,CAACD,MAAM;QACT,OAAO,EAAE;IACX;IAEA,MAAME,wBAAwBD,SAASC,yBAAyBL,SAASK,qBAAqB;IAC9F,MAAMC,8BACJF,SAASE,+BAA+BN,SAASM,2BAA2B;IAE9E,MAAMC,eAAe,AAACJ,IAAgC,CAACE,sBAAsB;IAE7E,OACE,AAACG,CAAAA,MAAMC,OAAO,CAACF,gBAAgBA,eAAe,EAAE,AAAD,GAAIG,OAAiB,CAACC,KAAKC;QACxE,MAAMC,YAAYD,GAAG,CAACN,4BAA4B;QAClD,IAAIO,cAAcC,aAAaD,cAAc,MAAM;YACjDF,IAAII,IAAI,CAACd,UAAUY;QACrB;QAEA,OAAOF;IACT,GAAG,EAAE,KAAK,EAAE;AAEhB,EAAC"}

package/dist/utilities/isValidTenantAssignment.d.ts

@@ -0,0 +1,13 @@
+import type { PayloadRequest } from 'payload';
+import type { MultiTenantPluginConfig } from '../types.js';
+type Args = {
+    previousValue?: unknown;
+    req: PayloadRequest;
+    tenantsArrayFieldName: string;
+    tenantsArrayTenantFieldName: string;
+    userHasAccessToAllTenants?: MultiTenantPluginConfig['userHasAccessToAllTenants'];
+    value: unknown;
+};
+export declare const isValidTenantAssignment: ({ previousValue, req, tenantsArrayFieldName, tenantsArrayTenantFieldName, userHasAccessToAllTenants, value, }: Args) => boolean;
+export {};
+//# sourceMappingURL=isValidTenantAssignment.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isValidTenantAssignment.d.ts","sourceRoot":"","sources":["../../src/utilities/isValidTenantAssignment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAK1D,KAAK,IAAI,GAAG;IACV,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;IACnB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,MAAM,CAAA;IACnC,yBAAyB,CAAC,EAAE,uBAAuB,CAAC,2BAA2B,CAAC,CAAA;IAChF,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,eAAO,MAAM,uBAAuB,kHAOjC,IAAI,KAAG,OAgCT,CAAA"}

package/dist/utilities/isValidTenantAssignment.js

@@ -0,0 +1,28 @@
+import { getTenantIDsFromValue } from './getTenantIDsFromValue.js';
+import { getUserTenantIDs } from './getUserTenantIDs.js';
+export const isValidTenantAssignment = ({ previousValue, req, tenantsArrayFieldName, tenantsArrayTenantFieldName, userHasAccessToAllTenants, value })=>{
+    const { user } = req;
+    if (user) {
+        if (userHasAccessToAllTenants?.(user)) {
+            return true;
+        }
+    } else if (req.payloadAPI === 'local') {
+        return true;
+    }
+    const submittedDocumentTenantIDs = getTenantIDsFromValue(value);
+    const storedDocumentTenantIDs = getTenantIDsFromValue(previousValue);
+    if (!hasTenantValueChanged(submittedDocumentTenantIDs, storedDocumentTenantIDs)) {
+        return true;
+    }
+    if (submittedDocumentTenantIDs.length === 0) {
+        return false;
+    }
+    const userAssignedTenantIDs = getUserTenantIDs(user, {
+        tenantsArrayFieldName,
+        tenantsArrayTenantFieldName
+    });
+    return submittedDocumentTenantIDs.every((tenantID)=>userAssignedTenantIDs.some((userAssignedTenantID)=>String(userAssignedTenantID) === String(tenantID)));
+};
+const hasTenantValueChanged = (submittedTenantIDs, storedTenantIDs)=>submittedTenantIDs.length !== storedTenantIDs.length || submittedTenantIDs.some((tenantID)=>!storedTenantIDs.includes(tenantID));
+
+//# sourceMappingURL=isValidTenantAssignment.js.map

package/dist/utilities/isValidTenantAssignment.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/isValidTenantAssignment.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport type { MultiTenantPluginConfig } from '../types.js'\n\nimport { getTenantIDsFromValue } from './getTenantIDsFromValue.js'\nimport { getUserTenantIDs } from './getUserTenantIDs.js'\n\ntype Args = {\n  previousValue?: unknown\n  req: PayloadRequest\n  tenantsArrayFieldName: string\n  tenantsArrayTenantFieldName: string\n  userHasAccessToAllTenants?: MultiTenantPluginConfig['userHasAccessToAllTenants']\n  value: unknown\n}\n\nexport const isValidTenantAssignment = ({\n  previousValue,\n  req,\n  tenantsArrayFieldName,\n  tenantsArrayTenantFieldName,\n  userHasAccessToAllTenants,\n  value,\n}: Args): boolean => {\n  const { user } = req\n\n  if (user) {\n    if (userHasAccessToAllTenants?.(user)) {\n      return true\n    }\n  } else if (req.payloadAPI === 'local') {\n    return true\n  }\n\n  const submittedDocumentTenantIDs = getTenantIDsFromValue(value)\n  const storedDocumentTenantIDs = getTenantIDsFromValue(previousValue)\n\n  if (!hasTenantValueChanged(submittedDocumentTenantIDs, storedDocumentTenantIDs)) {\n    return true\n  }\n\n  if (submittedDocumentTenantIDs.length === 0) {\n    return false\n  }\n\n  const userAssignedTenantIDs = getUserTenantIDs(user, {\n    tenantsArrayFieldName,\n    tenantsArrayTenantFieldName,\n  })\n\n  return submittedDocumentTenantIDs.every((tenantID) =>\n    userAssignedTenantIDs.some(\n      (userAssignedTenantID) => String(userAssignedTenantID) === String(tenantID),\n    ),\n  )\n}\n\nconst hasTenantValueChanged = (\n  submittedTenantIDs: (number | string)[],\n  storedTenantIDs: (number | string)[],\n): boolean =>\n  submittedTenantIDs.length !== storedTenantIDs.length ||\n  submittedTenantIDs.some((tenantID) => !storedTenantIDs.includes(tenantID))\n"],"names":["getTenantIDsFromValue","getUserTenantIDs","isValidTenantAssignment","previousValue","req","tenantsArrayFieldName","tenantsArrayTenantFieldName","userHasAccessToAllTenants","value","user","payloadAPI","submittedDocumentTenantIDs","storedDocumentTenantIDs","hasTenantValueChanged","length","userAssignedTenantIDs","every","tenantID","some","userAssignedTenantID","String","submittedTenantIDs","storedTenantIDs","includes"],"mappings":"AAIA,SAASA,qBAAqB,QAAQ,6BAA4B;AAClE,SAASC,gBAAgB,QAAQ,wBAAuB;AAWxD,OAAO,MAAMC,0BAA0B,CAAC,EACtCC,aAAa,EACbC,GAAG,EACHC,qBAAqB,EACrBC,2BAA2B,EAC3BC,yBAAyB,EACzBC,KAAK,EACA;IACL,MAAM,EAAEC,IAAI,EAAE,GAAGL;IAEjB,IAAIK,MAAM;QACR,IAAIF,4BAA4BE,OAAO;YACrC,OAAO;QACT;IACF,OAAO,IAAIL,IAAIM,UAAU,KAAK,SAAS;QACrC,OAAO;IACT;IAEA,MAAMC,6BAA6BX,sBAAsBQ;IACzD,MAAMI,0BAA0BZ,sBAAsBG;IAEtD,IAAI,CAACU,sBAAsBF,4BAA4BC,0BAA0B;QAC/E,OAAO;IACT;IAEA,IAAID,2BAA2BG,MAAM,KAAK,GAAG;QAC3C,OAAO;IACT;IAEA,MAAMC,wBAAwBd,iBAAiBQ,MAAM;QACnDJ;QACAC;IACF;IAEA,OAAOK,2BAA2BK,KAAK,CAAC,CAACC,WACvCF,sBAAsBG,IAAI,CACxB,CAACC,uBAAyBC,OAAOD,0BAA0BC,OAAOH;AAGxE,EAAC;AAED,MAAMJ,wBAAwB,CAC5BQ,oBACAC,kBAEAD,mBAAmBP,MAAM,KAAKQ,gBAAgBR,MAAM,IACpDO,mBAAmBH,IAAI,CAAC,CAACD,WAAa,CAACK,gBAAgBC,QAAQ,CAACN"}

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

@@ -1 +1 @@
-{"version":3,"file":"miniChalk.d.ts","sourceRoot":"","sources":["../../src/utilities/miniChalk.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,SAAS;gBACR,MAAM;gBACN,MAAM;gBACN,MAAM;eACP,MAAM;iBACJ,MAAM;mBACJ,MAAM;eACV,MAAM;qBACA,MAAM;iBACV,MAAM;kBACL,MAAM;mBAGL,MAAM;sBACH,MAAM;CACzB,CAAA"}
+{"version":3,"file":"miniChalk.d.ts","sourceRoot":"","sources":["../../src/utilities/miniChalk.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,SAAS;IACpB,IAAI,QAAQ,MAAM;IAClB,IAAI,QAAQ,MAAM;IAClB,IAAI,QAAQ,MAAM;IAClB,GAAG,QAAQ,MAAM;IACjB,KAAK,QAAQ,MAAM;IACnB,OAAO,QAAQ,MAAM;IACrB,GAAG,QAAQ,MAAM;IACjB,SAAS,QAAQ,MAAM;IACvB,KAAK,QAAQ,MAAM;IACnB,MAAM,QAAQ,MAAM;IAGpB,OAAO,QAAQ,MAAM;IACrB,UAAU,QAAQ,MAAM;CACzB,CAAA"}

package/dist/utilities/shouldRefreshTenantSelection.d.ts

@@ -0,0 +1,5 @@
+export declare const shouldRefreshTenantSelection: ({ initialValue, tenantCookie, }: {
+    initialValue?: number | string;
+    tenantCookie?: string;
+}) => boolean;
+//# sourceMappingURL=shouldRefreshTenantSelection.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shouldRefreshTenantSelection.d.ts","sourceRoot":"","sources":["../../src/utilities/shouldRefreshTenantSelection.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,4BAA4B,oCAGtC;IACD,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,KAAG,OAAiD,CAAA"}

package/dist/utilities/shouldRefreshTenantSelection.js

@@ -0,0 +1,3 @@
+export const shouldRefreshTenantSelection = ({ initialValue, tenantCookie })=>!initialValue && Boolean(tenantCookie);
+
+//# sourceMappingURL=shouldRefreshTenantSelection.js.map

package/dist/utilities/shouldRefreshTenantSelection.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/shouldRefreshTenantSelection.ts"],"sourcesContent":["export const shouldRefreshTenantSelection = ({\n  initialValue,\n  tenantCookie,\n}: {\n  initialValue?: number | string\n  tenantCookie?: string\n}): boolean => !initialValue && Boolean(tenantCookie)\n"],"names":["shouldRefreshTenantSelection","initialValue","tenantCookie","Boolean"],"mappings":"AAAA,OAAO,MAAMA,+BAA+B,CAAC,EAC3CC,YAAY,EACZC,YAAY,EAIb,GAAc,CAACD,gBAAgBE,QAAQD,cAAa"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-multi-tenant",
-  "version": "4.0.0-internal.697830c",
+  "version": "4.0.0-internal.77191e5",
   "description": "Multi Tenant plugin for Payload",
   "keywords": [
     "payload",
@@ -26,7 +26,6 @@
     }
   ],
   "sideEffects": [
-    "*.scss",
     "*.css"
   ],
   "type": "module",
@@ -81,13 +80,13 @@
   ],
   "devDependencies": {
     "@payloadcms/eslint-config": "3.28.0",
-    "@payloadcms/translations": "4.0.0-internal.697830c",
-    "@payloadcms/ui": "4.0.0-internal.697830c",
-    "payload": "4.0.0-internal.697830c"
+    "@payloadcms/translations": "4.0.0-internal.77191e5",
+    "@payloadcms/ui": "4.0.0-internal.77191e5",
+    "payload": "4.0.0-internal.77191e5"
   },
   "peerDependencies": {
-    "@payloadcms/ui": "4.0.0-internal.697830c",
-    "payload": "4.0.0-internal.697830c"
+    "@payloadcms/ui": "4.0.0-internal.77191e5",
+    "payload": "4.0.0-internal.77191e5"
   },
   "homepage:": "https://payloadcms.com",
   "scripts": {
@@ -96,7 +95,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/",
+    "copyfiles": "copyfiles -u 1 -e \"**/*.spec.*\" \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "pack:plugin": "pnpm build && pnpm pack"

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 = {
-    accessFunction?: Access;
-    accessKey: AllAccessKeys[number];
-    accessResultCallback?: MultiTenantPluginConfig['usersAccessResultOverride'];
-    adminUsersSlug: string;
-    collection: CollectionConfig;
-    fieldName: string;
-    tenantsArrayFieldName?: string;
-    tenantsArrayTenantFieldName?: string;
-    userHasAccessToAllTenants: Required<MultiTenantPluginConfig>['userHasAccessToAllTenants'];
-};
-export declare const withTenantAccess: ({ accessFunction, accessKey, accessResultCallback, adminUsersSlug, collection, fieldName, tenantsArrayFieldName, tenantsArrayTenantFieldName, userHasAccessToAllTenants, }: Args) => (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,EAAe,MAAM,SAAS,CAAA;AAE9F,OAAO,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAwB,MAAM,aAAa,CAAA;AAK/F,KAAK,IAAI,GAAG;IACV,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAChC,oBAAoB,CAAC,EAAE,uBAAuB,CAAC,2BAA2B,CAAC,CAAA;IAC3E,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,CAAC,uBAAuB,CAAC,CAAC,2BAA2B,CAAC,CAAA;CAC1F,CAAA;AACD,eAAO,MAAM,gBAAgB,GAC1B,4KAUE,IAAI,MACA,MAAM,UAAU,KAAG,OAAO,CAAC,YAAY,CAkF7C,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, User, 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 = {\n  accessFunction?: Access\n  accessKey: AllAccessKeys[number]\n  accessResultCallback?: MultiTenantPluginConfig['usersAccessResultOverride']\n  adminUsersSlug: string\n  collection: CollectionConfig\n  fieldName: string\n  tenantsArrayFieldName?: string\n  tenantsArrayTenantFieldName?: string\n  userHasAccessToAllTenants: Required<MultiTenantPluginConfig>['userHasAccessToAllTenants']\n}\nexport const withTenantAccess =\n  ({\n    accessFunction,\n    accessKey,\n    accessResultCallback,\n    adminUsersSlug,\n    collection,\n    fieldName,\n    tenantsArrayFieldName,\n    tenantsArrayTenantFieldName,\n    userHasAccessToAllTenants,\n  }: Args) =>\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(args.req.user as User)\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;AAatD,OAAO,MAAMC,mBACX,CAAC,EACCC,cAAc,EACdC,SAAS,EACTC,oBAAoB,EACpBC,cAAc,EACdC,UAAU,EACVC,SAAS,EACTC,qBAAqB,EACrBC,2BAA2B,EAC3BC,yBAAyB,EACpB,GACP,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,0BAA0BC,KAAKG,GAAG,CAACE,IAAI,GACxC;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"}