@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.2ab70db

package/dist/m365/aad/commands/user/user-password-validate.js

@@ -1,42 +1,61 @@
 "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 _AadUserPasswordValidateCommand_instances, _AadUserPasswordValidateCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserPasswordValidateCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadUserPasswordValidateCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserPasswordValidateCommand_instances, "m", _AadUserPasswordValidateCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.USER_PASSWORD_VALIDATE;
     }
     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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-p, --password <password>'
+    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);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_AadUserPasswordValidateCommand_instances = new WeakSet(), _AadUserPasswordValidateCommand_initOptions = function _AadUserPasswordValidateCommand_initOptions() {
+    this.options.unshift({
+        option: '-p, --password <password>'
+    });
+};
 module.exports = new AadUserPasswordValidateCommand();
 //# sourceMappingURL=user-password-validate.js.map

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

@@ -1,10 +1,33 @@
 "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 _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 GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadUserSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.USER_SET;
     }
@@ -14,26 +37,24 @@ class AadUserSetCommand extends GraphCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
-        telemetryProps.userPrincipalName = typeof args.options.userPrincipalName !== 'undefined';
-        telemetryProps.accountEnabled = (!!args.options.accountEnabled).toString();
-        return telemetryProps;
-    }
-    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 = {};
@@ -57,34 +78,33 @@ class AadUserSetCommand extends GraphCommand_1.default {
         });
         return requestBody;
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --objectId [objectId]'
-            },
-            {
-                option: '-n, --userPrincipalName [userPrincipalName]'
-            },
-            {
-                option: '--accountEnabled [accountEnabled]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.objectId && !args.options.userPrincipalName) {
-            return 'Specify either objectId or userPrincipalName';
-        }
-        if (args.options.objectId && args.options.userPrincipalName) {
-            return 'Specify either objectId or userPrincipalName but not both';
-        }
+}
+_AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry = function _AadUserSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            objectId: typeof args.options.objectId !== 'undefined',
+            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined',
+            accountEnabled: (!!args.options.accountEnabled).toString()
+        });
+    });
+}, _AadUserSetCommand_initOptions = function _AadUserSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --objectId [objectId]'
+    }, {
+        option: '-n, --userPrincipalName [userPrincipalName]'
+    }, {
+        option: '--accountEnabled [accountEnabled]'
+    });
+}, _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)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _AadUserSetCommand_initOptionSets = function _AadUserSetCommand_initOptionSets() {
+    this.optionSets.push(['objectId', 'userPrincipalName']);
+};
 module.exports = new AadUserSetCommand();
 //# sourceMappingURL=user-set.js.map

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

@@ -1,67 +1,87 @@
 "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 _AadUserSigninListCommand_instances, _AadUserSigninListCommand_initTelemetry, _AadUserSigninListCommand_initOptions, _AadUserSigninListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserSigninListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadUserSigninListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserSigninListCommand_instances, "m", _AadUserSigninListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserSigninListCommand_instances, "m", _AadUserSigninListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserSigninListCommand_instances, "m", _AadUserSigninListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.USER_SIGNIN_LIST;
     }
     get description() {
         return 'Retrieves the Azure AD user sign-ins for the tenant';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.userName = typeof args.options.userName !== 'undefined';
-        telemetryProps.userId = typeof args.options.userId !== 'undefined';
-        telemetryProps.appDisplayName = typeof args.options.appDisplayName !== 'undefined';
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        return telemetryProps;
-    }
     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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --userName [userName]'
-            },
-            {
-                option: '--userId [userId]'
-            },
-            {
-                option: '--appDisplayName [appDisplayName]'
-            },
-            {
-                option: '--appId [appId]'
+    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 utils_1.odata.getAllItems(endpoint);
+                logger.log(signins);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
+}
+_AadUserSigninListCommand_instances = new WeakSet(), _AadUserSigninListCommand_initTelemetry = function _AadUserSigninListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userName: typeof args.options.userName !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            appId: typeof args.options.appId !== 'undefined'
+        });
+    });
+}, _AadUserSigninListCommand_initOptions = function _AadUserSigninListCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --userName [userName]'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--appDisplayName [appDisplayName]'
+    }, {
+        option: '--appId [appId]'
+    });
+}, _AadUserSigninListCommand_initValidators = function _AadUserSigninListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.userId && args.options.userName) {
             return 'Specify either userId or userName, but not both';
         }
@@ -75,7 +95,7 @@ class AadUserSigninListCommand extends GraphCommand_1.default {
             return `${args.options.appId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AadUserSigninListCommand();
 //# sourceMappingURL=user-signin-list.js.map

package/dist/m365/aad/commands.js

@@ -38,7 +38,6 @@ exports.default = {
     O365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} o365group report activityfilecounts`,
     O365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} o365group report activitygroupcounts`,
     O365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} o365group report activitystorage`,
-    O365GROUP_RESTORE: `${prefix} o365group restore`,
     O365GROUP_USER_ADD: `${prefix} o365group user add`,
     O365GROUP_USER_LIST: `${prefix} o365group user list`,
     O365GROUP_USER_REMOVE: `${prefix} o365group user remove`,

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

@@ -1,68 +1,82 @@
 "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 _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");
 class AdaptiveCardSendCommand extends AnonymousCommand_1.default {
+    constructor() {
+        super();
+        _AdaptiveCardSendCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SEND;
     }
     get description() {
         return 'Sends adaptive card to the specified URL';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.actionUrl = typeof args.options.actionUrl !== 'undefined';
-        telemetryProps.card = typeof args.options.card !== 'undefined';
-        telemetryProps.cardData = typeof args.options.cardData !== 'undefined';
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.imageUrl = typeof args.options.imageUrl !== 'undefined';
-        telemetryProps.title = typeof args.options.title !== 'undefined';
-        return telemetryProps;
-    }
     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
@@ -162,34 +176,36 @@ class AdaptiveCardSendCommand extends AnonymousCommand_1.default {
         }
         return cardData;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-t, --title [title]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '-i, --imageUrl [imageUrl]'
-            },
-            {
-                option: '-a, --actionUrl [actionUrl]'
-            },
-            {
-                option: '--card [card]'
-            },
-            {
-                option: '--cardData [cardData]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_initTelemetry = function _AdaptiveCardSendCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            actionUrl: typeof args.options.actionUrl !== 'undefined',
+            card: typeof args.options.card !== 'undefined',
+            cardData: typeof args.options.cardData !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            imageUrl: typeof args.options.imageUrl !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
+        });
+    });
+}, _AdaptiveCardSendCommand_initOptions = function _AdaptiveCardSendCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-i, --imageUrl [imageUrl]'
+    }, {
+        option: '-a, --actionUrl [actionUrl]'
+    }, {
+        option: '--card [card]'
+    }, {
+        option: '--cardData [cardData]'
+    });
+}, _AdaptiveCardSendCommand_initValidators = function _AdaptiveCardSendCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!args.options.card && !args.options.title) {
             return 'Specify either the title or the card to send';
         }
@@ -210,7 +226,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AdaptiveCardSendCommand();
 //# sourceMappingURL=adaptivecard-send.js.map

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../cli");
 const AadAppGetCommand = require("../../aad/commands/app/app-get");
@@ -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();