@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators;
+var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators, _SpoWebRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -30,6 +30,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.WEB_ROLEASSIGNMENT_ADD;
@@ -165,22 +166,10 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
         if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
             return `Specified roleDefinitionId ${args.options.roleDefinitionId} 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`;
-        }
-        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
-        if (roleDefinitionOptions.some(item => item !== undefined) && roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either roleDefinitionId id or roleDefinitionName`;
-        }
-        if (roleDefinitionOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least roleDefinitionId id or roleDefinitionName`;
-        }
         return true;
     }));
+}, _SpoWebRoleAssignmentAddCommand_initOptionSets = function _SpoWebRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['principalId', 'upn', 'groupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
 };
 module.exports = new SpoWebRoleAssignmentAddCommand();
 //# sourceMappingURL=web-roleassignment-add.js.map

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators;
+var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators, _SpoWebRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -29,6 +29,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         __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);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.WEB_ROLEASSIGNMENT_REMOVE;
@@ -154,15 +155,10 @@ _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignm
         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;
     }));
+}, _SpoWebRoleAssignmentRemoveCommand_initOptionSets = function _SpoWebRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['principalId', 'upn', 'groupName'] });
 };
 module.exports = new SpoWebRoleAssignmentRemoveCommand();
 //# sourceMappingURL=web-roleassignment-remove.js.map

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

@@ -13,8 +13,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_initValidators;
+var _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initTelemetry, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -23,6 +24,7 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoWebRoleInheritanceResetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initValidators).call(this);
     }
@@ -37,27 +39,51 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
             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'
-            };
-            try {
-                yield request_1.default.post(requestOptions);
+            const resetWebRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield resetWebRoleInheritance();
             }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield resetWebRoleInheritance();
+                }
             }
         });
     }
 }
-_SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initOptions = function _SpoWebRoleInheritanceResetCommand_initOptions() {
+_SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoWebRoleInheritanceResetCommand_initOptions = function _SpoWebRoleInheritanceResetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--confirm'
     });
 }, _SpoWebRoleInheritanceResetCommand_initValidators = function _SpoWebRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -66,7 +66,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'
