@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.da01a44

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

@@ -1,30 +1,46 @@
 "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 _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");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadSpGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadSpGetCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Gets information about the specific service principal';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = (!(!args.options.appId)).toString();
-        telemetryProps.displayName = (!(!args.options.displayName)).toString();
-        telemetryProps.objectId = (!(!args.options.objectId)).toString();
-        return telemetryProps;
-    }
     getSpId(args) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
+        if (args.options.appObjectId) {
+            return Promise.resolve(args.options.appObjectId);
         }
         let spMatchQuery = '';
-        if (args.options.displayName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+        if (args.options.appDisplayName) {
+            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
         }
         else if (args.options.appId) {
             spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
@@ -44,64 +60,63 @@ class AadSpGetCommand extends GraphCommand_1.default {
                 return Promise.reject(`The specified Azure AD app does not exist`);
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`);
             }
             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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --appId [appId]'
-            },
-            {
-                option: '-n, --displayName [displayName]'
-            },
-            {
-                option: '--objectId [objectId]'
+    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);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        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)) {
+}
+_AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = function _AadSpGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: (!(!args.options.appId)).toString(),
+            appDisplayName: (!(!args.options.appDisplayName)).toString(),
+            appObjectId: (!(!args.options.appObjectId)).toString()
+        });
+    });
+}, _AadSpGetCommand_initOptions = function _AadSpGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --appId [appId]'
+    }, {
+        option: '-n, --appDisplayName [appDisplayName]'
+    }, {
+        option: '--appObjectId [appObjectId]'
+    });
+}, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid objectId GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _AadSpGetCommand_initOptionSets = function _AadSpGetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName', 'appObjectId']);
+};
 module.exports = new AadSpGetCommand();
 //# sourceMappingURL=sp-get.js.map

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

@@ -1,96 +1,108 @@
 "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 _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 {
+    constructor() {
+        super();
+        _AadUserGetCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Gets information about the specified user';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.userName = typeof args.options.userName !== 'undefined';
-        telemetryProps.properties = args.options.properties;
-        return telemetryProps;
-    }
-    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}`;
             }
-            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`);
+            else if (args.options.userName) {
+                requestUrl += `?$filter=userPrincipalName eq '${encodeURIComponent(args.options.userName)}'${properties}`;
             }
-            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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --userName [userName]'
-            },
-            {
-                option: '--email [email]'
-            },
-            {
-                option: '-p, --properties [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'
+            };
+            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]);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        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';
-        }
+}
+_AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry = function _AadUserGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            properties: args.options.properties
+        });
+    });
+}, _AadUserGetCommand_initOptions = function _AadUserGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --userName [userName]'
+    }, {
+        option: '--email [email]'
+    }, {
+        option: '-p, --properties [properties]'
+    });
+}, _AadUserGetCommand_initValidators = function _AadUserGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         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

@@ -1,67 +1,84 @@
 "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 _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 {
+    constructor() {
+        super();
+        _AadUserHibpCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserHibpCommand_instances, "m", _AadUserHibpCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserHibpCommand_instances, "m", _AadUserHibpCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserHibpCommand_instances, "m", _AadUserHibpCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.USER_HIBP;
     }
     get description() {
         return 'Allows you to retrieve all accounts that have been pwned with the specified username';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.domain = args.options.domain;
-        return telemetryProps;
-    }
-    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);
             }
-            return this.handleRejectedODataJsonPromise(err, logger, cb);
-        });
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --userName <userName>'
-            },
-            {
-                option: '--apiKey, <apiKey>'
-            },
-            {
-                option: '--domain, [domain]'
+            catch (err) {
+                if ((err && err.response !== undefined && err.response.status === 404) && (this.debug || this.verbose)) {
+                    logger.log('No pwnage found');
+                    return;
+                }
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+}
+_AadUserHibpCommand_instances = new WeakSet(), _AadUserHibpCommand_initTelemetry = function _AadUserHibpCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            domain: args.options.domain
+        });
+    });
+}, _AadUserHibpCommand_initOptions = function _AadUserHibpCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --userName <userName>'
+    }, {
+        option: '--apiKey, <apiKey>'
+    }, {
+        option: '--domain, [domain]'
+    });
+}, _AadUserHibpCommand_initValidators = function _AadUserHibpCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return 'Specify valid userName';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AadUserHibpCommand();
 //# sourceMappingURL=user-hibp.js.map

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

@@ -1,9 +1,30 @@
 "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 _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 {
+    constructor() {
+        super();
+        _AadUserListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserListCommand_instances, "m", _AadUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserListCommand_instances, "m", _AadUserListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.USER_LIST;
     }
@@ -13,25 +34,28 @@ class AadUserListCommand extends GraphCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.properties = args.options.properties;
-        telemetryProps.deleted = typeof args.options.deleted !== 'undefined';
-        return telemetryProps;
-    }
-    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 = {};
@@ -49,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 ');
@@ -58,14 +85,16 @@ class AadUserListCommand extends GraphCommand_1.default {
         }
         return filter;
     }
-    options() {
-        const options = [
-            { option: '-p, --properties [properties]' },
-            { option: '-d, --deleted' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_AadUserListCommand_instances = new WeakSet(), _AadUserListCommand_initTelemetry = function _AadUserListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            properties: args.options.properties,
+            deleted: typeof args.options.deleted !== 'undefined'
+        });
+    });
+}, _AadUserListCommand_initOptions = function _AadUserListCommand_initOptions() {
+    this.options.unshift({ option: '-p, --properties [properties]' }, { option: '-d, --deleted' });
+};
 module.exports = new AadUserListCommand();
 //# sourceMappingURL=user-list.js.map