@stamhoofd/backend 2.137.4 → 2.137.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.137.4",
+    "version": "2.137.5",
     "type": "module",
     "main": "./dist/index.js",
     "exports": {
@@ -19,6 +19,12 @@
             "import": "./dist/src/boot.js",
             "require": "./dist/src/boot.js"
         },
+        "./services/*": {
+            "types": "./dist/src/services/*.d.ts",
+            "import": "./dist/src/services/*.js",
+            "require": "./dist/src/services/*.js",
+            "@stamhoofd/source": "./src/services/*.ts"
+        },
         "./tests/helpers": {
             "types": "./dist/tests/helpers/index.d.ts",
             "import": "./dist/tests/helpers/index.js",
@@ -58,20 +64,20 @@
         "@simonbackx/simple-endpoints": "1.22.0",
         "@simonbackx/simple-errors": "1.5.0",
         "@simonbackx/simple-logging": "1.0.1",
-        "@stamhoofd/backend-env": "2.137.4",
-        "@stamhoofd/backend-i18n": "2.137.4",
-        "@stamhoofd/backend-middleware": "2.137.4",
-        "@stamhoofd/crons": "2.137.4",
-        "@stamhoofd/email": "2.137.4",
-        "@stamhoofd/excel-writer": "2.137.4",
-        "@stamhoofd/logging": "2.137.4",
-        "@stamhoofd/models": "2.137.4",
-        "@stamhoofd/object-differ": "2.137.4",
-        "@stamhoofd/queues": "2.137.4",
-        "@stamhoofd/sql": "2.137.4",
-        "@stamhoofd/structures": "2.137.4",
-        "@stamhoofd/types": "2.137.4",
-        "@stamhoofd/utility": "2.137.4",
+        "@stamhoofd/backend-env": "2.137.5",
+        "@stamhoofd/backend-i18n": "2.137.5",
+        "@stamhoofd/backend-middleware": "2.137.5",
+        "@stamhoofd/crons": "2.137.5",
+        "@stamhoofd/email": "2.137.5",
+        "@stamhoofd/excel-writer": "2.137.5",
+        "@stamhoofd/logging": "2.137.5",
+        "@stamhoofd/models": "2.137.5",
+        "@stamhoofd/object-differ": "2.137.5",
+        "@stamhoofd/queues": "2.137.5",
+        "@stamhoofd/sql": "2.137.5",
+        "@stamhoofd/structures": "2.137.5",
+        "@stamhoofd/types": "2.137.5",
+        "@stamhoofd/utility": "2.137.5",
         "archiver": "7.0.1",
         "axios": "1.18.1",
         "base-x": "3.0.11",
@@ -93,7 +99,7 @@
         "uuid": "14.0.1"
     },
     "devDependencies": {
-        "@stamhoofd/test-utils": "2.137.4",
+        "@stamhoofd/test-utils": "2.137.5",
         "@types/cookie": "0.6.0",
         "@types/luxon": "3.7.2",
         "@types/mailparser": "3.4.6",
@@ -108,5 +114,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "22cb2b32de8f785d8e0d94f324940d6419fbe7ea"
+    "gitHead": "52c8072d0294d8005c9d36a79219708ea148a357"
 }

package/src/crons/drip-emails.ts

@@ -1,5 +1,6 @@
 import { registerCron } from '@stamhoofd/crons';
 import { Organization } from '@stamhoofd/models';
+import { OrganizationEmailService } from '../services/OrganizationEmailService.js';
 import { isOutside } from './helpers/isOutside.js';
 import { useSavedIterator } from './helpers/useSavedIterator.js';
 