@@ -75,7 +75,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}...`);
             }
             try {
                 yield request_1.default.patch(requestOptions);
@@ -106,7 +106,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initOptions = function _SpoWebSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -133,7 +133,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initValidators = function _SpoWebSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands.js

@@ -62,6 +62,11 @@ exports.default = {
     FILE_ROLEINHERITANCE_BREAK: `${prefix} file roleinheritance break`,
     FILE_ROLEINHERITANCE_RESET: `${prefix} file roleinheritance reset`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
+    FILE_VERSION_CLEAR: `${prefix} file version clear`,
+    FILE_VERSION_GET: `${prefix} file version get`,
+    FILE_VERSION_LIST: `${prefix} file version list`,
+    FILE_VERSION_REMOVE: `${prefix} file version remove`,
+    FILE_VERSION_RESTORE: `${prefix} file version restore`,
     FOLDER_ADD: `${prefix} folder add`,
     FOLDER_COPY: `${prefix} folder copy`,
     FOLDER_GET: `${prefix} folder get`,
@@ -70,6 +75,7 @@ exports.default = {
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
     FOLDER_ROLEASSIGNMENT_REMOVE: `${prefix} folder roleassignment remove`,
+    FOLDER_ROLEASSIGNMENT_ADD: `${prefix} folder roleassignment add`,
     FOLDER_ROLEINHERITANCE_BREAK: `${prefix} folder roleinheritance break`,
     FOLDER_ROLEINHERITANCE_RESET: `${prefix} folder roleinheritance reset`,
     GET: `${prefix} get`,
@@ -78,9 +84,9 @@ exports.default = {
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_SET: `${prefix} group set`,
-    GROUP_USER_ADD: `${prefix} group user add`,
-    GROUP_USER_LIST: `${prefix} group user list`,
-    GROUP_USER_REMOVE: `${prefix} group user remove`,
+    GROUP_MEMBER_ADD: `${prefix} group member add`,
+    GROUP_MEMBER_LIST: `${prefix} group member list`,
+    GROUP_MEMBER_REMOVE: `${prefix} group member remove`,
     HIDEDEFAULTTHEMES_GET: `${prefix} hidedefaultthemes get`,
     HIDEDEFAULTTHEMES_SET: `${prefix} hidedefaultthemes set`,
     HOMESITE_GET: `${prefix} homesite get`,
@@ -95,7 +101,6 @@ exports.default = {
     HUBSITE_RIGHTS_GRANT: `${prefix} hubsite rights grant`,
     HUBSITE_RIGHTS_REVOKE: `${prefix} hubsite rights revoke`,
     HUBSITE_SET: `${prefix} hubsite set`,
-    HUBSITE_THEME_SYNC: `${prefix} hubsite theme sync`,
     HUBSITE_UNREGISTER: `${prefix} hubsite unregister`,
     KNOWLEDGEHUB_GET: `${prefix} knowledgehub get`,
     KNOWLEDGEHUB_REMOVE: `${prefix} knowledgehub remove`,
@@ -131,6 +136,7 @@ exports.default = {
     LIST_WEBHOOK_SET: `${prefix} list webhook set`,
     LISTITEM_ADD: `${prefix} listitem add`,
     LISTITEM_ATTACHMENT_LIST: `${prefix} listitem attachment list`,
+    LISTITEM_BATCH_ADD: `${prefix} listitem batch add`,
     LISTITEM_GET: `${prefix} listitem get`,
     LISTITEM_ISRECORD: `${prefix} listitem isrecord`,
     LISTITEM_LIST: `${prefix} listitem list`,
@@ -204,13 +210,13 @@ 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`,
     SITE_GROUPIFY: `${prefix} site groupify`,
+    SITE_HUBSITE_CONNECT: `${prefix} site hubsite connect`,
+    SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
+    SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,

package/dist/m365/{spo/commands/page/PageTemplateResponse.js → teams/commands/Meeting.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=PageTemplateResponse.js.map
+//# sourceMappingURL=Meeting.js.map

package/dist/m365/teams/commands/app/app-install.js

@@ -17,6 +17,7 @@ var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _T
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -43,10 +44,10 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
                 yield this.validateUser(args, logger);
                 let url = `${this.resource}/v1.0`;
                 if (args.options.teamId) {
-                    url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+                    url += `/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}/installedApps`;
                 }
                 else {
-                    url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+                    url += `/users/${formatting_1.formatting.encodeQueryParameter(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
                 }
                 const requestOptions = {
                     url: url,
@@ -56,7 +57,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}`
                     }
                 };
                 yield request_1.default.post(requestOptions);
@@ -105,11 +106,11 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         });
     });
 }, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '--appId <appId>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+    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 (!validation_1.validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.teamId &&
             !validation_1.validation.isValidGuid(args.options.teamId)) {
@@ -122,7 +123,7 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         return true;
     }));
 }, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'userId', 'userName']);
+    this.optionSets.push({ options: ['teamId', 'userId', 'userName'] });
 };
 module.exports = new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

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

