@pnp/cli-microsoft365 6.0.0-beta.9d619b2 → 6.0.0-beta.a008afc

package/dist/m365/teams/commands/team/team-set.js

@@ -1,23 +1,38 @@
 "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 _TeamsTeamSetCommand_instances, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators;
 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 TeamsTeamSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsTeamSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.TEAM_SET;
     }
     get description() {
         return 'Updates settings of a Microsoft Teams team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        TeamsTeamSetCommand.props.forEach((p) => {
-            telemetryProps[p] = typeof args.options[p] !== 'undefined';
-        });
-        return telemetryProps;
-    }
     mapRequestBody(options) {
         const requestBody = {};
         if (options.name) {
@@ -37,67 +52,56 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         }
         return requestBody;
     }
-    commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
-        if (args.options.displayName) {
-            args.options.name = args.options.displayName;
-            this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
-        }
-        const data = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: data,
-            responseType: 'json'
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    optionSets() {
-        return [['id', 'teamId']];
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '--teamId [teamId]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--displayName [displayName]'
-            },
-            {
-                option: '--description [description]'
-            },
-            {
-                option: '--mailNickName [mailNickName]'
-            },
-            {
-                option: '--classification [classification]'
-            },
-            {
-                option: '--visibility [visibility]',
-                autocomplete: ['Private', 'Public']
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.displayName) {
+                args.options.name = args.options.displayName;
+                this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
+            }
+            const data = this.mapRequestBody(args.options);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+}
+_TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemetry = function _TeamsTeamSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        TeamsTeamSetCommand.props.forEach((p) => {
+            this.telemetryProperties[p] = typeof args.options[p] !== 'undefined';
+        });
+    });
+}, _TeamsTeamSetCommand_initOptions = function _TeamsTeamSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--displayName [displayName]'
+    }, {
+        option: '--description [description]'
+    }, {
+        option: '--mailNickName [mailNickName]'
+    }, {
+        option: '--classification [classification]'
+    }, {
+        option: '--visibility [visibility]',
+        autocomplete: ['Private', 'Public']
+    });
+}, _TeamsTeamSetCommand_initValidators = function _TeamsTeamSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.visibility) {
@@ -106,8 +110,8 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 TeamsTeamSetCommand.props = [
     'displayName',
     'description',

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -1,11 +1,33 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_initOptionSets, _TeamsTeamUnarchiveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsTeamUnarchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TEAM_UNARCHIVE;
     }
@@ -25,57 +47,42 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
-        const endpoint = `${this.resource}/v1.0`;
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            const requestOptions = {
-                url: `${endpoint}/teams/${encodeURIComponent(teamId)}/unarchive`,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--teamId [teamId]'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0`;
+            try {
+                const teamId = yield this.getTeamId(args);
+                const requestOptions = {
+                    url: `${endpoint}/teams/${encodeURIComponent(teamId)}/unarchive`,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        if (!args.options.id && !args.options.name && !args.options.teamId) {
-            return 'Specify either id or name';
-        }
-        if (args.options.name && (args.options.id || args.options.teamId)) {
-            return 'Specify either id or name but not both';
-        }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+}
+_TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand_initOptions = function _TeamsTeamUnarchiveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    });
+}, _TeamsTeamUnarchiveCommand_initOptionSets = function _TeamsTeamUnarchiveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+}, _TeamsTeamUnarchiveCommand_initValidators = function _TeamsTeamUnarchiveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsTeamUnarchiveCommand();
 //# sourceMappingURL=team-unarchive.js.map

package/dist/m365/teams/commands/user/user-app-add.js

@@ -1,54 +1,76 @@
 "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 _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators;
 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 TeamsUserAppAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsUserAppAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.USER_APP_ADD;
     }
     get description() {
         return 'Install an app in the personal scope of the specified user';
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        const requestOptions = {
-            url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0`;
+            const requestOptions = {
+                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.id}`
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '--appId <appId>'
-            },
-            {
-                option: '--userId <userId>'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
+}
+_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--userId <userId>'
+    });
+}, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidGuid(args.options.userId)) {
+        if (!validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsUserAppAddCommand();
 //# sourceMappingURL=user-app-add.js.map

package/dist/m365/teams/commands/user/user-app-list.js

@@ -1,52 +1,69 @@
 "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 _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-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 TeamsUserAppListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsUserAppListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.USER_APP_LIST;
     }
     get description() {
         return 'List the apps installed in the personal scope of the specified user';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.userId = typeof args.options.userId !== 'undefined';
-        telemetryProps.userName = typeof args.options.userName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let userId = '';
-        this
-            .getUserId(args)
-            .then((_userId) => {
-            userId = _userId.value;
-            const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps?$expand=teamsAppDefinition`;
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((items) => {
-            items.forEach(i => {
-                const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
-                const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
-                i.appId = appId;
-            });
-            if (args.options.output === 'json') {
-                logger.log(items);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const userId = (yield this.getUserId(args)).value;
+                const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps?$expand=teamsAppDefinition`;
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                items.forEach(i => {
+                    const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
+                    const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
+                    i.appId = appId;
+                });
+                if (args.options.output === 'json') {
+                    logger.log(items);
+                }
+                else {
+                    logger.log(items.map(i => {
+                        return {
+                            id: i.id,
+                            appId: i.appId,
+                            displayName: i.teamsAppDefinition.displayName,
+                            version: i.teamsAppDefinition.version
+                        };
+                    }));
+                }
             }
-            else {
-                logger.log(items.map(i => {
-                    return {
-                        id: i.id,
-                        appId: i.appId,
-                        displayName: i.teamsAppDefinition.displayName,
-                        version: i.teamsAppDefinition.version
-                    };
-                }));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getUserId(args) {
         if (args.options.userId) {
@@ -61,33 +78,32 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    options() {
-        const options = [
-            {
-                option: '--userId [userId]'
-            },
-            {
-                option: '--userName [userName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.userId && !args.options.userName) {
-            return `userId or userName need to be provided`;
-        }
-        if (args.options.userId && args.options.userName) {
-            return `Please specify either userId or userName, not both`;
-        }
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+}
+_TeamsUserAppListCommand_instances = new WeakSet(), _TeamsUserAppListCommand_initTelemetry = function _TeamsUserAppListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsUserAppListCommand_initOptions = function _TeamsUserAppListCommand_initOptions() {
+    this.options.unshift({
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _TeamsUserAppListCommand_initValidators = function _TeamsUserAppListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.userName && !utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid userName`;
         }
         return true;
-    }
-}
+    }));
+}, _TeamsUserAppListCommand_initOptionSets = function _TeamsUserAppListCommand_initOptionSets() {
+    this.optionSets.push(['userId', 'userName']);
+};
 module.exports = new TeamsUserAppListCommand();
 //# sourceMappingURL=user-app-list.js.map