@pallasoft/ps-mail 1.2.0 → 1.4.0

package/dist/microsoft/constants/graph-mail-config.d.ts

@@ -23,6 +23,8 @@ export declare const GraphMailConfig: {
         readonly filter: "$filter";
         readonly select: "$select";
         readonly receivedSinceFilter: "receivedDateTime ge ";
+        readonly internetMessageIdFilter: "internetMessageId eq ";
+        readonly top: "$top";
     };
     readonly prefer: {
         readonly immutableIds: "IdType=\"ImmutableId\"";
@@ -33,6 +35,9 @@ export declare const GraphMailConfig: {
     readonly deltaPageSize: 50;
     readonly deltaFields: readonly ["id", "conversationId", "internetMessageId", "subject", "from", "sender", "toRecipients", "ccRecipients", "replyTo", "receivedDateTime", "sentDateTime", "hasAttachments", "isDraft", "categories", "bodyPreview"];
     readonly messageFields: readonly ["id", "conversationId", "internetMessageId", "subject", "from", "sender", "toRecipients", "ccRecipients", "replyTo", "receivedDateTime", "sentDateTime", "hasAttachments", "isDraft", "categories", "bodyPreview", "body", "uniqueBody", "internetMessageHeaders"];
+    readonly filterQuote: "'";
+    readonly locateFields: readonly ["id", "isDraft", "conversationId", "internetMessageId"];
+    readonly locateTop: "1";
     readonly attachmentFields: readonly ["id", "name", "contentType", "size", "isInline"];
     readonly syncResetErrorCodes: readonly ["syncstatenotfound", "syncstateinvalid", "resyncrequired"];
     readonly retry: {

package/dist/microsoft/constants/graph-mail-config.js

@@ -26,6 +26,8 @@ exports.GraphMailConfig = {
         filter: '$filter',
         select: '$select',
         receivedSinceFilter: 'receivedDateTime ge ',
+        internetMessageIdFilter: 'internetMessageId eq ',
+        top: '$top',
     },
     prefer: {
         immutableIds: 'IdType="ImmutableId"',
@@ -71,6 +73,9 @@ exports.GraphMailConfig = {
         'uniqueBody',
         'internetMessageHeaders',
     ],
+    filterQuote: "'",
+    locateFields: ['id', 'isDraft', 'conversationId', 'internetMessageId'],
+    locateTop: '1',
     attachmentFields: ['id', 'name', 'contentType', 'size', 'isInline'],
     syncResetErrorCodes: ['syncstatenotfound', 'syncstateinvalid', 'resyncrequired'],
     retry: {

package/dist/microsoft/index.d.ts

@@ -1,3 +1,3 @@
 export { GraphMailBodyType, GraphMailErrorReason, GraphMailFolder, GraphMailLifecycleEvent, } from './constants';
-export { GraphMailErrorService, GraphMailService } from './services';
-export type { GraphCredentials, GraphMailBodyData, GraphMailConnection, GraphMailDeltaData, GraphMailDeltaOptions, GraphMailDeltaPageData, GraphMailDraftData, GraphMailErrorData, GraphMailFileData, GraphMailHeaderData, GraphMailMessageData, GraphMailNotificationData, GraphMailNotificationPayloadData, GraphMailRecipientData, GraphMailRemovedData, GraphMailReplyData, GraphMailSubscriptionData, GraphMailSubscriptionOptions, GraphMailUploadSessionData, } from './models';
+export { GraphMailErrorService, GraphMailService, GraphTokenService } from './services';
+export type { GraphCredentials, GraphMailBodyData, GraphMailConnection, GraphMailDeltaData, GraphMailDeltaOptions, GraphMailDeltaPageData, GraphMailDraftData, GraphMailErrorData, GraphMailFileData, GraphMailHeaderData, GraphMailLocatedData, GraphMailMessageData, GraphMailNotificationData, GraphMailNotificationPayloadData, GraphMailRecipientData, GraphMailRemovedData, GraphMailReplyData, GraphMailSubscriptionData, GraphMailSubscriptionOptions, GraphMailUploadSessionData, } from './models';

package/dist/microsoft/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphMailService = exports.GraphMailErrorService = exports.GraphMailLifecycleEvent = exports.GraphMailFolder = exports.GraphMailErrorReason = exports.GraphMailBodyType = void 0;
+exports.GraphTokenService = exports.GraphMailService = exports.GraphMailErrorService = exports.GraphMailLifecycleEvent = exports.GraphMailFolder = exports.GraphMailErrorReason = exports.GraphMailBodyType = void 0;
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "GraphMailBodyType", { enumerable: true, get: function () { return constants_1.GraphMailBodyType; } });
 Object.defineProperty(exports, "GraphMailErrorReason", { enumerable: true, get: function () { return constants_1.GraphMailErrorReason; } });
@@ -9,3 +9,4 @@ Object.defineProperty(exports, "GraphMailLifecycleEvent", { enumerable: true, ge
 var services_1 = require("./services");
 Object.defineProperty(exports, "GraphMailErrorService", { enumerable: true, get: function () { return services_1.GraphMailErrorService; } });
 Object.defineProperty(exports, "GraphMailService", { enumerable: true, get: function () { return services_1.GraphMailService; } });
+Object.defineProperty(exports, "GraphTokenService", { enumerable: true, get: function () { return services_1.GraphTokenService; } });

package/dist/microsoft/models/graph-mail-draft-data.d.ts

@@ -10,4 +10,5 @@ export interface GraphMailDraftData {
     replyTo?: MailAddressData[];
     attachments?: GraphMailFileData[];
     headers?: GraphMailHeaderData[];
+    internetMessageId?: string;
 }

package/dist/microsoft/models/graph-mail-located-data.d.ts

@@ -0,0 +1,6 @@
+export interface GraphMailLocatedData {
+    id: string;
+    isDraft: boolean;
+    conversationId: string | null;
+    internetMessageId: string | null;
+}

package/dist/microsoft/models/graph-mail-located-data.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/microsoft/models/graph-mail-outgoing-message-data.d.ts

@@ -7,5 +7,6 @@ export interface GraphMailOutgoingMessageData {
     toRecipients?: GraphMailRecipientData[];
     ccRecipients?: GraphMailRecipientData[];
     replyTo?: GraphMailRecipientData[];
+    internetMessageId?: string;
     internetMessageHeaders?: GraphMailHeaderData[];
 }

package/dist/microsoft/models/graph-mail-reply-data.d.ts

@@ -1,6 +1,7 @@
 import type { MailAddressData } from '../../models/mail-address-data';
 import type { GraphMailBodyData } from './graph-mail-body-data';
 import type { GraphMailFileData } from './graph-mail-file-data';
+import type { GraphMailHeaderData } from './graph-mail-header-data';
 export interface GraphMailReplyData {
     body: GraphMailBodyData;
     subject?: string;
@@ -8,4 +9,6 @@ export interface GraphMailReplyData {
     cc?: MailAddressData[];
     replyTo?: MailAddressData[];
     attachments?: GraphMailFileData[];
+    headers?: GraphMailHeaderData[];
+    internetMessageId?: string;
 }

package/dist/microsoft/models/index.d.ts

@@ -15,6 +15,7 @@ export type { GraphMailErrorData } from './graph-mail-error-data';
 export type { GraphMailFileAttachmentRequest } from './graph-mail-file-attachment-request';
 export type { GraphMailFileData } from './graph-mail-file-data';
 export type { GraphMailHeaderData } from './graph-mail-header-data';
+export type { GraphMailLocatedData } from './graph-mail-located-data';
 export type { GraphMailMessageData } from './graph-mail-message-data';
 export type { GraphMailNotificationData } from './graph-mail-notification-data';
 export type { GraphMailNotificationPayloadData } from './graph-mail-notification-payload-data';

package/dist/microsoft/services/graph-mail-service.d.ts

@@ -8,6 +8,7 @@ import type { GraphMailDeltaOptions } from '../models/graph-mail-delta-options';
 import type { GraphMailDeltaPageData } from '../models/graph-mail-delta-page-data';
 import type { GraphMailDraftData } from '../models/graph-mail-draft-data';
 import type { GraphMailFileData } from '../models/graph-mail-file-data';
+import type { GraphMailLocatedData } from '../models/graph-mail-located-data';
 import type { GraphMailMessageData } from '../models/graph-mail-message-data';
 import type { GraphMailReplyData } from '../models/graph-mail-reply-data';
 import type { GraphMailSubscriptionData } from '../models/graph-mail-subscription-data';
@@ -21,6 +22,10 @@ export declare class GraphMailService {
     static downloadAttachment(connection: GraphMailConnection, messageId: string, attachmentId: string): Promise<MailAttachmentContentData>;
     static sendMail(connection: GraphMailConnection, draft: GraphMailDraftData): Promise<void>;
     static createAndSend(connection: GraphMailConnection, draft: GraphMailDraftData): Promise<MailSentData>;
+    static createDraft(connection: GraphMailConnection, draft: GraphMailDraftData): Promise<MailSentData>;
+    static createReplyDraft(connection: GraphMailConnection, messageId: string, reply: GraphMailReplyData): Promise<MailSentData>;
+    static sendDraft(connection: GraphMailConnection, messageId: string): Promise<void>;
+    static locate(connection: GraphMailConnection, internetMessageId: string): Promise<GraphMailLocatedData | null>;
     static addAttachment(connection: GraphMailConnection, messageId: string, file: GraphMailFileData): Promise<void>;
     static createUploadSession(connection: GraphMailConnection, messageId: string, file: GraphMailFileData): Promise<GraphMailUploadSessionData>;
     static reply(connection: GraphMailConnection, messageId: string, reply: GraphMailReplyData): Promise<MailSentData>;

package/dist/microsoft/services/graph-mail-service.js

@@ -216,6 +216,22 @@ var GraphMailService = /** @class */ (function () {
         });
     };
     GraphMailService.createAndSend = function (connection, draft) {
+        return __awaiter(this, void 0, void 0, function () {
+            var created;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.createDraft(connection, draft)];
+                    case 1:
+                        created = _a.sent();
+                        return [4 /*yield*/, this.sendDraft(connection, created.id)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, created];
+                }
+            });
+        });
+    };
+    GraphMailService.createDraft = function (connection, draft) {
         return __awaiter(this, void 0, void 0, function () {
             var created;
             return __generator(this, function (_a) {
@@ -230,14 +246,78 @@ var GraphMailService = /** @class */ (function () {
                         return [4 /*yield*/, this._attach(connection, created.id, draft.attachments)];
                     case 2:
                         _a.sent();
-                        return [4 /*yield*/, this._send(connection, created.id)];
-                    case 3:
+                        return [2 /*return*/, this._sent(created)];
+                }
+            });
+        });
+    };
+    GraphMailService.createReplyDraft = function (connection, messageId, reply) {
+        return __awaiter(this, void 0, void 0, function () {
+            var request, created;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        request = { message: this._outgoing(reply) };
+                        return [4 /*yield*/, graph_request_service_1.GraphRequestService.json(connection, {
+                                method: ps_utilities_1.HttpMethod.Post,
+                                url: mail_url_service_1.MailUrlService.path(this._messagePath(connection, messageId), graph_mail_config_1.GraphMailConfig.paths.createReply),
+                                body: request,
+                            })];
+                    case 1:
+                        created = _a.sent();
+                        return [4 /*yield*/, this._attach(connection, created.id, reply.attachments)];
+                    case 2:
                         _a.sent();
                         return [2 /*return*/, this._sent(created)];
                 }
             });
         });
     };
+    GraphMailService.sendDraft = function (connection, messageId) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._send(connection, messageId)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    GraphMailService.locate = function (connection, internetMessageId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var quote, page, found;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        quote = graph_mail_config_1.GraphMailConfig.filterQuote;
+                        return [4 /*yield*/, graph_request_service_1.GraphRequestService.json(connection, {
+                                method: ps_utilities_1.HttpMethod.Get,
+                                url: mail_url_service_1.MailUrlService.withQuery(mail_url_service_1.MailUrlService.path(this._mailboxPath(connection), graph_mail_config_1.GraphMailConfig.paths.messages), [
+                                    {
+                                        key: graph_mail_config_1.GraphMailConfig.query.filter,
+                                        value: "".concat(graph_mail_config_1.GraphMailConfig.query.internetMessageIdFilter).concat(quote).concat(internetMessageId.split(quote).join(quote + quote)).concat(quote),
+                                    },
+                                    this._select(graph_mail_config_1.GraphMailConfig.locateFields),
+                                    { key: graph_mail_config_1.GraphMailConfig.query.top, value: graph_mail_config_1.GraphMailConfig.locateTop },
+                                ]),
+                            })];
+                    case 1:
+                        page = _a.sent();
+                        found = page.value[0];
+                        if (found === undefined)
+                            return [2 /*return*/, null];
+                        return [2 /*return*/, {
+                                id: found.id,
+                                isDraft: found.isDraft === true,
+                                conversationId: typeof found.conversationId === 'string' ? found.conversationId : null,
+                                internetMessageId: typeof found.internetMessageId === 'string' ? found.internetMessageId : null,
+                            }];
+                }
+            });
+        });
+    };
     GraphMailService.addAttachment = function (connection, messageId, file) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, _b, _c, request, _d, _e, _f, _g;