@@ -16,8 +16,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsAppListCommand_instances, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const odata_1 = require("../../../../utils/odata");
-const validation_1 = require("../../../../utils/validation");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppListCommand extends GraphCommand_1.default {
@@ -32,60 +30,19 @@ class TeamsAppListCommand extends GraphCommand_1.default {
         return commands_1.default.APP_LIST;
     }
     get description() {
-        return 'Lists apps from the Microsoft Teams app catalog or apps installed in the specified team';
+        return 'Lists apps from the Microsoft Teams app catalog';
     }
     defaultProperties() {
         return ['id', 'displayName', 'distributionMethod'];
     }
-    getTeamId(args) {
-        if (args.options.teamId) {
-            return Promise.resolve(args.options.teamId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.teamName)
-            .then(group => {
-            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            return group.id;
-        });
-    }
-    getEndpointUrl(args) {
-        return new Promise((resolve, reject) => {
-            if (args.options.teamId || args.options.teamName) {
-                this
-                    .getTeamId(args)
-                    .then((teamId) => {
-                    let endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/installedApps?$expand=teamsApp`;
-                    if (!args.options.all) {
-                        endpoint += `&$filter=teamsApp/distributionMethod eq 'organization'`;
-                    }
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
-            }
-            else {
-                let endpoint = `${this.resource}/v1.0/appCatalogs/teamsApps`;
-                if (!args.options.all) {
-                    endpoint += `?$filter=distributionMethod eq 'organization'`;
-                }
-                return resolve(endpoint);
-            }
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const endpoint = yield this.getEndpointUrl(args);
-                const items = yield odata_1.odata.getAllItems(endpoint);
-                if (args.options.teamId || args.options.teamName) {
-                    items.forEach(t => {
-                        t.displayName = t.teamsApp.displayName;
-                        t.distributionMethod = t.teamsApp.distributionMethod;
-                    });
+                let requestUrl = `${this.resource}/v1.0/appCatalogs/teamsApps`;
+                if (args.options.distributionMethod) {
+                    requestUrl += `?$filter=distributionMethod eq '${args.options.distributionMethod}'`;
                 }
+                const items = yield odata_1.odata.getAllItems(requestUrl);
                 logger.log(items);
             }
             catch (err) {
@@ -97,29 +54,23 @@ class TeamsAppListCommand extends GraphCommand_1.default {
 _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'
+            distributionMethod: args.options.distributionMethod || false
         });
     });
 }, _TeamsAppListCommand_initOptions = function _TeamsAppListCommand_initOptions() {
     this.options.unshift({
-        option: '-a, --all'
-    }, {
-        option: '-i, --teamId [teamId]'
-    }, {
-        option: '-t --teamName [teamName]'
+        option: '--distributionMethod [distributionMethod]',
+        autocomplete: TeamsAppListCommand.allowedDistributionMethods
     });
 }, _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.';
-        }
-        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
+        if (args.options.distributionMethod &&
+            TeamsAppListCommand.allowedDistributionMethods.indexOf(args.options.distributionMethod) < 0) {
+            return `'${args.options.distributionMethod}' is not a valid distributionMethod. Allowed distribution methods are: ${TeamsAppListCommand.allowedDistributionMethods.join(', ')}`;
         }
         return true;
     }));
 };
+TeamsAppListCommand.allowedDistributionMethods = ['store', 'organization', 'sideloaded'];
 module.exports = new TeamsAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/teams/commands/app/app-publish.js

@@ -35,23 +35,22 @@ class TeamsAppPublishCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const fullPath = path.resolve(args.options.filePath);
-            if (this.verbose) {
-                logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
-                headers: {
-                    "content-type": "application/zip",
-                    accept: 'application/json;odata.metadata=none'
-                },
-                data: fs.readFileSync(fullPath)
-            };
             try {
-                const res = yield request_1.default.post(requestOptions);
-                if (res && res.id) {
-                    logger.log(res.id);
+                const fullPath = path.resolve(args.options.filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
                 }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
+                    headers: {
+                        'content-type': 'application/zip',
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: fs.readFileSync(fullPath)
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

package/dist/m365/teams/commands/app/app-uninstall.js

@@ -38,7 +38,7 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const uninstallApp = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.appId}`,
+                    url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.id}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     }
@@ -58,7 +58,7 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to uninstall the app with id ${args.options.appId} from the Microsoft Teams team ${args.options.teamId}?`
+                    message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?`
                 });
                 if (result.continue) {
                     yield uninstallApp();
@@ -75,7 +75,7 @@ _TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_i
     });
 }, _TeamsAppUninstallCommand_initOptions = function _TeamsAppUninstallCommand_initOptions() {
     this.options.unshift({
-        option: '--appId <appId>'
+        option: '--id <id>'
     }, {
         option: '--teamId <teamId>'
     }, {

package/dist/m365/teams/commands/app/app-update.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -64,7 +65,7 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.id);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -114,7 +115,7 @@ _TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTel
         return true;
     }));
 }, _TeamsAppUpdateCommand_initOptionSets = function _TeamsAppUpdateCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new TeamsAppUpdateCommand();
 //# sourceMappingURL=app-update.js.map

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

