@social-mail/social-mail-client 1.2.333 → 1.2.334

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.333",
+  "version": "1.2.334",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/pages/mailboxes/MailboxEditorPage.tsx

@@ -64,7 +64,7 @@ export default class MailboxEditorPage extends PopupWindowPage {
                         />
                 </FormField>
                 <FormField label="Email Address">
-                    <span text={Bind.oneWay(() => `${this.model.username}@${this.model.domain.domain.name}`)}/>
+                    <span text={Bind.oneWay(() => `${this.model.username}@${this.model.domain.name}`)}/>
                 </FormField>
                 <FormField label="Create Channel">
                     <Checkbox

package/src/common/pages/mailboxes/services/ExternalMailboxService.ts

@@ -25,33 +25,6 @@ export default class ExternalMailboxService {
     @Inject
     private entityService: EntityService;
 
-    public async createDomain(emailAddress: string, retry = 3): Promise<{ domainID?: number }> {
-        try {
-            const index = emailAddress.lastIndexOf("@");
-            let domainName = emailAddress;
-            if (index !== -1) {
-                domainName = emailAddress.substring(index + 1);
-            }
-            domainName = domainName.toLocaleLowerCase();
-            const d = await this.entityService.query(HostedDomain)
-                .where({ domainName }, (p) => (x) => x.domain.name === p.domainName)
-                .firstOrDefault();
-            if (d) {
-                return d;
-            }
-            const hd = HostedDomain.create({
-                domainNameToCreate: domainName,
-                external: true
-            });
-            return await this.entityService.save(hd);
-        } catch (error) {
-            if(retry--) {
-                return await this.createDomain(emailAddress, retry - 1);
-            }
-            throw error;
-        }
-    }
-
     async createMailbox(model: IExternalMailbox) {
         const {
             emailAddress,
@@ -67,15 +40,11 @@ export default class ExternalMailboxService {
             smtpUsername,
             smtpPassword,
         } = model;
-        const hd = await this.createDomain(emailAddress);
 
         const dateCreated = DateTime.now;
 
-        const [ emailUsername ] = emailAddress.split("@");
-
         const mb = Mailbox.create({
-            domainID: hd.domainID,
-            username: emailUsername,
+            externalEmailAddress: emailAddress,
             name,
             dateCreated,
             dateUpdated: dateCreated,

package/src/common/pages/mailboxes/services/MailboxService.ts

@@ -12,10 +12,7 @@ export default class MailboxService {
     private entityService: EntityService;
 
     public async domains(onlyHosted = false) {
-        let q = this.entityService.query(HostedDomain);
-        if (onlyHosted) {
-            q = q.where({}, (p) => (x) => x.external === false);
-        }
+        const q = this.entityService.query(HostedDomain);
         const hosted = await q
             .include((x) => x.domain)
             .toArray();
@@ -100,7 +97,7 @@ export default class MailboxService {
     async get(id) {
         return this.entityService.query(Mailbox)
             .where({ id }, (p) => (x) => x.mailboxID === p.id)
-            .include((x) => [x.userMailboxes, x.syncTargets, x.emailAddress, x.domain.domain])
+            .include((x) => [x.userMailboxes, x.syncTargets, x.emailAddress, x.domain])
             .firstOrDefault();
     }
 

package/src/common/pages/websites/blogs/LookupChannelPage.tsx

@@ -59,7 +59,7 @@ export default class LookupChannelPage extends PopupWindowPage<any, IMailbox> {
         if (search) {
             search = search + "%";
             if (search.startsWith("@")) {
-                q = q.where({ search }, (p) => (x) => Sql.text.like(x.domain.domain.name, p.search) );
+                q = q.where({ search }, (p) => (x) => Sql.text.like(x.domain.name, p.search) );
             } else {
                 q = q.where({ search }, (p) => (x) => Sql.text.like(x.emailAddress.emailAddress, p.search));
             }

package/src/model/model.ts

@@ -211,7 +211,7 @@ export interface IContact extends IClrEntity {
 	shippingAddressID?: number | null;
 	user?: IUser;
 	mailbox?: IMailbox;
-	domain?: IHostedDomain;
+	hostedDomain?: IHostedDomain;
 	preview?: IAppFile;
 	billingAddress?: IContactAddress;
 	addresses?: ICollection<IContactAddress>;
@@ -232,7 +232,7 @@ export const Contact: IModel<IContact> = new Model<IContact>(
 "Contact",
 ["contactID"],
 { name: "",type: "",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()) },
-{"name":"contacts","keys":[{"name":"contactID","type":"number","generated":"identity"}],"properties":[{"name":"externalID","type":"string","default":["externalID","\"\""]},{"name":"userID","type":"number"},{"name":"mailboxID","type":"number"},{"name":"domainID","type":"number"},{"name":"name","type":"string","default":["name","\"\""]},{"name":"description","type":"string","default":["description","\"\""]},{"name":"companyID","type":"string","default":["companyID","\"\""]},{"name":"salesTaxID","type":"string","default":["salesTaxID","\"\""]},{"name":"gstTaxID","type":"string","default":["gstTaxID","\"\""]},{"name":"vatTaxID","type":"string","default":["vatTaxID","\"\""]},{"name":"incomeTaxID","type":"string","default":["incomeTaxID","\"\""]},{"name":"type","type":"string","default":["type","\"\""]},{"name":"synchronization","type":"string","default":["synchronization","\"\""]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"previewID","type":"number"},{"name":"billingAddressID","type":"number"},{"name":"shippingAddressID","type":"number"}],"relations":[{"name":"user","fkMap":[{"fk":"userID","relatedKey":"userID"}],"relatedName":"User"},{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"preview","fkMap":[{"fk":"previewID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"billingAddress","fkMap":[{"fk":"billingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"addresses","isCollection":true,"isInverse":true,"relatedName":"ContactAddress"},{"name":"shippingAddress","fkMap":[{"fk":"shippingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"ContactEmail"},{"name":"phones","isCollection":true,"isInverse":true,"relatedName":"ContactPhone"},{"name":"items","isCollection":true,"isInverse":true,"relatedName":"ContactItem"},{"name":"domains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"},{"name":"sellerStores","isCollection":true,"isInverse":true,"relatedName":"Store"},{"name":"vendorItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"soldInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"boughtInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"soldItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
+{"name":"contacts","keys":[{"name":"contactID","type":"number","generated":"identity"}],"properties":[{"name":"externalID","type":"string","default":["externalID","\"\""]},{"name":"userID","type":"number"},{"name":"mailboxID","type":"number"},{"name":"domainID","type":"number"},{"name":"name","type":"string","default":["name","\"\""]},{"name":"description","type":"string","default":["description","\"\""]},{"name":"companyID","type":"string","default":["companyID","\"\""]},{"name":"salesTaxID","type":"string","default":["salesTaxID","\"\""]},{"name":"gstTaxID","type":"string","default":["gstTaxID","\"\""]},{"name":"vatTaxID","type":"string","default":["vatTaxID","\"\""]},{"name":"incomeTaxID","type":"string","default":["incomeTaxID","\"\""]},{"name":"type","type":"string","default":["type","\"\""]},{"name":"synchronization","type":"string","default":["synchronization","\"\""]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"previewID","type":"number"},{"name":"billingAddressID","type":"number"},{"name":"shippingAddressID","type":"number"}],"relations":[{"name":"user","fkMap":[{"fk":"userID","relatedKey":"userID"}],"relatedName":"User"},{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"hostedDomain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"preview","fkMap":[{"fk":"previewID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"billingAddress","fkMap":[{"fk":"billingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"addresses","isCollection":true,"isInverse":true,"relatedName":"ContactAddress"},{"name":"shippingAddress","fkMap":[{"fk":"shippingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"ContactEmail"},{"name":"phones","isCollection":true,"isInverse":true,"relatedName":"ContactPhone"},{"name":"items","isCollection":true,"isInverse":true,"relatedName":"ContactItem"},{"name":"domains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"},{"name":"sellerStores","isCollection":true,"isInverse":true,"relatedName":"Store"},{"name":"vendorItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"soldInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"boughtInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"soldItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
 );
 modelEntitySchemas["Contact"] = Contact;
 
@@ -352,6 +352,7 @@ export interface IDomain extends IClrEntity {
 	received?: number;
 	failed?: number;
 	emailAddresses?: ICollection<IEmailAddress>;
+	mailboxes?: ICollection<IMailbox>;
 	hostedDomain?: IHostedDomain;
 	contactDomains?: ICollection<IContactDomain>;
 	activities?: ICollection<IServerActivity>;
@@ -361,7 +362,7 @@ export const Domain: IModel<IDomain> = new Model<IDomain>(
 "Domain",
 ["domainID"],
 { name: "",received: 0,failed: 0 },
-{"name":"domains","keys":[{"name":"domainID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]},{"name":"received","type":"number","default":["received","0"]},{"name":"failed","type":"number","default":["failed","0"]}],"relations":[{"name":"emailAddresses","isCollection":true,"isInverse":true,"relatedName":"EmailAddress"},{"name":"hostedDomain","isCollection":false,"isInverse":true,"relatedName":"HostedDomain"},{"name":"contactDomains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"},{"name":"activities","isCollection":true,"isInverse":true,"relatedName":"ServerActivity"}]}
+{"name":"domains","keys":[{"name":"domainID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]},{"name":"received","type":"number","default":["received","0"]},{"name":"failed","type":"number","default":["failed","0"]}],"relations":[{"name":"emailAddresses","isCollection":true,"isInverse":true,"relatedName":"EmailAddress"},{"name":"mailboxes","isCollection":true,"isInverse":true,"relatedName":"Mailbox"},{"name":"hostedDomain","isCollection":false,"isInverse":true,"relatedName":"HostedDomain"},{"name":"contactDomains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"},{"name":"activities","isCollection":true,"isInverse":true,"relatedName":"ServerActivity"}]}
 );
 modelEntitySchemas["Domain"] = Domain;
 
@@ -370,13 +371,11 @@ export interface IHostedDomain extends IClrEntity {
 	enableReceive?: boolean;
 	enableSend?: boolean;
 	useRelay?: boolean;
-	external?: boolean;
 	aliasForName?: string | null;
 	domainNameToCreate?: string;
 	domain?: IDomain;
 	aliasFor?: IHostedDomain;
 	aliases?: ICollection<IHostedDomain>;
-	mailboxes?: ICollection<IMailbox>;
 	contacts?: ICollection<IContact>;
 	domainUsers?: ICollection<IDomainUser>;
 	relays?: ICollection<IDomainRelay>;
@@ -387,8 +386,8 @@ export interface IHostedDomain extends IClrEntity {
 export const HostedDomain: IModel<IHostedDomain> = new Model<IHostedDomain>(
 "HostedDomain",
 ["domainID"],
-{ enableReceive: false,enableSend: false,useRelay: false,external: false },
-{"name":"hosted_domains","keys":[{"name":"domainID","type":"number"}],"properties":[{"name":"enableReceive","type":"boolean","default":["enableReceive","false"]},{"name":"enableSend","type":"boolean","default":["enableSend","false"]},{"name":"useRelay","type":"boolean","default":["useRelay","false"]},{"name":"external","type":"boolean","default":["external","false"]},{"name":"aliasForName","type":"string"}],"relations":[{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"Domain"},{"name":"aliasFor","fkMap":[{"fk":"aliasForName","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"aliases","isCollection":true,"isInverse":true,"relatedName":"HostedDomain"},{"name":"mailboxes","isCollection":true,"isInverse":true,"relatedName":"Mailbox"},{"name":"contacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"domainUsers","isCollection":true,"isInverse":true,"relatedName":"DomainUser"},{"name":"relays","isCollection":true,"isInverse":true,"relatedName":"DomainRelay"},{"name":"domainKeys","isCollection":true,"isInverse":true,"relatedName":"DomainKey"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"}]}
+{ enableReceive: false,enableSend: false,useRelay: false },
+{"name":"hosted_domains","keys":[{"name":"domainID","type":"number"}],"properties":[{"name":"enableReceive","type":"boolean","default":["enableReceive","false"]},{"name":"enableSend","type":"boolean","default":["enableSend","false"]},{"name":"useRelay","type":"boolean","default":["useRelay","false"]},{"name":"aliasForName","type":"string"}],"relations":[{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"Domain"},{"name":"aliasFor","fkMap":[{"fk":"aliasForName","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"aliases","isCollection":true,"isInverse":true,"relatedName":"HostedDomain"},{"name":"contacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"domainUsers","isCollection":true,"isInverse":true,"relatedName":"DomainUser"},{"name":"relays","isCollection":true,"isInverse":true,"relatedName":"DomainRelay"},{"name":"domainKeys","isCollection":true,"isInverse":true,"relatedName":"DomainKey"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"}]}
 );
 modelEntitySchemas["HostedDomain"] = HostedDomain;
 
@@ -438,14 +437,14 @@ export interface IDomainKey extends IClrEntity {
 	keyType?: string;
 	readonly publicKey?: string;
 	domainID?: number;
-	domain?: IHostedDomain;
+	hostedDomain?: IHostedDomain;
 }
 
 export const DomainKey: IModel<IDomainKey> = new Model<IDomainKey>(
 "DomainKey",
 ["domainKeyID"],
 { name: "",keyType: "",publicKey: "" },
-{"name":"domain_keys","keys":[{"name":"domainKeyID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]},{"name":"keyType","type":"string","default":["keyType","\"\""]},{"name":"publicKey","type":"string","default":["publicKey","\"\""]},{"name":"domainID","type":"number"},{"name":"privateKey","type":"string","default":["privateKey","\"\""]}],"relations":[{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"}]}
+{"name":"domain_keys","keys":[{"name":"domainKeyID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]},{"name":"keyType","type":"string","default":["keyType","\"\""]},{"name":"publicKey","type":"string","default":["publicKey","\"\""]},{"name":"domainID","type":"number"},{"name":"privateKey","type":"string","default":["privateKey","\"\""]}],"relations":[{"name":"hostedDomain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"}]}
 );
 modelEntitySchemas["DomainKey"] = DomainKey;
 
@@ -621,7 +620,7 @@ export interface IEmailTemplate extends IClrEntity {
 	domainID?: number | null;
 	mailboxID?: number | null;
 	folderID?: number;
-	domain?: IHostedDomain;
+	hostedDomain?: IHostedDomain;
 	mailbox?: IMailbox;
 	folder?: IAppFile;
 }
@@ -630,7 +629,7 @@ export const EmailTemplate: IModel<IEmailTemplate> = new Model<IEmailTemplate>(
 "EmailTemplate",
 ["templateID"],
 {  },
-{"name":"email_templates","keys":[{"name":"templateID","type":"number","generated":"identity"}],"properties":[{"name":"domainID","type":"number"},{"name":"mailboxID","type":"number"},{"name":"folderID","type":"number"}],"relations":[{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"}]}
+{"name":"email_templates","keys":[{"name":"templateID","type":"number","generated":"identity"}],"properties":[{"name":"domainID","type":"number"},{"name":"mailboxID","type":"number"},{"name":"folderID","type":"number"}],"relations":[{"name":"hostedDomain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"}]}
 );
 modelEntitySchemas["EmailTemplate"] = EmailTemplate;
 
@@ -655,11 +654,12 @@ export interface IMailbox extends IClrEntity {
 	datePublished?: DateTime | null;
 	dateEngaged?: DateTime | null;
 	username?: string;
+	externalEmailAddress?: string;
 	name?: string;
 	notify?: boolean;
 	deleteVerificationID?: string;
 	emailAddress?: IEmailAddress;
-	domain?: IHostedDomain;
+	domain?: IDomain;
 	logo?: IAppFile;
 	contacts?: ICollection<IContact>;
 	templates?: ICollection<IEmailTemplate>;
@@ -678,7 +678,7 @@ export const Mailbox: IModel<IMailbox> = new Model<IMailbox>(
 "Mailbox",
 ["mailboxID"],
 { storage: 0,maxStorage: 0,indexAttachments: false,indexImageAttachments: false,openThreads: 0,totalThreads: 0,unread: 0,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),isChannel: false,isPrivateChannel: false,requireApproval: false,subscriberCount: 0 },
-{"name":"mailboxes","keys":[{"name":"mailboxID","type":"number"}],"properties":[{"name":"domainID","type":"number"},{"name":"storage","type":"number","default":["storage","0"]},{"name":"maxStorage","type":"number","default":["maxStorage","0"]},{"name":"indexAttachments","type":"boolean","default":["indexAttachments","false"]},{"name":"indexImageAttachments","type":"boolean","default":["indexImageAttachments","false"]},{"name":"firstID","type":"number","default":["firstID","0"]},{"name":"recentID","type":"number","default":["recentID","0"]},{"name":"openThreads","type":"number","default":["openThreads","0"]},{"name":"totalThreads","type":"number","default":["totalThreads","0"]},{"name":"unread","type":"number","default":["unread","0"]},{"name":"logoID","type":"number"},{"name":"description","type":"string","default":["description","\"\""]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"isChannel","type":"boolean","default":["isChannel","false"]},{"name":"isPrivateChannel","type":"boolean","default":["isPrivateChannel","false"]},{"name":"requireApproval","type":"boolean","default":["requireApproval","false"]},{"name":"subscriberCount","type":"number","default":["subscriberCount","0"]},{"name":"datePublished","type":"DateTime","default":["datePublished","new DefaultFactory(() => new DateTime())"]},{"name":"dateEngaged","type":"DateTime","default":["dateEngaged","new DefaultFactory(() => new DateTime())"]},{"name":"parentID","type":"number","default":["parentID","0"]}],"relations":[{"name":"emailAddress","fkMap":[{"fk":"mailboxID","relatedKey":"emailAddressID"}],"relatedName":"EmailAddress"},{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"logo","fkMap":[{"fk":"logoID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"contacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"MailboxEmail"},{"name":"mailboxContacts","isCollection":true,"isInverse":true,"relatedName":"MailboxContact"},{"name":"threadEmails","isCollection":true,"isInverse":true,"relatedName":"MailboxContactEmail"},{"name":"syncTargets","isCollection":true,"isInverse":true,"relatedName":"MailboxSyncTarget"},{"name":"channelConfig","isCollection":false,"isInverse":true,"relatedName":"ChannelConfig"},{"name":"subscriberActivities","isCollection":true,"isInverse":true,"relatedName":"SubscriberActivity"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"userMailboxes","isCollection":true,"isInverse":true,"relatedName":"UserMailbox"},{"name":"websiteChannels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"}]}
+{"name":"mailboxes","keys":[{"name":"mailboxID","type":"number"}],"properties":[{"name":"domainID","type":"number"},{"name":"storage","type":"number","default":["storage","0"]},{"name":"maxStorage","type":"number","default":["maxStorage","0"]},{"name":"indexAttachments","type":"boolean","default":["indexAttachments","false"]},{"name":"indexImageAttachments","type":"boolean","default":["indexImageAttachments","false"]},{"name":"firstID","type":"number","default":["firstID","0"]},{"name":"recentID","type":"number","default":["recentID","0"]},{"name":"openThreads","type":"number","default":["openThreads","0"]},{"name":"totalThreads","type":"number","default":["totalThreads","0"]},{"name":"unread","type":"number","default":["unread","0"]},{"name":"logoID","type":"number"},{"name":"description","type":"string","default":["description","\"\""]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"isChannel","type":"boolean","default":["isChannel","false"]},{"name":"isPrivateChannel","type":"boolean","default":["isPrivateChannel","false"]},{"name":"requireApproval","type":"boolean","default":["requireApproval","false"]},{"name":"subscriberCount","type":"number","default":["subscriberCount","0"]},{"name":"datePublished","type":"DateTime","default":["datePublished","new DefaultFactory(() => new DateTime())"]},{"name":"dateEngaged","type":"DateTime","default":["dateEngaged","new DefaultFactory(() => new DateTime())"]},{"name":"parentID","type":"number","default":["parentID","0"]}],"relations":[{"name":"emailAddress","fkMap":[{"fk":"mailboxID","relatedKey":"emailAddressID"}],"relatedName":"EmailAddress"},{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"Domain"},{"name":"logo","fkMap":[{"fk":"logoID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"contacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"MailboxEmail"},{"name":"mailboxContacts","isCollection":true,"isInverse":true,"relatedName":"MailboxContact"},{"name":"threadEmails","isCollection":true,"isInverse":true,"relatedName":"MailboxContactEmail"},{"name":"syncTargets","isCollection":true,"isInverse":true,"relatedName":"MailboxSyncTarget"},{"name":"channelConfig","isCollection":false,"isInverse":true,"relatedName":"ChannelConfig"},{"name":"subscriberActivities","isCollection":true,"isInverse":true,"relatedName":"SubscriberActivity"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"userMailboxes","isCollection":true,"isInverse":true,"relatedName":"UserMailbox"},{"name":"websiteChannels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"}]}
 );
 modelEntitySchemas["Mailbox"] = Mailbox;
 
@@ -1624,6 +1624,7 @@ modelEntitySchemas["VerificationTokenAddress"] = VerificationTokenAddress;
 export interface ITag extends IClrEntity {
 	readonly tagID?: number;
 	name?: string;
+	label?: string;
 	readonly lowerCaseName?: string;
 	path?: string | null;
 	isSystemTag?: boolean;
@@ -1642,110 +1643,11 @@ export interface ITag extends IClrEntity {
 export const Tag: IModel<ITag> = new Model<ITag>(
 "Tag",
 ["tagID"],
-{ name: "",isSystemTag: false },
-{"name":"tags","keys":[{"name":"tagID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]},{"name":"lowerCaseName","type":"string","generated":"computed"},{"name":"path","type":"string","default":["path","\"\""]},{"name":"isSystemTag","type":"boolean","default":["isSystemTag","false"]},{"name":"contentTypes","type":"string","default":["contentTypes","\"\""]},{"name":"parentID","type":"number"}],"relations":[{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"tagID"}],"relatedName":"Tag"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"Tag"},{"name":"fileTags","isCollection":true,"isInverse":true,"relatedName":"AppFileTag"},{"name":"emailTags","isCollection":true,"isInverse":true,"relatedName":"EmailTag"},{"name":"mailboxContactTags","isCollection":true,"isInverse":true,"relatedName":"MailboxContactTag"},{"name":"storeItemFolderTags","isCollection":true,"isInverse":true,"relatedName":"StoreItemFolderTag"},{"name":"storeTags","isCollection":true,"isInverse":true,"relatedName":"StoreTag"},{"name":"storeItemTags","isCollection":true,"isInverse":true,"relatedName":"StoreItemTag"}]}
+{ name: "",label: "",isSystemTag: false },
+{"name":"tags","keys":[{"name":"tagID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]},{"name":"label","type":"string","default":["label","\"\""]},{"name":"lowerCaseName","type":"string","generated":"computed"},{"name":"path","type":"string","default":["path","\"\""]},{"name":"isSystemTag","type":"boolean","default":["isSystemTag","false"]},{"name":"contentTypes","type":"string","default":["contentTypes","\"\""]},{"name":"parentID","type":"number"}],"relations":[{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"tagID"}],"relatedName":"Tag"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"Tag"},{"name":"fileTags","isCollection":true,"isInverse":true,"relatedName":"AppFileTag"},{"name":"emailTags","isCollection":true,"isInverse":true,"relatedName":"EmailTag"},{"name":"mailboxContactTags","isCollection":true,"isInverse":true,"relatedName":"MailboxContactTag"},{"name":"storeItemFolderTags","isCollection":true,"isInverse":true,"relatedName":"StoreItemFolderTag"},{"name":"storeTags","isCollection":true,"isInverse":true,"relatedName":"StoreTag"},{"name":"storeItemTags","isCollection":true,"isInverse":true,"relatedName":"StoreItemTag"}]}
 );
 modelEntitySchemas["Tag"] = Tag;
 
-export interface IVirtualServer extends IClrEntity {
-	readonly serverID?: number;
-	serverName?: string;
-	ownerEmailAddress?: string | null;
-	ownerPhoneNumber?: string | null;
-	active?: boolean;
-	bucketName?: string | null;
-	database?: string | null;
-	host?: string;
-	forwardHost?: string | null;
-	forwardPublicKey?: string | null;
-	environmentVariables?: string | null;
-	maxStorageGB?: number;
-	dnsZones?: ICollection<IDnsZone>;
-}
-
-export const VirtualServer: IModel<IVirtualServer> = new Model<IVirtualServer>(
-"VirtualServer",
-["serverID"],
-{ serverName: "",active: false,host: "",maxStorageGB: 0 },
-{"name":"virtual_servers","keys":[{"name":"serverID","type":"number","generated":"identity"}],"properties":[{"name":"serverName","type":"string","default":["serverName","\"\""]},{"name":"ownerEmailAddress","type":"string","default":["ownerEmailAddress","\"\""]},{"name":"ownerPhoneNumber","type":"string","default":["ownerPhoneNumber","\"\""]},{"name":"active","type":"boolean","default":["active","false"]},{"name":"bucketName","type":"string","default":["bucketName","\"\""]},{"name":"database","type":"string","default":["database","\"\""]},{"name":"host","type":"string","default":["host","\"\""]},{"name":"forwardHost","type":"string","default":["forwardHost","\"\""]},{"name":"forwardPrivateKey","type":"string","default":["forwardPrivateKey","\"\""]},{"name":"forwardPublicKey","type":"string","default":["forwardPublicKey","\"\""]},{"name":"environmentVariables","type":"string","default":["environmentVariables","\"\""]},{"name":"maxStorageGB","type":"number","default":["maxStorageGB","0"]}],"relations":[{"name":"dnsZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"}]}
-);
-modelEntitySchemas["VirtualServer"] = VirtualServer;
-
-export interface IDnsZone extends IClrEntity {
-	readonly zoneID?: number;
-	serverID?: number;
-	zone?: string;
-	keySigningKeyID?: number;
-	zoneSigningKeyID?: number;
-	dateCreated?: DateTime;
-	dateUpdated?: DateTime;
-	signed?: string | null;
-	unsigned?: string | null;
-	virtualServer?: IVirtualServer;
-	ksk?: IDnsSigningKey;
-	zsk?: IDnsSigningKey;
-	records?: ICollection<IDnsZoneRecord>;
-}
-
-export const DnsZone: IModel<IDnsZone> = new Model<IDnsZone>(
-"DnsZone",
-["zoneID"],
-{ zone: "",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()) },
-{"name":"dns_zones","keys":[{"name":"zoneID","type":"number","generated":"identity"}],"properties":[{"name":"serverID","type":"number"},{"name":"zone","type":"string","default":["zone","\"\""]},{"name":"zoneLowerCase","type":"string","generated":"computed"},{"name":"keySigningKeyID","type":"number"},{"name":"zoneSigningKeyID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"signed","type":"string","default":["signed","\"\""]},{"name":"unsigned","type":"string","default":["unsigned","\"\""]}],"relations":[{"name":"virtualServer","fkMap":[{"fk":"serverID","relatedKey":"serverID"}],"relatedName":"VirtualServer"},{"name":"ksk","fkMap":[{"fk":"keySigningKeyID","relatedKey":"keyID"}],"relatedName":"DnsSigningKey"},{"name":"zsk","fkMap":[{"fk":"zoneSigningKeyID","relatedKey":"keyID"}],"relatedName":"DnsSigningKey"},{"name":"records","isCollection":true,"isInverse":true,"relatedName":"DnsZoneRecord"}]}
-);
-modelEntitySchemas["DnsZone"] = DnsZone;
-
-export interface IDnsZoneRecord extends IClrEntity {
-	readonly recordID?: number;
-	zoneID?: number;
-	disabled?: boolean;
-	name?: string;
-	type?: "A" | "AAAA" | "CNAME" | "MX" | "TXT" | "PTR" | "SRV" | "CAA" | "NS" | "SOA";
-	isAlias?: boolean;
-	value?: string;
-	ttl?: number;
-	dateCreated?: DateTime;
-	dateUpdated?: DateTime;
-	notes?: string | null;
-	signature?: string | null;
-	expiryDate?: DateTime | null;
-	readonly fqdn?: string | null;
-	hosted?: boolean;
-	zone?: IDnsZone;
-}
-
-export const DnsZoneRecordTypeArray = [{"label":"A","value":"A"},{"label":"AAAA","value":"AAAA"},{"label":"CNAME","value":"CNAME"},{"label":"MX","value":"MX"},{"label":"TXT","value":"TXT"},{"label":"PTR","value":"PTR"},{"label":"SRV","value":"SRV"},{"label":"CAA","value":"CAA"},{"label":"NS","value":"NS"},{"label":"SOA","value":"SOA"}];
-
-export const DnsZoneRecord: IModel<IDnsZoneRecord> = new Model<IDnsZoneRecord>(
-"DnsZoneRecord",
-["recordID"],
-{ disabled: false,name: "",type: "A",isAlias: false,value: "",ttl: 0,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),hosted: false },
-{"name":"dns_zone_records","keys":[{"name":"recordID","type":"number","generated":"identity"}],"properties":[{"name":"zoneID","type":"number"},{"name":"disabled","type":"boolean","default":["disabled","false"]},{"name":"name","type":"string","default":["name","\"\""]},{"name":"type","type":"Object","default":["type","\"A\""]},{"name":"isAlias","type":"boolean","default":["isAlias","false"]},{"name":"value","type":"string","default":["value","\"\""]},{"name":"ttl","type":"number","default":["ttl","0"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"notes","type":"string","default":["notes","\"\""]},{"name":"signature","type":"string","default":["signature","\"\""]},{"name":"expiryDate","type":"DateTime","default":["expiryDate","new DefaultFactory(() => new DateTime())"]},{"name":"fqdn","type":"string","default":["fqdn","\"\""]},{"name":"hosted","type":"boolean","default":["hosted","false"]}],"relations":[{"name":"zone","fkMap":[{"fk":"zoneID","relatedKey":"zoneID"}],"relatedName":"DnsZone"}]}
-);
-modelEntitySchemas["DnsZoneRecord"] = DnsZoneRecord;
-
-export interface IDnsSigningKey extends IClrEntity {
-	readonly keyID?: number;
-	publicKey?: string;
-	digestAlgorithm?: number;
-	signingAlgorithm?: number;
-	digest?: string;
-	flags?: number;
-	dateCreated?: DateTime;
-	expiryDate?: DateTime;
-	fileName?: string;
-	kskZones?: ICollection<IDnsZone>;
-	zskZones?: ICollection<IDnsZone>;
-}
-
-export const DnsSigningKey: IModel<IDnsSigningKey> = new Model<IDnsSigningKey>(
-"DnsSigningKey",
-["keyID"],
-{ publicKey: "",digestAlgorithm: 0,signingAlgorithm: 0,digest: "",flags: 0,dateCreated: new DefaultFactory(() => new DateTime()),expiryDate: new DefaultFactory(() => new DateTime()),fileName: "" },
-{"name":"dns_signing_keys","keys":[{"name":"keyID","type":"number","generated":"identity"}],"properties":[{"name":"publicKey","type":"string","default":["publicKey","\"\""]},{"name":"privateKey","type":"string","default":["privateKey","\"\""]},{"name":"digestAlgorithm","type":"number","default":["digestAlgorithm","0"]},{"name":"signingAlgorithm","type":"number","default":["signingAlgorithm","0"]},{"name":"digest","type":"string","default":["digest","\"\""]},{"name":"flags","type":"number","default":["flags","0"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"expiryDate","type":"DateTime","default":["expiryDate","new DefaultFactory(() => new DateTime())"]},{"name":"fileName","type":"string","default":["fileName","\"\""]}],"relations":[{"name":"kskZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"},{"name":"zskZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"}]}
-);
-modelEntitySchemas["DnsSigningKey"] = DnsSigningKey;
-
 const fixRelatedSchemas = (schema) => {
 for (const key in schema) {
 if (Object.prototype.hasOwnProperty.call(schema, key)) {

package/src/services/contacts/ContactService.ts

@@ -12,7 +12,7 @@ export default class ContactService {
     async get(id) {
         return this.entityService.query(Contact)
             .where({ id}, (p) => (x) => x.contactID === p.id)
-            .include((x) => [x.addresses, x.items, x.emails, x.phones, x.domain])
+            .include((x) => [x.addresses, x.items, x.emails, x.phones, x.hostedDomain])
             .firstOrDefault();
     }