@pnp/cli-microsoft365 6.0.0-beta.4d2402f → 6.0.0-beta.4e32416

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -0,0 +1,170 @@
+"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 _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleAssignmentRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEASSIGNMENT_REMOVE;
+    }
+    get description() {
+        return 'Removes a role assignment from web permissions';
+    }
+    commandAction(logger, args, cb) {
+        const removeRoleAssignment = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
+            }
+            if (args.options.upn) {
+                this.GetUserPrincipalId(args.options)
+                    .then((userPrincipalId) => {
+                    args.options.principalId = userPrincipalId;
+                    this.RemoveRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else if (args.options.groupName) {
+                this.GetGroupPrincipalId(args.options)
+                    .then((groupPrincipalId) => {
+                    args.options.principalId = groupPrincipalId;
+                    this.RemoveRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else {
+                this.RemoveRoleAssignment(logger, args.options, cb);
+            }
+        };
+        if (args.options.confirm) {
+            removeRoleAssignment();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeRoleAssignment();
+                }
+            });
+        }
+    }
+    RemoveRoleAssignment(logger, options, cb) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+            method: 'POST',
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    GetGroupPrincipalId(options) {
+        const groupGetCommandOptions = {
+            webUrl: options.webUrl,
+            name: options.groupName,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getGroupOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getGroupOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+    GetUserPrincipalId(options) {
+        const userGetCommandOptions = {
+            webUrl: options.webUrl,
+            email: options.upn,
+            id: undefined,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getUserOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getUserOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+}
+_SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            principalId: typeof args.options.principalId !== 'undefined',
+            upn: typeof args.options.upn !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoWebRoleAssignmentRemoveCommand_initOptions = function _SpoWebRoleAssignmentRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoWebRoleAssignmentRemoveCommand_initValidators = function _SpoWebRoleAssignmentRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.principalId && isNaN(args.options.principalId)) {
+            return `Specified principalId ${args.options.principalId} is not a number`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId id or upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least principalId id or upn or groupName`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleAssignmentRemoveCommand();
+//# sourceMappingURL=web-roleassignment-remove.js.map

package/dist/m365/spo/commands/web/web-roleinheritance-reset.js

@@ -0,0 +1,63 @@
+"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 _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleInheritanceResetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEINHERITANCE_RESET;
+    }
+    get description() {
+        return 'Restores role inheritance of subsite';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
+        }
+        const requestOptions = {
+            url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
+            method: 'POST',
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+}
+_SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initOptions = function _SpoWebRoleInheritanceResetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    });
+}, _SpoWebRoleInheritanceResetCommand_initValidators = function _SpoWebRoleInheritanceResetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+};
+module.exports = new SpoWebRoleInheritanceResetCommand();
+//# sourceMappingURL=web-roleinheritance-reset.js.map

package/dist/m365/spo/commands/web/web-set.js

@@ -1,30 +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 _SpoWebSetCommand_instances, _SpoWebSetCommand_initTelemetry, _SpoWebSetCommand_initOptions, _SpoWebSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebSetCommand_instances, "m", _SpoWebSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebSetCommand_instances, "m", _SpoWebSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebSetCommand_instances, "m", _SpoWebSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.WEB_SET;
     }
     get description() {
         return 'Updates subsite properties';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.headerEmphasis = typeof args.options.headerEmphasis !== 'undefined';
-        telemetryProps.headerLayout = typeof args.options.headerLayout !== 'undefined';
-        telemetryProps.megaMenuEnabled = typeof args.options.megaMenuEnabled !== 'undefined';
-        telemetryProps.siteLogoUrl = typeof args.options.siteLogoUrl !== 'undefined';
-        telemetryProps.title = typeof args.options.title !== 'undefined';
-        telemetryProps.quickLaunchEnabled = typeof args.options.quickLaunchEnabled !== 'undefined';
-        telemetryProps.footerEnabled = typeof args.options.footerEnabled !== 'undefined';
-        telemetryProps.searchScope = args.options.searchScope !== 'undefined';
-        this.trackUnknownOptions(telemetryProps, args.options);
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const payload = {};
         this.addUnknownOptionsToPayload(payload, args.options);
@@ -57,7 +65,7 @@ class SpoWebSetCommand extends SpoCommand_1.default {
             payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web`,
+            url: `${args.options.url}/_api/web`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 accept: 'application/json;odata=nometadata'
@@ -66,7 +74,7 @@ class SpoWebSetCommand extends SpoCommand_1.default {
             data: payload
         };
         if (this.verbose) {
-            logger.logToStderr(`Updating properties of subsite ${args.options.webUrl}...`);
+            logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
         }
         request_1.default
             .patch(requestOptions)
@@ -75,49 +83,52 @@ class SpoWebSetCommand extends SpoCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-t, --title [title]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '--siteLogoUrl [siteLogoUrl]'
-            },
-            {
-                option: '--quickLaunchEnabled [quickLaunchEnabled]'
-            },
-            {
-                option: '--headerLayout [headerLayout]',
-                autocomplete: ['standard', 'compact']
-            },
-            {
-                option: '--headerEmphasis [headerEmphasis]',
-                autocomplete: ['0', '1', '2', '3']
-            },
-            {
-                option: '--megaMenuEnabled [megaMenuEnabled]',
-                autocomplete: ['true', 'false']
-            },
-            {
-                option: '--footerEnabled [footerEnabled]',
-                autocomplete: ['true', 'false']
-            },
-            {
-                option: '--searchScope [searchScope]',
-                autocomplete: SpoWebSetCommand.searchScopeOptions
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = function _SpoWebSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.description !== 'undefined',
+            headerEmphasis: typeof args.options.headerEmphasis !== 'undefined',
+            headerLayout: typeof args.options.headerLayout !== 'undefined',
+            megaMenuEnabled: typeof args.options.megaMenuEnabled !== 'undefined',
+            siteLogoUrl: typeof args.options.siteLogoUrl !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            quickLaunchEnabled: typeof args.options.quickLaunchEnabled !== 'undefined',
+            footerEnabled: typeof args.options.footerEnabled !== 'undefined',
+            searchScope: args.options.searchScope !== 'undefined'
+        });
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
+    });
+}, _SpoWebSetCommand_initOptions = function _SpoWebSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--siteLogoUrl [siteLogoUrl]'
+    }, {
+        option: '--quickLaunchEnabled [quickLaunchEnabled]'
+    }, {
+        option: '--headerLayout [headerLayout]',
+        autocomplete: ['standard', 'compact']
+    }, {
+        option: '--headerEmphasis [headerEmphasis]',
+        autocomplete: ['0', '1', '2', '3']
+    }, {
+        option: '--megaMenuEnabled [megaMenuEnabled]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--footerEnabled [footerEnabled]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--searchScope [searchScope]',
+        autocomplete: SpoWebSetCommand.searchScopeOptions
+    });
+}, _SpoWebSetCommand_initValidators = function _SpoWebSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -157,9 +168,9 @@ class SpoWebSetCommand extends SpoCommand_1.default {
                 return `${args.options.searchScope} is not a valid value for searchScope. Allowed values are DefaultScope|Tenant|Hub|Site`;
             }
         }
