@dosgato/api 1.2.4 → 1.3.0

package/dist/util/context.js

@@ -0,0 +1,105 @@
+import { Context, MockContext } from '@txstate-mws/graphql-server';
+import { AssetRule, DataRule, PageRule, RoleServiceInternal, RulePathMode, SiteRule, getPageRules, getAssetRules, getDataRules, getSiteRules, getGlobalRules, getTemplateRules, getUsers, GroupServiceInternal } from '../internal.js';
+import { Cache, keyby } from 'txstate-utils';
+async function fetchPageRules(netid, roleIds) {
+    if (netid === 'anonymous')
+        return [new PageRule({ path: '/', mode: RulePathMode.SELFANDSUB })];
+    if (netid === 'render')
+        return [new PageRule({ path: '/', mode: RulePathMode.SELFANDSUB, viewlatest: true })];
+    if (roleIds.length === 0)
+        return [];
+    return await getPageRules({ roleIds });
+}
+async function fetchAssetRules(netid, roleIds) {
+    if (netid === 'anonymous')
+        return [];
+    if (netid === 'render')
+        return [new AssetRule({ path: '/', mode: RulePathMode.SELFANDSUB })];
+    if (roleIds.length === 0)
+        return [];
+    return await getAssetRules({ roleIds });
+}
+async function fetchSiteRules(netid, roleIds) {
+    if (netid === 'anonymous' || netid === 'render')
+        return [new SiteRule({})];
+    if (roleIds.length === 0)
+        return [];
+    return await getSiteRules({ roleIds });
+}
+async function fetchDataRules(netid, roleIds) {
+    if (netid === 'anonymous')
+        return [new DataRule({ path: '/' })];
+    if (netid === 'render')
+        return [new DataRule({ path: '/', viewlatest: true })];
+    if (roleIds.length === 0)
+        return [];
+    return await getDataRules({ roleIds });
+}
+async function fetchGlobalRules(netid, roleIds) {
+    const grants = {
+        manageAccess: false,
+        manageGlobalData: false,
+        manageParentRoles: false,
+        manageTemplates: false,
+        createSites: false
+    };
+    if (roleIds.length === 0)
+        return grants;
+    const rules = await getGlobalRules({ roleIds });
+    for (const r of rules) {
+        grants.manageAccess || (grants.manageAccess = r.grants.manageAccess);
+        grants.manageGlobalData || (grants.manageGlobalData = r.grants.manageGlobalData);
+        grants.manageParentRoles || (grants.manageParentRoles = r.grants.manageParentRoles);
+        grants.manageTemplates || (grants.manageTemplates = r.grants.manageTemplates);
+        grants.createSites || (grants.createSites = r.grants.createSites);
+    }
+    return grants;
+}
+async function fetchTemplateRules(netid, roleIds) {
+    if (roleIds.length === 0)
+        return [];
+    return await getTemplateRules({ roleIds });
+}
+async function fetchUser(login) {
+    if (['render', 'anonymous'].includes(login))
+        return undefined;
+    return (await getUsers({ ids: [login] }))[0];
+}
+async function fetchGroups(login, ctx) {
+    const groups = await ctx.svc(GroupServiceInternal).findByUserId(login);
+    return keyby(groups, 'id');
+}
+const authCache = new Cache(async (login, ctx) => {
+    const roles = await ctx.svc(RoleServiceInternal).findByUserId(login);
+    const roleIds = roles.map(r => r.id);
+    const [pageRules, assetRules, siteRules, dataRules, globalGrants, templateRules, groupsById, user] = await Promise.all([
+        fetchPageRules(login, roleIds),
+        fetchAssetRules(login, roleIds),
+        fetchSiteRules(login, roleIds),
+        fetchDataRules(login, roleIds),
+        fetchGlobalRules(login, roleIds),
+        fetchTemplateRules(login, roleIds),
+        fetchGroups(login, ctx),
+        fetchUser(login)
+    ]);
+    return { roles, pageRules, assetRules, siteRules, dataRules, globalGrants, templateRules, groupsById, user };
+});
+export class DGMockContext extends MockContext {
+    get login() {
+        return this.auth?.sub ?? this.auth?.client_id ?? 'anonymous';
+    }
+    async waitForAuth() {
+        await super.waitForAuth();
+        this.authInfo = await authCache.get(this.login, this);
+    }
+}
+export class DGContext extends Context {
+    get login() {
+        return this.auth?.sub ?? this.auth?.client_id ?? 'anonymous';
+    }
+    async waitForAuth() {
+        await super.waitForAuth();
+        this.authInfo = await authCache.get(this.login, this);
+    }
+}
+//# sourceMappingURL=context.js.map

package/dist/util/context.js.map

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

package/dist/util/index.d.ts

@@ -1,4 +1,5 @@
 export * from './authservice.js';
+export * from './context.js';
 export * from './indexing.js';
 export * from './migrations.js';
 export * from './registry.js';
@@ -22,6 +23,7 @@ export declare function popPath(path: string): string;
  * must begin with a / or else it will remove two directories
  */
 export declare function shiftPath(path: string): string;
+export declare function ensureEndSlash(path: string): string;
 export declare function basename(p: string): string;
 export declare function numerate(name: string): string;
 export declare function numerateLoop(name: string, usedNames: Set<string>): string;

package/dist/util/index.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import { isNotBlank } from 'txstate-utils';
 export * from './authservice.js';
+export * from './context.js';
 export * from './indexing.js';
 export * from './migrations.js';
 export * from './registry.js';
@@ -39,6 +40,9 @@ export function popPath(path) {
 export function shiftPath(path) {
     return '/' + path.split('/').slice(2).join('/');
 }
+export function ensureEndSlash(path) {
+    return path.endsWith('/') ? path : path + '/';
+}
 export function basename(p) {
     return path.basename(p);
 }

package/dist/util/index.js.map

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

package/dist/version/version.resolver.js

@@ -30,9 +30,9 @@ let VersionResolver = class VersionResolver {
         ]);
         if (!page && !asset && !data)
             throw new Error('Specified dataId could not be found.');
-        if ((page && !await ctx.svc(PageService).mayUpdate(page)) ||
-            (asset && !await ctx.svc(AssetService).mayUpdate(asset)) ||
-            (data && !await ctx.svc(DataService).mayUpdate(data)))
+        if ((page && !ctx.svc(PageService).mayUpdate(page)) ||
+            (asset && !ctx.svc(AssetService).mayUpdate(asset)) ||
+            (data && !ctx.svc(DataService).mayUpdate(data)))
             throw new Error('You are not allowed to mark or unmark this version.');
         const vSvc = ctx.svc(VersionedService);
         await vSvc.toggleMarked(intDataId, version);

package/dist/version/version.resolver.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosgato/api",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "A CMS designed for large institutions with thousands of editors and hundreds of subsites.",
   "type": "module",
   "exports": {
@@ -10,7 +10,7 @@
   "dependencies": {
     "@dosgato/templating": "^1.0.3",
     "@fastify/multipart": "^8.0.0",
-    "@txstate-mws/graphql-server": "^2.1.4",
+    "@txstate-mws/graphql-server": "^2.2.4",
     "archiver": "^6.0.1",
     "dataloader-factory": "^4.5.0",
     "fast-json-patch": "^3.1.0",