nylas 6.9.0 → 6.11.0

package/lib/config.d.ts

@@ -1,10 +1,13 @@
 import { WebhookTriggers } from './models/webhook';
+import LoggingInterface from './models/LoggingInterface';
 export declare let apiServer: string | null;
 export declare function setApiServer(newApiServer: string | null): void;
 export declare let clientSecret: string;
 export declare function setClientSecret(newClientSecret: string): void;
 export declare let timeout: number;
 export declare function setTimeout(newTimeout: number): void;
+export declare let logger: LoggingInterface | undefined;
+export declare function setLogger(newLogger?: LoggingInterface): void;
 export declare type NylasConfig = {
     /** Nylas application client ID */
     clientId: string;
@@ -14,6 +17,8 @@ export declare type NylasConfig = {
     apiServer?: string;
     /** Timeout for outgoing API calls, in milliseconds */
     timeout?: number;
+    /** Logger to redirect log messages to your application. */
+    logger?: LoggingInterface;
 };
 export declare enum ResponseType {
     CODE = "code",

package/lib/config.js

@@ -17,6 +17,11 @@ function setTimeout(newTimeout) {
     exports.timeout = newTimeout;
 }
 exports.setTimeout = setTimeout;
+exports.logger = undefined;
+function setLogger(newLogger) {
+    exports.logger = newLogger;
+}
+exports.setLogger = setLogger;
 var ResponseType;
 (function (ResponseType) {
     ResponseType["CODE"] = "code";

package/lib/models/LoggingInterface.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Logging interface to redirect log messages to your application.
+ */
+export default interface LoggingInterface {
+    /**
+     * Log a warning message.
+     * @param message The message to log.
+     */
+    warn(message: string): void;
+    /**
+     * Log an error message.
+     * @param message The error message to log.
+     */
+    error(message: string): void;
+}

package/lib/models/LoggingInterface.js

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

package/lib/models/attributes.js

@@ -86,12 +86,10 @@ var AttributeNumber = /** @class */ (function (_super) {
         return val;
     };
     AttributeNumber.prototype.fromJSON = function (val) {
-        if (!isNaN(Number(val))) {
-            return Number(val);
-        }
-        else {
+        if (val === null || isNaN(Number(val))) {
             return null;
         }
+        return Number(val);
     };
     return AttributeNumber;
 }(Attribute));
@@ -109,8 +107,8 @@ var AttributeNumberList = /** @class */ (function (_super) {
         }
         var nums = [];
         for (var num in json) {
-            if (!isNaN(Number(num))) {
-                nums.push(Number(num));
+            if (!isNaN(Number(json[num]))) {
+                nums.push(Number(json[num]));
             }
         }
         return nums;

package/lib/models/draft.js

@@ -66,7 +66,11 @@ var Draft = /** @class */ (function (_super) {
         if (this.rawMime) {
             throw Error('saveRequestBody() cannot be called for raw MIME drafts');
         }
-        return _super.prototype.saveRequestBody.call(this);
+        var json = _super.prototype.saveRequestBody.call(this);
+        if (this.replyToMessageId !== undefined && this.replyToMessageId === '') {
+            delete json.reply_to_message_id;
+        }
+        return json;
     };
     Draft.prototype.deleteRequestBody = function (params) {
         if (params === void 0) { params = {}; }

package/lib/models/event.js

@@ -148,6 +148,9 @@ var Event = /** @class */ (function (_super) {
         if (this.id && json.participants) {
             json.participants.forEach(function (participant) { return delete participant.status; });
         }
+        if (this.visibility !== undefined && this.visibility === '') {
+            delete json.visibility;
+        }
         return json;
     };
     Event.prototype.rsvp = function (status, comment, callback) {

package/lib/models/webhook-notification.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import Model from './model';
 import { Attribute } from './attributes';
 export declare type LinkClickProperties = {
@@ -121,4 +122,12 @@ export default class WebhookNotification extends Model implements WebhookNotific
     deltas: WebhookDelta[];
     static attributes: Record<string, Attribute>;
     constructor(props?: WebhookNotificationProperties);
+    /**
+     * Verify incoming webhook signature came from Nylas
+     * @param xNylasSignature The signature to verify
+     * @param rawBody The raw body from the payload
+     * @param clientSecret Overriding client secret of the app receiving the webhook
+     * @return true if the webhook signature was verified from Nylas
+     */
+    static verifyWebhookSignature(xNylasSignature: string, rawBody: Buffer, clientSecret?: string): boolean;
 }

package/lib/models/webhook-notification.js

@@ -15,9 +15,18 @@ var __extends = (this && this.__extends) || (function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+var crypto_1 = __importDefault(require("crypto"));
 var model_1 = __importDefault(require("./model"));
 var attributes_1 = __importDefault(require("./attributes"));
+var config = __importStar(require("../config"));
 var LinkClick = /** @class */ (function (_super) {
     __extends(LinkClick, _super);
     function LinkClick(props) {
@@ -276,6 +285,24 @@ var WebhookNotification = /** @class */ (function (_super) {
         _this.initAttributes(props);
         return _this;
     }
+    /**
+     * Verify incoming webhook signature came from Nylas
+     * @param xNylasSignature The signature to verify
+     * @param rawBody The raw body from the payload
+     * @param clientSecret Overriding client secret of the app receiving the webhook
+     * @return true if the webhook signature was verified from Nylas
+     */
+    WebhookNotification.verifyWebhookSignature = function (xNylasSignature, rawBody, clientSecret) {
+        var clientSecretToUse = clientSecret || config.clientSecret;
+        if (!clientSecretToUse) {
+            throw new Error('Client secret is required to verify webhook signature');
+        }
+        var digest = crypto_1.default
+            .createHmac('sha256', clientSecretToUse)
+            .update(rawBody)
+            .digest('hex');
+        return digest === xNylasSignature;
+    };
     WebhookNotification.attributes = {
         deltas: attributes_1.default.Collection({
             modelKey: 'deltas',

package/lib/nylas-connection.js

@@ -48,6 +48,7 @@ var delta_collection_1 = __importDefault(require("./models/delta-collection"));
 var outbox_1 = __importDefault(require("./models/outbox"));
 var job_status_restful_model_collection_1 = __importDefault(require("./models/job-status-restful-model-collection"));
 var rate_limit_error_1 = __importDefault(require("./models/rate-limit-error"));
+var config_1 = require("./config");
 var PACKAGE_JSON = require('../package.json');
 var SDK_VERSION = PACKAGE_JSON.version;
 var SUPPORTED_API_VERSION = '2.5';
@@ -189,7 +190,7 @@ var NylasConnection = /** @class */ (function () {
             controller = new abort_controller_1.default();
             timeout = setTimeout(function () {
                 controller.abort();
-            }, 150);
+            }, config.timeout);
         }
         return new Promise(function (resolve, reject) {
             return node_fetch_1.default(req, { signal: controller === null || controller === void 0 ? void 0 : controller.signal })
@@ -201,7 +202,7 @@ var NylasConnection = /** @class */ (function () {
                 var apiVersion = response.headers.get('nylas-api-version');
                 var warning = _this.getWarningForVersion(SUPPORTED_API_VERSION, apiVersion);
                 if (warning) {
-                    console.warn(warning);
+                    config_1.logger === null || config_1.logger === void 0 ? void 0 : config_1.logger.warn(warning);
                 }
                 if (response.status > 299) {
                     return response.text().then(function (body) {
@@ -266,10 +267,10 @@ var NylasConnection = /** @class */ (function () {
             })
                 .catch(function (err) {
                 if (err && err.name && err.name === 'AbortError') {
-                    console.warn('Request timed out');
+                    config_1.logger === null || config_1.logger === void 0 ? void 0 : config_1.logger.warn('Request timed out');
                     return reject(err);
                 }
-                console.error("Error encountered during request:\n" + err.stack);
+                config_1.logger === null || config_1.logger === void 0 ? void 0 : config_1.logger.error("Error encountered during request:\n" + err.stack);
                 return reject(err);
             })
                 .then(function () {

package/lib/nylas.d.ts

@@ -8,6 +8,7 @@ import Webhook from './models/webhook';
 import { AuthenticateUrlConfig, NylasConfig } from './config';
 import AccessToken from './models/access-token';
 import ApplicationDetails, { ApplicationDetailsProperties } from './models/application-details';
+import LoggingInterface from './models/LoggingInterface';
 declare class Nylas {
     static clientId: string;
     static get clientSecret(): string;
@@ -16,6 +17,8 @@ declare class Nylas {
     static set apiServer(newApiServer: string | null);
     static get timeout(): number;
     static set timeout(timeout: number);
+    static get logger(): LoggingInterface | undefined;
+    static set logger(timeout: LoggingInterface | undefined);
     static accounts: ManagementModelCollection<ManagementAccount> | RestfulModelCollection<Account>;
     static connect: Connect;
     static webhooks: ManagementModelCollection<Webhook>;

package/lib/nylas.js

@@ -57,6 +57,17 @@ var Nylas = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(Nylas, "logger", {
+        get: function () {
+            return config.logger;
+        },
+        // Logger to redirect log messages to your application
+        set: function (timeout) {
+            config.setLogger(timeout);
+        },
+        enumerable: true,
+        configurable: true
+    });
     Nylas.config = function (config) {
         if (config.apiServer && config.apiServer.indexOf('://') === -1) {
             throw new Error('Please specify a fully qualified URL for the API Server.');
@@ -74,6 +85,9 @@ var Nylas = /** @class */ (function () {
             this.apiServer = 'https://api.nylas.com';
         }
         this.timeout = config.timeout || 0;
+        if (config.logger) {
+            this.logger = config.logger;
+        }
         var conn = new nylas_connection_1.default(this.clientSecret, {
             clientId: this.clientId,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nylas",
-  "version": "6.9.0",
+  "version": "6.11.0",
   "description": "A NodeJS wrapper for the Nylas REST API for email, contacts, and calendar.",
   "main": "lib/nylas.js",
   "types": "lib/nylas.d.ts",
@@ -47,7 +47,7 @@
     "backoff": "^2.5.0",
     "form-data": "^4.0.0",
     "JSONStream": "^1.3.5",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.12",
     "uuid": "^8.3.2",
     "websocket": "^1.0.34"
   },