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

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

@@ -1,4 +1,19 @@
 "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 _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -7,17 +22,19 @@ const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsTeamRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.TEAM_REMOVE;
     }
     get description() {
         return 'Removes the specified Microsoft Teams team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.id) {
             return Promise.resolve(args.options.id);
@@ -32,10 +49,6 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
         });
     }
     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 removeTeam = () => {
             this
                 .getTeamId(args)
@@ -70,39 +83,34 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--teamId [teamId]'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.id && !args.options.name && !args.options.teamId) {
+}
+_TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initTelemetry = function _TeamsTeamRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _TeamsTeamRemoveCommand_initOptions = function _TeamsTeamRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--confirm'
+    });
+}, _TeamsTeamRemoveCommand_initValidators = function _TeamsTeamRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!args.options.id && !args.options.name) {
             return 'Specify either id or name';
         }
-        if (args.options.name && (args.options.id || args.options.teamId)) {
+        if (args.options.name && args.options.id) {
             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)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsTeamRemoveCommand();
 //# sourceMappingURL=team-remove.js.map

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 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) {
@@ -38,10 +53,6 @@ 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.`);
@@ -59,44 +70,32 @@ class TeamsTeamSetCommand extends GraphCommand_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']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
+}
+_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 && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -106,8 +105,8 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 TeamsTeamSetCommand.props = [
     'displayName',
     'description',

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

@@ -1,4 +1,19 @@
 "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_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -6,6 +21,12 @@ 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);
+    }
     get name() {
         return commands_1.default.TEAM_UNARCHIVE;
     }
@@ -26,10 +47,6 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
         });
     }
     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)
@@ -46,36 +63,26 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
         })
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--teamId [teamId]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.id && !args.options.name && !args.options.teamId) {
+}
+_TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand_initOptions = function _TeamsTeamUnarchiveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    });
+}, _TeamsTeamUnarchiveCommand_initValidators = function _TeamsTeamUnarchiveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!args.options.id && !args.options.name) {
             return 'Specify either id or name';
         }
-        if (args.options.name && (args.options.id || args.options.teamId)) {
+        if (args.options.name && args.options.id) {
             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)) {
             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,10 +1,31 @@
 "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 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;
     }
@@ -21,34 +42,30 @@ class TeamsUserAppAddCommand extends GraphCommand_1.default {
             },
             responseType: 'json',
             data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
+                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.id}`
             }
         };
         request_1.default
             .post(requestOptions)
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '--appId <appId>'
-            },
-            {
-                option: '--userId <userId>'
-            }
-        ];
-        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 (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (!utils_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,22 +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 _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class 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);
+    }
     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
@@ -61,19 +77,22 @@ 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) {
+}
+_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 && !args.options.userName) {
             return `userId or userName need to be provided`;
         }
@@ -87,7 +106,7 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
             return `${args.options.userName} is not a valid userName`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsUserAppListCommand();
 //# sourceMappingURL=user-app-list.js.map

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

@@ -1,4 +1,19 @@
 "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 _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,22 +21,24 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsUserAppRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppRemoveCommand_instances, "m", _TeamsUserAppRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppRemoveCommand_instances, "m", _TeamsUserAppRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppRemoveCommand_instances, "m", _TeamsUserAppRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.USER_APP_REMOVE;
     }
     get description() {
         return 'Uninstall an app from the personal scope of the specified user.';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!!args.options.confirm).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const removeApp = () => {
             const endpoint = `${this.resource}/v1.0`;
             const requestOptions = {
-                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps/${args.options.appId}`,
+                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps/${args.options.id}`,
                 headers: {
                     'accept': 'application/json;odata.metadata=none'
                 },
@@ -39,7 +56,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the app with id ${args.options.appId} for user ${args.options.userId}?`
+                message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -50,27 +67,28 @@ class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '--appId <appId>'
-            },
-            {
-                option: '--userId <userId>'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand_initTelemetry = function _TeamsUserAppRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!!args.options.confirm).toString()
+        });
+    });
+}, _TeamsUserAppRemoveCommand_initOptions = function _TeamsUserAppRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--userId <userId>'
+    }, {
+        option: '--confirm'
+    });
+}, _TeamsUserAppRemoveCommand_initValidators = function _TeamsUserAppRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsUserAppRemoveCommand();
 //# sourceMappingURL=user-app-remove.js.map