-        return this.validateUnknownOptions(args.options, 'web', 'set');
-    }
-}
+        return true;
+    }));
+};
 SpoWebSetCommand.searchScopeOptions = ['defaultscope', 'tenant', 'hub', 'site'];
 module.exports = new SpoWebSetCommand();
 //# sourceMappingURL=web-set.js.map

package/dist/m365/spo/commands.js

@@ -54,6 +54,7 @@ exports.default = {
     FILE_LIST: `${prefix} file list`,
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
+    FILE_RENAME: `${prefix} file rename`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
     FOLDER_ADD: `${prefix} folder add`,
     FOLDER_COPY: `${prefix} folder copy`,
@@ -100,6 +101,8 @@ exports.default = {
     LIST_LABEL_SET: `${prefix} list label set`,
     LIST_LIST: `${prefix} list list`,
     LIST_REMOVE: `${prefix} list remove`,
+    LIST_ROLEASSIGNMENT_REMOVE: `${prefix} list roleassignment remove`,
+    LIST_ROLEASSIGNMENT_ADD: `${prefix} list roleassignment add`,
     LIST_ROLEINHERITANCE_BREAK: `${prefix} list roleinheritance break`,
     LIST_ROLEINHERITANCE_RESET: `${prefix} list roleinheritance reset`,
     LIST_SET: `${prefix} list set`,
@@ -125,6 +128,7 @@ exports.default = {
     LISTITEM_RECORD_DECLARE: `${prefix} listitem record declare`,
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,
     LISTITEM_ROLEINHERITANCE_BREAK: `${prefix} listitem roleinheritance break`,
     LISTITEM_ROLEINHERITANCE_RESET: `${prefix} listitem roleinheritance reset`,
     LISTITEM_SET: `${prefix} listitem set`,
@@ -189,9 +193,6 @@ exports.default = {
     SITE_APPPERMISSION_LIST: `${prefix} site apppermission list`,
     SITE_APPPERMISSION_REMOVE: `${prefix} site apppermission remove`,
     SITE_APPPERMISSION_SET: `${prefix} site apppermission set`,
-    SITE_CLASSIC_ADD: `${prefix} site classic add`,
-    SITE_CLASSIC_LIST: `${prefix} site classic list`,
-    SITE_CLASSIC_SET: `${prefix} site classic set`,
     SITE_COMMSITE_ENABLE: `${prefix} site commsite enable`,
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
@@ -267,6 +268,9 @@ exports.default = {
     WEB_LIST: `${prefix} web list`,
     WEB_REINDEX: `${prefix} web reindex`,
     WEB_REMOVE: `${prefix} web remove`,
+    WEB_ROLEASSIGNMENT_REMOVE: `${prefix} web roleassignment remove`,
+    WEB_ROLEASSIGNMENT_ADD: `${prefix} web roleassignment add`,
+    WEB_ROLEINHERITANCE_RESET: `${prefix} web roleinheritance reset`,
     WEB_SET: `${prefix} web set`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/teams/commands/app/app-install.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 _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -7,6 +22,14 @@ const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppInstallCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsAppInstallCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_INSTALL;
     }
@@ -33,7 +56,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.appId}`
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
                 }
             };
             return request_1.default.post(requestOptions);
@@ -69,29 +92,21 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
             return Promise.reject(`User with ID ${args.options.userId} not found. Original error: ${err.error.message}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId <appId>' },
-            { option: '--teamId [teamId]' },
-            { option: '--userId [userId]' },
-            { option: '--userName [userName]' }
-        ];
-        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`;
-        }
-        if (!args.options.teamId &&
-            !args.options.userId &&
-            !args.options.userName) {
-            return `Specify either teamId, userId or userName`;
-        }
-        if ((args.options.teamId && args.options.userId) ||
-            (args.options.teamId && args.options.userName) ||
-            (args.options.userId && args.options.userName)) {
-            return `Specify either teamId, userId or userName but not multiple`;
+}
+_TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initTelemetry = function _TeamsAppInstallCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
+    this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+}, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_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 (args.options.teamId &&
             !utils_1.validation.isValidGuid(args.options.teamId)) {
@@ -102,7 +117,9 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'userId', 'userName']);
+};
 module.exports = new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/teams/commands/app/app-list.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 _TeamsAppListCommand_instances, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsAppListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_LIST;
     }
     get description() {
         return 'Lists apps from the Microsoft Teams app catalog or apps installed in the specified team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.all = args.options.all || false;
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'displayName', 'distributionMethod'];
     }
@@ -74,22 +89,25 @@ class TeamsAppListCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-a, --all'
-            },
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '-t --teamName [teamName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            all: args.options.all || false,
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined'
+        });
+    });
+}, _TeamsAppListCommand_initOptions = function _TeamsAppListCommand_initOptions() {
+    this.options.unshift({
+        option: '-a, --all'
+    }, {
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '-t --teamName [teamName]'
+    });
+}, _TeamsAppListCommand_initValidators = function _TeamsAppListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.teamId && args.options.teamName) {
             return 'Specify either teamId or teamName, but not both.';
         }
@@ -97,7 +115,7 @@ class TeamsAppListCommand extends GraphCommand_1.default {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsAppListCommand();
 //# sourceMappingURL=app-list.js.map