@pnp/cli-microsoft365 6.0.0-beta.550f33a → 6.0.0-beta.55cbe4a

package/dist/m365/graph/commands/schemaextension/schemaextension-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionSetCommand_instances, _GraphSchemaExtensionSetCommand_initTelemetry, _GraphSchemaExtensionSetCommand_initOptions, _GraphSchemaExtensionSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class GraphSchemaExtensionSetCommand extends GraphCommand_1.default {
@@ -33,65 +33,68 @@ class GraphSchemaExtensionSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates a Microsoft Graph schema extension';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Updating schema extension with id '${args.options.id}'...`);
-        }
-        // The default request data always contains owner
-        const data = {
-            owner: args.options.owner
-        };
-        // Add the description to request data if any
-        if (args.options.description) {
-            if (this.debug) {
-                logger.logToStderr(`Will update description to '${args.options.description}'...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Updating schema extension with id '${args.options.id}'...`);
             }
-            data.description = args.options.description;
-        }
-        // Add the status to request data if any
-        if (args.options.status) {
-            if (this.debug) {
-                logger.logToStderr(`Will update status to '${args.options.status}'...`);
+            // The default request data always contains owner
+            const data = {
+                owner: args.options.owner
+            };
+            // Add the description to request data if any
+            if (args.options.description) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update description to '${args.options.description}'...`);
+                }
+                data.description = args.options.description;
             }
-            data.status = args.options.status;
-        }
-        // Add the target types to request data if any
-        const targetTypes = args.options.targetTypes
-            ? args.options.targetTypes.split(',').map(t => t.trim())
-            : [];
-        if (targetTypes.length > 0) {
-            if (this.debug) {
-                logger.logToStderr(`Will update targetTypes to '${args.options.targetTypes}'...`);
+            // Add the status to request data if any
+            if (args.options.status) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update status to '${args.options.status}'...`);
+                }
+                data.status = args.options.status;
             }
