nylas 6.2.2 → 6.3.2

package/lib/config.d.ts

@@ -9,6 +9,7 @@ export declare type NylasConfig = {
 };
 export declare type AuthenticateUrlConfig = {
     redirectURI: string;
+    redirectOnError?: boolean;
     loginHint?: string;
     state?: string;
     provider?: string;

package/lib/models/calendar-availability.d.ts

@@ -64,10 +64,12 @@ export declare class CalendarConsecutiveAvailability extends Model implements Ca
 }
 export declare type CalendarAvailabilityProperties = {
     timeSlots: TimeSlotProperties[];
+    order?: string[];
 };
 export default class CalendarAvailability extends Model implements CalendarAvailabilityProperties {
     object: string;
     timeSlots: TimeSlot[];
+    order?: string[];
     static attributes: Record<string, Attribute>;
     constructor(props?: CalendarAvailabilityProperties);
 }

package/lib/models/calendar-availability.js

@@ -112,6 +112,9 @@ var CalendarAvailability = /** @class */ (function (_super) {
             jsonKey: 'time_slots',
             itemClass: free_busy_1.TimeSlot,
         }),
+        order: attributes_1.default.StringList({
+            modelKey: 'order',
+        }),
     };
     return CalendarAvailability;
 }(model_1.default));

package/lib/models/calendar-restful-model-collection.js

@@ -67,8 +67,8 @@ var CalendarRestfulModelCollection = /** @class */ (function (_super) {
                 callback(null, json);
             }
             var freeBusy = [];
-            for (var _i = 0, _a = JSON.parse(json); _i < _a.length; _i++) {
-                var fb = _a[_i];
+            for (var _i = 0, json_1 = json; _i < json_1.length; _i++) {
+                var fb = json_1[_i];
                 freeBusy.push(new free_busy_1.default().fromJSON(fb));
             }
             return Promise.resolve(freeBusy);

package/lib/models/draft.d.ts

@@ -7,6 +7,7 @@ export declare type DraftProperties = MessageProperties & {
     rawMime?: string;
     replyToMessageId?: string;
     version?: number;
+    fileIdsToAttach?: string[];
 };
 export default class Draft extends Message implements DraftProperties {
     rawMime?: string;

package/lib/models/free-busy.d.ts

@@ -20,12 +20,14 @@ export declare type TimeSlotProperties = {
     status: string;
     startTime: number;
     endTime: number;
+    emails?: string[];
 };
 export declare class TimeSlot extends Model implements TimeSlotProperties {
     object: string;
     status: string;
     startTime: number;
     endTime: number;
+    emails?: string[];
     static attributes: Record<string, Attribute>;
     constructor(props?: TimeSlotProperties);
 }

package/lib/models/free-busy.js

@@ -66,6 +66,9 @@ var TimeSlot = /** @class */ (function (_super) {
             modelKey: 'endTime',
             jsonKey: 'end_time',
         }),
+        emails: attributes_1.default.StringList({
+            modelKey: 'emails',
+        }),
     };
     return TimeSlot;
 }(model_1.default));

package/lib/models/job-status-restful-model-collection.d.ts

@@ -0,0 +1,9 @@
+import RestfulModelCollection from './restful-model-collection';
+import JobStatus from './job-status';
+import NylasConnection from '../nylas-connection';
+export default class JobStatusRestfulModelCollection extends RestfulModelCollection<JobStatus> {
+    connection: NylasConnection;
+    modelClass: typeof JobStatus;
+    constructor(connection: NylasConnection);
+    protected createModel(json: Record<string, unknown>): JobStatus;
+}

package/lib/models/job-status-restful-model-collection.js

@@ -0,0 +1,38 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var restful_model_collection_1 = __importDefault(require("./restful-model-collection"));
+var job_status_1 = __importDefault(require("./job-status"));
+var outbox_job_status_1 = __importDefault(require("./outbox-job-status"));
+var JobStatusRestfulModelCollection = /** @class */ (function (_super) {
+    __extends(JobStatusRestfulModelCollection, _super);
+    function JobStatusRestfulModelCollection(connection) {
+        var _this = _super.call(this, job_status_1.default, connection) || this;
+        _this.connection = connection;
+        _this.modelClass = job_status_1.default;
+        return _this;
+    }
+    JobStatusRestfulModelCollection.prototype.createModel = function (json) {
+        if (json['object'] && json['object'] === 'message') {
+            return new outbox_job_status_1.default(this.connection).fromJSON(json);
+        }
+        return new this.modelClass(this.connection).fromJSON(json);
+    };
+    return JobStatusRestfulModelCollection;
+}(restful_model_collection_1.default));
+exports.default = JobStatusRestfulModelCollection;