@@ -15,11 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsCacheRemoveCommand_instances, _TeamsCacheRemoveCommand_initTelemetry, _TeamsCacheRemoveCommand_initOptions, _TeamsCacheRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const os_1 = require("os");
 const util = require("util");
 const Cli_1 = require("../../../../cli/Cli");
-const GraphCommand_1 = require("../../../base/GraphCommand");
+const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
-class TeamsCacheRemoveCommand extends GraphCommand_1.default {
+class TeamsCacheRemoveCommand extends AnonymousCommand_1.default {
     constructor() {
         super();
         _TeamsCacheRemoveCommand_instances.add(this);
@@ -63,19 +65,48 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
     clearTeamsCache(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.killRunningProcess(logger);
-                yield this.removeCacheFiles(logger);
+                const filePath = this.getTeamsCacheFolderPath(logger);
+                const folderExists = yield this.checkIfCacheFolderExists(filePath, logger);
+                if (folderExists) {
+                    yield this.killRunningProcess(logger);
+                    yield this.removeCacheFiles(filePath, logger);
+                    logger.logToStderr('Teams cache cleared!');
+                }
+                else {
+                    logger.logToStderr('Cache folder does not exist. Nothing to remove.');
+                }
             }
             catch (e) {
                 throw e.message;
             }
-            logger.logToStderr('Teams cache cleared!');
         });
     }
+    getTeamsCacheFolderPath(logger) {
+        const platform = process.platform;
+        if (this.verbose) {
+            logger.logToStderr(`Getting path of Teams cache folder for platform ${platform}...`);
+        }
+        let filePath = '';
+        switch (platform) {
+            case 'win32':
+                filePath = `${process.env.APPDATA}\\Microsoft\\Teams`;
+                break;
+            case 'darwin':
+                filePath = `${os_1.homedir}/Library/Application Support/Microsoft/Teams`;
+                break;
+        }
+        return filePath;
+    }
+    checkIfCacheFolderExists(filePath, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Checking if Teams cache folder exists at ${filePath}...`);
+        }
+        return fs.existsSync(filePath);
+    }
     killRunningProcess(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr('Stop Teams client');
+                logger.logToStderr('Stopping Teams client...');
             }
             const platform = process.platform;
             let cmd = '';
@@ -112,19 +143,19 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
             }
         });
     }
-    removeCacheFiles(logger) {
+    removeCacheFiles(filePath, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr('Clear Teams cached files');
+                logger.logToStderr('Removing Teams cache files...');
             }
             const platform = process.platform;
             let cmd = '';
             switch (platform) {
                 case 'win32':
-                    cmd = 'cd %userprofile% && rmdir /s /q AppData\\Roaming\\Microsoft\\Teams';
+                    cmd = `rmdir /s /q "${filePath}"`;
                     break;
                 case 'darwin':
-                    cmd = 'rm -r ~/Library/Application\\ Support/Microsoft/Teams';
+                    cmd = `rm -r "${filePath}"`;
                     break;
             }
             if (this.debug) {

package/dist/m365/teams/commands/channel/channel-add.js

@@ -140,7 +140,7 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
         return true;
     }));
 }, _TeamsChannelAddCommand_initOptionSets = function _TeamsChannelAddCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] });
 };
 module.exports = new TeamsChannelAddCommand();
 //# sourceMappingURL=channel-add.js.map