@@ -295,25 +375,16 @@ var GraphMailService = /** @class */ (function () {
     };
     GraphMailService.reply = function (connection, messageId, reply) {
         return __awaiter(this, void 0, void 0, function () {
-            var request, created;
+            var created;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        request = { message: this._outgoing(reply) };
-                        return [4 /*yield*/, graph_request_service_1.GraphRequestService.json(connection, {
-                                method: ps_utilities_1.HttpMethod.Post,
-                                url: mail_url_service_1.MailUrlService.path(this._messagePath(connection, messageId), graph_mail_config_1.GraphMailConfig.paths.createReply),
-                                body: request,
-                            })];
+                    case 0: return [4 /*yield*/, this.createReplyDraft(connection, messageId, reply)];
                     case 1:
                         created = _a.sent();
-                        return [4 /*yield*/, this._attach(connection, created.id, reply.attachments)];
+                        return [4 /*yield*/, this.sendDraft(connection, created.id)];
                     case 2:
                         _a.sent();
-                        return [4 /*yield*/, this._send(connection, created.id)];
-                    case 3:
-                        _a.sent();
-                        return [2 /*return*/, this._sent(created)];
+                        return [2 /*return*/, created];
                 }
             });
         });
@@ -436,8 +507,10 @@ var GraphMailService = /** @class */ (function () {
             outgoing.ccRecipients = this._recipients(message.cc);
         if (message.replyTo !== undefined)
             outgoing.replyTo = this._recipients(message.replyTo);
-        if ('headers' in message && message.headers !== undefined)
+        if (message.headers !== undefined)
             outgoing.internetMessageHeaders = message.headers;
+        if (message.internetMessageId !== undefined)
+            outgoing.internetMessageId = message.internetMessageId;
         return outgoing;
     };
     GraphMailService._recipients = function (addresses) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pallasoft/ps-mail",
-	"version": "1.2.0",
+	"version": "1.4.0",
 	"private": false,
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",