package/lib/models/message-restful-model-collection.js

@@ -51,6 +51,12 @@ var MessageRestfulModelCollection = /** @class */ (function (_super) {
             };
             delete options.view;
         }
+        // If only one message ID was passed in, use the normal find function
+        if (messageIds.length == 1) {
+            return this.find(messageIds[0], options).then(function (message) {
+                return [message];
+            });
+        }
         return this.range(__assign({ path: this.path() + "/" + messageIds.join() }, options));
     };
     /**

package/lib/models/model-collection.d.ts

@@ -5,6 +5,7 @@ export default class ModelCollection<T extends Model> {
     connection: NylasConnection;
     modelClass: any;
     _path: string;
+    baseUrl?: string;
     constructor(modelClass: any, connection: NylasConnection, path: string);
     forEach(params: Record<string, unknown> | undefined, eachCallback: (item: T) => void, completeCallback?: (err?: Error | null | undefined) => void): void;
     list(params?: Record<string, unknown>, callback?: (error: Error | null, obj?: T[]) => void): Promise<T[]>;

package/lib/models/model-collection.js

@@ -157,6 +157,7 @@ var ModelCollection = /** @class */ (function () {
                 method: 'GET',
                 path: path,
                 qs: __assign(__assign({}, params), { offset: offset, limit: limit }),
+                baseUrl: this.baseUrl,
             });
         }
         return this.getModelCollection(params, offset, limit, path);
