@social-mail/social-mail-client 1.2.72 → 1.2.74

package/src/model/model.ts

@@ -317,7 +317,7 @@ export interface IEmail extends IClrEntity {
 	subscriberActivities?: ICollection<ISubscriberActivity>;
 }
 
-export const EmailStatusArray = [{"label":"queued","value":"queued"},{"label":"received","value":"received"},{"label":"draft","value":"draft"},{"label":"published","value":"published"},{"label":"pending-approval","value":"pending-approval"},{"label":"scheduled","value":"scheduled"},{"label":"sent","value":"sent"},{"label":"sent-failed","value":"sent-failed"}];
+export const EmailStatusArray = [{"label":"queued","value":"queued"},{"label":"received","value":"received"},{"label":"draft","value":"draft"},{"label":"published","value":"published"},{"label":"pending-approval","value":"pending-approval"},{"label":"scheduled","value":"scheduled"},{"label":"sent","value":"sent"},{"label":"sent-failed","value":"sent-failed"},{"label":"deleted","value":"deleted"}];
 
 export const Email: IModel<IEmail> = new Model<IEmail>("Email", ["emailID"], { senderName: "",received: false,dateReceived: new DefaultFactory(() => new DateTime()),dateCreated: new DefaultFactory(() => new DateTime()),status: "queued",forwardCount: 0,replyCount: 0,viewCount: 0,originalFileSize: 0 });
 
@@ -420,6 +420,7 @@ export interface IMailbox extends IClrEntity {
 	dateEngaged?: DateTime | null;
 	username?: string;
 	name?: string;
+	notify?: boolean;
 	emailAddress?: IEmailAddress;
 	domain?: IHostedDomain;
 	logo?: IAppFile;
@@ -462,6 +463,7 @@ export interface IMailboxContact extends IClrEntity {
 	blocked?: boolean;
 	mute?: boolean;
 	status?: "invited" | "added" | "active" | "unsubscribed" | "blocked";
+	notify?: boolean;
 	emailAddressText?: string;
 	name?: string;
 	mailbox?: IMailbox;
@@ -600,11 +602,11 @@ export interface IUser extends IClrEntity {
 	contacts?: ICollection<IContact>;
 	domainUsers?: ICollection<IDomainUser>;
 	pins?: ICollection<IUserPin>;
+	userPushSubscriptions?: ICollection<IUserPushSubscription>;
 	roles?: ICollection<IUserRole>;
 	userMailboxes?: ICollection<IUserMailbox>;
 	authFactors?: ICollection<IUserAuthFactor>;
 	publishedWebSiteVersions?: ICollection<IWebSiteFolderVersion>;
-	licenses?: ICollection<IAppLicense>;
 }
 
 export const UserStatusArray = [{"label":"active","value":"active"},{"label":"blocked","value":"blocked"},{"label":"locked","value":"locked"},{"label":"change-password","value":"change-password"},{"label":"external","value":"external"}];
@@ -623,6 +625,17 @@ export interface IUserPin extends IClrEntity {
 
 export const UserPin: IModel<IUserPin> = new Model<IUserPin>("UserPin", ["pinID"], {  });
 
+export interface IUserPushSubscription extends IClrEntity {
+	readonly subscriptionID?: number;
+	userID?: number;
+	mailboxID?: number | null;
+	emailAddressID?: number | null;
+	notify?: boolean;
+	user?: IUser;
+}
+
+export const UserPushSubscription: IModel<IUserPushSubscription> = new Model<IUserPushSubscription>("UserPushSubscription", ["subscriptionID"], { notify: false });
+
 export interface IUserRole extends IClrEntity {
 	userID?: number;
 	roleName?: string;
@@ -738,115 +751,3 @@ export interface ITag extends IClrEntity {
 }
 
 export const Tag: IModel<ITag> = new Model<ITag>("Tag", ["tagID"], { name: "",isSystemTag: false });
-
-export interface IProduct extends IClrEntity {
-	productID?: string;
-	name?: string;
-	description?: string | null;
-	prices?: ICollection<IProductPrice>;
-}
-
-export const Product: IModel<IProduct> = new Model<IProduct>("Product", ["productID"], { name: "" });
-
-export interface IProductPrice extends IClrEntity {
-	priceID?: string;
-	productID?: string;
-	quantity?: number;
-	amount?: number;
-	isActive?: boolean;
-	currency?: string;
-	product?: IProduct;
-	licenses?: ICollection<IAppLicense>;
-}
-
-export const ProductPrice: IModel<IProductPrice> = new Model<IProductPrice>("ProductPrice", ["priceID"], { quantity: 0,amount: 0,isActive: false,currency: "" });
-
-export interface IAppLicense extends IClrEntity {
-	readonly licenseID?: number;
-	customerID?: number;
-	priceID?: string;
-	dateCreated?: DateTime;
-	dateExpiry?: DateTime;
-	dateUpdated?: DateTime;
-	maxCores?: number;
-	licenseCode?: string;
-	customer?: IUser;
-	price?: IProductPrice;
-}
-
-export const AppLicense: IModel<IAppLicense> = new Model<IAppLicense>("AppLicense", ["licenseID","priceID"], { dateCreated: new DefaultFactory(() => new DateTime()),dateExpiry: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),maxCores: 0,licenseCode: "" });
-
-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 });
-
-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()) });
-
-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 });
-
-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: "" });