@@ -30,7 +31,7 @@ async function checkDrips() {
     // Get the next x organization to send e-mails for
     for await (const organization of iterate()) {
         try {
-            await organization.checkDrips();
+            await OrganizationEmailService.checkDrips(organization);
         } catch (e) {
             console.error(e);
         }

package/src/crons.ts

@@ -4,8 +4,10 @@ import { Group, Organization, Payment, Registration, STPackage, Webshop } from '
 import { SQL } from '@stamhoofd/sql';
 import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
 import { checkSettlements } from './helpers/CheckSettlements.js';
+import { OrganizationDNSService } from './services/OrganizationDNSService.js';
 import { PaymentService } from './services/PaymentService.js';
 import { RegistrationService } from './services/RegistrationService.js';
+import { STPackageService } from './services/STPackageService.js';
 
 let lastDNSCheck: Date | null = null;
 let lastDNSId = '';
@@ -39,7 +41,7 @@ async function checkDNS() {
             console.log('[DNS] ' + organization.name);
         }
         try {
-            await organization.updateDNSRecords();
+            await OrganizationDNSService.updateDNSRecords(organization);
         } catch (e) {
             console.error(e);
         }
@@ -76,7 +78,7 @@ async function checkExpirationEmails() {
     console.log('[EXPIRATION EMAILS] Sending expiration emails...');
 
     for (const pack of packages) {
-        await pack.sendExpiryEmail();
+        await STPackageService.sendExpiryEmail(pack);
     }
     lastExpirationCheck = new Date();
 }

package/src/email-recipient-loaders/payments.ts

@@ -1,5 +1,5 @@
 import type { RecipientLoader } from '@stamhoofd/models';
-import { BalanceItem, BalanceItemPayment, Email, Member, MemberResponsibilityRecord, Organization, Payment, User } from '@stamhoofd/models';
+import { BalanceItem, BalanceItemPayment, Email, Member, MemberResponsibilityRecord, Organization, Payment, Platform, User } from '@stamhoofd/models';
 import { compileToSQLFilter, SQL } from '@stamhoofd/sql';
 import type { LimitedFilteredRequest, PaymentGeneral, StamhoofdFilter } from '@stamhoofd/structures';
 import { CountFilteredRequest, EmailRecipient, PaginatedResponse, PaymentMethod } from '@stamhoofd/structures';
@@ -301,12 +301,13 @@ async function getOrganizationRecipients(ids: { organizationId: string; payment:
     if (subFilter === null) {
         // Use full admins instead
         const admins = await User.getAdmins(allOrganizationIds, { verified: true });
+        const platform = await Platform.getSharedStruct();
         for (const { organizationId, payment } of ids) {
             const organization = organizationMap.get(organizationId);
             if (!organization) {
                 continue;
             }
-            const users = admins.filter(a => a.permissions?.forOrganization(organization)?.hasFullAccess());
+            const users = admins.filter(a => a.permissions?.forOrganization(organization, platform, { inheritFromPlatform: false })?.hasFullAccess());
 
             if (users.length === 0) {
                 console.warn('No admins found for organization with id ', organizationId, ' while fetching email recipients for payment with id ', payment.id);

package/src/endpoints/auth/CreateAdminEndpoint.ts

@@ -2,13 +2,14 @@ import type { Decoder } from '@simonbackx/simple-encoding';
 import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { PasswordToken, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
+import { Platform, sendEmailTemplate, User } from '@stamhoofd/models';
 import type { UserWithMembers } from '@stamhoofd/structures';
 import { EmailTemplateType, Recipient, Replacement, UserPermissions, User as UserStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../helpers/Context.js';
+import { PasswordForgotService } from '../../services/PasswordForgotService.js';
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = UserStruct;
@@ -117,7 +118,7 @@ export class CreateAdminEndpoint extends Endpoint<Params, Query, Body, ResponseB
         validUntil.setTime(validUntil.getTime() + 7 * 24 * 3600 * 1000);
 
         const dateTime = Formatter.dateTime(validUntil);
-        const recoveryUrl = await PasswordToken.getPasswordRecoveryUrl(admin, organization, request.i18n, validUntil);
+        const recoveryUrl = await PasswordForgotService.getPasswordRecoveryUrl(admin, organization, request.i18n, validUntil);
         const platformName = ((await Platform.getSharedStruct()).config.name);
 
         const name = organization?.name ?? platformName;

package/src/endpoints/auth/CreateTokenEndpoint.ts

@@ -6,6 +6,7 @@ import type { ChallengeGrantStruct, PasswordGrantStruct, PasswordTokenGrantStruc
 import { CreateTokenStruct, LoginMethod, SignupResponse, Token as TokenStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../helpers/Context.js';
+import { VerificationCodeService } from '../../services/VerificationCodeService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -127,7 +128,7 @@ export class CreateTokenEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 // if not: throw a validation error (e-mail validation is required)
                 if (!user.verified) {
                     const code = await EmailVerificationCode.createFor(user, user.email);
-                    code.send(user, organization, request.i18n).catch(console.error);
+                    VerificationCodeService.send(code, user, organization, request.i18n).catch(console.error);
 
                     throw new SimpleError({
                         code: 'verify_email',

package/src/endpoints/auth/ForgotPasswordEndpoint.ts

@@ -1,11 +1,12 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
 import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
-import { PasswordToken, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
+import { Platform, sendEmailTemplate, User } from '@stamhoofd/models';
 import { EmailTemplateType, ForgotPasswordRequest, LoginMethod, Recipient, Replacement } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Context } from '../../helpers/Context.js';
+import { PasswordForgotService } from '../../services/PasswordForgotService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -72,7 +73,7 @@ export class ForgotPasswordEndpoint extends Endpoint<Params, Query, Body, Respon
             return new Response(undefined);
         }
 
-        const recoveryUrl = await PasswordToken.getPasswordRecoveryUrl(user, organization, request.i18n);
+        const recoveryUrl = await PasswordForgotService.getPasswordRecoveryUrl(user, organization, request.i18n);
 
         // Create e-mail builder
         await sendEmailTemplate(organization, {

package/src/endpoints/auth/PatchUserEndpoint.ts

@@ -10,6 +10,7 @@ import { LoginMethod, NewUser, PermissionLevel, SignupResponse, UserPermissions
 import { Context } from '../../helpers/Context.js';
 import { MemberUserSyncer } from '../../helpers/MemberUserSyncer.js';
 import { AuthenticatedStructures } from '../../helpers/AuthenticatedStructures.js';
+import { VerificationCodeService } from '../../services/VerificationCodeService.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -79,10 +80,12 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
             }
 
             if (request.body.permissions) {
+                const platform = await Platform.getSharedStruct();
+
                 if (organization) {
                     editUser.permissions = UserPermissions.limitedPatch(editUser.permissions, request.body.permissions, organization.id);
 
-                    if (editUser.id === user.id && (!editUser.permissions || !editUser.permissions.forOrganization(organization)?.hasFullAccess()) && STAMHOOFD.environment !== 'development') {
+                    if (editUser.id === user.id && (!editUser.permissions || !editUser.permissions.forOrganization(organization, platform, { inheritFromPlatform: false })?.hasFullAccess()) && STAMHOOFD.environment !== 'development') {
                         throw new SimpleError({
                             code: 'permission_denied',
                             message: $t(`%DG`),
@@ -99,7 +102,7 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
                         editUser.permissions = null;
                     }
 
-                    if (editUser.id === user.id && !editUser.permissions?.platform?.hasFullAccess() && STAMHOOFD.environment !== 'development') {
+                    if (editUser.id === user.id && !editUser.permissions?.forPlatform(platform)?.hasFullAccess() && STAMHOOFD.environment !== 'development') {
                         throw new SimpleError({
                             code: 'permission_denied',
                             message: $t(`%DG`),
@@ -187,7 +190,7 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
                 // Create an validation code
                 // We always need the code, to return it. Also on password recovery -> may not be visible to the client whether the user exists or not
                 const code = await EmailVerificationCode.createFor(editUser, request.body.email);
-                code.send(editUser, organization, request.i18n, editUser.id === user.id).catch(console.error);
+                VerificationCodeService.send(code, editUser, organization, request.i18n, editUser.id === user.id).catch(console.error);
 
                 throw new SimpleError({
                     code: 'verify_email',

package/src/endpoints/auth/RetryEmailVerificationEndpoint.ts

@@ -5,6 +5,7 @@ import { EmailVerificationCode } from '@stamhoofd/models';
 import { PollEmailVerificationRequest, PollEmailVerificationResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../helpers/Context.js';
+import { VerificationCodeService } from '../../services/VerificationCodeService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -32,7 +33,7 @@ export class PollEmailVerificationEndpoint extends Endpoint<Params, Query, Body,
         const valid = await EmailVerificationCode.poll(organization?.id ?? null, request.body.token);
 
         if (valid) {
-            EmailVerificationCode.resend(organization, request.body.token, request.i18n).catch(console.error);
+            VerificationCodeService.resend(organization, request.body.token, request.i18n).catch(console.error);
         }
 
         return new Response(PollEmailVerificationResponse.create({

package/src/endpoints/auth/SignupEndpoint.ts

@@ -6,6 +6,8 @@ import { EmailVerificationCode, PasswordToken, Platform, sendEmailTemplate, User
 import { EmailTemplateType, LoginMethod, NewUser, Recipient, Replacement, SignupResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../helpers/Context.js';
+import { PasswordForgotService } from '../../services/PasswordForgotService.js';
+import { VerificationCodeService } from '../../services/VerificationCodeService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -77,7 +79,7 @@ export class SignupEndpoint extends Endpoint<Params, Query, Body, ResponseBody>
                 // We don't await this block to avoid user enumeration attack using request response time
                 (async () => {
                     // Send an e-mail to say you already have an account + follow password forgot flow
-                    const recoveryUrl = await PasswordToken.getPasswordRecoveryUrl(user, organization, request.i18n);
+                    const recoveryUrl = await PasswordForgotService.getPasswordRecoveryUrl(user, organization, request.i18n);
 
                     // Create e-mail builder
                     await sendEmailTemplate(organization, {
@@ -118,7 +120,7 @@ export class SignupEndpoint extends Endpoint<Params, Query, Body, ResponseBody>
         const code = await EmailVerificationCode.createFor(user, user.email);
 
         if (sendCode) {
-            code.send(user, organization, request.i18n).catch(console.error);
+            VerificationCodeService.send(code, user, organization, request.i18n).catch(console.error);
         }
 
         return new Response(SignupResponse.create({

package/src/endpoints/global/email/CreateEmailEndpoint.ts

@@ -7,6 +7,7 @@ import { EmailStatus, Email as EmailStruct, EmailTemplate as EmailTemplateStruct
 
 import { Context } from '../../../helpers/Context.js';
 import { SimpleError } from '@simonbackx/simple-errors';
+import { EmailPreviewService } from '../../../services/EmailPreviewService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -162,6 +163,6 @@ export class CreateEmailEndpoint extends Endpoint<Params, Query, Body, ResponseB
             await duplicate.save();
         }
 
-        return new Response(await model.getPreviewStructure({ allLanguages: true }));
+        return new Response(await EmailPreviewService.getPreviewStructure(model, { allLanguages: true }));
     }
 }

package/src/endpoints/global/email/GetAdminEmailsEndpoint.test.ts

@@ -157,7 +157,7 @@ describe('Endpoint.getAdminEmails', () => {
         expect(unsubscribeUrlReplacement!.value).toMatch(/^https:\/\//); // Should still be a valid URL
         expect(unsubscribeUrlReplacement!.value).not.toContain('secret-token-12345'); // Original sensitive token should be gone
 
-        // This tests that Email.getStructureForUser properly handles sensitive data by:
+        // This tests that EmailPreviewService.getStructureForUser properly handles sensitive data by:
         // 1. Removing original sensitive replacements from other users' data
         // 2. Creating fresh, appropriate replacements for the current viewer
         // 3. Ensuring web safety of all replacement values

package/src/endpoints/global/email/GetAdminEmailsEndpoint.ts

@@ -9,6 +9,7 @@ import { Email, Platform } from '@stamhoofd/models';
 import type { SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
 import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import { Context } from '../../../helpers/Context.js';
+import { EmailPreviewService } from '../../../services/EmailPreviewService.js';
 import { emailFilterCompilers } from '../../../sql-filters/emails.js';
 import { emailSorters } from '../../../sql-sorters/emails.js';
 
@@ -158,7 +159,7 @@ export class GetAdminEmailsEndpoint extends Endpoint<Params, Query, Body, Respon
         }
 
         return new PaginatedResponse<EmailPreview[], LimitedFilteredRequest>({
-            results: await Promise.all(emails.map(email => email.getPreviewStructure({ allLanguages: true }))),
+            results: await Promise.all(emails.map(email => EmailPreviewService.getPreviewStructure(email, { allLanguages: true }))),
             next,
         });
     }

package/src/endpoints/global/email/GetEmailEndpoint.ts

@@ -5,6 +5,7 @@ import type { EmailPreview } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Context } from '../../../helpers/Context.js';
+import { EmailPreviewService } from '../../../services/EmailPreviewService.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -51,6 +52,6 @@ export class GetEmailEndpoint extends Endpoint<Params, Query, Body, ResponseBody
             throw Context.auth.error();
         }
 
-        return new Response(await model.getPreviewStructure({ allLanguages: true }));
+        return new Response(await EmailPreviewService.getPreviewStructure(model, { allLanguages: true }));
     }
 }

package/src/endpoints/global/email/GetUserEmailsEndpoint.test.ts

@@ -537,7 +537,7 @@ describe('Endpoint.GetUserEmails', () => {
         expect(unsubscribeUrlReplacement!.value).toMatch(/^https:\/\//); // Should still be a valid URL
         expect(unsubscribeUrlReplacement!.value).not.toContain('secret-token-12345'); // Original sensitive token should be gone
 
-        // This tests that Email.getStructureForUser properly handles sensitive data by:
+        // This tests that EmailPreviewService.getStructureForUser properly handles sensitive data by:
         // 1. Removing original sensitive replacements from other users' data
         // 2. Creating fresh, appropriate replacements for the current viewer
         // 3. Ensuring web safety of all replacement values

package/src/endpoints/global/email/GetUserEmailsEndpoint.ts

@@ -11,6 +11,7 @@ import type { Language } from '@stamhoofd/types/Language';
 import type { SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
 import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import { Context } from '../../../helpers/Context.js';
+import { EmailPreviewService } from '../../../services/EmailPreviewService.js';
 import { emailFilterCompilers, userEmailFilterCompilers } from '../../../sql-filters/emails.js';
 import { emailSorters } from '../../../sql-sorters/emails.js';
 
@@ -135,7 +136,7 @@ export class GetUserEmailsEndpoint extends Endpoint<Params, Query, Body, Respons
         }
 
         return new PaginatedResponse<EmailWithRecipients[], LimitedFilteredRequest>({
-            results: await Promise.all(emails.map(email => email.getStructureForUser(user, memberIds, options))),
+            results: await Promise.all(emails.map(email => EmailPreviewService.getStructureForUser(email, user, memberIds, options))),
             next,
         });
     }

package/src/endpoints/global/email/PatchEmailEndpoint.ts

@@ -8,6 +8,7 @@ import type { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding'
 import { patchObject } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Context } from '../../../helpers/Context.js';
+import { EmailPreviewService } from '../../../services/EmailPreviewService.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -211,6 +212,6 @@ export class PatchEmailEndpoint extends Endpoint<Params, Query, Body, ResponseBo
             await model.queueForSending();
         }
 
-        return new Response(await model.getPreviewStructure({ allLanguages: true }));
+        return new Response(await EmailPreviewService.getPreviewStructure(model, { allLanguages: true }));
     }
 }

package/src/endpoints/global/files/ExportToExcelEndpoint.ts

@@ -6,7 +6,7 @@ import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { ArchiverWriterAdapter, exportToExcel, XlsxWriter } from '@stamhoofd/excel-writer';
 import { Platform, RateLimiter, sendEmailTemplate } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import type { ExcelExportType, IPaginatedResponse, LimitedFilteredRequest } from '@stamhoofd/structures';
+import type { ExcelExportType, IPaginatedResponse, LimitedFilteredRequest, Platform as PlatformStruct } from '@stamhoofd/structures';
 import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, Replacement, Version } from '@stamhoofd/structures';
 import { sleep } from '@stamhoofd/utility';
 import { Context } from '../../../helpers/Context.js';
@@ -20,7 +20,12 @@ type ResponseBody = ExcelExportResponse;
 
 type ExcelExporter<T> = {
     fetch(request: LimitedFilteredRequest): Promise<IPaginatedResponse<T[], LimitedFilteredRequest>>;
-    sheets: XlsxTransformerSheet<T, unknown>[];
+
+    /**
+     * The sheet definitions depend on the platform: they are built per export request instead of
+     * once at module load, so the callbacks never have to read a process wide platform singleton.
+     */
+    getSheets(platform: PlatformStruct): XlsxTransformerSheet<T, unknown>[];
 };
 
 export const limiter = new RateLimiter({
@@ -86,8 +91,6 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
         limiter.track(user.id, 1);
         let sendEmail = false;
 
-        await Platform.getSharedStruct();
-
         const result = await Promise.race([
             this.job(loader, request.body, request.params.type, user.id).then(async (url: string) => {
                 if (sendEmail) {
@@ -146,6 +149,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
                 // Estimate how long it will take.
                 // If too long, we'll schedule it and write it to Digitalocean Spaces
                 // Otherwise we'll just return the file directly
+                const platform = await Platform.getSharedStruct();
                 const { file, stream } = await FileCache.getWriteStream('.xlsx');
 
                 const zipWriterAdapter = new ArchiverWriterAdapter(stream);
@@ -155,7 +159,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
                 request.filter.limit = STAMHOOFD.environment === 'development' ? 1000 : 100; // in development, we need to check if total count matches and pagination is working correctly
 
                 await exportToExcel({
-                    definitions: loader.sheets,
+                    definitions: loader.getSheets(platform),
                     writer,
                     dataGenerator: fetchToAsyncIterator(request.filter, loader, { signFiles: true }),
                     filter: request.workbookFilter,