@@ -172,6 +173,7 @@ var ModelCollection = /** @class */ (function () {
             method: 'GET',
             path: this.path() + "/" + id,
             qs: params,
+            baseUrl: this.baseUrl,
         })
             .then(function (json) {
             var model = _this.createModel(json);
@@ -185,6 +187,7 @@ var ModelCollection = /** @class */ (function () {
             method: 'GET',
             path: path,
             qs: __assign(__assign({}, params), { offset: offset, limit: limit }),
+            baseUrl: this.baseUrl,
         })
             .then(function (jsonArray) {
             var models = jsonArray.map(function (json) {

package/lib/models/outbox-job-status.d.ts

@@ -1,21 +1,20 @@
 import OutboxMessage, { OutboxMessageProperties } from './outbox-message';
-import Model from './model';
 import { Attribute } from './attributes';
 import NylasConnection from '../nylas-connection';
-export declare type OutboxJobStatusProperties = {
-    jobStatusId: string;
-    accountId: string;
-    status: string;
+import JobStatus, { JobStatusProperties } from './job-status';
+export declare type OutboxJobStatusProperties = JobStatusProperties & {
+    messageId?: string;
+    threadId?: string;
+    sendAt?: Date;
+    originalSendAt?: Date;
     originalData?: OutboxMessageProperties;
 };
-export default class OutboxJobStatus extends Model implements OutboxJobStatusProperties {
-    jobStatusId: string;
-    status: string;
-    accountId: string;
+export default class OutboxJobStatus extends JobStatus implements OutboxJobStatusProperties {
+    messageId?: string;
+    threadId?: string;
+    sendAt?: Date;
+    originalSendAt?: Date;
     originalData?: OutboxMessage;
-    private _connection?;
     static attributes: Record<string, Attribute>;
-    constructor(props?: OutboxJobStatusProperties);
-    get connection(): NylasConnection | undefined;
-    fromJSON(json: Record<string, unknown>, connection?: NylasConnection): this;
+    constructor(connection: NylasConnection, props?: OutboxJobStatusProperties);
 }

package/lib/models/outbox-job-status.js

@@ -12,59 +12,53 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var outbox_message_1 = __importDefault(require("./outbox-message"));
-var model_1 = __importDefault(require("./model"));
 var attributes_1 = __importDefault(require("./attributes"));
+var job_status_1 = __importDefault(require("./job-status"));
 var OutboxJobStatus = /** @class */ (function (_super) {
     __extends(OutboxJobStatus, _super);
-    function OutboxJobStatus(props) {
-        var _this = _super.call(this) || this;
-        _this.jobStatusId = '';
-        _this.status = '';
-        _this.accountId = '';
+    function OutboxJobStatus(connection, props) {
+        var _this = _super.call(this, connection, props) || this;
         _this.initAttributes(props);
         return _this;
     }
-    Object.defineProperty(OutboxJobStatus.prototype, "connection", {
-        get: function () {
-            return this._connection;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    OutboxJobStatus.prototype.fromJSON = function (json, connection) {
-        // Allow a connection object to be passed in to instantiate a Calendar sub object
-        if (connection) {
-            this._connection = connection;
-        }
-        return _super.prototype.fromJSON.call(this, json);
-    };
-    OutboxJobStatus.attributes = {
-        jobStatusId: attributes_1.default.String({
-            modelKey: 'jobStatusId',
-            jsonKey: 'job_status_id',
+    OutboxJobStatus.attributes = __assign(__assign({}, job_status_1.default.attributes), { messageId: attributes_1.default.String({
+            modelKey: 'messageId',
+            jsonKey: 'message_id',
+            readOnly: true,
+        }), threadId: attributes_1.default.String({
+            modelKey: 'threadId',
+            jsonKey: 'thread_id',
             readOnly: true,
-        }),
-        status: attributes_1.default.String({
-            modelKey: 'status',
+        }), sendAt: attributes_1.default.DateTime({
+            modelKey: 'sendAt',
+            jsonKey: 'send_at',
             readOnly: true,
-        }),
-        accountId: attributes_1.default.String({
-            modelKey: 'accountId',
-            jsonKey: 'account_id',
+        }), originalSendAt: attributes_1.default.DateTime({
+            modelKey: 'originalSendAt',
+            jsonKey: 'original_send_at',
             readOnly: true,
-        }),
-        originalData: attributes_1.default.Object({
+        }), originalData: attributes_1.default.Object({
             modelKey: 'originalData',
             jsonKey: 'original_data',
             itemClass: outbox_message_1.default,
             readOnly: true,
-        }),
-    };
+        }) });
     return OutboxJobStatus;
-}(model_1.default));
+}(job_status_1.default));
 exports.default = OutboxJobStatus;

package/lib/models/outbox.js

@@ -58,7 +58,7 @@ var Outbox = /** @class */ (function () {
             body: body,
         })
             .then(function (json) {
-            var message = new outbox_job_status_1.default().fromJSON(json, _this.connection);
+            var message = new outbox_job_status_1.default(_this.connection).fromJSON(json);
             if (options.callback) {
                 options.callback(null, message);
             }
@@ -85,7 +85,7 @@ var Outbox = /** @class */ (function () {
             path: "/" + jobStatusId,
             body: body,
         }).then(function (json) {
-            var message = new outbox_job_status_1.default().fromJSON(json, _this.connection);
+            var message = new outbox_job_status_1.default(_this.connection).fromJSON(json);
             return Promise.resolve(message);
         });
     };

package/lib/models/restful-model-collection.d.ts

@@ -4,7 +4,6 @@ import ModelCollection from './model-collection';
 export declare type GetCallback = (error: Error | null, result?: RestfulModel) => void;
 export default class RestfulModelCollection<T extends RestfulModel> extends ModelCollection<any> {
     modelClass: typeof RestfulModel;
-    baseUrl?: string;
     constructor(modelClass: typeof RestfulModel, connection: NylasConnection);
     count(params?: Record<string, unknown>, callback?: (err: Error | null, num?: number) => void): Promise<number>;
     first(params?: Record<string, unknown>, callback?: (error: Error | null, model?: T) => void): Promise<T>;

package/lib/models/scheduler-restful-model-collection.d.ts

@@ -14,6 +14,7 @@ export declare type ProviderAvailability = {
 export default class SchedulerRestfulModelCollection extends RestfulModelCollection<Scheduler> {
     connection: NylasConnection;
     modelClass: typeof Scheduler;
+    baseUrl: string;
     constructor(connection: NylasConnection);
     getGoogleAvailability(): Promise<ProviderAvailability>;
     getOffice365Availability(): Promise<ProviderAvailability>;

package/lib/nylas-connection.d.ts

@@ -10,7 +10,6 @@ import Thread from './models/thread';
 import Draft from './models/draft';
 import File from './models/file';
 import Event from './models/event';
-import JobStatus from './models/job-status';
 import Resource from './models/resource';
 import Folder, { Label } from './models/folder';
 import { AppendOptions } from 'form-data';
@@ -20,6 +19,7 @@ import SchedulerRestfulModelCollection from './models/scheduler-restful-model-co
 import MessageRestfulModelCollection from './models/message-restful-model-collection';
 import DeltaCollection from './models/delta-collection';
 import Outbox from './models/outbox';
+import JobStatusRestfulModelCollection from './models/job-status-restful-model-collection';
 export declare enum AuthMethod {
     BASIC = 0,
     BEARER = 1
@@ -50,7 +50,7 @@ export default class NylasConnection {
     drafts: RestfulModelCollection<Draft>;
     files: RestfulModelCollection<File>;
     calendars: CalendarRestfulModelCollection;
-    jobStatuses: RestfulModelCollection<JobStatus>;
+    jobStatuses: JobStatusRestfulModelCollection;
     events: RestfulModelCollection<Event>;
     resources: RestfulModelCollection<Resource>;
     deltas: DeltaCollection;

package/lib/nylas-connection.js

@@ -34,7 +34,6 @@ var thread_1 = __importDefault(require("./models/thread"));
 var draft_1 = __importDefault(require("./models/draft"));
 var file_1 = __importDefault(require("./models/file"));
 var event_1 = __importDefault(require("./models/event"));
-var job_status_1 = __importDefault(require("./models/job-status"));
 var resource_1 = __importDefault(require("./models/resource"));
 var folder_1 = __importStar(require("./models/folder"));
 var form_data_1 = __importDefault(require("form-data"));
@@ -45,6 +44,7 @@ var scheduler_restful_model_collection_1 = __importDefault(require("./models/sch
 var message_restful_model_collection_1 = __importDefault(require("./models/message-restful-model-collection"));
 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 PACKAGE_JSON = require('../package.json');
 var SDK_VERSION = PACKAGE_JSON.version;
 var SUPPORTED_API_VERSION = '2.5';
@@ -62,7 +62,7 @@ var NylasConnection = /** @class */ (function () {
         this.drafts = new restful_model_collection_1.default(draft_1.default, this);
         this.files = new restful_model_collection_1.default(file_1.default, this);
         this.calendars = new calendar_restful_model_collection_1.default(this);
-        this.jobStatuses = new restful_model_collection_1.default(job_status_1.default, this);
+        this.jobStatuses = new job_status_restful_model_collection_1.default(this);
         this.events = new restful_model_collection_1.default(event_1.default, this);
         this.resources = new restful_model_collection_1.default(resource_1.default, this);
         this.deltas = new delta_collection_1.default(this);
@@ -194,6 +194,7 @@ var NylasConnection = /** @class */ (function () {
                 }
                 if (response.status > 299) {
                     return response
+                        .clone()
                         .json()
                         .then(function (body) {
                         var error = new nylas_api_error_1.default(response.status, body.type, body.message);
@@ -237,13 +238,18 @@ var NylasConnection = /** @class */ (function () {
                     }
                     else if (response.headers.get('content-length') &&
                         Number(response.headers.get('content-length')) == 0) {
-                        return resolve();
+                        return resolve(undefined);
                     }
                     else if (response.headers.get('Content-Type') === 'message/rfc822') {
                         return resolve(response.text());
                     }
                     else {
-                        return resolve(response.json());
+                        return response
+                            .clone()
+                            .json()
+                            .catch(function () { return response.text(); })
+                            .then(function (data) { return resolve(data); })
+                            .catch(function () { return resolve(undefined); });
                     }
                 }
             })

package/lib/nylas.d.ts

@@ -23,5 +23,10 @@ declare class Nylas {
     static application(options?: ApplicationDetailsProperties): Promise<ApplicationDetails>;
     static exchangeCodeForToken(code: string, callback?: (error: Error | null, accessToken?: string) => void): Promise<AccessToken>;
     static urlForAuthentication(options: AuthenticateUrlConfig): string;
+    /**
+     * Revoke a single access token
+     * @param accessToken The access token to revoke
+     */
+    static revoke(accessToken: string): Promise<void>;
 }
 export = Nylas;

package/lib/nylas.js

@@ -163,8 +163,23 @@ var Nylas = /** @class */ (function () {
         if (options.provider != null) {
             url += "&provider=" + options.provider;
         }
+        if (options.redirectOnError) {
+            url += '&redirect_on_error=true';
+        }
         return url;
     };
+    /**
+     * Revoke a single access token
+     * @param accessToken The access token to revoke
+     */
+    Nylas.revoke = function (accessToken) {
+        return Nylas.with(accessToken)
+            .request({
+            method: 'POST',
+            path: '/oauth/revoke',
+        })
+            .catch(function (err) { return Promise.reject(err); });
+    };
     Nylas.clientId = '';
     return Nylas;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nylas",
-  "version": "6.2.2",
+  "version": "6.3.2",
   "description": "A NodeJS wrapper for the Nylas REST API for email, contacts, and calendar.",
   "main": "lib/nylas.js",
   "types": "lib/nylas.d.ts",