@lilaquadrat/studio 10.0.0-beta.8 → 10.0.0

package/lib/src/services/me.service.d.ts

@@ -1,10 +1,9 @@
-import { Me, Scope, Settings, Action, BasicData } from '@lilaquadrat/interfaces';
-import { RequestHandler } from 'express';
+import { Me, Scope, Settings, Action, BasicData, PermissionsWithScope } from '@lilaquadrat/interfaces';
 import { FastifyRequest, FastifyReply } from 'fastify';
 import Immutable from '../Immutable.class.js';
 declare class MeService extends Immutable<Me> {
     meModel: import("../classes/modelv2.class.js").default<Me, string>;
-    permissionsModel: import("../classes/modelv2.class.js").default<import("@lilaquadrat/interfaces").PermissionsWithScope, string>;
+    permissionsModel: import("../classes/modelv2.class.js").default<PermissionsWithScope, string>;
     model: import("../classes/modelv2.class.js").default<Me, string>;
     settings: import("../classes/modelv2.class.js").default<Settings, string>;
     /**
@@ -17,7 +16,7 @@ declare class MeService extends Immutable<Me> {
        * @returns
        * @memberof MeClass
        */
-    static getSinglePermission(user: string, company: string, project: string | undefined): Promise<import("mongodb").WithId<import("@lilaquadrat/interfaces").PermissionsWithScope> | null>;
+    static getSinglePermission(user: string, company: string, project: string | undefined): Promise<import("mongodb").WithId<PermissionsWithScope> | null>;
     static checkSinglePermission(user: string, company: string, project: string | undefined, scope: string): Promise<boolean>;
     /**
        * if only user is given, get all company permissions
@@ -31,7 +30,7 @@ declare class MeService extends Immutable<Me> {
     }): Promise<import("@lilaquadrat/interfaces").CreateResult<BasicData<Me>>>;
     updateUser(user: string, data: Me & {
         terms?: boolean;
-    }): Promise<import("mongodb").UpdateResult<BasicData<Me>>>;
+    }): Promise<import("mongodb").UpdateResult<import("bson").Document>>;
     /**
      * get the personal data
      */
@@ -40,7 +39,12 @@ declare class MeService extends Immutable<Me> {
      * get settings for the user
      */
     getSettings(user: string): Promise<import("mongodb").WithId<Settings> | null>;
-    static checkScope(scope: Scope): RequestHandler;
+    static checkScope(scope: Scope): (request: FastifyRequest<{
+        Params: {
+            company: string;
+            project?: string;
+        };
+    }>, reply: FastifyReply) => Promise<undefined>;
     static checkScopeFastify(scope: Scope): (request: FastifyRequest<{
         Params: {
             company: string;
@@ -52,22 +56,29 @@ declare class MeService extends Immutable<Me> {
      * @param action
      * @returns
      */
-    static checkStorageScope(action: 'create' | 'read' | 'edit' | 'remove' | 'delete'): (request: FastifyRequest<{
+    static checkStorageScope(action: 'create' | 'read' | 'edit' | 'remove'): (request: FastifyRequest<{
         Params: {
             app: string;
             company: string;
             project: string;
         };
     }>, reply: FastifyReply) => Promise<undefined>;
-    static checkScopeUniversal(action: Action): RequestHandler;
+    static checkScopeUniversal(action: Action): (request: FastifyRequest<{
+        Params: {
+            app: string;
+            model: string;
+            company: string;
+            project?: string;
+        };
+    }>, reply: FastifyReply) => Promise<undefined>;
     /**
      * checks if a valid token is present and we are not in the context of a custom app
      */
-    static validToken(): RequestHandler;
+    static validToken(): (request: FastifyRequest, reply: FastifyReply) => Promise<undefined>;
     /**
      * checks if a valid token is present regardless of the custom app context
      */
-    static validAppToken(): RequestHandler;
+    static validAppToken(): (request: FastifyRequest, reply: FastifyReply) => Promise<undefined>;
     /**
      * checks if
      ** auth is set
@@ -75,8 +86,8 @@ declare class MeService extends Immutable<Me> {
      ** accounts and customer are connected
      ** the email address is confirmed
      */
-    static validMember(): RequestHandler;
-    static getCompany(permissions: any[], company: string): any[];
+    static validMember(): (request: FastifyRequest, reply: FastifyReply) => Promise<undefined>;
+    static checkMemberListAccess(): (request: FastifyRequest, reply: FastifyReply) => Promise<undefined>;
     updateSettings(user: string, newSettings: Settings['settings']): Promise<import("mongodb").UpdateResult<Settings>>;
     cleanSettings(settings: {
         [key: string]: string | number;

package/lib/src/services/me.service.js

@@ -4,7 +4,6 @@ import MeModel from '../models/me.model.js';
 import PermissionsModel from '../models/permissions.model.js';
 import SettingsModel from '../models/settings.model.js';
 import Immutable from '../Immutable.class.js';
-import respondCode from '../functions/respondCode.js';
 class MeService extends Immutable {
     constructor() {
         super(...arguments);
@@ -198,24 +197,24 @@ class MeService extends Immutable {
         return this.settings.db.findOne({ user });
     }
     static checkScope(scope) {
-        return (req, res, next) => {
-            if (!req.auth)
-                return respondCode('UNAUTHORIZED', res);
-            return MeService.getSinglePermission(req.auth.sub, req.params.company, req.params.project)
-                .then((permission) => {
-                if (!permission)
-                    throw new Error('NO_PERMISSIONS_FOUND');
+        return async (request, reply) => {
+            if (!request.auth) {
+                return reply.code(401).send();
+            }
+            try {
+                const permission = await MeService.getSinglePermission(request.auth.sub, request.params.company, request.params.project);
+                if (!permission) {
+                    return reply.code(403).send();
+                }
                 const foundScope = permission.scope?.filter((single) => scope.includes(single)) || [];
                 if (foundScope.length !== scope.length) {
-                    throw new Error('NO_RIGHTS_FOR_THIS_ACTION');
+                    return reply.code(403).send();
                 }
-                next();
-                return true;
-            })
-                .catch((e) => {
-                console.error(e, scope, req.auth.sub, req.params.company, req.params.project);
-                return respondCode('FORBIDDEN', res);
-            });
+            }
+            catch (e) {
+                console.error(e, scope, request.auth.sub, request.params.company, request.params.project);
+                return reply.code(403).send();
+            }
         };
     }
     static checkScopeFastify(scope) {
@@ -246,89 +245,62 @@ class MeService extends Immutable {
      */
     static checkStorageScope(action) {
         return async (request, reply) => {
+            let scope;
             if (!request.auth) {
                 return reply.code(401).send();
             }
-            const permission = await MeService.getSinglePermission(request.auth.sub, request.params.company, request.params.project);
-            if (!permission) {
+            if (request.auth.gty === 'client-credentials') {
+                scope = request.auth.permissions;
+            }
+            else {
+                const permission = await MeService.getSinglePermission(request.auth.sub, request.params.company, request.params.project);
+                scope = permission?.scope;
+            }
+            if (!scope) {
                 return reply.code(403).send();
             }
             const singlePermission = `${request.params.app}:storage${action.charAt(0).toUpperCase() + action.slice(1)}`;
-            if (!permission?.scope?.includes(singlePermission)) {
+            if (!scope?.includes(singlePermission)) {
                 return reply.code(403).send();
             }
         };
     }
     static checkScopeUniversal(action) {
-        return (req, res, next) => {
-            if (!req.auth)
-                return respondCode('UNAUTHORIZED', res);
-            const combinedScope = `${req.params.app}:${req.params.model}:${action}`;
-            return MeService.checkSinglePermission(req.auth.sub, req.params.company, req.params.project, combinedScope)
-                .then((found) => {
-                if (found) {
-                    next();
-                    return true;
+        return async (request, reply) => {
+            if (!request.auth) {
+                return reply.code(401).send();
+            }
+            const combinedScope = `${request.params.app}:${request.params.model}:${action}`;
+            try {
+                const found = await MeService.checkSinglePermission(request.auth.sub, request.params.company, request.params.project, combinedScope);
+                if (!found) {
+                    return reply.code(403).send();
                 }
-                return respondCode('FORBIDDEN', res);
-            })
-                .catch((e) => {
-                console.error(e, combinedScope, req.auth.sub, req.params.company, req.params.project);
-                return respondCode('FORBIDDEN', res);
-            });
+            }
+            catch (e) {
+                console.error(e, combinedScope, request.auth.sub, request.params.company, request.params.project);
+                return reply.code(403).send();
+            }
         };
     }
-    // static checkScopeApp(namespace: string, action: string, appPermissions?: AppPermissions, userPermissions?: Permissions) {
-    //   if (!appPermissions?.scope.includes(`${namespace}:${action}`)) throw new Error('FORBIDDEN_APP');
-    //   if (!userPermissions?.scope?.includes(`${appPermissions?.app}:${action}`)) throw new Error('FORBIDDEN_USER');
-    //   return true;
-    // }
-    // static checkScopeAppMiddleware(scope: Scope): RequestHandler {
-    //   return (req, res, next) => {
-    //     const appScope = scope.map((single) => `${req.studioApp}:${single}` as SingleScope);
-    //     /*
-    //     get app from namespace
-    //     am i allowed to use the action for APP A?
-    //     check data source -> e.g. data is created by APP A, is APP B allowed to read/edit/delete it?
-    //     */
-    //     console.log(req.studioApp, 'editor:data:read', appScope, scope);
-    //     if (!req.auth) return respondCode('FORBIDDEN', res);
-    //     // if company disables the app usage, remove the app from available app in the project
-    //     // check project if app is still useable
-    //     // check scope for app user company project combination
-    //     return MeService.getSinglePermission(req.auth.sub, req.params.company, req.params.project)
-    //       .then((permission) => {
-    //         if (!permission) throw new Error('no permissions found');
-    //         const foundScope = permission.scope?.filter((single) => appScope.includes(single)) || [];
-    //         if (foundScope.length !== scope.length) throw new Error('no rights for this action');
-    //         // eslint-disable-next-line promise/no-callback-in-promise
-    //         next();
-    //         return true;
-    //       })
-    //       .catch((e) => {
-    //         console.error(e, scope, req.auth.sub, req.params.company, req.params.project);
-    //         return respondCode('FORBIDDEN', res);
-    //       });
-    //   };
-    // }
     /**
      * checks if a valid token is present and we are not in the context of a custom app
      */
     static validToken() {
-        return (req, res, next) => {
-            if (!req.auth || req.customApp)
-                return respondCode('UNAUTHORIZED', res);
-            return next();
+        return async (request, reply) => {
+            if (!request.auth || request.customApp) {
+                return reply.code(401).send();
+            }
         };
     }
     /**
      * checks if a valid token is present regardless of the custom app context
      */
     static validAppToken() {
-        return (req, res, next) => {
-            if (!req.auth)
-                return respondCode('UNAUTHORIZED', res);
-            return next();
+        return async (request, reply) => {
+            if (!request.auth) {
+                return reply.code(401).send();
+            }
         };
     }
     /**
@@ -339,27 +311,32 @@ class MeService extends Immutable {
      ** the email address is confirmed
      */
     static validMember() {
-        return async (req, res, next) => {
-            if (!req.auth)
-                return respondCode('UNAUTHORIZED', res);
-            const customer = await CustomersService.getCustomerByAccount(req.auth.sub, req.studioApp);
+        return async (request, reply) => {
+            if (!request.auth) {
+                return reply.code(401).send();
+            }
+            const customer = await CustomersService.getCustomerByAccount(request.auth.sub, request.studioApp);
             if (!customer) {
-                return res.status(403).json('USER_NOT_FOUND');
+                return reply.code(403).send('USER_NOT_FOUND');
             }
-            const connectedAccount = customer.accounts?.find((single) => single.account === req.auth.sub && single.app === req.studioApp);
+            const connectedAccount = customer.accounts?.find((single) => single.account === request.auth.sub && single.app === request.studioApp);
             if (!connectedAccount) {
-                return res.status(400).json('NO_CONNECTED_CUSTOMER');
+                return reply.code(400).send('NO_CONNECTED_CUSTOMER');
             }
             if (!customer?.emailConfirmed) {
-                return res.status(403).json('EMAIL_VALIDATION_REQUIRED');
+                return reply.code(403).send('EMAIL_VALIDATION_REQUIRED');
             }
-            req.auth.customerInternalId = customer?._id;
-            req.auth.email_verified = customer?.emailConfirmed === true;
-            return next();
+            request.auth.customerInternalId = customer?._id;
+            request.auth.email_verified = customer?.emailConfirmed === true;
         };
     }
-    static getCompany(permissions, company) {
-        return permissions.filter((single) => single.company === company);
+    static checkMemberListAccess() {
+        return async (request, reply) => {
+            if (!request.auth) {
+                return reply.code(401).send();
+            }
+            // listParticipantsService.stateForAccount();
+        };
     }
     updateSettings(user, newSettings) {
         return SettingsModel.db.updateOne({ user }, { $set: { settings: newSettings } }, { upsert: true });

package/lib/src/services/me.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"me.service.js","sourceRoot":"","sources":["../../../src/services/me.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAGzC,OAAO,gBAAgB,MAAM,kCAAkC,CAAC;AAChE,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,MAAM,SAAU,SAAQ,SAAa;IAArC;;QAEE,YAAO,GAAG,OAAO,CAAC;QAElB,qBAAgB,GAAG,gBAAgB,CAAC;QAEpC,UAAK,GAAG,OAAO,CAAC;QAEhB,aAAQ,GAAG,aAAa,CAAC;IAyiB3B,CAAC;IAviBC;;;;;;;;;SASK;IACL,MAAM,CAAC,mBAAmB,CAAC,IAAY,EAAE,OAAe,EAAE,OAA2B;QAEnF,OAAO,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC;YACjC,IAAI,EAAE,OAAO,EAAE,OAAO;SACvB,EAAE,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAErC,CAAC;IAED,MAAM,CAAC,qBAAqB,CAAC,IAAY,EAAE,OAAe,EAAE,OAA2B,EAAE,KAAa;QAEpG,OAAO,gBAAgB,CAAC,EAAE,CAAC,cAAc,CAAC;YACxC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;SAChD,CAAC;aACC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAEhC,CAAC;IAED;;;SAGK;IACL,cAAc,CAAC,IAAY,EAAE,OAAgB,EAAE,OAAgB;QAE7D,IAAI,WAAW,GAAa,EAAE,CAAC;QAC/B;;;cAGM;QACN,MAAM,KAAK,GAA2B;YACpC,IAAI,EAAE;gBACJ,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;aACpC;SACF,CAAC;QAEF;;cAEM;QACN,MAAM,aAAa,GAAG;YACpB;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,SAAS;oBACb,GAAG,EAAE;wBACH,OAAO,EAAE,UAAU;wBACnB,OAAO,EAAE,aAAa;qBACvB;oBACD,QAAQ,EAAE;wBACR;4BACE,MAAM,EAAE;gCACN,IAAI,EAAE;oCACJ,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE;oCACxC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,EAAE;iCAC9C;6BACF;yBACF;wBACD;4BACE,QAAQ,EAAE;gCACR,IAAI,EAAE,CAAC;gCACP,EAAE,EAAE,CAAC;gCACL,WAAW,EAAE,CAAC;gCACd,GAAG,EAAE,CAAC;6BACP;yBACF;qBACF;iBACF;aACF;YACD;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU;iBACjB;aACF;SACF,CAAC;QAEF;;cAEM;QACN,MAAM,aAAa,GAAG;YACpB;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,WAAW;oBACjB,EAAE,EAAE,SAAS;oBACb,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE;oBAC5B,QAAQ,EAAE;wBACR;4BACE,MAAM,EAAE;gCACN,IAAI,EAAE;oCACJ,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE;iCACzC;6BACF;yBACF;wBACD;4BACE,QAAQ,EAAE;gCACR,IAAI,EAAE,CAAC;gCACP,EAAE,EAAE,CAAC;6BACN;yBACF;qBACF;iBACF;aACF;YACD;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU;iBACjB;aACF;SACF,CAAC;QAEF;;WAEG;QACH,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACpC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,WAAW,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,aAAa,CAAC,CAAC;QAEjD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;YAEzB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACjD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAEhD,WAAW,GAAG,CAAC,GAAG,WAAW,EAAE,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAEnE,CAAC;QAED,IAAI,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;YAExB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAE3D;;oBAEQ;YACR,WAAW,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAErF,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;YAEvB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3D,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAE3D;;oBAEQ;YACR,WAAW,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,aAAa,CAAC,CAAC;QAEnD,CAAC;QAED,OAAO,gBAAgB,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;IAE9D,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,WAAwD;QAE9E,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC;YAClC,MAAM,EAAE,WAAW,CAAC,GAAG;YACvB,QAAQ,EAAE,WAAW,CAAC,EAAE;YACxB,YAAY,EAAE,WAAW,CAAC,MAAM;SACjC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aACpC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAEb,MAAM,OAAO,GAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;YAEnC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;YACvC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;YACzC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YAEhC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAElD,CAAC,CAAC,CAAC;IAEP,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,IAA8B;QAErD,IAAI,YAAY,GAA6B,EAAE,GAAG,IAAI,EAAE,CAAC;QAEzD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEhD,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC;YACnC,OAAO,YAAY,CAAC,KAAK,CAAC;YAE1B,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;QAEpC,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAE3E,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAY;QAElB,OAAO,OAAO,CAAC,EAAE,CAAC,OAAO,CACvB,EAAE,EAAE,EAAE,IAAI,EAAE,EACZ;YACE,UAAU,EAAE;gBACV,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,CAAC;gBACX,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;gBACR,EAAE,EAAE,CAAC;gBACL,aAAa,EAAE,CAAC;gBAChB,GAAG,EAAE,CAAC;aACP;SACF,CACF,CAAC;IAEJ,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,IAAY;QAEtB,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5C,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,KAAY;QAE5B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAExB,IAAI,CAAC,GAAG,CAAC,IAAI;gBAAE,OAAO,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;YAEvD,OAAO,SAAS,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;iBACvF,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;gBAEnB,IAAI,CAAC,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBAEzD,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBAEtF,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;oBAEvC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;gBAE/C,CAAC;gBAED,IAAI,EAAE,CAAC;gBACP,OAAO,IAAI,CAAC;YAEd,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAEX,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC9E,OAAO,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAEvC,CAAC,CAAC,CAAC;QAEP,CAAC,CAAC;IAEJ,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,KAAY;QAEnC,OAAO,KAAK,EAAE,OAA0E,EAAE,KAAmB,EAAE,EAAE;YAE/G,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAElB,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAEhC,CAAC;YAED,IAAI,CAAC;gBAEH,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,mBAAmB,CACpD,OAAO,CAAC,IAAI,CAAC,GAAG,EAChB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,OAAO,CACvB,CAAC;gBAEF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAEhB,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;gBAEhC,CAAC;gBAED,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBAEtF,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;oBAEvC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;gBAEhC,CAAC;YAEH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBAEX,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAG,OAAO,CAAC,MAAc,CAAC,OAAO,EAAG,OAAO,CAAC,MAAc,CAAC,OAAO,CAAC,CAAC;gBAC5G,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAEhC,CAAC;QAEH,CAAC,CAAC;IAEJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,CAAC,MAAwD;QAE/E,OAAO,KAAK,EAAE,OAAsF,EAAE,KAAmB,EAAE,EAAE;YAE3H,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAElB,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAEhC,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,mBAAmB,CACpD,OAAO,CAAC,IAAI,CAAC,GAAG,EAChB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,OAAO,CACvB,CAAC;YAEF,IAAI,CAAC,UAAU,EAAE,CAAC;gBAEhB,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAEhC,CAAC;YAED,MAAM,gBAAgB,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YAE5G,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAEnD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAEhC,CAAC;QAEH,CAAC,CAAC;IAEJ,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,MAAc;QAEvC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAExB,IAAI,CAAC,GAAG,CAAC,IAAI;gBAAE,OAAO,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;YAEvD,MAAM,aAAa,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,EAAE,CAAC;YAExE,OAAO,SAAS,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC;iBACxG,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBAEd,IAAI,KAAK,EAAE,CAAC;oBAEV,IAAI,EAAE,CAAC;oBACP,OAAO,IAAI,CAAC;gBAEd,CAAC;gBAED,OAAO,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAEvC,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAEX,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACtF,OAAO,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAEvC,CAAC,CAAC,CAAC;QAEP,CAAC,CAAC;IAEJ,CAAC;IAED,4HAA4H;IAE5H,qGAAqG;IAErG,kHAAkH;IAElH,iBAAiB;IAEjB,IAAI;IAEJ,iEAAiE;IAEjE,iCAAiC;IAEjC,2FAA2F;IAE3F,SAAS;IACT,6BAA6B;IAC7B,gDAAgD;IAChD,mGAAmG;IACnG,SAAS;IACT,uEAAuE;IAEvE,2DAA2D;IAE3D,6FAA6F;IAC7F,+CAA+C;IAC/C,8DAA8D;IAE9D,iGAAiG;IACjG,gCAAgC;IAEhC,oEAAoE;IAEpE,oGAAoG;IAEpG,gGAAgG;IAEhG,qEAAqE;IACrE,kBAAkB;IAClB,uBAAuB;IAEvB,WAAW;IACX,wBAAwB;IAExB,yFAAyF;IACzF,gDAAgD;IAEhD,YAAY;IAEZ,OAAO;IAEP,IAAI;IAEJ;;OAEG;IACH,MAAM,CAAC,UAAU;QAEf,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAExB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,SAAS;gBAAE,OAAO,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;YACxE,OAAO,IAAI,EAAE,CAAC;QAEhB,CAAC,CAAC;IAEJ,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,aAAa;QAElB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAExB,IAAI,CAAC,GAAG,CAAC,IAAI;gBAAE,OAAO,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;YACvD,OAAO,IAAI,EAAE,CAAC;QAEhB,CAAC,CAAC;IAEJ,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,WAAW;QAEhB,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAE9B,IAAI,CAAC,GAAG,CAAC,IAAI;gBAAE,OAAO,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;YAEvD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,CAA8B,CAAC;YAEvH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAEd,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAEhD,CAAC;YAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC;YAE9H,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAEtB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAEvD,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;gBAE9B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YAE3D,CAAC;YAED,GAAG,CAAC,IAAI,CAAC,kBAAkB,GAAG,QAAQ,EAAE,GAAG,CAAC;YAC5C,GAAG,CAAC,IAAI,CAAC,cAAc,GAAG,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAC;YAE5D,OAAO,IAAI,EAAE,CAAC;QAEhB,CAAC,CAAC;IAEJ,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,WAAkB,EAAE,OAAe;QAEnD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;IAEpE,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,WAAiC;QAE5D,OAAO,aAAa,CAAC,EAAE,CAAC,SAAS,CAC/B,EAAE,IAAI,EAAE,EACR,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EACnC,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;IAEJ,CAAC;IAED,aAAa,CAAC,QAA4C;QAExD,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAEvC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,KAAK,GAAG,EAAE;gBAAE,OAAO,MAAM,CAAC;YAE9B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAE/B,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;oBAExB,aAAa,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;gBAE9B,CAAC;YAEH,CAAC;YAED,OAAO,MAAM,CAAC;QAEhB,CAAC,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;IAEvB,CAAC;CAEF;AACD,OAAO,EACL,SAAS,GACV,CAAC;AACF,eAAe,IAAI,SAAS,EAAE,CAAC"}
+{"version":3,"file":"me.service.js","sourceRoot":"","sources":["../../../src/services/me.service.ts"],"names":[],"mappings":"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"}

package/lib/src/services/publish.service.d.ts

@@ -1,24 +1,22 @@
 import { ObjectId, SortDirection, WithId } from 'mongodb';
-import { QueueServiceClient, QueueClient } from '@azure/storage-queue';
 import { Immutable } from '../../main.js';
 import { BasicData, Options, Publish, PublishResult, UserApp, UserAppOptionsRequired } from '@lilaquadrat/interfaces';
 export declare class PublishService extends Immutable<Publish> {
     model: import("../classes/modelv2.class.js").default<Publish, string>;
-    service: QueueServiceClient;
     queue: string;
-    client: QueueClient;
     constructor(connectionString: string, queue: string, storageAccount?: string);
-    getClient(company: string, project: string): Promise<QueueClient>;
     publish(referenceId: ObjectId, method: Publish['method'], contentGroup: Publish['contentGroup'] | undefined, category: string | undefined, planned: Date | undefined, options: UserAppOptionsRequired & Pick<Publish, 'appPublish' | 'modelPublish' | 'type'>): Promise<import("@lilaquadrat/interfaces").CreateResult<BasicData<Publish>>>;
-    email(referenceId: ObjectId, customer: ObjectId, planned: Date | undefined, options: UserAppOptionsRequired): Promise<void | import("@lilaquadrat/interfaces").CreateResult<BasicData<Publish>>>;
+    email(referenceId: ObjectId, customer: ObjectId, planned: Date | undefined, options: UserAppOptionsRequired & {
+        relatedData: Publish['relatedData'];
+    }): Promise<void | import("@lilaquadrat/interfaces").CreateResult<BasicData<Publish>>>;
     /**
      * sends an email based upon data selected via id
      */
     emailViaId(id: string, customer: ObjectId, planned: Date | undefined, options: UserAppOptionsRequired): Promise<void | import("@lilaquadrat/interfaces").CreateResult<BasicData<Publish>>>;
     publishPlanned(planned: BasicData<Publish>, user: string, app: string): Promise<void>;
-    setState(_id: ObjectId, state: Publish['state'], user: string, app: string): Promise<import("mongodb").UpdateResult<BasicData<Publish>>>;
-    setResult(_id: ObjectId, result: PublishResult[] | undefined, state: Publish['state'], user: string, app: string): Promise<import("mongodb").UpdateResult<BasicData<Publish>>>;
-    cancel(_id: ObjectId, company: string, project: string, user: string, app: string): Promise<import("mongodb").UpdateResult<BasicData<Publish>>>;
+    setState(_id: ObjectId, state: Publish['state'], user: string, app: string): Promise<import("mongodb").UpdateResult<import("bson").Document>>;
+    setResult(_id: ObjectId, result: PublishResult[] | undefined, state: Publish['state'], user: string, app: string): Promise<import("mongodb").UpdateResult<import("bson").Document>>;
+    cancel(_id: ObjectId, company: string, project: string, user: string, app: string): Promise<import("mongodb").UpdateResult<import("bson").Document>>;
     getActiveExists(referenceId: ObjectId | undefined, method: Publish['method'] | undefined, contentGroup: Publish['contentGroup'] | undefined, category: Publish['category'] | undefined, planned: Date | undefined, options: Options & UserApp & {
         appPublish?: string;
         modelPublish?: string;

package/lib/src/services/publish.service.js

@@ -1,39 +1,39 @@
-import { QueueServiceClient } from '@azure/storage-queue';
+// import { QueueServiceClient, QueueClient } from '@azure/storage-queue';
 import publishDataAggregation from '../aggegations/publishData.aggregation.js';
 import cleanObject from '../helpers/cleanObject.js';
 import { PublishModel } from '../../models.js';
 import { Immutable, logger } from '../../main.js';
 import resultDataAggregation from '../aggegations/resultData.aggregation.js';
-import EditorBaseService from '../services/editorBase.service.js';
+// import EditorBaseService from '../services/editorBase.service.js';
 import publishMethodService from './publishMethod.service.js';
 import EditorService from '../services/editor.service.js';
-import { DefaultAzureCredential } from '@azure/identity';
+import jetstreamService from './jetstream.service.js';
+// import { DefaultAzureCredential } from '@azure/identity';
 export class PublishService extends Immutable {
+    // client: QueueClient;
     constructor(connectionString, queue, storageAccount) {
         super();
         this.model = PublishModel;
-        if (storageAccount) {
-            logger.info('publish.use.storage_account');
-            const credentials = new DefaultAzureCredential();
-            this.service = new QueueServiceClient(`https://${storageAccount}.queue.core.windows.net`, credentials);
-        }
-        else if (connectionString && queue) {
-            logger.info('publish.use.connection_string');
-            this.service = QueueServiceClient.fromConnectionString(connectionString);
-        }
-    }
-    async getClient(company, project) {
-        const editorBase = await EditorBaseService.single(company, project, 'server');
-        let client;
-        if (!editorBase?.version || editorBase?.version === '1') {
-            client = this.service.getQueueClient('publish');
-        }
-        else {
-            client = this.service.getQueueClient(`publishv${editorBase.version}`);
-        }
-        await client.createIfNotExists();
-        return client;
+        // if (storageAccount) {
+        //   logger.info('publish.use.storage_account');
+        //   const credentials = new DefaultAzureCredential();
+        //   this.service = new QueueServiceClient(`https://${storageAccount}.queue.core.windows.net`, credentials);
+        // } else if (connectionString && queue) {
+        //   logger.info('publish.use.connection_string');
+        //   this.service = QueueServiceClient.fromConnectionString(connectionString);
+        // }
     }
+    // async getClient(company: string, project: string) {
+    //   const editorBase = await EditorBaseService.single(company, project, 'server');
+    //   let client: QueueClient;
+    //   if (!editorBase?.version || editorBase?.version === '1') {
+    //     client = this.service.getQueueClient('publish');
+    //   } else {
+    //     client = this.service.getQueueClient(`publishv${editorBase.version}`);
+    //   }
+    //   await client.createIfNotExists();
+    //   return client;
+    // }
     async publish(referenceId, method, contentGroup, category, planned, options) {
         const double = await this.getActiveExists(referenceId, method, contentGroup, category, planned, options);
         if (double)
@@ -60,8 +60,7 @@ export class PublishService extends Immutable {
         const publish = await this.create(dataObject, options.user, options.app);
         delete dataObject.history;
         if (!planned) {
-            const client = await this.getClient(options.company, options.project);
-            await client.sendMessage(Buffer.from(JSON.stringify(dataObject)).toString('base64'));
+            await jetstreamService.publish('actions.publish.publish', publish);
         }
         return publish;
     }
@@ -80,13 +79,15 @@ export class PublishService extends Immutable {
             recipient: customer.toString(),
             type: 'editor',
         };
+        if (options.relatedData) {
+            dataObject.relatedData = options.relatedData;
+        }
         if (planned)
             dataObject.planned = planned;
         const publish = await this.create(dataObject, options.user, options.app);
         delete dataObject.history;
         if (!planned) {
-            const client = await this.getClient(options.company, options.project);
-            await client.sendMessage(Buffer.from(JSON.stringify(dataObject)).toString('base64'));
+            await jetstreamService.publish('actions.publish.publish', dataObject);
         }
         return publish;
     }
@@ -117,14 +118,14 @@ export class PublishService extends Immutable {
         const publish = await this.create(dataObject, options.user, options.app);
         delete dataObject.history;
         if (!planned) {
-            const client = await this.getClient(options.company, options.project);
-            await client.sendMessage(Buffer.from(JSON.stringify(dataObject)).toString('base64'));
+            await jetstreamService.publish('actions.publish.publish', dataObject);
         }
         return publish;
     }
     async publishPlanned(planned, user, app) {
-        const client = await this.getClient(planned.company, planned.project);
-        await client.sendMessage(Buffer.from(JSON.stringify(planned)).toString('base64'));
+        // const client = await this.getClient(planned.company as string, planned.project as string);
+        // await client.sendMessage(Buffer.from(JSON.stringify(planned)).toString('base64'));
+        await jetstreamService.publish('actions.publish.publish', planned);
         await this.setState(planned._id, 'inQueue', user, app);
     }
     setState(_id, state, user, app) {
@@ -189,6 +190,7 @@ export class PublishService extends Immutable {
     }
     async handlePlanned(user, app) {
         const planned = await this.getPlanned();
+        logger.debug(`publish.planned.${planned.length}`);
         const all = planned.map((single) => this.publishPlanned(single, user, app));
         return all;
     }

package/lib/src/services/publish.service.js.map

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

package/lib/src/services/publishData.service.d.ts

@@ -1,13 +1,16 @@
 import { Filter, ObjectId } from 'mongodb';
 import { Modelv2 } from '../../main.js';
-import { BasicData, Content, EditorLegacy, ObjectIdString, Publish, Universal } from '@lilaquadrat/interfaces';
+import { BasicData, Content, ObjectIdString } from '@lilaquadrat/interfaces';
 export default class PublishDataService {
-    static getModel(type: Publish['type'], model?: string): Promise<Modelv2<Content, string> | Modelv2<Universal, string>>;
-    static getAll(company: string, project: string, app: string, model: string, type: Publish['type'], full: boolean, changed?: Date, affectedStates?: Content['state'][], category?: string): Promise<import("mongodb").WithId<Content>[] | import("mongodb").WithId<Universal>[]>;
-    static countAll(company: string, project: string, app: string, model: string, type: Publish['type'], changed?: Date, affectedStates?: Content['state'][], category?: string): Promise<number>;
-    static getQuery(company: string, project: string, app: string, model: string, type: Publish['type'], changed?: Date, affectedStates?: Content['state'][], category?: string): Filter<Content> | Filter<Universal>;
-    static getSingleInternalId(internalId: ObjectId, company: string, project: string, partials: boolean, children: boolean, genericData: boolean, appPublish: string, modelPublish: string, type: Publish['type'], affectedStates?: Content['state'][]): Promise<Content & EditorLegacy>;
-    static getSingle(id: string, company: string, project: string, partials: boolean, children: boolean, genericData: boolean, appPublish: string, modelPublish: string, type: Publish['type'], affectedStates?: Content['state'][]): Promise<Content & EditorLegacy>;
+    static getModel(): Promise<Modelv2<Content, string>>;
+    static getAll(company: string, project: string, full: boolean, changed?: Date, affectedStates?: Content['state'][], category?: string): Promise<import("mongodb").WithId<Content>[]>;
+    static countAll(company: string, project: string, changed?: Date, affectedStates?: Content['state'][], category?: string): Promise<number>;
+    static getQuery(company: string, project: string, changed?: Date, affectedStates?: Content['state'][], category?: string, options?: {
+        includeLayouts: boolean;
+        includePartials?: boolean;
+    }): Filter<Content>;
+    static getSingleInternalId(internalId: ObjectId, company: string, project: string, partials: boolean, children: boolean, genericData: boolean, affectedStates?: Content['state'][]): Promise<BasicData<Content>>;
+    static getSingle(id: string, company: string, project: string, partials: boolean, children: boolean, genericData: boolean, affectedStates?: Content['state'][]): Promise<BasicData<Content>>;
     static getContextData(arrayOfInternalIds: (ObjectId | ObjectIdString)[], options: {
         company: string;
         project: string;