@pnp/cli-microsoft365 6.0.0-beta.01ba480 → 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.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,15 +84,17 @@ 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`,
     HOMESITE_REMOVE: `${prefix} homesite remove`,
     HOMESITE_SET: `${prefix} homesite set`,
+    HUBSITE_CONNECT: `${prefix} hubsite connect`,
     HUBSITE_DATA_GET: `${prefix} hubsite data get`,
+    HUBSITE_DISCONNECT: `${prefix} hubsite disconnect`,
     HUBSITE_GET: `${prefix} hubsite get`,
     HUBSITE_LIST: `${prefix} hubsite list`,
     HUBSITE_REGISTER: `${prefix} hubsite register`,
@@ -128,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`,

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,
@@ -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-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

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

@@ -20,6 +20,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelGetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -57,7 +58,7 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             return Promise.resolve('');
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -80,10 +81,10 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
                 const channelId = yield this.getChannelId(args);
                 let url = '';
                 if (args.options.primary) {
-                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/primaryChannel`;
+                    url = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/primaryChannel`;
                 }
                 else {
-                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+                    url = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(channelId)}`;
                 }
                 const requestOptions = {
                     url: url,
@@ -113,11 +114,11 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
     });
 }, _TeamsChannelGetCommand_initOptions = function _TeamsChannelGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --teamId [teamId]'
+        option: '--teamId [teamId]'
     }, {
         option: '--teamName [teamName]'
     }, {
-        option: '-c, --id [id]'
+        option: '-i, --id [id]'
     }, {
         option: '--name [name]'
     }, {
@@ -134,7 +135,7 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
         return true;
     }));
 }, _TeamsChannelGetCommand_initOptionSets = function _TeamsChannelGetCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['id', 'name', 'primary']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['id', 'name', 'primary'] });
 };
 module.exports = new TeamsChannelGetCommand();
 //# sourceMappingURL=channel-get.js.map

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

@@ -95,7 +95,7 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
         return true;
     }));
 }, _TeamsChannelListCommand_initOptionSets = function _TeamsChannelListCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] });
 };
 module.exports = new TeamsChannelListCommand();
 //# sourceMappingURL=channel-list.js.map

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

@@ -21,6 +21,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -42,7 +43,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
                 const teamId = yield this.getTeamId(args);
                 const channelId = yield this.getChannelId(teamId, args);
                 const userIds = yield this.getUserId(args);
-                const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}/members`;
+                const endpoint = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(channelId)}/members`;
                 const roles = args.options.owner ? ["owner"] : [];
                 const tasks = [];
                 for (const userId of userIds) {
@@ -89,7 +90,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -121,7 +122,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     }
     getSingleUser(userDisplayName) {
         const userRequestOptions = {
-            url: `${this.resource}/v1.0/users?$filter=displayName eq '${encodeURIComponent(userDisplayName)}'`,
+            url: `${this.resource}/v1.0/users?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(userDisplayName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -180,7 +181,7 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
         return true;
     }));
 }, _TeamsChannelMemberAddCommand_initOptionSets = function _TeamsChannelMemberAddCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userId', 'userDisplayName']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userDisplayName'] });
 };
 module.exports = new TeamsChannelMemberAddCommand();
 //# sourceMappingURL=channel-member-add.js.map

package/dist/m365/teams/commands/channel/channel-member-list.js

@@ -21,6 +21,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -81,7 +82,7 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -137,7 +138,7 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
         return true;
     }));
 }, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] });
 };
 module.exports = new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -21,6 +21,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -107,7 +108,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -201,7 +202,7 @@ _TeamsChannelMemberRemoveCommand_instances = new WeakSet(), _TeamsChannelMemberR
         return true;
     }));
 }, _TeamsChannelMemberRemoveCommand_initOptionSets = function _TeamsChannelMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userId', 'userName', 'id']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userName', 'id'] });
 };
 module.exports = new TeamsChannelMemberRemoveCommand();
 //# sourceMappingURL=channel-member-remove.js.map

package/dist/m365/teams/commands/channel/channel-member-set.js

@@ -20,6 +20,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -81,7 +82,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -178,7 +179,7 @@ _TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetC
         return true;
     }));
 }, _TeamsChannelMemberSetCommand_initOptionSets = function _TeamsChannelMemberSetCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userName', 'userId', 'id']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userName', 'userId', 'id'] });
 };
 module.exports = new TeamsChannelMemberSetCommand();
 //# sourceMappingURL=channel-member-set.js.map