package/src/services/WebPushService.ts

@@ -48,30 +48,9 @@ export default class WebPushService {
         return s;
     }
     async updateRegistration(s: PushSubscription) {
-        const endpoint = s.endpoint;
-        const expirationTime = s.expirationTime;
 
-        const toHex = (a: ArrayBuffer) => {
-            let n = "";
-            const u = new Uint8Array(a);
-            for (const iterator of u) {
-                n += iterator.toString(16).padStart(2, '0');
-            }
-            return n;
-        };
-
-        const p256dh = toHex(s.getKey("p256dh"));
-        const auth = toHex(s.getKey("auth"));
-        const json = {
-            endpoint,
-            expirationTime,
-            keys: {
-                p256dh,
-                auth
-            }
-        };
         const session = await this.entityService.query(LoginSession, "currentUser").firstOrDefault();
-        session.deviceToken = JSON.stringify(json);
+        session.deviceToken = JSON.stringify(s);
         session.deviceTokenType = "WebPush";
         const cloner = this.entityService.cloner(session);
         await this.entityService.save(cloner.copy);

package/src/web/page/mails/MailboxContacts.tsx

@@ -22,6 +22,8 @@ import Switch from "@web-atoms/web-controls/dist/basic/Switch";
 import Checkbox from "@web-atoms/web-controls/dist/basic/Checkbox";
 import ToggleButtonBar from "@web-atoms/web-controls/dist/basic/ToggleButtonBar";
 import AddMiniContactPage from "./contact/AddMiniContactPage";
+import PopupService from "@web-atoms/core/dist/web/services/PopupService";
+import MailboxService from "../../../common/pages/mailboxes/services/MailboxService";
 
 const css = styled.css `
 &[data-page-type=master-detail] {
@@ -166,6 +168,7 @@ export default class MailsPage extends MasterDetailPage {
         //     </div>}
         //     /></div>;
         document.title = mailbox.emailAddress?.emailAddress;
+        this.updateNotifications(mailbox);
         if (isMobileView) {
             this.headerRenderer = () => <div data-layout="row">
                 <input value={Bind.twoWaysImmediate(() => this.search)} type="search" placeholder="Sender Search"/>
@@ -325,4 +328,24 @@ export default class MailsPage extends MasterDetailPage {
         this.selectedThread = existing;
     }
 
+    @Action({ onEvent: "update-mailbox-notify"})
+    async updateMailboxNotify() {
+        const m = this.currentMailbox;
+        const message = m.notify
+            ? `Disable notification for this ${m.emailAddress?.name || ""} ${m.emailAddress?.emailAddress}?`
+            : `Enable notification for this ${m.emailAddress?.name || ""} ${m.emailAddress?.emailAddress}?`;
+        if(!await PopupService.confirm({ message , title :"Are you sure"})) {
+            return;
+        }
+        await this.resolve(MailboxService).toggleNotify(m);
+        this.updateNotifications(m);
+    }
+
+    private updateNotifications(mailbox: IMailbox) {
+        this.actionRenderer = () => <i
+            class={mailbox.notify ? "fad fa-bell" : "fad fa-bell-slash"}
+            title={mailbox.notify ? "Disable Notifications" : "Enable Notifications"}
+            data-click-event="update-mailbox-notify" />;
+    }
+
 }

package/src/web/page/mails/service/MailService.ts

@@ -1,7 +1,7 @@
 import DISingleton from "@web-atoms/core/dist/di/DISingleton";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import EntityService from "../../../../services/EntityService";
-import { AppFile, Email, EmailAddress, IAppFile, IEmail, Mailbox, MailboxContact } from "../../../../model/model";
+import { AppFile, Email, EmailAddress, IAppFile, IEmail, Mailbox, MailboxContact, UserPushSubscription } from "../../../../model/model";
 import { Sql } from "../../../../common/Sql";
 import { CommonEvents } from "../../../../common/events/CommonEvents";
 
@@ -12,10 +12,15 @@ export default class MailService {
     private entityService: EntityService;
 
     async mailbox(mailboxID: number) {
-        return this.entityService.query(Mailbox)
+        const mb = await this.entityService.query(Mailbox)
             .where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID)
             .include((x) => x.emailAddress)
             .firstOrDefault();
+        const notify = await this.entityService.query(UserPushSubscription)
+            .where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID && x.emailAddressID === null)
+            .firstOrDefault();
+        mb.notify = !!notify;
+        return mb;
     }
 
     async list({