@pnp/cli-microsoft365 6.0.0-beta.38c66cf → 6.0.0-beta.3a04435

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

@@ -1,38 +1,55 @@
 "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 _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initOptionSets;
 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");
 class OutlookMessageListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.MESSAGE_LIST;
     }
     get description() {
         return 'Gets all mail messages from the specified folder';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.folderId = typeof args.options.folderId !== 'undefined';
-        telemetryProps.folderName = typeof args.options.folderName !== 'undefined';
-        return telemetryProps;
-    }
     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) {
@@ -67,31 +84,24 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
             }, err => reject(err));
         });
     }
-    options() {
-        const options = [
-            {
-                option: '--folderName [folderName]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--folderId [folderId]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.folderId &&
-            !args.options.folderName) {
-            return 'Specify folderId or folderName';
-        }
-        if (args.options.folderId &&
-            args.options.folderName) {
-            return 'Specify either folderId or folderName but not both';
-        }
-        return true;
-    }
 }
+_OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand_initTelemetry = function _OutlookMessageListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderId: typeof args.options.folderId !== 'undefined',
+            folderName: typeof args.options.folderName !== 'undefined'
+        });
+    });
+}, _OutlookMessageListCommand_initOptions = function _OutlookMessageListCommand_initOptions() {
+    this.options.unshift({
+        option: '--folderName [folderName]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--folderId [folderId]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    });
+}, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
+    this.optionSets.push(['folderId', 'folderName']);
+};
 module.exports = new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map

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

@@ -1,4 +1,19 @@
 "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 _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -6,45 +21,43 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
 class OutlookMessageMoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _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_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.MESSAGE_MOVE;
     }
     get description() {
         return 'Moves message to the specified folder';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.sourceFolderId = typeof args.options.sourceFolderId !== 'undefined';
-        telemetryProps.sourceFolderName = typeof args.options.sourceFolderName !== 'undefined';
-        telemetryProps.targetFolderId = typeof args.options.targetFolderId !== 'undefined';
-        telemetryProps.targetFolderName = typeof args.options.targetFolderName !== 'undefined';
-        return telemetryProps;
-    }
-    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.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) {
@@ -76,50 +89,34 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
             }, err => reject(err));
         });
     }
-    options() {
-        const options = [
-            {
-                option: '--messageId <messageId>'
-            },
-            {
-                option: '--sourceFolderName [sourceFolderName]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--sourceFolderId [sourceFolderId]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--targetFolderName [targetFolderName]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--targetFolderId [targetFolderId]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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_instances = new WeakSet(), _OutlookMessageMoveCommand_initTelemetry = function _OutlookMessageMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            sourceFolderId: typeof args.options.sourceFolderId !== 'undefined',
+            sourceFolderName: typeof args.options.sourceFolderName !== 'undefined',
+            targetFolderId: typeof args.options.targetFolderId !== 'undefined',
+            targetFolderName: typeof args.options.targetFolderName !== 'undefined'
+        });
+    });
+}, _OutlookMessageMoveCommand_initOptions = function _OutlookMessageMoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--sourceFolderName [sourceFolderName]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--sourceFolderId [sourceFolderId]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--targetFolderName [targetFolderName]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--targetFolderId [targetFolderId]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    });
+}, _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,44 +1,65 @@
 "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 _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 {
+    constructor() {
+        super();
+        _OutlookRoomListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookRoomListCommand_instances, "m", _OutlookRoomListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookRoomListCommand_instances, "m", _OutlookRoomListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.ROOM_LIST;
     }
     get description() {
         return 'Get a collection of all available rooms';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.roomlistEmail = typeof args.options.roomlistEmail !== 'undefined';
-        return telemetryProps;
-    }
     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));
-    }
-    options() {
-        const options = [
-            {
-                option: '--roomlistEmail [roomlistEmail]'
+    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);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_OutlookRoomListCommand_instances = new WeakSet(), _OutlookRoomListCommand_initTelemetry = function _OutlookRoomListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            roomlistEmail: typeof args.options.roomlistEmail !== 'undefined'
+        });
+    });
+}, _OutlookRoomListCommand_initOptions = function _OutlookRoomListCommand_initOptions() {
+    this.options.unshift({
+        option: '--roomlistEmail [roomlistEmail]'
+    });
+};
 module.exports = new OutlookRoomListCommand();
 //# sourceMappingURL=room-list.js.map

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

@@ -17,7 +17,6 @@ exports.default = {
     REPORT_MAILBOXUSAGEQUOTASTATUSMAILBOXCOUNTS: `${prefix} report mailboxusagequotastatusmailboxcounts`,
     REPORT_MAILBOXUSAGESTORAGE: `${prefix} report mailboxusagestorage`,
     ROOM_LIST: `${prefix} room list`,
-    ROOMLIST_LIST: `${prefix} roomlist list`,
-    SENDMAIL: `${prefix} sendmail`
+    ROOMLIST_LIST: `${prefix} roomlist list`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -1,75 +1,91 @@
 "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 _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 validation_1 = require("../../../../utils/validation");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 const paAppListCommand = require("../app/app-list");
 class PaAppGetCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaAppGetCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Gets information about the specified Microsoft Power App';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
-        return telemetryProps;
-    }
     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) {
@@ -80,7 +96,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;
@@ -89,30 +105,29 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
         app.owner = app.properties.owner.email || '';
         return app;
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '-d, --displayName [displayName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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)) {
+}
+_PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = function _PaAppGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined'
+        });
+    });
+}, _PaAppGetCommand_initOptions = function _PaAppGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name [name]'
+    }, {
+        option: '-d, --displayName [displayName]'
+    });
+}, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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']);
+};
 module.exports = new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map