@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -33,103 +33,106 @@ class AadSiteClassificationSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates site classification configuration';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groupSettings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const unifiedGroupSetting = res.value.filter((directorySetting) => {
-                return directorySetting.displayName === 'Group.Unified';
-            });
-            if (!unifiedGroupSetting ||
-                unifiedGroupSetting.length === 0) {
-                return Promise.reject("There is no previous defined site classification which can updated.");
-            }
-            const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
-            unifiedGroupSetting[0].values.forEach((directorySetting) => {
-                switch (directorySetting.name) {
-                    case "ClassificationList":
-                        if (args.options.classifications) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.classifications
-                            });
-                        }
-                        else {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": directorySetting.value
-                            });
-                        }
-                        break;
-                    case "DefaultClassification":
-                        if (args.options.defaultClassification) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.defaultClassification
-                            });
-                        }
-                        else {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": directorySetting.value
-                            });
-                        }
-                        break;
-                    case "UsageGuidelinesUrl":
-                        if (args.options.usageGuidelinesUrl) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.usageGuidelinesUrl
-                            });
-                        }
-                        else {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": directorySetting.value
-                            });
-                        }
-                        break;
-                    case "GuestUsageGuidelinesUrl":
-                        if (args.options.guestUsageGuidelinesUrl) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.guestUsageGuidelinesUrl
-                            });
-                        }
-                        else {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                const unifiedGroupSetting = res.value.filter((directorySetting) => {
+                    return directorySetting.displayName === 'Group.Unified';
+                });
+                if (!unifiedGroupSetting ||
+                    unifiedGroupSetting.length === 0) {
+                    throw "There is no previous defined site classification which can updated.";
+                }
+                const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
+                unifiedGroupSetting[0].values.forEach((directorySetting) => {
+                    switch (directorySetting.name) {
+                        case "ClassificationList":
+                            if (args.options.classifications) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.classifications
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        case "DefaultClassification":
+                            if (args.options.defaultClassification) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.defaultClassification
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        case "UsageGuidelinesUrl":
+                            if (args.options.usageGuidelinesUrl) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.usageGuidelinesUrl
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        case "GuestUsageGuidelinesUrl":
+                            if (args.options.guestUsageGuidelinesUrl) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.guestUsageGuidelinesUrl
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        default:
                             updatedDirSettings.values.push({
                                 "name": directorySetting.name,
                                 "value": directorySetting.value
                             });
-                        }
-                        break;
-                    default:
-                        updatedDirSettings.values.push({
-                            "name": directorySetting.name,
-                            "value": directorySetting.value
-                        });
-                        break;
-                }
-            });
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groupSettings/${unifiedGroupSetting[0].id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: updatedDirSettings
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                            break;
+                    }
+                });
+                requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings/${unifiedGroupSetting[0].id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json',
+                    data: updatedDirSettings
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadSiteClassificationSetCommand_instances = new WeakSet(), _AadSiteClassificationSetCommand_initTelemetry = function _AadSiteClassificationSetCommand_initTelemetry() {

package/dist/m365/aad/commands/sp/sp-add.js

@@ -13,7 +13,7 @@ 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 _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators;
+var _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators, _AadSpAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadSpAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SP_ADD;
@@ -64,27 +65,28 @@ class AadSpAddCommand extends GraphCommand_1.default {
             return Promise.resolve(spItem.appId);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getAppId(args)
-            .then((appId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/servicePrincipals`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: {
-                    appId: appId
-                },
-                responseType: 'json'
-            };
-            return 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 appId = yield this.getAppId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/servicePrincipals`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        appId: appId
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = function _AadSpAddCommand_initTelemetry() {
@@ -105,13 +107,6 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
     });
 }, _AadSpAddCommand_initValidators = function _AadSpAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.appName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, appName, or objectId';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
@@ -120,6 +115,8 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
         }
         return true;
     }));
+}, _AadSpAddCommand_initOptionSets = function _AadSpAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appName', 'objectId']);
 };
 module.exports = new AadSpAddCommand();
 //# sourceMappingURL=sp-add.js.map

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

@@ -13,7 +13,7 @@ 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 _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators;
+var _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators, _AadSpGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SP_GET;
@@ -64,27 +65,28 @@ class AadSpGetCommand extends GraphCommand_1.default {
             return Promise.resolve(spItem.id);
         });
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving service principal information...`);
-        }
-        this
-            .getSpId(args)
-            .then((id) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/servicePrincipals/${id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving service principal information...`);
+            }
+            try {
+                const id = yield this.getSpId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/servicePrincipals/${id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = function _AadSpGetCommand_initTelemetry() {
@@ -105,13 +107,6 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, objectId or displayName';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
@@ -120,6 +115,8 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
         }
         return true;
     }));
+}, _AadSpGetCommand_initOptionSets = function _AadSpGetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'displayName', 'objectId']);
 };
 module.exports = new AadSpGetCommand();
 //# sourceMappingURL=sp-get.js.map

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

@@ -13,7 +13,7 @@ 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");
@@ -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)) {
             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

@@ -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);
         });
     }
 }

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");
@@ -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 utils_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 ');