@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initValidators;
+var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -26,7 +26,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         _OutlookMessageMoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.MESSAGE_MOVE;
@@ -34,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.messageId}`;
-            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.messageId}`;
+                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) {
@@ -116,26 +115,8 @@ _OutlookMessageMoveCommand_instances = new WeakSet(), _OutlookMessageMoveCommand
         option: '--targetFolderId [targetFolderId]',
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
-}, _OutlookMessageMoveCommand_initValidators = function _OutlookMessageMoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.sourceFolderId &&
-            !args.options.sourceFolderName) {
-            return 'Specify sourceFolderId or sourceFolderName';
-        }
-        if (args.options.sourceFolderId &&
-            args.options.sourceFolderName) {
-            return 'Specify either sourceFolderId or sourceFolderName but not both';
-        }
-        if (!args.options.targetFolderId &&
-            !args.options.targetFolderName) {
-            return 'Specify targetFolderId or targetFolderName';
-        }
-        if (args.options.targetFolderId &&
-            args.options.targetFolderName) {
-            return 'Specify either targetFolderId or targetFolderName but not both';
-        }
-        return true;
-    }));
+}, _OutlookMessageMoveCommand_initOptionSets = function _OutlookMessageMoveCommand_initOptionSets() {
+    this.optionSets.push(['sourceFolderId', 'sourceFolderName'], ['targetFolderId', 'targetFolderName']);
 };
 module.exports = new OutlookMessageMoveCommand();
 //# sourceMappingURL=message-move.js.map

package/dist/m365/outlook/commands/room/room-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");
@@ -25,17 +34,20 @@ class OutlookRoomListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'phone', 'emailAddress'];
     }
-    commandAction(logger, args, cb) {
-        let endpoint = `${this.resource}/v1.0/places/microsoft.graph.room`;
-        if (args.options.roomlistEmail) {
-            endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
-        }
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((rooms) => {
-            logger.log(rooms);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let endpoint = `${this.resource}/v1.0/places/microsoft.graph.room`;
+            if (args.options.roomlistEmail) {
+                endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
+            }
+            try {
+                const rooms = yield utils_1.odata.getAllItems(endpoint);
+                logger.log(rooms);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _OutlookRoomListCommand_instances = new WeakSet(), _OutlookRoomListCommand_initTelemetry = function _OutlookRoomListCommand_initTelemetry() {

package/dist/m365/outlook/commands/roomlist/roomlist-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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -13,13 +22,16 @@ class OutlookRoomListListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'phone', 'emailAddress'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`)
-            .then((roomLists) => {
-            logger.log(roomLists);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const roomLists = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`);
+                logger.log(roomLists);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new OutlookRoomListListCommand();

package/dist/m365/pa/commands/app/app-get.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators;
+var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_GET;
@@ -38,54 +39,53 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName', 'description', 'appVersion', 'owner'];
     }
-    commandAction(logger, args, cb) {
-        if (args.options.name) {
-            const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Power App with name '${args.options.name}'...`);
-            }
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                logger.log(this.setProperties(res));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Power App with displayName '${args.options.displayName}'...`);
-            }
-            this
-                .getApps(args, logger)
-                .then((getAppsOutput) => {
-                const allApps = JSON.parse(getAppsOutput.stdout);
-                if (allApps.length > 0) {
-                    const app = allApps.find((a) => {
-                        return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
-                    });
-                    if (!!app) {
-                        logger.log(this.setProperties(app));
-                    }
-                    else {
-                        if (this.verbose) {
-                            logger.logToStderr(`No app found with displayName '${args.options.displayName}'`);
-                        }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.name) {
+                    const requestOptions = {
+                        url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                        headers: {
+                            accept: 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving information about Microsoft Power App with name '${args.options.name}'...`);
                     }
+                    const res = yield request_1.default.get(requestOptions);
+                    logger.log(this.setProperties(res));
                 }
                 else {
                     if (this.verbose) {
-                        logger.logToStderr('No apps found');
+                        logger.logToStderr(`Retrieving information about Microsoft Power App with displayName '${args.options.displayName}'...`);
+                    }
+                    const getAppsOutput = yield this.getApps(args, logger);
+                    const allApps = JSON.parse(getAppsOutput.stdout);
+                    if (allApps.length > 0) {
+                        const app = allApps.find((a) => {
+                            return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
+                        });
+                        if (!!app) {
+                            logger.log(this.setProperties(app));
+                        }
+                        else {
+                            if (this.verbose) {
+                                logger.logToStderr(`No app found with displayName '${args.options.displayName}'`);
+                            }
+                        }
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.logToStderr('No apps found');
+                        }
                     }
                 }
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getApps(args, logger) {
         if (this.verbose) {
@@ -121,17 +121,13 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.name && !args.options.displayName) {
-            return 'Specify either name or displayName';
-        }
-        if (args.options.name && args.options.displayName) {
-            return 'Specify either name or displayName but not both';
-        }
         if (args.options.name && !utils_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;
     }));
+}, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {
+    this.optionSets.push(['name', 'displayName']);
 };
 module.exports = new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/pa/commands/app/app-list.js

@@ -35,24 +35,27 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
-        utils_1.odata
-            .getAllItems(url)
-            .then((apps) => {
-            if (apps.length > 0) {
-                apps.forEach(a => {
-                    a.displayName = a.properties.displayName;
-                });
-                logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No apps found');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
+            try {
+                const apps = yield utils_1.odata.getAllItems(url);
+                if (apps.length > 0) {
+                    apps.forEach(a => {
+                        a.displayName = a.properties.displayName;
+                    });
+                    logger.log(apps);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No apps found');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _PaAppListCommand_instances = new WeakSet(), _PaAppListCommand_initTelemetry = function _PaAppListCommand_initTelemetry() {

package/dist/m365/pa/commands/app/app-remove.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PaAppRemoveCommand_instances, _PaAppRemoveCommand_initTelemetry, _PaAppRemoveCommand_initOptions, _PaAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
+const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
@@ -34,48 +35,47 @@ class PaAppRemoveCommand extends PowerAppsCommand_1.default {
     get description() {
         return 'Removes the specified Microsoft Power App';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
-        }
-        const removePaApp = () => {
-            const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2017-08-01`,
-                resolveWithFullResponse: true,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(() => cb(), (rawRes) => {
-                if (rawRes.response && rawRes.response.status === 403) {
-                    cb(`App '${args.options.name}' does not exist`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
+            }
+            const removePaApp = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2017-08-01`,
+                    resolveWithFullResponse: true,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    this.handleRejectedODataJsonPromise(rawRes, logger, cb);
+                catch (err) {
+                    if (err.response && err.response.status === 403) {
+                        throw new Command_1.CommandError(`App '${args.options.name}' does not exist`);
+                    }
+                    else {
+                        this.handleRejectedODataJsonPromise(err);
+                    }
                 }
             });
-        };
-        if (args.options.confirm) {
-            removePaApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Microsoft Power App ${args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removePaApp();
+            if (args.options.confirm) {
+                yield removePaApp();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the Microsoft Power App ${args.options.name}?`
+                });
+                if (result.continue) {
+                    yield removePaApp();
                 }
-            });
-        }
+            }
+        });
     }
 }
 _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry = function _PaAppRemoveCommand_initTelemetry() {