@lilaquadrat/studio 10.0.0-beta.1 → 10.0.0-beta.11

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.js';
+import DomainsService from './domains.service.js';
+import HostingService from './hosting.service.js';
+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

@@ -1,10 +1,10 @@
 import { ObjectId, UnorderedBulkOperation, UpdateResult, WithId } from 'mongodb';
-import Immutable from '../Immutable.class';
+import Immutable from '../Immutable.class.js';
 import { CustomerPerson, CustomerCompany, CustomersModelActions, CustomerPersonWithEmail, CreateResult, UserAppWithOptions, BasicData, Options, Customers, History, CustomerImportResult, ObjectIdString } from '@lilaquadrat/interfaces';
 import { Location } from '@lilaquadrat/interfaces';
 import { ValidateFunction } from 'ajv';
 export declare class CustomersService extends Immutable<CustomerPerson | CustomerCompany> {
-    model: import("../classes/modelv2.class").default<Customers, CustomersModelActions>;
+    model: import("../classes/modelv2.class.js").default<Customers, CustomersModelActions>;
     /**
      * is only used from admins so action will be always minimal e.g. createPersonMinimal
      */
@@ -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.js';
+import CustomersModel, { structureCompany, structurePerson } from '../models/customers.model.js';
+import ImmutableError from '../classes/errors/Immutable.error.js';
+import fetch from 'node-fetch';
+import querystring from 'querystring';
+import publishService from './publish.service.js';
+import { companyStructuresAggregation } from '../aggegations/structures.aggregation.js';
+import StructureService from './structures.service.js';
+import listParticipantsService from './listParticipants.service.js';
+import safeObjectId from '../helpers/safeObjectId.js';
+import { structure as listParticipantsStructure } from '../models/listsParticipants.model.js';
+import ListsModel from '../models/lists.model.js';
+import { MeService } from './me.service.js';
+import ForbiddenError from '../classes/errors/Forbidden.error.js';
+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

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

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

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

@@ -1,8 +1,8 @@
 import { ObjectId, WithId } from 'mongodb';
-import Immutable from '../Immutable.class';
+import Immutable from '../Immutable.class.js';
 import { Domain, ProjectDomain, Secret, Certificate, SystemDomain, Hosting, DomainsList, BasicData, DomainConf, HostingPorts, SkipLimitSort, UserApp, UserAppWithOptions, ListCustomQueries } from '@lilaquadrat/interfaces';
 declare class DomainsService extends Immutable<Domain> {
-    model: import("../classes/modelv2.class").default<Domain, string>;
+    model: import("../classes/modelv2.class.js").default<Domain, string>;
     single(internalId: ObjectId, options: {
         includeSecret: true;
     }): Promise<WithId<Omit<ProjectDomain, 'secret'> & {
@@ -33,7 +33,7 @@ declare class DomainsService extends Immutable<Domain> {
     /**
      * start a new certification action based upon the last failed for this domain
      */
-    retrySSL(data: ProjectDomain, user: string, app: string): Promise<import("@lilaquadrat/interfaces").CreateResult<import("@lilaquadrat/interfaces").CertificateAction> | null>;
+    retrySSL(data: ProjectDomain, user: string, app: string): Promise<null>;
     remove(_id: ObjectId, user: string, app: string): Promise<import("mongodb").DeleteResult>;
     linkCertificate(certificateInternalId: ObjectId, domain: string, company: string | undefined, project: string | undefined, user: string, app: string): Promise<import("mongodb").UpdateResult<BasicData<Domain>>>;
     linkMultipleDomains(certificateInternalId: ObjectId, domains: string[], company: string, project: string, user: string, app: string): Promise<import("mongodb").UpdateResult<BasicData<Domain>>[]>;
@@ -78,8 +78,8 @@ declare class DomainsService extends Immutable<Domain> {
         ports?: Record<string, number>;
         port?: number;
     })[], port: HostingPorts): (T & {
-        ports?: Record<string, number> | undefined;
-        port?: number | undefined;
+        ports?: Record<string, number>;
+        port?: number;
     })[];
     /**
      *
@@ -99,17 +99,10 @@ declare class DomainsService extends Immutable<Domain> {
     }): {
         http: DomainConf;
         https: DomainConf[];
-        defaultDomain?: DomainConf | undefined;
-        redirectDomains?: DomainConf[] | undefined;
+        defaultDomain?: DomainConf;
+        redirectDomains?: DomainConf[];
     } | null;
-    getOrRequestForProject(company: string, project: string, options: Required<UserApp>): Promise<Promise<{
-        type: 'certificate';
-        data: BasicData<Certificate>;
-    } | {
-        type: 'request';
-        data: ObjectId | undefined;
-    }>[]>;
-    requestCertificateForDomain(internalId: ObjectId, options: Required<UserApp>): Promise<import("@lilaquadrat/interfaces").CreateResult<import("@lilaquadrat/interfaces").CertificateAction> | null>;
+    requestCertificateForDomain(internalId: ObjectId, options: Required<UserApp>): Promise<null>;
 }
 declare const _default: DomainsService;
 export default _default;

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

@@ -1,21 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongodb_1 = require("mongodb");
-const dns_1 = __importDefault(require("dns"));
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const domain_model_1 = __importDefault(require("../models/domain.model"));
-const certificates_service_1 = __importDefault(require("./certificates.service"));
-const hosting_model_1 = __importDefault(require("../models/hosting.model"));
-const certificatesAction_service_1 = __importDefault(require("./certificatesAction.service"));
-const secret_service_1 = __importDefault(require("./secret.service"));
-const dns = dns_1.default.promises;
-class DomainsService extends Immutable_class_1.default {
+import { ObjectId } from 'mongodb';
+import DNS from 'dns';
+import Immutable from '../Immutable.class.js';
+import DomainModel from '../models/domain.model.js';
+// import certificatesService from './certificates.service.js';
+import HostingModel from '../models/hosting.model.js';
+// import certificatesActionService from './certificatesAction.service.js';
+import secretService from './secret.service.js';
+const dns = DNS.promises;
+class DomainsService extends Immutable {
     constructor() {
         super(...arguments);
-        this.model = domain_model_1.default;
+        this.model = DomainModel;
     }
     async single(internalId, options) {
         const projection = {};
@@ -114,43 +109,49 @@ class DomainsService extends Immutable_class_1.default {
      */
     async createWithSSL(data, user, app) {
         const newDomain = await this.create({ ...data, validated: false }, user, app);
-        const secret = await secret_service_1.default.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, user, app);
+        const secret = await secretService.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, user, app);
         /** set the dns validation secret */
         await this.immutable(newDomain._id, { secret: secret._id }, user, 'change', app, undefined, undefined, 'setSecret');
-        const certOrRequest = await certificates_service_1.default.getOrRequest(data.domain, data.company, data.project, user, app);
-        if (certOrRequest.type === 'certificate') {
-            await this.linkCertificate(new mongodb_1.ObjectId(certOrRequest.data?._id), data.domain, data.company, data.project, user, app);
-        }
+        // const certOrRequest = await certificatesService.getOrRequest(data.domain, data.company, data.project, user, app);
+        // if (certOrRequest.type === 'certificate') {
+        //   await this.linkCertificate(new ObjectId(certOrRequest.data?._id), data.domain, data.company, data.project, user, app);
+        // }
         return newDomain;
     }
     async createWithSecret(data, options) {
         const newDomain = await this.create({ ...data, validated: false }, options.user, options.app);
-        const secret = await secret_service_1.default.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, options.user, options.app);
+        const secret = await secretService.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, options.user, options.app);
         /** set the dns validation secret */
         await this.immutable(newDomain._id, { secret: secret._id }, options.user, 'change', options.app, undefined, undefined, 'setSecret');
         return newDomain;
     }
     async createWithWildcard(data, options) {
         const newDomain = await this.create({ ...data, validated: true }, options.user, options.app);
-        const certOrRequest = await certificates_service_1.default.getOrRequestWildcard(data.domain, options);
-        if (certOrRequest.type === 'certificate') {
-            await this.linkCertificate(new mongodb_1.ObjectId(certOrRequest.data?._id), data.domain, undefined, undefined, options.user, options.app);
-        }
+        // const certOrRequest = await certificatesService.getOrRequestWildcard(data.domain, options);
+        // if (certOrRequest.type === 'certificate') {
+        //   await this.linkCertificate(new ObjectId(certOrRequest.data?._id), data.domain, undefined, undefined, options.user, options.app);
+        // }
         return newDomain;
     }
     /**
      * start a new certification action based upon the last failed for this domain
      */
     async retrySSL(data, user, app) {
-        const failedAction = await certificatesAction_service_1.default.latest(data.domain, data.company, data.project);
-        if (failedAction?.state === 'failed') {
-            return certificatesAction_service_1.default.request(failedAction.domains, failedAction.type, failedAction.contentType, failedAction.renew, {
-                company: failedAction.company,
-                project: failedAction.project,
-                user,
-                app,
-            });
-        }
+        // const failedAction = await certificatesActionService.latest(data.domain, data.company, data.project);
+        // if (failedAction?.state === 'failed') {
+        //   return certificatesActionService.request(
+        //     failedAction.domains,
+        //     failedAction.type as 'domain',
+        //     failedAction.contentType,
+        //     failedAction.renew,
+        //     {
+        //       company: failedAction.company as string,
+        //       project: failedAction.project as string,
+        //       user,
+        //       app,
+        //     },
+        //   );
+        // }
         return null;
     }
     async remove(_id, user, app) {
@@ -165,7 +166,7 @@ class DomainsService extends Immutable_class_1.default {
         return this.immutable({ domain, company, project }, { certificate: certificateInternalId }, user, 'change', app, undefined, undefined, 'setCertificate');
     }
     linkMultipleDomains(certificateInternalId, domains, company, project, user, app) {
-        const PROMISEARRAY = domains.map((domain) => this.linkCertificate(new mongodb_1.ObjectId(certificateInternalId), domain, company, project, user, app));
+        const PROMISEARRAY = domains.map((domain) => this.linkCertificate(new ObjectId(certificateInternalId), domain, company, project, user, app));
         return Promise.all(PROMISEARRAY);
     }
     /**
@@ -209,7 +210,7 @@ class DomainsService extends Immutable_class_1.default {
      * get all domains for specific project with ports and certificates
      */
     async getDomainsWithPorts(company, project) {
-        const hostingPorts = await hosting_model_1.default.db.findOne({ company, project, active: true });
+        const hostingPorts = await HostingModel.db.findOne({ company, project, active: true });
         if (!hostingPorts)
             return [];
         return this.model.db.aggregate([
@@ -287,7 +288,7 @@ class DomainsService extends Immutable_class_1.default {
      * get all domains from active hosting with ports and certificates
      */
     async getAllDomainsWithPorts() {
-        return hosting_model_1.default.db.aggregate([
+        return HostingModel.db.aggregate([
             {
                 $match: {
                     $and: [
@@ -591,45 +592,63 @@ class DomainsService extends Immutable_class_1.default {
         };
         return returnObject;
     }
-    async getOrRequestForProject(company, project, options) {
-        const domains = await this.model.db.find({
-            company,
-            project,
-            validated: true,
-            active: true,
-            isDefault: false,
-        }).toArray();
-        return domains.map((single) => certificates_service_1.default.getOrRequest(single.domain, company, project, options.user, options.app));
-    }
+    // async getOrRequestForProject(company: string, project: string, options: Required<UserApp>): Promise<Promise<{
+    //   type: 'certificate';
+    //   data: BasicData<Certificate>;
+    // } | {
+    //   type: 'request';
+    //   data: ObjectId | undefined;
+    // }>[]> {
+    //   const domains = await this.model.db.find({
+    //     company,
+    //     project,
+    //     validated: true,
+    //     active: true,
+    //     isDefault: false,
+    //   }).toArray();
+    //   return domains.map((single) => certificatesService.getOrRequest(
+    //     single.domain, company, project, options.user, options.app,
+    //   ));
+    // }
     async requestCertificateForDomain(internalId, options) {
         const domain = await this.model.db.findOne({ _id: internalId });
         if (!domain)
             return null;
-        if (await certificatesAction_service_1.default.actionExistsForDomain(domain.domain))
-            throw new Error('CERTIFICATEACTION_EXISTS');
+        // if (await certificatesActionService.actionExistsForDomain(domain.domain)) throw new Error('CERTIFICATEACTION_EXISTS');
         if (!domain?.active && domain.company && domain.project)
             throw new Error('DOMAIN_NOT_ACTIVE');
         if (!domain?.validated)
             throw new Error('DOMAIN_NOT_VALIDATED');
-        if (!domain.company && !domain.project) {
-            return certificatesAction_service_1.default.request([domain.domain], 'wildcard', 'pem', true, {
-                app: options.app,
-                user: options.user,
-                forceFile: true,
-                timeout: 120,
-            });
-        }
-        else if (domain.company && domain.project) {
-            return certificatesAction_service_1.default.request([domain.domain], 'domain', 'pem', true, {
-                ...options,
-                company: domain.company,
-                project: domain.project,
-                forceFile: true,
-                timeout: 120,
-            });
-        }
+        // if (!domain.company && !domain.project) {
+        //   return certificatesActionService.request(
+        //     [domain.domain],
+        //     'wildcard',
+        //     'pem',
+        //     true,
+        //     {
+        //       app: options.app,
+        //       user: options.user,
+        //       forceFile: true,
+        //       timeout: 120,
+        //     },
+        //   );
+        // } else if (domain.company && domain.project) {
+        //   return certificatesActionService.request(
+        //     [domain.domain],
+        //     'domain',
+        //     'pem',
+        //     true,
+        //     {
+        //       ...options,
+        //       company: domain.company,
+        //       project: domain.project,
+        //       forceFile: true,
+        //       timeout: 120,
+        //     },
+        //   );
+        // }
         return null;
     }
 }
-exports.default = new DomainsService();
+export default new DomainsService();
 //# sourceMappingURL=domains.service.js.map