@lilaquadrat/studio 10.0.0-beta.2 → 10.0.0-beta.3

package/lib/{cjs/src → src}/services/certificates.service.js

@@ -1,29 +1,23 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CertificatesService = void 0;
-const tls_1 = __importDefault(require("tls"));
-const net_1 = __importDefault(require("net"));
-const fs_1 = __importDefault(require("fs"));
-const acme_1 = __importDefault(require("@root/acme"));
-const csr_1 = __importDefault(require("@root/csr"));
-const packer_1 = __importDefault(require("@root/pem/packer"));
-const keypairs_1 = __importDefault(require("@root/keypairs"));
-const child_process_1 = require("child_process");
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const node_crypto_1 = require("node:crypto");
-const certificate_model_1 = __importDefault(require("../models/certificate.model"));
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const certificatesAction_service_1 = __importDefault(require("./certificatesAction.service"));
-const http_challenge_class_1 = __importDefault(require("../http.challenge.class"));
-const logger_1 = __importDefault(require("../logger"));
-const dns_challenge_class_1 = __importDefault(require("../dns.challenge.class"));
-class CertificatesService extends Immutable_class_1.default {
+import tls from 'tls';
+import net from 'net';
+import fs from 'fs';
+import ACME from '@root/acme';
+import CSR from '@root/csr';
+import PEM from '@root/pem/packer';
+import Keypairs from '@root/keypairs';
+import { exec } from 'child_process';
+import fetch from 'node-fetch';
+import { X509Certificate } from 'node:crypto';
+import CertificateModel from '../models/certificate.model';
+import Immutable from '../Immutable.class';
+import certificatesActionsService from './certificatesAction.service';
+import HttpSslChallenge from '../http.challenge.class';
+import logger from '../logger';
+import DnsSslChallenge from '../dns.challenge.class';
+export class CertificatesService extends Immutable {
     constructor(acme_email, acmeMode, shareClient) {
         super();
-        this.model = certificate_model_1.default;
+        this.model = CertificateModel;
         this.shareClient = shareClient;
         this.acme_email = acme_email;
         this.acme_directory = acmeMode === 'live'
@@ -48,7 +42,7 @@ class CertificatesService extends Immutable_class_1.default {
         });
         if (certificate)
             return { type: 'certificate', data: certificate };
-        const request = await certificatesAction_service_1.default.request([domain], 'domain', 'pem', true, {
+        const request = await certificatesActionsService.request([domain], 'domain', 'pem', true, {
             company,
             project,
             user,
@@ -65,32 +59,32 @@ class CertificatesService extends Immutable_class_1.default {
         const certificate = await this.model.db.findOne({ domains: { $in: [domain] } });
         if (certificate)
             return { type: 'certificate', data: certificate };
-        const request = await certificatesAction_service_1.default.request([domain], 'wildcard', 'pem', true, options);
+        const request = await certificatesActionsService.request([domain], 'wildcard', 'pem', true, options);
         return {
             type: 'request',
             data: request._id,
         };
     }
     getCertificateDetails(cert) {
-        const secureContext = tls_1.default.createSecureContext({ cert });
-        const secureSocket = new tls_1.default.TLSSocket(new net_1.default.Socket(), { secureContext });
+        const secureContext = tls.createSecureContext({ cert });
+        const secureSocket = new tls.TLSSocket(new net.Socket(), { secureContext });
         const details = secureSocket.getCertificate();
         secureSocket.destroy();
         return details;
     }
     async getBase(inputDomains, type, privateKey, privateServerKey) {
         const domains = type === 'wildcard' ? [`*.${inputDomains[0]}`] : inputDomains;
-        const acme = acme_1.default.create({ maintainerEmail: this.acme_email, packageAgent: 'lilastudio/v1.4', notify: () => { } });
+        const acme = ACME.create({ maintainerEmail: this.acme_email, packageAgent: 'lilastudio/v1.4', notify: () => { } });
         await acme.init(this.acme_directory);
-        const accountKey = await keypairs_1.default.import({ pem: privateKey });
-        const serverKey = await keypairs_1.default.import({ pem: privateServerKey });
+        const accountKey = await Keypairs.import({ pem: privateKey });
+        const serverKey = await Keypairs.import({ pem: privateServerKey });
         const account = await acme.accounts.create({ accountKey, subscriberEmail: this.acme_email, agreeToTerms: true });
-        const der = await csr_1.default.csr({
+        const der = await CSR.csr({
             domains,
             jwk: serverKey,
             encoding: 'der',
         });
-        const csr = await packer_1.default.packBlock({ type: 'CERTIFICATE REQUEST', bytes: der });
+        const csr = await PEM.packBlock({ type: 'CERTIFICATE REQUEST', bytes: der });
         return {
             acme,
             account,
@@ -110,11 +104,11 @@ class CertificatesService extends Immutable_class_1.default {
             csr: optionsBase.csr,
             domains: optionsBase.domains,
             challenges: {
-                'dns-01': new dns_challenge_class_1.default(domain, credentials, process.env.AZURE_RESOURCE_GROUP, azureSubscriptionId),
+                'dns-01': new DnsSslChallenge(domain, credentials, process.env.AZURE_RESOURCE_GROUP, azureSubscriptionId),
             },
         };
         const certificate = await optionsBase.acme.certificates.create(options);
-        const crypto = new node_crypto_1.X509Certificate(`${certificate.cert}\n${certificate.chain}\n`);
+        const crypto = new X509Certificate(`${certificate.cert}\n${certificate.chain}\n`);
         certificate.valid = {
             from: new Date(crypto.validFrom),
             to: new Date(crypto.validTo),
@@ -123,16 +117,16 @@ class CertificatesService extends Immutable_class_1.default {
     }
     convertToPfx(certificate, privateKey, tempName) {
         return new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(`openssl pkcs12 -export -passout pass: -inkey <(echo "${privateKey}") -in <(echo "${certificate}") -out ${tempName}.pfx`, { timeout: 5000 }, (e, stdout, stderr) => {
+            exec(`openssl pkcs12 -export -passout pass: -inkey <(echo "${privateKey}") -in <(echo "${certificate}") -out ${tempName}.pfx`, { timeout: 5000 }, (e, stdout, stderr) => {
                 // if (this.debug) {
-                logger_1.default.debug('stdout ', stdout);
-                logger_1.default.debug('stderr ', stderr);
+                logger.debug('stdout ', stdout);
+                logger.debug('stderr ', stderr);
                 // }
                 if (e instanceof Error) {
                     return reject(e);
                 }
-                const content = fs_1.default.readFileSync(`${tempName}.pfx`);
-                fs_1.default.rm(`${tempName}.pfx`, () => { });
+                const content = fs.readFileSync(`${tempName}.pfx`);
+                fs.rm(`${tempName}.pfx`, () => { });
                 return resolve(content);
             });
         });
@@ -151,11 +145,11 @@ class CertificatesService extends Immutable_class_1.default {
             csr: optionsBase.csr,
             domains: optionsBase.domains,
             challenges: {
-                'http-01': new http_challenge_class_1.default(company, project, this.shareClient),
+                'http-01': new HttpSslChallenge(company, project, this.shareClient),
             },
         };
         const certificate = await optionsBase.acme.certificates.create(options);
-        const crypto = new node_crypto_1.X509Certificate(`${certificate.cert}\n${certificate.chain}\n`);
+        const crypto = new X509Certificate(`${certificate.cert}\n${certificate.chain}\n`);
         certificate.valid = {
             from: new Date(crypto.validFrom),
             to: new Date(crypto.validTo),
@@ -166,11 +160,10 @@ class CertificatesService extends Immutable_class_1.default {
      * calls ``http://DOMAIN/.studio/check/`` to check if the response code is 202
      */
     checkResponses(domains) {
-        const PromiseArray = domains.map((single) => (0, node_fetch_1.default)(`http://${single}/.studio/check/`, { timeout: 5000 }));
+        const PromiseArray = domains.map((single) => fetch(`http://${single}/.studio/check/`, { timeout: 5000 }));
         return Promise.all(PromiseArray)
             .then((responses) => responses.filter((single) => single.status !== 202).length === 0);
     }
 }
-exports.CertificatesService = CertificatesService;
-exports.default = new CertificatesService();
+export default new CertificatesService();
 //# sourceMappingURL=certificates.service.js.map

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

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

package/lib/{cjs/src → src}/services/certificatesAction.service.js

@@ -1,28 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CertificatesActionsService = void 0;
-const storage_queue_1 = require("@azure/storage-queue");
-const dayjs_1 = __importDefault(require("dayjs"));
-const logger_1 = __importDefault(require("../logger"));
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const certificate_action_model_1 = __importDefault(require("../models/certificate-action.model"));
-const hardCopy_1 = __importDefault(require("../helpers/hardCopy"));
-const identity_1 = require("@azure/identity");
-class CertificatesActionsService extends Immutable_class_1.default {
+import { QueueServiceClient } from '@azure/storage-queue';
+import dayjs from 'dayjs';
+import logger from '../logger';
+import Immutable from '../Immutable.class';
+import CertificateActionModel from '../models/certificate-action.model';
+import hardCopy from '../helpers/hardCopy';
+import { DefaultAzureCredential } from '@azure/identity';
+export class CertificatesActionsService extends Immutable {
     constructor(connectionString, storageAccount) {
         super();
-        this.model = certificate_action_model_1.default;
+        this.model = CertificateActionModel;
         if (storageAccount) {
-            logger_1.default.info('certificates-action.use.storage_account');
-            const credentials = new identity_1.DefaultAzureCredential();
-            this.service = new storage_queue_1.QueueServiceClient(`https://${storageAccount}.queue.core.windows.net`, credentials);
+            logger.info('certificates-action.use.storage_account');
+            const credentials = new DefaultAzureCredential();
+            this.service = new QueueServiceClient(`https://${storageAccount}.queue.core.windows.net`, credentials);
         }
         else if (connectionString) {
-            logger_1.default.info('certificates-action.use.connection_string');
-            this.service = storage_queue_1.QueueServiceClient.fromConnectionString(connectionString);
+            logger.info('certificates-action.use.connection_string');
+            this.service = QueueServiceClient.fromConnectionString(connectionString);
         }
         if (this.service) {
             this.client = this.service.getQueueClient('certs');
@@ -53,14 +47,14 @@ class CertificatesActionsService extends Immutable_class_1.default {
         return newAction;
     }
     planRenew(certificate, validPercent, options) {
-        const validDays = (0, dayjs_1.default)(certificate.valid.to).diff(certificate.valid.from, 'days');
+        const validDays = dayjs(certificate.valid.to).diff(certificate.valid.from, 'days');
         const renewInDays = Math.floor((validDays * (validPercent / 100)));
         if (renewInDays < 1) {
-            logger_1.default.info('cant plan renew of certificate, renew in days is smaller than 1');
+            logger.info('cant plan renew of certificate, renew in days is smaller than 1');
             return new Promise((resolve) => resolve());
         }
         const renewObject = {
-            planned: (0, dayjs_1.default)(certificate.valid.from).add(renewInDays, 'days').toDate(),
+            planned: dayjs(certificate.valid.from).add(renewInDays, 'days').toDate(),
             type: certificate.type,
             contentType: certificate.contentType,
             domains: certificate.domains,
@@ -84,7 +78,7 @@ class CertificatesActionsService extends Immutable_class_1.default {
     async planRetry(certificateAction, error, retryTimeout = 86400, user, app) {
         const retry = certificateAction.retryCount !== certificateAction.maxRetries;
         const renewObject = {
-            ...(0, hardCopy_1.default)(certificateAction),
+            ...hardCopy(certificateAction),
             state: retry ? 'retry' : 'failed',
             renew: true,
         };
@@ -122,7 +116,7 @@ class CertificatesActionsService extends Immutable_class_1.default {
             state: 'new',
             planned: { $lte: new Date(), $exists: true },
         };
-        return certificate_action_model_1.default.db.find(select, { sort: { planned: -1 } })
+        return CertificateActionModel.db.find(select, { sort: { planned: -1 } })
             .toArray();
     }
     async handlePlanned() {
@@ -190,6 +184,5 @@ class CertificatesActionsService extends Immutable_class_1.default {
         return this.immutable({ _id: internalId }, { state: 'canceled' }, options.user, 'change', options.app, undefined, undefined, 'stateChange');
     }
 }
-exports.CertificatesActionsService = CertificatesActionsService;
-exports.default = new CertificatesActionsService(process.env.PUBLISH_QUEUE_CONNECTION_STRING, process.env.STORAGE_ACCOUNT);
+export default new CertificatesActionsService(process.env.PUBLISH_QUEUE_CONNECTION_STRING, process.env.STORAGE_ACCOUNT);
 //# sourceMappingURL=certificatesAction.service.js.map

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

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

package/lib/{cjs/src → src}/services/conf.service.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ShareClientInterface, DomainConf, HostingWithSettings } from '@lilaquadrat/interfaces';
 export declare class ConfService {
     shareClient: ShareClientInterface;
@@ -6,7 +5,7 @@ export declare class ConfService {
      *
      * load the base nginx conf file for further rendering
      */
-    getBase(folder: string, name: string): Promise<Buffer>;
+    getBase(folder: string, name: string): Promise<Buffer<ArrayBufferLike>>;
     constructor();
     /**
        * generates nginx config

package/lib/{cjs/src → src}/services/conf.service.js

@@ -1,14 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfService = void 0;
-const handlebars_1 = __importDefault(require("handlebars"));
-const ShareClientFactory_class_1 = __importDefault(require("../ShareClientFactory.class"));
-const domains_service_1 = __importDefault(require("./domains.service"));
-const hosting_service_1 = __importDefault(require("./hosting.service"));
-class ConfService {
+import handlebars from 'handlebars';
+import ShareClientFactory from '../ShareClientFactory.class';
+import DomainsService from './domains.service';
+import HostingService from './hosting.service';
+export class ConfService {
     /**
      *
      * load the base nginx conf file for further rendering
@@ -17,7 +11,7 @@ class ConfService {
         return this.shareClient.get(folder, name);
     }
     constructor() {
-        this.shareClient = (0, ShareClientFactory_class_1.default)('azureStorage', {
+        this.shareClient = ShareClientFactory('azureStorage', {
             connectionString: process.env.HOSTING_STORAGE_CONNECTION,
             shareName: 'customer-apps',
             accountName: process.env.STORAGE_ACCOUNT,
@@ -28,7 +22,7 @@ class ConfService {
        *
        */
     render(http, https, defaultDomain, redirectDomains, company, project, baseConf, hosting) {
-        const template = handlebars_1.default.compile(baseConf);
+        const template = handlebars.compile(baseConf);
         const conf = template({
             http, https, company, project, defaultDomain, hosting, redirectDomains,
         }).trim();
@@ -43,7 +37,7 @@ class ConfService {
         return conf;
     }
     renderStreamConf(domains, confString) {
-        const template = handlebars_1.default.compile(confString);
+        const template = handlebars.compile(confString);
         const conf = template({
             domains,
         }).trim();
@@ -143,8 +137,8 @@ class ConfService {
         return null;
     }
     async refreshDockerCompose(base = '/base/data/user') {
-        const domains = await hosting_service_1.default.getActive();
-        const mappedDomains = domains_service_1.default.mapPortToRealPorts(domains, { http: 8000, https: 9000 });
+        const domains = await HostingService.getActive();
+        const mappedDomains = DomainsService.mapPortToRealPorts(domains, { http: 8000, https: 9000 });
         return this.shareClient.create('', 'docker-compose.json', JSON.stringify(this.getComposeObject(mappedDomains, base)));
     }
     async refreshNginx(type, company, project) {
@@ -169,13 +163,13 @@ class ConfService {
         }
         const confBase = (await this.getBase('base', template)).toString();
         if (type === 'stream' || type === 'proxy') {
-            const domains = await domains_service_1.default.getAllDomainsWithPorts();
-            renderedConf = this.renderStreamConf(domains_service_1.default.mapPortToRealPorts(domains, { http: 8000, https: 9000 }), confBase);
+            const domains = await DomainsService.getAllDomainsWithPorts();
+            renderedConf = this.renderStreamConf(DomainsService.mapPortToRealPorts(domains, { http: 8000, https: 9000 }), confBase);
         }
         if (type === 'project' && company && project) {
-            const hosting = await hosting_service_1.default.single(company, project);
-            const domains = await domains_service_1.default.getDomainsWithPorts(company, project);
-            const mappedDomains = domains_service_1.default.mapDomainsProject(domains, { http: 8000, https: 9000, redirectToMainDomain: hosting?.redirectToMainDomain });
+            const hosting = await HostingService.single(company, project);
+            const domains = await DomainsService.getDomainsWithPorts(company, project);
+            const mappedDomains = DomainsService.mapDomainsProject(domains, { http: 8000, https: 9000, redirectToMainDomain: hosting?.redirectToMainDomain });
             renderedConf = this.render(mappedDomains?.http, mappedDomains?.https, mappedDomains?.defaultDomain, mappedDomains?.redirectDomains, company, project, confBase);
         }
         return this.shareClient.create(targetFolder, targetFile, renderedConf);
@@ -184,6 +178,5 @@ class ConfService {
         return this.shareClient.createFolder(base, path);
     }
 }
-exports.ConfService = ConfService;
-exports.default = new ConfService();
+export default new ConfService();
 //# sourceMappingURL=conf.service.js.map

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

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

package/lib/{cjs/src → src}/services/customers.service.d.ts

@@ -22,7 +22,7 @@ export declare class CustomersService extends Immutable<CustomerPerson | Custome
         customer?: {
             _id: ObjectId;
             id: string;
-        } | undefined;
+        };
     }>;
     single(internalId: ObjectId, options: {
         company: string;

package/lib/{cjs/src → src}/services/customers.service.js

@@ -1,51 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomersService = void 0;
-const mongodb_1 = require("mongodb");
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const customers_model_1 = __importStar(require("../models/customers.model"));
-const Immutable_error_1 = __importDefault(require("../classes/errors/Immutable.error"));
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const querystring_1 = __importDefault(require("querystring"));
-const publish_service_1 = __importDefault(require("./publish.service"));
-const structures_aggregation_1 = require("../aggegations/structures.aggregation");
-const structures_service_1 = __importDefault(require("./structures.service"));
-const listParticipants_service_1 = __importDefault(require("./listParticipants.service"));
-const safeObjectId_1 = __importDefault(require("../helpers/safeObjectId"));
-const listsParticipants_model_1 = require("../models/listsParticipants.model");
-const lists_model_1 = __importDefault(require("../models/lists.model"));
-const me_service_1 = require("./me.service");
-const Forbidden_error_1 = __importDefault(require("../classes/errors/Forbidden.error"));
-class CustomersService extends Immutable_class_1.default {
+import { ObjectId } from 'mongodb';
+import Immutable from '../Immutable.class';
+import CustomersModel, { structureCompany, structurePerson } from '../models/customers.model';
+import ImmutableError from '../classes/errors/Immutable.error';
+import fetch from 'node-fetch';
+import querystring from 'querystring';
+import publishService from './publish.service';
+import { companyStructuresAggregation } from '../aggegations/structures.aggregation';
+import StructureService from './structures.service';
+import listParticipantsService from './listParticipants.service';
+import safeObjectId from '../helpers/safeObjectId';
+import { structure as listParticipantsStructure } from '../models/listsParticipants.model';
+import ListsModel from '../models/lists.model';
+import { MeService } from './me.service';
+import ForbiddenError from '../classes/errors/Forbidden.error';
+export class CustomersService extends Immutable {
     constructor() {
         super(...arguments);
-        this.model = customers_model_1.default;
+        this.model = CustomersModel;
     }
     createWithTypeMinimal(data, options) {
         let action = 'createPersonMinimal';
@@ -76,11 +47,11 @@ class CustomersService extends Immutable_class_1.default {
         const response = { isNew: false };
         if (options.validator) {
             if (!options.validator({ ...data, company: options.company })) {
-                throw new Immutable_error_1.default('VALIDATION_FAILED', options.validator.errors);
+                throw new ImmutableError('VALIDATION_FAILED', options.validator.errors);
             }
         }
         else if (!this.model.validate({ ...data, company: options.company }, modelAction)) {
-            throw new Immutable_error_1.default('VALIDATION_FAILED', this.model.compiledTypes[modelAction].errors);
+            throw new ImmutableError('VALIDATION_FAILED', this.model.compiledTypes[modelAction].errors);
         }
         customer = await this.getByEmail(data.email, options);
         if (!customer) {
@@ -101,7 +72,7 @@ class CustomersService extends Immutable_class_1.default {
                 $project: { emailConfirmationCode: 0 },
             });
         }
-        aggregation.push(...structures_aggregation_1.companyStructuresAggregation);
+        aggregation.push(...companyStructuresAggregation);
         const customer = await this.model.db.aggregate(aggregation).toArray();
         return customer ? customer[0] : undefined;
     }
@@ -134,7 +105,7 @@ class CustomersService extends Immutable_class_1.default {
             normalizeaddress: 1,
             dedupe: 1,
         };
-        const response = await (0, node_fetch_1.default)(`https://eu1.locationiq.com/v1/search?${querystring_1.default.stringify(requestData)}`);
+        const response = await fetch(`https://eu1.locationiq.com/v1/search?${querystring.stringify(requestData)}`);
         if (response.ok) {
             const data = await response.json();
             return data.filter((single) => single.address.house_number);
@@ -189,7 +160,7 @@ class CustomersService extends Immutable_class_1.default {
             // if email is not confirmed and no confirmation code is set, set a new one
             if (!customer.emailConfirmed && !customer.emailConfirmationCode) {
                 await this.setEmailConfirmationCode(customer._id, options);
-                await publish_service_1.default.emailViaId('email-confirmation-mail', customer._id, undefined, options);
+                await publishService.emailViaId('email-confirmation-mail', customer._id, undefined, options);
             }
             delete customer.emailConfirmationCode;
         }
@@ -269,10 +240,10 @@ class CustomersService extends Immutable_class_1.default {
     }
     getStructure(type) {
         if (type === 'person') {
-            return customers_model_1.structurePerson;
+            return structurePerson;
         }
         if (type === 'company') {
-            return customers_model_1.structureCompany;
+            return structureCompany;
         }
         return [];
     }
@@ -325,7 +296,7 @@ class CustomersService extends Immutable_class_1.default {
                */
         importData.map((single) => {
             const originalId = single._id?.toString();
-            const newId = new mongodb_1.ObjectId();
+            const newId = new ObjectId();
             single._id = newId;
             single.company = options.company;
             single.project = options.project;
@@ -356,22 +327,22 @@ class CustomersService extends Immutable_class_1.default {
         let customerOrParticipants = [];
         const data = [];
         if (options.list) {
-            const list = await lists_model_1.default.db.findOne({ _id: (0, safeObjectId_1.default)(options.list), company: options.company });
+            const list = await ListsModel.db.findOne({ _id: safeObjectId(options.list), company: options.company });
             if (!list)
                 throw new Error('LIST_NOT_FOUND');
-            const hasRightsForParticipants = await me_service_1.MeService.checkSinglePermission(options.user, options.company, list?.project, 'listsParticipants:export');
+            const hasRightsForParticipants = await MeService.checkSinglePermission(options.user, options.company, list?.project, 'listsParticipants:export');
             if (!hasRightsForParticipants)
-                throw new Forbidden_error_1.default();
+                throw new ForbiddenError();
             const optionsWithProject = { company: options.company, project: list?.project };
-            customerOrParticipants = await listParticipants_service_1.default.getAllForExport((0, safeObjectId_1.default)(options.list), optionsWithProject);
-            structures.push(...await structures_service_1.default.getByModel('listsParticipants', optionsWithProject));
-            structures.push(...await structures_service_1.default.getByModel('customers', options));
-            baseStructure = ['_id', 'id', 'joinedDate', 'joinedTime', 'participantId', ...this.getStructure('person'), ...listsParticipants_model_1.structure];
+            customerOrParticipants = await listParticipantsService.getAllForExport(safeObjectId(options.list), optionsWithProject);
+            structures.push(...await StructureService.getByModel('listsParticipants', optionsWithProject));
+            structures.push(...await StructureService.getByModel('customers', options));
+            baseStructure = ['_id', 'id', 'joinedDate', 'joinedTime', 'participantId', ...this.getStructure('person'), ...listParticipantsStructure];
             name = `list-${list.name.replace(/[^a-zA-Z0-9\-_]/g, '_')}-participants`;
         }
         else {
             customerOrParticipants = await this.model.db.find({ company: options.company }).toArray();
-            structures.push(...await structures_service_1.default.getByModel('customers', options));
+            structures.push(...await StructureService.getByModel('customers', options));
             baseStructure = ['_id', 'id', ...this.getStructure('person')];
         }
         const fullStructure = [...baseStructure].filter((single) => !['company', 'project', 'list', 'user'].includes(single));
@@ -424,7 +395,7 @@ class CustomersService extends Immutable_class_1.default {
         const queryArray = [];
         importHistoryData.map((single) => {
             const newParentId = idMapping[single.history.parent?.toString()];
-            single._id = new mongodb_1.ObjectId();
+            single._id = new ObjectId();
             /**
                  * update the parent id
                  */
@@ -471,6 +442,5 @@ class CustomersService extends Immutable_class_1.default {
         return { bulk, filteredData, skippedData };
     }
 }
-exports.CustomersService = CustomersService;
-exports.default = new CustomersService();
+export default new CustomersService();
 //# sourceMappingURL=customers.service.js.map