@pnp/cli-microsoft365 6.0.0-beta.f782445 → 6.0.0-beta.fa2dfa8

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

@@ -0,0 +1,97 @@
+"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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry, _OutlookMessageGetCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OutlookMessageGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.MESSAGE_GET;
+    }
+    get description() {
+        return 'Retrieves specified message';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAuth ? 'app only permissions' : 'delegated permissions'}`);
+                }
+                let requestUrl = '';
+                if (isAppOnlyAuth) {
+                    if (!args.options.userId && !args.options.userPrincipalName) {
+                        throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                    }
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                    }
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                }
+                else {
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                    }
+                    if (args.options.userId || args.options.userPrincipalName) {
+                        requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                    }
+                    else {
+                        requestUrl += 'me';
+                    }
+                }
+                requestUrl += `/messages/${args.options.id}`;
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${requestUrl}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_initTelemetry = function _OutlookMessageGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+        });
+    });
+}, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userPrincipalName [userPrincipalName]'
+    });
+};
+module.exports = new OutlookMessageGetCommand();
+//# sourceMappingURL=message-get.js.map

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,8 @@ 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 formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
@@ -29,17 +39,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) {
@@ -53,7 +64,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
         }
         return new Promise((resolve, reject) => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${encodeURIComponent(args.options.folderName)}'&$select=id`,
+                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.folderName)}'&$select=id`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -91,7 +102,7 @@ _OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
 }, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
-    this.optionSets.push(['folderId', 'folderName']);
+    this.optionSets.push({ options: ['folderId', 'folderName'] });
 };
 module.exports = new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map

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");
@@ -8,6 +17,7 @@ var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemet
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
@@ -25,31 +35,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) {
@@ -60,7 +69,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         }
         return new Promise((resolve, reject) => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${encodeURIComponent(folderName)}'&$select=id`,
+                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(folderName)}'&$select=id`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -108,7 +117,7 @@ _OutlookMessageMoveCommand_instances = new WeakSet(), _OutlookMessageMoveCommand
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
 }, _OutlookMessageMoveCommand_initOptionSets = function _OutlookMessageMoveCommand_initOptionSets() {
-    this.optionSets.push(['sourceFolderId', 'sourceFolderName'], ['targetFolderId', 'targetFolderName']);
+    this.optionSets.push({ options: ['sourceFolderId', 'sourceFolderName'] }, { options: ['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");
@@ -6,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookRoomListCommand_instances, _OutlookRoomListCommand_initTelemetry, _OutlookRoomListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListCommand extends GraphCommand_1.default {
@@ -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 odata_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,6 +1,15 @@
 "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 odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListListCommand extends GraphCommand_1.default {
@@ -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 odata_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/outlook/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'outlook';
 exports.default = {
     MAIL_SEND: `${prefix} mail send`,
+    MESSAGE_GET: `${prefix} message get`,
     MESSAGE_LIST: `${prefix} message list`,
     MESSAGE_MOVE: `${prefix} message move`,
     REPORT_MAILACTIVITYCOUNTS: `${prefix} report mailactivitycounts`,

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 const paAppListCommand = require("../app/app-list");
@@ -39,54 +40,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/${formatting_1.formatting.encodeQueryParameter(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) {
@@ -97,7 +97,7 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     setProperties(app) {
         app.displayName = app.properties.displayName;
@@ -122,13 +122,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 && !utils_1.validation.isValidGuid(args.options.name)) {
+        if (args.options.name && !validation_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']);
+    this.optionSets.push({ options: ['name', 'displayName'] });
 };
 module.exports = new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppListCommand_instances, _PaAppListCommand_initTelemetry, _PaAppListCommand_initOptions, _PaAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaAppListCommand extends PowerAppsCommand_1.default {
@@ -35,24 +36,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/' + formatting_1.formatting.encodeQueryParameter(args.options.environment) : ''}/apps?api-version=2017-08-01`;
+            try {
+                const apps = yield odata_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() {