npm - @dosgato/api - Versions diffs - 0.0.112 → 0.0.114 - Mend

@dosgato/api 0.0.112 → 0.0.114

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

package/dist/asset/asset.service.js +1 -2
package/dist/asset/asset.service.js.map +1 -1
package/dist/assetfolder/assetfolder.service.js +1 -2
package/dist/assetfolder/assetfolder.service.js.map +1 -1
package/dist/assetrule/assetrule.service.d.ts +1 -7
package/dist/assetrule/assetrule.service.js +16 -58
package/dist/assetrule/assetrule.service.js.map +1 -1
package/dist/data/data.model.d.ts +1 -1
package/dist/data/data.model.js +1 -1
package/dist/data/data.model.js.map +1 -1
package/dist/data/data.service.js +1 -2
package/dist/data/data.service.js.map +1 -1
package/dist/datafolder/datafolder.database.d.ts +2 -2
package/dist/datafolder/datafolder.database.js +2 -2
package/dist/datafolder/datafolder.database.js.map +1 -1
package/dist/datafolder/datafolder.model.d.ts +2 -2
package/dist/datafolder/datafolder.model.js +1 -1
package/dist/datafolder/datafolder.model.js.map +1 -1
package/dist/datafolder/datafolder.service.js +1 -2
package/dist/datafolder/datafolder.service.js.map +1 -1
package/dist/dataroot/dataroot.model.d.ts +1 -1
package/dist/dataroot/dataroot.service.d.ts +1 -1
package/dist/dataroot/dataroot.service.js +1 -1
package/dist/dataroot/dataroot.service.js.map +1 -1
package/dist/datarule/datarule.model.d.ts +1 -1
package/dist/datarule/datarule.model.js +1 -1
package/dist/datarule/datarule.model.js.map +1 -1
package/dist/datarule/datarule.service.d.ts +1 -1
package/dist/datarule/datarule.service.js +17 -30
package/dist/datarule/datarule.service.js.map +1 -1
package/dist/globalrule/globalrule.service.d.ts +0 -1
package/dist/globalrule/globalrule.service.js +8 -6
package/dist/globalrule/globalrule.service.js.map +1 -1
package/dist/index.js +2 -0
package/dist/index.js.map +1 -1
package/dist/page/page.service.js +10 -14
package/dist/page/page.service.js.map +1 -1
package/dist/pagerule/pagerule.service.d.ts +1 -0
package/dist/pagerule/pagerule.service.js +4 -1
package/dist/pagerule/pagerule.service.js.map +1 -1
package/dist/pagetree/pagetree.database.d.ts +2 -2
package/dist/pagetree/pagetree.database.js +3 -3
package/dist/pagetree/pagetree.database.js.map +1 -1
package/dist/pagetree/pagetree.service.d.ts +2 -2
package/dist/site/site.database.d.ts +2 -2
package/dist/site/site.database.js +2 -2
package/dist/site/site.database.js.map +1 -1
package/dist/site/site.service.d.ts +2 -2
package/dist/site/site.service.js +1 -1
package/dist/site/site.service.js.map +1 -1
package/dist/siterule/siterule.service.d.ts +1 -1
package/dist/siterule/siterule.service.js +2 -2
package/dist/siterule/siterule.service.js.map +1 -1
package/dist/template/template.database.d.ts +1 -1
package/dist/template/template.model.d.ts +2 -2
package/dist/template/template.model.js +1 -1
package/dist/template/template.model.js.map +1 -1
package/dist/template/template.service.d.ts +2 -2
package/dist/templaterule/templaterule.model.d.ts +1 -1
package/dist/templaterule/templaterule.model.js +2 -1
package/dist/templaterule/templaterule.model.js.map +1 -1
package/dist/templaterule/templaterule.service.d.ts +1 -1
package/dist/templaterule/templaterule.service.js +2 -2
package/dist/templaterule/templaterule.service.js.map +1 -1
package/dist/user/user.service.js +1 -2
package/dist/user/user.service.js.map +1 -1
package/dist/util/authservice.d.ts +1 -1
package/dist/util/authservice.js +72 -31
package/dist/util/authservice.js.map +1 -1
package/package.json +1 -1

package/dist/datafolder/datafolder.database.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"datafolder.database.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.database.ts"],"names":[],"mappings":"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~~kBAA0B~~,EAAE,MAAe;~~IAC/F~~,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,~~kBAAkB~~,CAAC,CAAA;~~IACpD~~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"}
1	+ {"version":3,"file":"datafolder.database.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.database.ts"],"names":[],"mappings":"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"}