-            data.targetTypes = targetTypes;
-        }
-        // Add the properties to request data if any
-        const properties = args.options.properties
-            ? JSON.parse(args.options.properties)
-            : null;
-        if (properties) {
-            if (this.debug) {
-                logger.logToStderr(`Will update properties to '${args.options.properties}'...`);
+            // Add the target types to request data if any
+            const targetTypes = args.options.targetTypes
+                ? args.options.targetTypes.split(',').map(t => t.trim())
+                : [];
+            if (targetTypes.length > 0) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update targetTypes to '${args.options.targetTypes}'...`);
+                }
+                data.targetTypes = targetTypes;
             }
-            data.properties = properties;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            data,
-            responseType: 'json'
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(() => {
-            if (this.debug) {
-                logger.logToStderr("Schema extension successfully updated.");
+            // Add the properties to request data if any
+            const properties = args.options.properties
+                ? JSON.parse(args.options.properties)
+                : null;
+            if (properties) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update properties to '${args.options.properties}'...`);
+                }
+                data.properties = properties;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
+                if (this.debug) {
+                    logger.logToStderr("Schema extension successfully updated.");
+                }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     validateProperties(propertiesString) {
         let properties = null;
@@ -148,7 +151,7 @@ _GraphSchemaExtensionSetCommand_instances = new WeakSet(), _GraphSchemaExtension
     });
 }, _GraphSchemaExtensionSetCommand_initValidators = function _GraphSchemaExtensionSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.owner)) {
+        if (!validation_1.validation.isValidGuid(args.options.owner)) {
             return `The specified owner '${args.options.owner}' is not a valid App Id`;
         }
         if (!args.options.status && !args.options.properties && !args.options.targetTypes && !args.options.description) {

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSubscriptionAddCommand_instances, _GraphSubscriptionAddCommand_initTelemetry, _GraphSubscriptionAddCommand_initOptions, _GraphSubscriptionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const DEFAULT_EXPIRATION_DELAY_IN_MINUTES_PER_RESOURCE_TYPE = {
@@ -52,31 +52,34 @@ class GraphSubscriptionAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Creates a Microsoft Graph subscription';
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            changeType: args.options.changeType,
-            resource: args.options.resource,
-            notificationUrl: args.options.notificationUrl,
-            expirationDateTime: this.getExpirationDateTimeOrDefault(logger, args)
-        };
-        if (args.options.clientState) {
-            data["clientState"] = args.options.clientState;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/subscriptions`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            data,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                changeType: args.options.changeType,
+                resource: args.options.resource,
+                notificationUrl: args.options.notificationUrl,
+                expirationDateTime: this.getExpirationDateTimeOrDefault(logger, args)
+            };
+            if (args.options.clientState) {
+                data["clientState"] = args.options.clientState;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/subscriptions`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data,
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getExpirationDateTimeOrDefault(logger, args) {
         if (args.options.expirationDateTime) {
@@ -157,7 +160,7 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (!this.isValidChangeTypes(args.options.changeType)) {
             return `The specified changeType is invalid. Valid options are 'created', 'updated' and 'deleted'`;
         }
-        if (args.options.expirationDateTime && !utils_1.validation.isValidISODateTime(args.options.expirationDateTime)) {
+        if (args.options.expirationDateTime && !validation_1.validation.isValidISODateTime(args.options.expirationDateTime)) {
             return 'The expirationDateTime is not a valid ISO date string';
         }
         if (args.options.clientState && args.options.clientState.length > 128) {

package/dist/m365/onedrive/commands/onedrive-list.js

@@ -1,8 +1,17 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../config");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const spo_1 = require("../../../utils/spo");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class OneDriveListCommand extends SpoCommand_1.default {
@@ -15,24 +24,25 @@ class OneDriveListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving list of OneDrive sites...`);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving list of OneDrive sites...`);
+                }
+                this.allSites = [];
+                yield this.getAllSites(spoAdminUrl, '0', undefined, logger);
+                logger.log(this.allSites);
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            this.allSites = [];
-            return this.getAllSites(spoAdminUrl, '0', undefined, logger);
-        })
-            .then(_ => {
-            logger.log(this.allSites);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getAllSites(spoAdminUrl, startIndex, formDigest, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
                 const requestOptions = {

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -97,17 +98,17 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
             .get(requestOptions)
             .then((site) => site.id);
     }
-    commandAction(logger, args, cb) {
-        this
-            .getEndpointUrl(args)
-            .then(endpoint => utils_1.odata.getAllItems(endpoint))
-            .then((items) => {
-            return Promise.resolve(items);
-        })
-            .then((items) => {
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const endpoint = yield this.getEndpointUrl(args);
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
@@ -120,10 +121,10 @@ _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListComma
     this.options.unshift({ option: '--userId [userId]' }, { option: '--userName [userName]' }, { option: '--groupId [groupId]' }, { option: '--groupName [groupName]' }, { option: '-u, --webUrl [webUrl]' });
 }, _OneNoteNotebookListCommand_initValidators = function _OneNoteNotebookListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.userId && args.options.userName) {

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -16,7 +16,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -32,57 +31,71 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return commands_1.default.MAIL_SEND;
     }
     get description() {
-        return 'Sends an e-mail';
+        return 'Sends an email';
     }
-    commandAction(logger, args, cb) {
-        const bodyContents = args.options.bodyContents;
-        const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
-        if (isAppOnlyAuth === true && !args.options.sender) {
-            return cb(new Command_1.CommandError(`Specify a upn or user id in the 'sender' option when using app only authentication.`));
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/${args.options.sender ? 'users/' + encodeURIComponent(args.options.sender) : 'me'}/sendMail`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            responseType: 'json',
-            data: {
-                message: {
-                    subject: args.options.subject,
-                    body: {
-                        contentType: args.options.bodyContentType || 'Text',
-                        content: bodyContents
+    commandAction(logger, args) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (isAppOnlyAuth === true && !args.options.sender) {
+                    throw `Specify a upn or user id in the 'sender' option when using app only authentication.`;
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${args.options.sender ? 'users/' + encodeURIComponent(args.options.sender) : 'me'}/sendMail`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
                     },
-                    toRecipients: args.options.to.split(',').map(e => {
-                        return {
-                            emailAddress: {
-                                address: e.trim()
-                            }
-                        };
-                    })
-                },
-                saveToSentItems: args.options.saveToSentItems
-            }
-        };
-        if (args.options.mailbox) {
-            requestOptions.data.message.from = {
-                emailAddress: {
-                    address: args.options.mailbox
+                    responseType: 'json',
+                    data: {
+                        message: {
+                            subject: args.options.subject,
+                            body: {
+                                contentType: args.options.bodyContentType || 'Text',
+                                content: args.options.bodyContents
+                            },
+                            toRecipients: this.mapEmailAddressesToRecipients(args.options.to.split(',')),
+                            ccRecipients: this.mapEmailAddressesToRecipients((_a = args.options.cc) === null || _a === void 0 ? void 0 : _a.split(',')),
+                            bccRecipients: this.mapEmailAddressesToRecipients((_b = args.options.bcc) === null || _b === void 0 ? void 0 : _b.split(',')),
+                            importance: args.options.importance
+                        },
+                        saveToSentItems: args.options.saveToSentItems
+                    }
+                };
+                if (args.options.mailbox) {
+                    requestOptions.data.message.from = {
+                        emailAddress: {
+                            address: args.options.mailbox
+                        }
+                    };
                 }
-            };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    mapEmailAddressesToRecipients(emailAddresses) {
+        if (!emailAddresses) {
+            return emailAddresses;
         }
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        return emailAddresses.map(email => ({
+            emailAddress: {
+                address: email.trim()
+            }
+        }));
     }
 }
 _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            bodyContents: typeof args.options.bodyContents !== 'undefined',
+            cc: typeof args.options.cc !== 'undefined',
+            bcc: typeof args.options.bcc !== 'undefined',
             bodyContentType: args.options.bodyContentType,
             saveToSentItems: args.options.saveToSentItems,
+            importance: args.options.importance,
             mailbox: typeof args.options.mailbox !== 'undefined',
             sender: typeof args.options.sender !== 'undefined'
         });
@@ -92,6 +105,10 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         option: '-s, --subject <subject>'
     }, {
         option: '-t, --to <to>'
+    }, {
+        option: '--cc [cc]'
+    }, {
+        option: '--bcc [bcc]'
     }, {
         option: '--sender [sender]'
     }, {
@@ -101,6 +118,9 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
     }, {
         option: '--bodyContentType [bodyContentType]',
         autocomplete: ['Text', 'HTML']
+    }, {
+        option: '--importance [importance]',
+        autocomplete: ['low', 'normal', 'high']
     }, {
         option: '--saveToSentItems [saveToSentItems]'
     });
@@ -116,6 +136,9 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             args.options.saveToSentItems !== 'false') {
             return `${args.options.saveToSentItems} is not a valid value for the saveToSentItems option. Allowed values are true|false`;
         }
