@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

package/dist/m365/aad/commands/user/user-password-validate.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");
@@ -21,23 +30,26 @@ class AadUserPasswordValidateCommand extends GraphCommand_1.default {
     get description() {
         return "Check a user's password against the organization's password validation policy";
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/beta/users/validatePassword`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: {
-                password: args.options.password
-            },
-            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* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/users/validatePassword`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    data: {
+                        password: args.options.password
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadUserPasswordValidateCommand_instances = new WeakSet(), _AadUserPasswordValidateCommand_initOptions = function _AadUserPasswordValidateCommand_initOptions() {

package/dist/m365/aad/commands/user/user-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators, _AadUserSetCommand_initOptionSets;
 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 AadUserSetCommand extends GraphCommand_1.default {
@@ -37,19 +37,24 @@ class AadUserSetCommand extends GraphCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    commandAction(logger, args, cb) {
-        const manifest = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.objectId ? args.options.objectId : args.options.userPrincipalName)}`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json',
-            data: manifest
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const manifest = this.mapRequestBody(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.objectId ? args.options.objectId : args.options.userPrincipalName)}`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json',
+                    data: manifest
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     mapRequestBody(options) {
         const requestBody = {};
@@ -93,7 +98,7 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
 }, _AadUserSetCommand_initValidators = function _AadUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.objectId &&
-            !utils_1.validation.isValidGuid(args.options.objectId)) {
+            !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/user/user-signin-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserSigninListCommand_instances, _AadUserSigninListCommand_initTelemetry, _AadUserSigninListCommand_initOptions, _AadUserSigninListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserSigninListCommand extends GraphCommand_1.default {
@@ -35,27 +36,30 @@ class AadUserSigninListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'userPrincipalName', 'appId', 'appDisplayName', 'createdDateTime'];
     }
-    commandAction(logger, args, cb) {
-        let endpoint = `${this.resource}/v1.0/auditLogs/signIns`;
-        let filter = "";
-        if (args.options.userName || args.options.userId) {
-            filter = args.options.userId ?
-                `?$filter=userId eq '${encodeURIComponent(args.options.userId)}'` :
-                `?$filter=userPrincipalName eq '${encodeURIComponent(args.options.userName)}'`;
-        }
-        if (args.options.appId || args.options.appDisplayName) {
-            filter += filter ? " and " : "?$filter=";
-            filter += args.options.appId ?
-                `appId eq '${encodeURIComponent(args.options.appId)}'` :
-                `appDisplayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
-        }
-        endpoint += filter;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((signins) => {
-            logger.log(signins);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let endpoint = `${this.resource}/v1.0/auditLogs/signIns`;
+                let filter = "";
+                if (args.options.userName || args.options.userId) {
+                    filter = args.options.userId ?
+                        `?$filter=userId eq '${encodeURIComponent(args.options.userId)}'` :
+                        `?$filter=userPrincipalName eq '${encodeURIComponent(args.options.userName)}'`;
+                }
+                if (args.options.appId || args.options.appDisplayName) {
+                    filter += filter ? " and " : "?$filter=";
+                    filter += args.options.appId ?
+                        `appId eq '${encodeURIComponent(args.options.appId)}'` :
+                        `appDisplayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+                }
+                endpoint += filter;
+                const signins = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(signins);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadUserSigninListCommand_instances = new WeakSet(), _AadUserSigninListCommand_initTelemetry = function _AadUserSigninListCommand_initTelemetry() {
@@ -85,10 +89,10 @@ _AadUserSigninListCommand_instances = new WeakSet(), _AadUserSigninListCommand_i
         if (args.options.appId && args.options.appDisplayName) {
             return 'Specify either appId or appDisplayName, but not both';
         }
-        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.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         return true;

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../Command");
 const request_1 = require("../../../request");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
@@ -36,45 +35,48 @@ class AdaptiveCardSendCommand extends AnonymousCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    commandAction(logger, args, cb) {
-        const unknownOptions = this.getUnknownOptions(args.options);
-        const unknownOptionNames = Object.getOwnPropertyNames(unknownOptions);
-        const card = this.getCard(args, unknownOptionNames, unknownOptions);
-        const requestOptions = {
-            url: args.options.url,
-            headers: {
-                'content-type': 'application/json',
-                'x-anonymous': true
-            },
-            data: {
-                type: 'message',
-                attachments: [{
-                        contentType: 'application/vnd.microsoft.card.adaptive',
-                        content: card
-                    }]
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            if (res) {
-                // when sending card to Teams succeeds, the body contains 1 which we
-                // can safely ignore
-                if (typeof res === 'string') {
-                    // when sending the webhook to Teams fails, the response is 200
-                    // but the body contains a string similar to 'Webhook message delivery
-                    // failed with error: Microsoft Teams endpoint returned HTTP error 400
-                    // with ContextId MS-CV=Qn6afVIGzEq...' which we should treat as
-                    // a failure
-                    if (res.indexOf('failed') > -1) {
-                        return cb(new Command_1.CommandError(res));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const unknownOptions = this.getUnknownOptions(args.options);
+            const unknownOptionNames = Object.getOwnPropertyNames(unknownOptions);
+            const card = this.getCard(args, unknownOptionNames, unknownOptions);
+            const requestOptions = {
+                url: args.options.url,
+                headers: {
+                    'content-type': 'application/json',
+                    'x-anonymous': true
+                },
+                data: {
+                    type: 'message',
+                    attachments: [{
+                            contentType: 'application/vnd.microsoft.card.adaptive',
+                            content: card
+                        }]
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                if (res) {
+                    // when sending card to Teams succeeds, the body contains 1 which we
+                    // can safely ignore
+                    if (typeof res === 'string') {
+                        // when sending the webhook to Teams fails, the response is 200
+                        // but the body contains a string similar to 'Webhook message delivery
+                        // failed with error: Microsoft Teams endpoint returned HTTP error 400
+                        // with ContextId MS-CV=Qn6afVIGzEq...' which we should treat as
+                        // a failure
+                        if (res.indexOf('failed') > -1) {
+                            throw res;
+                        }
+                        logger.log(res);
                     }
-                    logger.log(res);
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getCard(args, unknownOptionNames, unknownOptions) {
         // use custom card

package/dist/m365/app/commands/app-get.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 cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const AadAppGetCommand = require("../../aad/commands/app/app-get");
 const AppCommand_1 = require("../../base/AppCommand");
 const commands_1 = require("../commands");
@@ -11,22 +20,25 @@ class AppGetCommand extends AppCommand_1.default {
     get description() {
         return 'Retrieves information about the current Azure AD app';
     }
-    commandAction(logger, args, cb) {
-        const options = {
-            appId: this.appId,
-            output: 'json',
-            debug: args.options.debug,
-            verbose: args.options.verbose
-        };
-        cli_1.Cli
-            .executeCommandWithOutput(AadAppGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
-            .then((appGetOutput) => {
-            if (this.verbose) {
-                logger.logToStderr(appGetOutput.stderr);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const options = {
+                appId: this.appId,
+                output: 'json',
+                debug: args.options.debug,
+                verbose: args.options.verbose
+            };
+            try {
+                const appGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadAppGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                if (this.verbose) {
+                    logger.logToStderr(appGetOutput.stderr);
+                }
+                logger.log(JSON.parse(appGetOutput.stdout));
             }
-            logger.log(JSON.parse(appGetOutput.stdout));
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new AppGetCommand();

package/dist/m365/app/commands/app-open.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 _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const settingsNames_1 = require("../../../settingsNames");
 const AppCommand_1 = require("../../base/AppCommand");
 const commands_1 = require("../commands");
@@ -23,15 +32,21 @@ class AppOpenCommand extends AppCommand_1.default {
     get description() {
         return 'Opens Azure AD app in the Azure AD portal';
     }
-    commandAction(logger, args, cb) {
-        this.logOrOpenUrl(args, logger)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.logOrOpenUrl(args, logger);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     logOrOpenUrl(args, logger) {
         return new Promise((resolve, reject) => {
             const previewPrefix = args.options.preview === true ? "preview." : "";
             const url = `https://${previewPrefix}portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/${this.appId}/isMSAApp/`;
-            if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
+            if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
                 logger.log(`Use a web browser to open the page ${url}`);
                 return resolve();
             }

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const appGetCommand = require("../../../aad/commands/app/app-get");
 const AppCommand_1 = require("../../../base/AppCommand");
@@ -26,23 +26,25 @@ class AppPermissionListCommand extends AppCommand_1.default {
     get description() {
         return 'Lists API permissions for the current AAD app';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getServicePrincipal({ appId: this.appId }, logger, GetServicePrincipal.withPermissions)
-            .then(servicePrincipal => {
-            if (servicePrincipal) {
-                // service principal found, get permissions from the service principal
-                return this.getServicePrincipalPermissions(servicePrincipal, logger);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const servicePrincipal = yield this.getServicePrincipal({ appId: this.appId }, logger, GetServicePrincipal.withPermissions);
+                let permissions;
+                if (servicePrincipal) {
+                    // service principal found, get permissions from the service principal
+                    permissions = yield this.getServicePrincipalPermissions(servicePrincipal, logger);
+                }
+                else {
+                    // service principal not found, get permissions from app registration
+                    permissions = yield this.getAppRegPermissions(this.appId, logger);
+                }
+                logger.log(permissions);
             }
-            else {
-                // service principal not found, get permissions from app registration
-                return this.getAppRegPermissions(this.appId, logger);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })
-            .then(permissions => {
-            logger.log(permissions);
-            cb();
-        }, err => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getServicePrincipal(servicePrincipalInfo, logger, mode) {
         var _a;
@@ -205,7 +207,7 @@ class AppPermissionListCommand extends AppCommand_1.default {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            const output = yield cli_1.Cli.executeCommandWithOutput(appGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const output = yield Cli_1.Cli.executeCommandWithOutput(appGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
             if (this.debug) {
                 logger.logToStderr(output.stderr);
             }

package/dist/m365/base/AnonymousCommand.js

@@ -1,10 +1,21 @@
 "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 Command_1 = require("../../Command");
 class AnonymousCommand extends Command_1.default {
-    action(logger, args, cb) {
-        this.initAction(args, logger);
-        this.commandAction(logger, args, cb);
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.initAction(args, logger);
+            yield this.commandAction(logger, args);
+        });
     }
 }
 exports.default = AnonymousCommand;

package/dist/m365/base/AppCommand.js

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AppCommand_instances, _AppCommand_initOptions, _AppCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
-const cli_1 = require("../../cli");
+const Cli_1 = require("../../cli/Cli");
 const Command_1 = require("../../Command");
-const utils_1 = require("../../utils");
+const validation_1 = require("../../utils/validation");
 class AppCommand extends Command_1.default {
     constructor() {
         super();
@@ -29,53 +29,60 @@ class AppCommand extends Command_1.default {
     get resource() {
         return 'https://graph.microsoft.com';
     }
-    action(logger, args, cb) {
-        const m365rcJsonPath = '.m365rc.json';
-        if (!fs.existsSync(m365rcJsonPath)) {
-            return cb(new Command_1.CommandError(`Could not find file: ${m365rcJsonPath}`));
-        }
-        try {
-            const m365rcJsonContents = fs.readFileSync(m365rcJsonPath, 'utf8');
-            if (!m365rcJsonContents) {
-                return cb(new Command_1.CommandError(`File ${m365rcJsonPath} is empty`));
+    action(logger, args) {
+        const _super = Object.create(null, {
+            action: { get: () => super.action }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const m365rcJsonPath = '.m365rc.json';
+            if (!fs.existsSync(m365rcJsonPath)) {
+                throw new Command_1.CommandError(`Could not find file: ${m365rcJsonPath}`);
             }
-            this.m365rcJson = JSON.parse(m365rcJsonContents);
-        }
-        catch (e) {
-            return cb(new Command_1.CommandError(`Could not parse file: ${m365rcJsonPath}`));
-        }
-        if (!this.m365rcJson.apps ||
-            this.m365rcJson.apps.length === 0) {
-            return cb(new Command_1.CommandError(`No Azure AD apps found in ${m365rcJsonPath}`));
-        }
-        if (args.options.appId) {
-            if (!this.m365rcJson.apps.some(app => app.appId === args.options.appId)) {
-                return cb(new Command_1.CommandError(`App ${args.options.appId} not found in ${m365rcJsonPath}`));
+            try {
+                const m365rcJsonContents = fs.readFileSync(m365rcJsonPath, 'utf8');
+                if (!m365rcJsonContents) {
+                    throw new Command_1.CommandError(`File ${m365rcJsonPath} is empty`);
+                }
+                this.m365rcJson = JSON.parse(m365rcJsonContents);
             }
-            this.appId = args.options.appId;
-            return super.action(logger, args, cb);
-        }
-        if (this.m365rcJson.apps.length === 1) {
-            this.appId = this.m365rcJson.apps[0].appId;
-            return super.action(logger, args, cb);
-        }
-        if (this.m365rcJson.apps.length > 1) {
-            cli_1.Cli.prompt({
-                message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
-                type: 'list',
-                choices: this.m365rcJson.apps.map((app, i) => {
-                    return {
-                        name: `${app.name} (${app.appId})`,
-                        value: i
-                    };
-                }),
-                default: 0,
-                name: 'appIdIndex'
-            }, (result) => {
+            catch (err) {
+                if (err instanceof Command_1.CommandError) {
+                    throw err;
+                }
+                throw new Command_1.CommandError(`Could not parse file: ${m365rcJsonPath}`);
+            }
+            if (!this.m365rcJson.apps ||
+                this.m365rcJson.apps.length === 0) {
+                throw new Command_1.CommandError(`No Azure AD apps found in ${m365rcJsonPath}`);
+            }
+            if (args.options.appId) {
+                if (!this.m365rcJson.apps.some(app => app.appId === args.options.appId)) {
+                    throw new Command_1.CommandError(`App ${args.options.appId} not found in ${m365rcJsonPath}`);
+                }
+                this.appId = args.options.appId;
+                return _super.action.call(this, logger, args);
+            }
+            if (this.m365rcJson.apps.length === 1) {
+                this.appId = this.m365rcJson.apps[0].appId;
+                return _super.action.call(this, logger, args);
+            }
+            if (this.m365rcJson.apps.length > 1) {
+                const result = yield Cli_1.Cli.prompt({
+                    message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
+                    type: 'list',
+                    choices: this.m365rcJson.apps.map((app, i) => {
+                        return {
+                            name: `${app.name} (${app.appId})`,
+                            value: i
+                        };
+                    }),
+                    default: 0,
+                    name: 'appIdIndex'
+                });
                 this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
-                super.action(logger, args, cb);
-            });
-        }
+                yield _super.action.call(this, logger, args);
+            }
+        });
     }
 }
 exports.default = AppCommand;
@@ -83,7 +90,7 @@ _AppCommand_instances = new WeakSet(), _AppCommand_initOptions = function _AppCo
     this.options.unshift({ option: '--appId [appId]' });
 }, _AppCommand_initValidators = function _AppCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         return true;

package/dist/m365/base/DateAndPeriodBasedReport.js

@@ -24,11 +24,13 @@ class DateAndPeriodBasedReport extends PeriodBasedReport_1.default {
         __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initOptions).call(this);
         __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initValidators).call(this);
     }
-    commandAction(logger, args, cb) {
-        const periodParameter = args.options.period ? `${this.usageEndpoint}(period='${encodeURIComponent(args.options.period)}')` : '';
-        const dateParameter = args.options.date ? `${this.usageEndpoint}(date=${encodeURIComponent(args.options.date)})` : '';
-        const endpoint = `${this.resource}/v1.0/reports/${(args.options.period ? periodParameter : dateParameter)}`;
-        this.executeReport(endpoint, logger, args.options.output, cb);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const periodParameter = args.options.period ? `${this.usageEndpoint}(period='${encodeURIComponent(args.options.period)}')` : '';
+            const dateParameter = args.options.date ? `${this.usageEndpoint}(date=${encodeURIComponent(args.options.date)})` : '';
+            const endpoint = `${this.resource}/v1.0/reports/${(args.options.period ? periodParameter : dateParameter)}`;
+            yield this.executeReport(endpoint, logger, args.options.output);
+        });
     }
 }
 exports.default = DateAndPeriodBasedReport;