package/dist/datafolder/datafolder.model.d.ts CHANGED Viewed

@@ -8,7 +8,7 @@ export declare class DataFolder {
     deleted: boolean;
     deleteState: DeleteState;
     deletedAt?: DateTime;
-    templateId: number;
+    templateId: string;
     siteId?: string;
     deletedBy?: number;
     templateKey: string;
@@ -19,7 +19,7 @@ export declare class DataFolderFilter {
     internalIds?: number[];
     ids?: string[];
     templateKeys?: string[];
-    templateIds?: number[];
+    templateIds?: string[];
     siteIds?: string[];
     global?: boolean;
     deleteStates?: DeleteStateInput[];

package/dist/datafolder/datafolder.model.js CHANGED Viewed

@@ -17,7 +17,7 @@ let DataFolder = class DataFolder {
         this.internalId = row.id;
         this.id = row.guid;
         this.name = row.name;
-        this.templateId = row.templateId;
+        this.templateId = String(row.templateId);
         this.siteId = optionalString(row.siteId);
         this.deleteState = row.deleteState;
         this.deleted = row.deleteState !== DeleteState.NOTDELETED;

package/dist/datafolder/datafolder.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"datafolder.model.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,6BAA6B,CAAA;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACjF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAE1F,IACa,UAAU,GADvB,MACa,UAAU;IAwBrB,YAAa,GAAQ;QACnB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,EAAE,CAAA;QACxB,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAClB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;~~QAChC~~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"}
1	+ {"version":3,"file":"datafolder.model.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.model.ts"],"names":[],"mappings":"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"}

package/dist/datafolder/datafolder.service.js CHANGED Viewed

@@ -245,8 +245,7 @@ export class DataFolderService extends DosGatoService {
         if (!folder.siteId)
             return await this.haveGlobalPerm('manageGlobalData');
         if (folder.orphaned) {
-            const srSvc = this.svc(SiteRuleService);
-            const siteRules = (await this.currentSiteRules()).filter(r => srSvc.applies(r, folder.siteId));
+            const siteRules = (await this.currentSiteRules()).filter(r => SiteRuleService.applies(r, folder.siteId));
             return siteRules.some(r => r.grants.delete);
         }
         const dataRules = await this.currentDataRules();

package/dist/datafolder/datafolder.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"datafolder.service.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"datafolder.service.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.service.ts"],"names":[],"mappings":"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"}

package/dist/dataroot/dataroot.model.d.ts CHANGED Viewed

@@ -8,7 +8,7 @@ export declare class DataRoot {
 export declare class DataRootFilter {
     ids?: string[];
     templateKeys?: string[];
-    templateIds?: number[];
+    templateIds?: string[];
     siteIds?: string[];
     orphaned?: DeletedFilter;
     global?: boolean;

package/dist/dataroot/dataroot.service.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { type DataFolder, DataRoot, type DataRootFilter, DosGatoService, type Site, type Template } from '../internal.js';
 export declare class DataRootService extends DosGatoService<DataRoot> {
-    templatesById?: Map<number, Template>;
+    templatesById?: Map<string, Template>;
     templatesByKey?: Map<string, Template>;
     allSites?: Site[];
     find(filter?: DataRootFilter): Promise<DataRoot[]>;

package/dist/dataroot/dataroot.service.js CHANGED Viewed

@@ -8,7 +8,7 @@ export class DataRootService extends DosGatoService {
         filter ?? (filter = {});
         const idPairs = (filter.ids ?? []).map(id => {
             const [siteId, templateId] = id.split('-');
-            return { siteId: siteId === 'global' ? undefined : siteId, templateId: Number(templateId) };
+            return { siteId: siteId === 'global' ? undefined : siteId, templateId };
         });
         filter.templateIds = intersect({ skipEmpty: true }, filter.templateIds, idPairs.map(p => p.templateId));
         filter.templateKeys = intersect({ skipEmpty: true }, filter.templateKeys, filter.templateIds?.map(tid => this.templatesById.get(tid)?.key).filter(isNotNull));

package/dist/dataroot/dataroot.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dataroot.service.js","sourceRoot":"","sources":["../../src/dataroot/dataroot.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAmB,QAAQ,EAAuB,cAAc,EAAa,mBAAmB,EAAiB,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7K,MAAM,OAAO,eAAgB,SAAQ,cAAwB;IAK3D,KAAK,CAAC,IAAI,CAAE,MAAuB;QACjC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QACjD,IAAI,CAAC,aAAa,KAAlB,IAAI,CAAC,aAAa,GAAK,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,EAAA;QAClK,IAAI,CAAC,cAAc,KAAnB,IAAI,CAAC,cAAc,GAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,EAAA;QACrI,MAAM,KAAN,MAAM,GAAK,EAAE,EAAA;QACb,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC1C,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,~~MAAM,CAAC,UAAU,CAAC,EAAE,~~CAAA;~~QAC7F~~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"}
1	+ {"version":3,"file":"dataroot.service.js","sourceRoot":"","sources":["../../src/dataroot/dataroot.service.ts"],"names":[],"mappings":"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"}

package/dist/datarule/datarule.model.d.ts CHANGED Viewed

@@ -20,7 +20,7 @@ export declare class DataRule {
     type: string;
     grants: DataRuleGrants;
     path: string;
-    templateId?: number;
+    templateId?: string;
     roleId: string;
     siteId?: string;
     constructor(row: any);

package/dist/datarule/datarule.model.js CHANGED Viewed

@@ -92,7 +92,7 @@ let DataRule = class DataRule {
         this.id = String(row.id);
         this.roleId = String(row.roleId);
         this.siteId = optionalString(row.siteId);
-        this.templateId = row.templateId;
+        this.templateId = optionalString(row.templateId);
         this.grants = new DataRuleGrants(row);
         this.path = row.path;
     }

package/dist/datarule/datarule.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"datarule.model.js","sourceRoot":"","sources":["../../src/datarule/datarule.model.ts"],"names":[],"mappings":"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~~QAChC~~,IAAI,CAAC,MAAM,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACtB,CAAC;CACF,CAAA;AAvBC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;;oCACR;AAGV;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,2DAA2D,EAAE,CAAC;;sCAC1E;AAG5B;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,mCAAmC,EAAE,CAAC;8BACpD,cAAc;wCAAA;AAGtB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,uLAAuL,EAAE,CAAC;;sCACpM;AAXD,QAAQ;IADpB,UAAU,CAAC,EAAE,WAAW,EAAE,kHAAkH,EAAE,CAAC;;GACnI,QAAQ,CAyBpB;SAzBY,QAAQ;AA4BrB,IAAa,cAAc,GAA3B,MAAa,cAAc;CAK1B,CAAA;AALY,cAAc;IAD1B,SAAS,EAAE;GACC,cAAc,CAK1B;SALY,cAAc;AAQ3B,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;CAe/B,CAAA;AAbC;IADC,KAAK,EAAE;;mDACO;AAGf;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACX;AAGf;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACP;AAGnB;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACb;AAGb;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC7C,kBAAkB;mDAAA;AAdhB,mBAAmB;IAD/B,SAAS,EAAE;GACC,mBAAmB,CAe/B;SAfY,mBAAmB;AAkBhC,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;CAe/B,CAAA;AAbC;IADC,KAAK,EAAE;;mDACO;AAGf;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACX;AAGf;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACP;AAGnB;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACb;AAGb;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC7C,kBAAkB;mDAAA;AAdhB,mBAAmB;IAD/B,SAAS,EAAE;GACC,mBAAmB,CAe/B;SAfY,mBAAmB;AAiBhC,IACa,gBAAgB,GAD7B,MACa,gBAAiB,SAAQ,iBAAiB;IAIrD,YAAa,MAAuD;QAClE,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;IACjC,CAAC;CACF,CAAA;AANC;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,QAAQ;kDAAA;AAFR,gBAAgB;IAD5B,UAAU,EAAE;;GACA,gBAAgB,CAQ5B;SARY,gBAAgB;AAW7B,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;CAAG,CAAA;AAAtB,mBAAmB;IAD/B,UAAU,EAAE;GACA,mBAAmB,CAAG;SAAtB,mBAAmB"}
1	+ {"version":3,"file":"datarule.model.js","sourceRoot":"","sources":["../../src/datarule/datarule.model.ts"],"names":[],"mappings":"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"}

package/dist/datarule/datarule.service.d.ts CHANGED Viewed

@@ -18,7 +18,7 @@ export declare class DataRuleService extends DosGatoService<DataRule> {
     create(args: CreateDataRuleInput, validateOnly?: boolean): Promise<DataRuleResponse>;
     update(args: UpdateDataRuleInput, validateOnly?: boolean): Promise<DataRuleResponse>;
     delete(ruleId: string): Promise<ValidatedResponse>;
-    applies(rule: DataRule, item: Data): Promise<boolean>;
+    static applies(rule: DataRule, itemOrFolder: Data | DataFolder, pathWithoutSite: string): boolean;
     static appliesToSiteAndTemplate(r: DataRule, item: Data | DataFolder): boolean;
     static appliesToPath(r: DataRule, dataPathWithoutSite: string): boolean;
     appliesToFolder(rule: DataRule, folder: DataFolder): Promise<boolean>;

package/dist/datarule/datarule.service.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
-import { Cache, filterAsync, isNotNull } from 'txstate-utils';
+import { Cache, isNotNull } from 'txstate-utils';
 import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
-import { tooPowerfulHelper, DosGatoService, getDataRules, DataRule, createDataRule, updateDataRule, deleteDataRule, RoleService, DataRuleResponse, RoleServiceInternal, DataServiceInternal, DataFolderService } from '../internal.js';
+import { tooPowerfulHelper, DosGatoService, getDataRules, DataRule, createDataRule, updateDataRule, deleteDataRule, RoleService, DataRuleResponse, RoleServiceInternal, DataServiceInternal, shiftPath, DataFolderServiceInternal } from '../internal.js';
 const dataRulesByIdLoader = new PrimaryKeyLoader({
     fetch: async (ids) => {
         return await getDataRules({ ids });
@@ -41,27 +41,20 @@ export class DataRuleServiceInternal extends BaseService {
         return [...dataRulesForTemplate, ...globalRules];
     }
     async findByDataEntry(data) {
-        // a data entry can have a site, folder, or neither
-        let folderRules = [];
-        if (data.folderInternalId) {
-            const folder = await this.svc(DataFolderService).findByInternalId(data.folderInternalId);
-            folderRules = await this.findByDataFolder(folder);
-        }
-        else {
-            // TODO: What if the data is not in a folder?
-        }
-        const siteDataRules = await this.findBySiteId(data.siteId);
-        const drService = this.svc(DataRuleService);
-        return await filterAsync([...folderRules, ...siteDataRules], async (rule) => await drService.applies(rule, data));
+        const [rules, dataPath] = await Promise.all([
+            this.findByTemplateId(data.templateId),
+            this.svc(DataServiceInternal).getPath(data)
+        ]);
+        const dataPathWithoutSite = shiftPath(dataPath);
+        return rules.filter(rule => DataRuleService.applies(rule, data, dataPathWithoutSite));
     }
     async findByDataFolder(folder) {
-        const [siteRules, templateRules] = await Promise.all([
-            this.findBySiteId(folder.siteId),
-            this.findByTemplateId(String(folder.templateId))
+        const [rules, folderPath] = await Promise.all([
+            this.findByTemplateId(folder.templateId),
+            this.svc(DataFolderServiceInternal).getPath(folder)
         ]);
-        const drService = this.svc(DataRuleService);
-        // TODO: Should appliesToFolder be looking at the template ID for the rule and the folder to see if they match?
-        return await filterAsync([...siteRules, ...templateRules], async (rule) => await drService.appliesToFolder(rule, folder));
+        const folderPathWithoutSite = shiftPath(folderPath);
+        return rules.filter(rule => DataRuleService.applies(rule, folder, folderPathWithoutSite));
     }
 }
 export class DataRuleService extends DosGatoService {
@@ -161,14 +154,8 @@ export class DataRuleService extends DosGatoService {
             throw new Error('An error occurred while deleting the data rule.');
         }
     }
-    async applies(rule, item) {
-        if (!item.siteId && rule.siteId)
-            return false;
-        if (rule.siteId && rule.siteId !== item.siteId)
-            return false;
-        const dataPath = await this.svc(DataServiceInternal).getPath(item);
-        const dataPathWithoutSite = '/' + dataPath.split('/').slice(2).join('/');
-        return dataPathWithoutSite.startsWith(rule.path);
+    static applies(rule, itemOrFolder, pathWithoutSite) {
+        return this.appliesToSiteAndTemplate(rule, itemOrFolder) && this.appliesToPath(rule, pathWithoutSite);
     }
     static appliesToSiteAndTemplate(r, item) {
         if (!item.siteId && r.siteId)
@@ -199,13 +186,13 @@ export class DataRuleService extends DosGatoService {
         return tooPowerfulHelper(rule, await this.currentDataRules(), this.asOrMorePowerful);
     }
     async mayWrite(rule) {
-        const role = await this.svc(RoleService).findById(rule.id);
+        const role = await this.svc(RoleServiceInternal).findById(rule.id);
         return await this.svc(RoleService).mayUpdate(role);
     }
     async mayView(rule) {
         if (await this.haveGlobalPerm('manageAccess'))
             return true;
-        const role = await this.svc(RoleServiceInternal).findById(rule.roleId);
+        const role = await this.svc(RoleService).findById(rule.roleId);
         return !!role;
     }
 }

package/dist/datarule/datarule.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"datarule.service.js","sourceRoot":"","sources":["../../src/datarule/datarule.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,KAAK,~~EAAE~~,~~WAAW,EAAE,~~SAAS,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC5E,OAAO,EACL,iBAAiB,EAAE,cAAc,EAA8B,YAAY,EAAE,QAAQ,EACrF,cAAc,EAA4B,cAAc,EAA4B,cAAc,EAClG,WAAW,EAAuB,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,~~iBAAiB~~,~~EAChH~~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~~mDAAmD;QACnD~~,~~IAAI~~,~~WAAW~~,~~GAAe,~~EAAE,~~CAAA;QAChC~~,~~IAAI,IAAI,~~CAAC,~~gBAAgB,EAAE;YACzB,MAAM,MAAM,~~GAAG,MAAM,~~IAAI~~,CAAC,GAAG,CAAC,~~iBAAiB~~,CAAC,~~CAAC,~~gBAAgB,CAAC,IAAI,CAAC,~~gBAAgB~~,CAAC~~,CAAA~~;~~YACxF~~,~~WAAW,GAAG,MAAM,~~IAAI,CAAC,~~gBAAgB~~,CAAC,~~MAAO~~,CAAC,~~CAAA;SACnD;aAAM;YACL,6CAA6C;SAC9C;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,~~CAAC,~~YAAY~~,CAAC,IAAI,CAAC,~~MAAM,~~CAAC,CAAA;~~QAC1D~~,MAAM,~~SAAS~~,GAAG,~~IAAI~~,CAAC,~~GAAG~~,CAAC,~~eAAe,CAAC,~~CAAA;~~QAC3C~~,OAAO,~~MAAM~~,~~WAAW,~~CAAC,~~CAAC~~,~~GAAG,WAAW,EAAE,GAAG,aAAa,~~CAAC,~~EAAE,KAAK,EAAC,~~IAAI,~~EAAC~~,EAAE,CAAC,~~MAAM~~,~~SAAS,~~CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;~~IACjH~~,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAE,MAAkB;QACxC,MAAM,CAAC,~~SAAS~~,EAAE,~~aAAa~~,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;~~YACnD~~,IAAI,CAAC,~~YAAY~~,CAAC,MAAM,CAAC,~~MAAM~~,CAAC;~~YAChC~~,IAAI,CAAC,~~gBAAgB~~,CAAC,~~MAAM~~,CAAC,~~MAAM,~~CAAC,~~UAAU~~,CAAC,CAAC;~~SACjD~~,CAAC,CAAA;QACF,MAAM,~~SAAS~~,GAAG,~~IAAI~~,CAAC,~~GAAG~~,CAAC,~~eAAe,CAAC,~~CAAA;~~QAC3C,+GAA+G;QAC/G~~,OAAO,~~MAAM~~,~~WAAW,~~CAAC,~~CAAC~~,~~GAAG,SAAS,EAAE,GAAG,aAAa,~~CAAC,~~EAAE,KAAK,EAAC,~~IAAI,~~EAAC~~,EAAE,CAAC,~~MAAM~~,~~SAAS,~~CAAC,~~eAAe~~,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;~~IACzH~~,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,cAAwB;IAA7D;;QACE,QAAG,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;~~IAqIzC~~,CAAC;~~IAnIC~~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~~KAAK~~,CAAC,OAAO,CAAE,IAAc,EAAE,~~IAAU;QACvC~~,~~IAAI~~,~~CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM~~;~~YAAE~~,OAAO,~~KAAK,CAAA;QAC7C,~~IAAI,~~IAAI,~~CAAC,~~MAAM~~,~~IAAI,IAAI,~~CAAC,~~MAAM,KAAK,~~IAAI,~~CAAC~~,~~MAAM;YAAE~~,~~OAAO,KAAK,CAAA;QAC5D,MAAM,QAAQ,GAAG,MAAM,IAAI,~~CAAC,~~GAAG,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,~~IAAI,~~CAAC,CAAA;QAClE,MAAM,mBAAmB,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,~~IAAI,CAAC,~~GAAG~~,CAAC,~~CAAA;QACxE,OAAO,mBAAmB,CAAC,UAAU,CAAC,~~IAAI,~~CAAC~~,~~IAAI~~,CAAC,CAAA;~~IAClD~~,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAE,CAAW,EAAE,IAAuB;QACnE,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC1C,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QACtD,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU;YAAE,OAAO,KAAK,CAAA;QAClE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,aAAa,CAAE,CAAW,EAAE,mBAA2B;QAC5D,OAAO,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,eAAe,CAAE,IAAc,EAAE,MAAkB;QACvD,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC/C,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC9D,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,IAAc,EAAE,CAAA;QAC9C,OAAO,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC;IAED,gBAAgB,CAAE,KAAe,EAAE,KAAe;QAChD,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC/D,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,WAAW,CAAE,IAAc;QAC/B,OAAO,iBAAiB,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,gBAAgB,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;IACtF,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,IAAc;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,~~WAAW~~,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;~~QAC1D~~,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,IAAK,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,IAAc;QAC3B,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YAAE,OAAO,IAAI,CAAA;QAC1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,~~mBAAmB~~,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;~~QACtE~~,OAAO,CAAC,CAAC,IAAI,CAAA;IACf,CAAC;CACF"}
1	+ {"version":3,"file":"datarule.service.js","sourceRoot":"","sources":["../../src/datarule/datarule.service.ts"],"names":[],"mappings":"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"}

package/dist/globalrule/globalrule.service.d.ts CHANGED Viewed

@@ -11,7 +11,6 @@ export declare class GlobalRuleService extends DosGatoService<GlobalRule> {
     create(args: CreateGlobalRuleInput, validateOnly?: boolean): Promise<GlobalRuleResponse>;
     update(args: UpdateGlobalRuleInput, validateOnly?: boolean): Promise<GlobalRuleResponse>;
     delete(ruleId: string): Promise<ValidatedResponse>;
-    applies(rule: GlobalRule): Promise<boolean>;
     tooPowerful(rule: GlobalRule): Promise<boolean>;
     mayWrite(rule: GlobalRule): Promise<boolean>;
     mayView(rule: GlobalRule): Promise<boolean>;

package/dist/globalrule/globalrule.service.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
 import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
-import { getGlobalRules, GlobalRule, DosGatoService, tooPowerfulHelper, RoleService, createGlobalRule, GlobalRuleResponse, updateGlobalRule, deleteGlobalRule, RoleServiceInternal } from '../internal.js';
+import { getGlobalRules, GlobalRule, DosGatoService, RoleService, createGlobalRule, GlobalRuleResponse, updateGlobalRule, deleteGlobalRule, RoleServiceInternal } from '../internal.js';
 const globalRulesByIdLoader = new PrimaryKeyLoader({
     fetch: async (ids) => {
         return await getGlobalRules({ ids });
@@ -87,11 +87,13 @@ export class GlobalRuleService extends DosGatoService {
             throw new Error('An error occurred while deleting the global rule.');
         }
     }
-    async applies(rule) {
-        return true; // global rules always apply but we provide this function to match coding style of other rules
-    }
     async tooPowerful(rule) {
-        return tooPowerfulHelper(rule, await this.currentGlobalRules(), () => true);
+        const grants = await this.currentGlobalGrants();
+        return (rule.grants.createSites && !grants.createSites) ||
+            (rule.grants.manageAccess && !grants.manageAccess) ||
+            (rule.grants.manageGlobalData && !grants.manageGlobalData) ||
+            (rule.grants.manageParentRoles && !grants.manageParentRoles) ||
+            (rule.grants.manageTemplates && !grants.manageTemplates);
     }
     async mayWrite(rule) {
         const role = await this.svc(RoleService).findById(rule.id);
@@ -100,7 +102,7 @@ export class GlobalRuleService extends DosGatoService {
     async mayView(rule) {
         if (await this.haveGlobalPerm('manageAccess'))
             return true;
-        const role = await this.svc(RoleServiceInternal).findById(rule.roleId);
+        const role = await this.svc(RoleService).findById(rule.roleId);
         return !!role;
     }
     async mayOverrideStamps() {

package/dist/globalrule/globalrule.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC5E,OAAO,EACL,cAAc,EAAE,UAAU,EAAE,cAAc,~~EAAE~~,~~iBAAiB,EAAE,~~WAAW,EAC9C,gBAAgB,EAAE,kBAAkB,EAChE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EACxD,MAAM,gBAAgB,CAAA;AAEvB,MAAM,qBAAqB,GAAG,IAAI,gBAAgB,CAAC;IACjD,KAAK,EAAE,KAAK,EAAE,GAAa,EAAE,EAAE;QAC7B,OAAO,MAAM,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IACtC,CAAC;CACF,CAAC,CAAA;AACF,MAAM,uBAAuB,GAAG,IAAI,eAAe,CAAC;IAClD,KAAK,EAAE,KAAK,EAAE,OAAiB,EAAE,EAAE;QACjC,OAAO,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC1C,CAAC;IACD,UAAU,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;CACxC,CAAC,CAAA;AAEF,MAAM,OAAO,yBAA0B,SAAQ,WAAW;IACxD,KAAK,CAAC,QAAQ,CAAE,MAAc;QAC5B,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAc;QAChC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrE,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,cAA0B;IAAjE;;QACE,QAAG,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;~~IAgF3C~~,CAAC;~~IA9EC~~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~~OAAO~~,CAAE,IAAgB;~~QAC7B~~,~~OAAO~~,IAAI,CAAA,CAAC,~~8FAA8F;IAC5G~~,CAAC~~;IAED~~,~~KAAK~~,CAAC,WAAW,~~CAAE~~,~~IAAgB~~;~~QACjC~~,~~OAAO~~,~~iBAAiB~~,CAAC,IAAI,~~EAAE~~,MAAM,IAAI,CAAC,~~kBAAkB~~,~~EAAE~~,~~EAAE~~,~~GAAG~~,~~EAAE~~,CAAC,IAAI,CAAC,CAAA;~~IAC7E~~,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,IAAgB;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1D,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,IAAK,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,IAAgB;QAC7B,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YAAE,OAAO,IAAI,CAAA;QAC1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,~~mBAAmB~~,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;~~QACtE~~,OAAO,CAAC,CAAC,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;IACjD,CAAC;CACF"}
1	+ {"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"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"}

package/dist/index.js CHANGED Viewed

@@ -104,6 +104,8 @@ export class DGServer {
             send403: async (ctx) => {
                 if (!ctx.auth?.sub)
                     return true;
+                if (ctx.auth.sub === 'anonymous')
+                    return false;
                 const user = await ctx.svc(UserServiceInternal).findById(ctx.auth?.sub);
                 return !user || user.disabled;
             },

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,SAAS,EAAqB,MAAM,6BAA6B,CAAA;AAExF,OAAO,EAA8B,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEvE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAErC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EACL,cAAc,EAAE,aAAa,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,aAAa,EAC3F,iBAAiB,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,YAAY,EACtF,gBAAgB,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,8BAA8B,EAClG,uBAAuB,EAAE,YAAY,EAAE,2BAA2B,EAAE,gBAAgB,EACpF,2BAA2B,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,YAAY,EACpF,uBAAuB,EAAE,YAAY,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gBAAgB,EACzG,oBAAoB,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,YAAY,EAC1G,6BAA6B,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,aAAa,EAC1F,6BAA6B,EAAE,kBAAkB,EAAE,eAAe,EAAE,oBAAoB,EACxF,cAAc,EAAoB,+BAA+B,EAAE,oBAAoB,EACvF,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,gBAAgB,EACxF,2BAA2B,EAAE,eAAe,EAAE,iBAAiB,EAAE,WAAW,EAAE,iBAAiB,EAC/F,mBAAmB,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,sBAAsB,EAAsC,mBAAmB,EAChR,MAAM,eAAe,CAAA;AAEtB,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,MAAc,EAAE,aAAqB,EAAE,EAAE;IAC3E,MAAM,eAAe,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAC9C,CAAC,CAAC,CAAA;AAEF,KAAK,UAAU,WAAW,CAAE,SAAiB,EAAE,aAAqB,EAAE,KAAa,EAAE,IAAS,EAAE,SAAc,EAAE,IAAS,EAAE,MAAuB;IAChJ,MAAM,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AAClD,CAAC;AAiBD,MAAM,OAAO,QAAQ;IAInB,YAAa,MAA8B;QACzC,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,CAAA;QACrH,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,KAAK,CAAE,IAAiB;QAC5B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS;YAAE,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC1E,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK,MAAM,CAAA;QAE1G,IAAI,aAAa;YAAE,MAAM,OAAO,EAAE,CAAA;QAClC,MAAM,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEjC,+BAA+B;QAC/B,MAAM,kBAAkB,EAAE,CAAA;QAE1B,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;QACxB,IAAI,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM,EAAE;YACzD,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAChC,MAAM,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAA;YACvB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM,EAAE;gBACzC,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;gBACzC,MAAM,SAAS,EAAE,CAAA;aAClB;YACD,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;SAClC;QAED,MAAM,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEnC,MAAM,SAAS,GAAuB;YACpC,cAAc;YACd,aAAa;YACb,wBAAwB;YACxB,mBAAmB;YACnB,iBAAiB;YACjB,4BAA4B;YAC5B,mBAAmB;YACnB,8BAA8B;YAC9B,YAAY;YACZ,uBAAuB;YACvB,gBAAgB;YAChB,2BAA2B;YAC3B,kBAAkB;YAClB,6BAA6B;YAC7B,gBAAgB;YAChB,2BAA2B;YAC3B,kBAAkB;YAClB,6BAA6B;YAC7B,aAAa;YACb,wBAAwB;YACxB,oBAAoB;YACpB,YAAY;YACZ,uBAAuB;YACvB,gBAAgB;YAChB,2BAA2B;YAC3B,gBAAgB;YAChB,2BAA2B;YAC3B,YAAY;YACZ,uBAAuB;YACvB,YAAY;YACZ,mBAAmB;YACnB,uBAAuB;YACvB,gBAAgB;YAChB,2BAA2B;YAC3B,oBAAoB;YACpB,gBAAgB;YAChB,2BAA2B;YAC3B,oBAAoB;YACpB,+BAA+B;YAC/B,YAAY;YACZ,uBAAuB;YACvB,eAAe;SAChB,CAAC;QACD,SAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAA;QAEpD,MAAM,UAAU,GAA+C;YAC7D,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,sBAAsB,EAAE;YAC1D,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,wBAAwB,EAAE;YAC9D,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE;YAChD,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,mBAAmB,EAAE;YACpD,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE;SAC3C,CAAA;QACD,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAA;QAE3C,MAAM,KAAK,GAAG,KAAK,EAAE,GAAG,IAAyI,EAAE,EAAE;YACnK,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;gBACrB,WAAW,CAAC,GAAG,IAAI,CAAC;gBACpB,WAAW,CAAC,GAAG,IAAI,CAAC;aACrB,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,MAAM,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;QAEvH,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YACzB,GAAG,IAAI;YACP,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,KAAK,EAAE,GAAY,EAAE,EAAE;gBAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG;oBAAE,OAAO,IAAI,CAAA;gBAC/B,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;gBACvE,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAA;YAC/B,CAAC;YACD,SAAS;YACT,UAAU;YACV,KAAK;SACN,CAAC,CAAA;QACF,sBAAsB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC/C,CAAC;CACF;AAED,cAAc,eAAe,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/page/page.service.js CHANGED Viewed

@@ -24,6 +24,14 @@ const pagesInPagetreeLoader = new OneToManyLoader({
     keysFromFilter: (filter) => filter?.pagetreeIds ?? [],
     idLoader: [pagesByInternalIdLoader, pagesByDataIdLoader]
 });
+const pagesByTemplateKeyLoader = new OneToManyLoader({
+    fetch: async (templateKeys, filter) => {
+        return await getPages({ ...filter, templateKeys });
+    },
+    extractKey: (p) => p.templateKey,
+    keysFromFilter: (filter) => filter?.templateKeys ?? [],
+    idLoader: [pagesByInternalIdLoader, pagesByDataIdLoader]
+});
 const pagesByInternalIdPathLoader = new OneToManyLoader({
     fetch: async (internalIdPaths, filter) => {
         return await getPages({ ...filter, internalIdPaths });
@@ -87,18 +95,7 @@ export class PageServiceInternal extends BaseService {
         return await this.loaders.get(pagesInPagetreeLoader, filter).load(id);
     }
     async findByTemplate(key, filter) {
-        const searchRule = { indexName: 'templateKey', equal: key };
-        const [dataIdsLatest, dataIdsPublished] = await Promise.all([
-            this.svc(VersionedService).find([searchRule], 'page'),
-            this.svc(VersionedService).find([searchRule], 'page', 'published')
-        ]);
-        let dataIds = unique([...dataIdsLatest, ...dataIdsPublished]);
-        if (!dataIds.length)
-            return [];
-        if (filter?.ids?.length) {
-            dataIds = dataIds.filter(i => filter.ids?.includes(i));
-        }
-        return await this.findByIds(dataIds);
+        return await this.loaders.get(pagesByTemplateKeyLoader, filter).load(key);
     }
     async getPageChildren(page, recursive, filter) {
         const loader = recursive ? pagesByInternalIdPathRecursiveLoader : pagesByInternalIdPathLoader;
@@ -283,8 +280,7 @@ export class PageService extends DosGatoService {
     // may view the page in a list
     async mayView(page) {
         if (page.orphaned) {
-            const srSvc = this.svc(SiteRuleService);
-            const siteRules = (await this.currentSiteRules()).filter(r => srSvc.applies(r, page.siteId));
+            const siteRules = (await this.currentSiteRules()).filter(r => SiteRuleService.applies(r, page.siteId));
             return siteRules.some(r => r.grants.delete);
         }
         const [pageRules, pagePath] = await Promise.all([