+        if (args.options.importance && ['low', 'normal', 'high'].indexOf(args.options.importance) === -1) {
+            return `'${args.options.importance}' is not a valid value for the importance option. Allowed values are low|normal|high`;
+        }
         return true;
     }));
 };

package/dist/m365/outlook/commands/message/message-list.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -8,7 +17,7 @@ var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemet
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
@@ -29,17 +38,18 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['subject', 'receivedDateTime'];
     }
-    commandAction(logger, args, cb) {
-        this
-            .getFolderId(args)
-            .then((folderId) => {
-            const url = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';
-            return utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
-        })
-            .then((messages) => {
-            logger.log(messages);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const folderId = yield this.getFolderId(args);
+                const url = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';
+                const messages = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
+                logger.log(messages);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getFolderId(args) {
         if (!args.options.folderId && !args.options.folderName) {

package/dist/m365/outlook/commands/message/message-move.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -25,31 +34,30 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Moves message to the specified folder';
     }
-    commandAction(logger, args, cb) {
-        let sourceFolder;
-        let targetFolder;
-        this
-            .getFolderId(args.options.sourceFolderId, args.options.sourceFolderName)
-            .then((folderId) => {
-            sourceFolder = folderId;
-            return this.getFolderId(args.options.targetFolderId, args.options.targetFolderName);
-        })
-            .then((folderId) => {
-            targetFolder = folderId;
-            const messageUrl = `mailFolders/${sourceFolder}/messages/${args.options.id}`;
-            const requestOptions = {
-                url: `${this.resource}/v1.0/me/${messageUrl}/move`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                data: {
-                    destinationId: targetFolder
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let sourceFolder;
+            let targetFolder;
+            try {
+                sourceFolder = yield this.getFolderId(args.options.sourceFolderId, args.options.sourceFolderName);
+                targetFolder = yield this.getFolderId(args.options.targetFolderId, args.options.targetFolderName);
+                const messageUrl = `mailFolders/${sourceFolder}/messages/${args.options.id}`;
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/me/${messageUrl}/move`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    data: {
+                        destinationId: targetFolder
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getFolderId(folderId, folderName) {
         if (folderId) {