@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3a04435

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

@@ -13,10 +13,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators;
+var _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators, _AadUserGetCommand_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 AadUserGetCommand extends GraphCommand_1.default {
@@ -26,6 +26,7 @@ class AadUserGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_GET;
@@ -33,45 +34,45 @@ class AadUserGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets information about the specified user';
     }
-    commandAction(logger, args, cb) {
-        const properties = args.options.properties ?
-            `&$select=${args.options.properties.split(',').map(p => encodeURIComponent(p.trim())).join(',')}` :
-            '';
-        let requestUrl = `${this.resource}/v1.0/users`;
-        if (args.options.id) {
-            requestUrl += `?$filter=id eq '${encodeURIComponent(args.options.id)}'${properties}`;
-        }
-        else if (args.options.userName) {
-            requestUrl += `?$filter=userPrincipalName eq '${encodeURIComponent(args.options.userName)}'${properties}`;
-        }
-        else if (args.options.email) {
-            requestUrl += `?$filter=mail eq '${encodeURIComponent(args.options.email)}'${properties}`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value.length === 1) {
-                return Promise.resolve(res.value[0]);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const properties = args.options.properties ?
+                `&$select=${args.options.properties.split(',').map(p => encodeURIComponent(p.trim())).join(',')}` :
+                '';
+            let requestUrl = `${this.resource}/v1.0/users`;
+            if (args.options.id) {
+                requestUrl += `?$filter=id eq '${encodeURIComponent(args.options.id)}'${properties}`;
+            }
+            else if (args.options.userName) {
+                requestUrl += `?$filter=userPrincipalName eq '${encodeURIComponent(args.options.userName)}'${properties}`;
+            }
+            else if (args.options.email) {
+                requestUrl += `?$filter=mail eq '${encodeURIComponent(args.options.email)}'${properties}`;
             }
-            const identifier = args.options.id ? `id ${args.options.id}`
-                : args.options.userName ? `user name ${args.options.userName}`
-                    : `email ${args.options.email}`;
-            if (res.value.length === 0) {
-                return Promise.reject(`The specified user with ${identifier} does not exist`);
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                const identifier = args.options.id ? `id ${args.options.id}`
+                    : args.options.userName ? `user name ${args.options.userName}`
+                        : `email ${args.options.email}`;
+                if (res.value.length === 0) {
+                    throw `The specified user with ${identifier} does not exist`;
+                }
+                if (res.value.length > 1) {
+                    throw `Multiple users with ${identifier} found. Please disambiguate (user names): ${res.value.map(a => a.userPrincipalName).join(', ')} or (ids): ${res.value.map(a => a.id).join(', ')}`;
+                }
+                logger.log(res.value[0]);
             }
-            return Promise.reject(`Multiple users with ${identifier} found. Please disambiguate (user names): ${res.value.map(a => a.userPrincipalName).join(', ')} or (ids): ${res.value.map(a => a.id).join(', ')}`);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry = function _AadUserGetCommand_initTelemetry() {
@@ -94,20 +95,14 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
     });
 }, _AadUserGetCommand_initValidators = function _AadUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.userName && !args.options.email) {
-            return 'Specify id, userName or email, one is required';
-        }
-        if ((args.options.id && args.options.email) ||
-            (args.options.id && args.options.userName) ||
-            (args.options.userName && args.options.email)) {
-            return 'Use either id, userName or email, but not all';
-        }
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadUserGetCommand_initOptionSets = function _AadUserGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'userName', 'email']);
 };
 module.exports = new AadUserGetCommand();
 //# sourceMappingURL=user-get.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserHibpCommand_instances, _AadUserHibpCommand_initTelemetry, _AadUserHibpCommand_initOptions, _AadUserHibpCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class AadUserHibpCommand extends AnonymousCommand_1.default {
@@ -33,29 +33,28 @@ class AadUserHibpCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Allows you to retrieve all accounts that have been pwned with the specified username';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `https://haveibeenpwned.com/api/v3/breachedaccount/${encodeURIComponent(args.options.userName)}${(args.options.domain ? `?domain=${encodeURIComponent(args.options.domain)}` : '')}`,
-            headers: {
-                'accept': 'application/json',
-                'hibp-api-key': args.options.apiKey,
-                'x-anonymous': true
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        })
-            .catch((err) => {
-            if ((err && err.response !== undefined && err.response.status === 404) && (this.debug || this.verbose)) {
-                logger.log('No pwnage found');
-                cb();
-                return;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `https://haveibeenpwned.com/api/v3/breachedaccount/${encodeURIComponent(args.options.userName)}${(args.options.domain ? `?domain=${encodeURIComponent(args.options.domain)}` : '')}`,
+                    headers: {
+                        'accept': 'application/json',
+                        'hibp-api-key': args.options.apiKey,
+                        'x-anonymous': true
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                if ((err && err.response !== undefined && err.response.status === 404) && (this.debug || this.verbose)) {
+                    logger.log('No pwnage found');
+                    return;
+                }
+                this.handleRejectedODataJsonPromise(err);
             }
-            return this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
 }
@@ -75,7 +74,7 @@ _AadUserHibpCommand_instances = new WeakSet(), _AadUserHibpCommand_initTelemetry
     });
 }, _AadUserHibpCommand_initValidators = function _AadUserHibpCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (!validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return 'Specify valid userName';
         }
         return true;

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -6,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserListCommand_instances, _AadUserListCommand_initTelemetry, _AadUserListCommand_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 AadUserListCommand extends GraphCommand_1.default {
@@ -25,19 +34,28 @@ class AadUserListCommand extends GraphCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    commandAction(logger, args, cb) {
-        const properties = args.options.properties ?
-            args.options.properties.split(',').map(p => p.trim()) :
-            ['userPrincipalName', 'displayName'];
-        const filter = this.getFilter(args.options);
-        const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
-        const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
-        utils_1.odata
-            .getAllItems(url)
-            .then((users) => {
-            logger.log(users);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let filter = '';
+                const properties = args.options.properties ?
+                    args.options.properties.split(',').map(p => p.trim()) :
+                    ['userPrincipalName', 'displayName'];
+                try {
+                    filter = this.getFilter(args.options);
+                }
+                catch (ex) {
+                    throw ex;
+                }
+                const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
+                const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
+                const users = yield odata_1.odata.getAllItems(url);
+                logger.log(users);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getFilter(options) {
         const filters = {};
@@ -55,7 +73,10 @@ class AadUserListCommand extends GraphCommand_1.default {
         ];
         Object.keys(options).forEach(key => {
             if (excludeOptions.indexOf(key) === -1) {
-                filters[key] = encodeURIComponent(options[key].replace(/'/g, `''`));
+                if (typeof options[key] === 'boolean') {
+                    throw `Specify value for the ${key} property`;
+                }
+                filters[key] = encodeURIComponent(options[key].toString().replace(/'/g, `''`));
             }
         });
         let filter = Object.keys(filters).map(key => `startsWith(${key}, '${filters[key]}')`).join(' and ');

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

@@ -13,10 +13,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators;
+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 {
@@ -26,6 +26,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
         __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;
@@ -36,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 = {};
@@ -91,18 +97,14 @@ _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 && !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';
-        }
         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;
     }));
+}, _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

@@ -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/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

@@ -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