@pnp/cli-microsoft365 5.5.0-beta.4e973d9 → 5.5.0-beta.9774606

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -5,7 +5,7 @@ const Command_1 = require("../../../../Command");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const spoSiteClassicAddCommand = require("../site/site-classic-add");
+const spoSiteAddCommand = require("../site/site-add");
 const spoSiteGetCommand = require("../site/site-get");
 const spoSiteRemoveCommand = require("../site/site-remove");
 const spoTenantAppCatalogUrlGetCommand = require("./tenant-appcatalogurl-get");
@@ -21,7 +21,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
             logger.logToStderr('Checking for existing app catalog URL...');
         }
         cli_1.Cli
-            .executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { _: [] } })
+            .executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } })
             .then((spoTenantAppCatalogUrlGetCommandOutput) => {
             const appCatalogUrl = spoTenantAppCatalogUrlGetCommandOutput.stdout;
             if (!appCatalogUrl) {
@@ -33,6 +33,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Found app catalog URL ${appCatalogUrl}`);
             }
+            //Using JSON.parse
             return this.ensureNoExistingSite(appCatalogUrl, args.options.force, logger);
         })
             .then(() => this.ensureNoExistingSite(args.options.url, args.options.force, logger))
@@ -92,17 +93,19 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Creating app catalog at ${options.url}...`);
         }
-        const siteClassicAddOptions = {
+        const siteAddOptions = {
             webTemplate: 'APPCATALOG#0',
             title: 'App catalog',
+            type: 'ClassicSite',
             url: options.url,
             timeZone: options.timeZone,
-            owner: options.owner,
+            owners: options.owner,
             wait: options.wait,
             verbose: this.verbose,
-            debug: this.debug
+            debug: this.debug,
+            removeDeletedSite: false
         };
-        return cli_1.Cli.executeCommand(spoSiteClassicAddCommand, { options: Object.assign(Object.assign({}, siteClassicAddOptions), { _: [] }) });
+        return cli_1.Cli.executeCommand(spoSiteAddCommand, { options: Object.assign(Object.assign({}, siteAddOptions), { _: [] }) });
     }
     options() {
         const options = [

package/dist/m365/spo/commands.js

@@ -63,9 +63,11 @@ exports.default = {
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
     GET: `${prefix} get`,
+    GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     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`,
@@ -167,6 +169,7 @@ exports.default = {
     REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
     REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
     REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
+    ROLEDEFINITION_GET: `${prefix} roledefinition get`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,
     SEARCH: `${prefix} search`,

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

@@ -0,0 +1,155 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const util = require("util");
+const cli_1 = require("../../../../cli");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class TeamsCacheRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super(...arguments);
+        this.exec = util.promisify(require('child_process').exec);
+    }
+    get name() {
+        return commands_1.default.CACHE_REMOVE;
+    }
+    get description() {
+        return 'Removes the Microsoft Teams client cache';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.confirm = (!(!args.options.confirm)).toString();
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        if (args.options.confirm) {
+            this.clearTeamsCache(logger, cb);
+        }
+        else {
+            logger.logToStderr('This command will execute the following steps.');
+            logger.logToStderr('- Stop the Microsoft Teams client.');
+            logger.logToStderr('- Clear the Microsoft Teams cached files.');
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to clear your Microsoft Teams cache?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    this.clearTeamsCache(logger, cb);
+                }
+            });
+        }
+    }
+    clearTeamsCache(logger, cb) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.killRunningProcess(logger);
+                yield this.removeCacheFiles(logger);
+            }
+            catch (e) {
+                cb(e.message);
+                return;
+            }
+            logger.logToStderr('Teams cache cleared!');
+            cb();
+        });
+    }
+    killRunningProcess(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Stop Teams client');
+            }
+            const platform = process.platform;
+            let cmd = '';
+            switch (platform) {
+                case 'win32':
+                    cmd = 'taskkill /IM "Teams.exe" /F';
+                    break;
+                case 'darwin':
+                    cmd = `ps ax | grep MacOS/Teams -m 1 | grep -v grep | awk '{ print $1 }'`;
+                    break;
+            }
+            if (this.debug) {
+                logger.logToStderr(cmd);
+            }
+            try {
+                const cmdOutput = yield this.exec(cmd);
+                if (cmdOutput.stdout !== '' && platform === 'darwin') {
+                    process.kill(cmdOutput.stdout);
+                }
+                if (this.verbose) {
+                    logger.logToStderr('Teams client closed');
+                }
+            }
+            catch (e) {
+                const errorMessage = e.message;
+                if (errorMessage.includes('ERROR: The process "Teams.exe" not found.')) {
+                    if (this.verbose) {
+                        logger.logToStderr('Teams client isn\'t running');
+                    }
+                }
+                else {
+                    throw new Error(errorMessage);
+                }
+            }
+        });
+    }
+    removeCacheFiles(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Clear Teams cached files');
+            }
+            const platform = process.platform;
+            let cmd = '';
+            switch (platform) {
+                case 'win32':
+                    cmd = 'cd %userprofile% && rmdir /s /q AppData\\Roaming\\Microsoft\\Teams';
+                    break;
+                case 'darwin':
+                    cmd = 'rm -r ~/Library/Application\\ Support/Microsoft/Teams';
+                    break;
+            }
+            if (this.debug) {
+                logger.logToStderr(cmd);
+            }
+            try {
+                yield this.exec(cmd);
+            }
+            catch (e) {
+                throw new Error(e.message);
+            }
+        });
+    }
+    options() {
+        const options = [
+            {
+                option: '--confirm'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate() {
+        if (process.env.CLIMICROSOFT365_ENV === 'docker') {
+            return 'Because you\'re running CLI for Microsoft 365 in a Docker container, we can\'t clear the cache on your host. Instead run this command on your host using "npx ..."';
+        }
+        if (process.platform !== 'win32' && process.platform !== 'darwin') {
+            return `${process.platform} platform is unsupported for this command`;
+        }
+        return true;
+    }
+}
+module.exports = new TeamsCacheRemoveCommand();
+//# sourceMappingURL=cache-remove.js.map

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamArchiveCommand extends GraphCommand_1.default {
@@ -16,27 +17,53 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
         telemetryProps.shouldSetSpoSiteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;
         return telemetryProps;
     }
+    getTeamId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.name)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            return group.id;
+        });
+    }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
         const siteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/archive`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                shouldSetSpoSiteReadOnlyForMembers: siteReadOnlyForMembers
-            }
-        };
-        request_1.default
-            .post(requestOptions)
+        this
+            .getTeamId(args)
+            .then((teamId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/archive`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    shouldSetSpoSiteReadOnlyForMembers: siteReadOnlyForMembers
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--teamId [teamId]'
             },
             {
                 option: '--shouldSetSpoSiteReadOnlyForMembers'
@@ -46,9 +73,18 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!args.options.id && !args.options.name && !args.options.teamId) {
+            return 'Specify either id or name';
+        }
+        if (args.options.name && (args.options.id || args.options.teamId)) {
+            return 'Specify either id or name but not both';
+        }
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         return true;
     }
 }

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

@@ -15,13 +15,24 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.description = typeof args.options.description !== 'undefined';
         telemetryProps.classification = typeof args.options.classification !== 'undefined';
-        telemetryProps.visibility = typeof args.options.visibility !== 'undefined';
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
+        if (args.options.displayName) {
+            args.options.name = args.options.displayName;
+            this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
+        }
         const data = {
-            displayName: args.options.displayName,
-            mailNickname: this.generateMailNickname(args.options.displayName),
+            displayName: args.options.name,
+            mailNickname: this.generateMailNickname(args.options.name),
             partsToClone: args.options.partsToClone
         };
         if (args.options.description) {
@@ -34,7 +45,7 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
             data.visibility = args.options.visibility;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/clone`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.id)}/clone`,
             headers: {
                 "content-type": "application/json",
                 accept: 'application/json;odata.metadata=none'
@@ -46,13 +57,25 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    optionSets() {
+        return [
+            ['id', 'teamId'],
+            ['name', 'displayName']
+        ];
+    }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [teamId]'
             },
             {
-                option: '-n, --displayName <displayName>'
+                option: '--teamId [teamId]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--displayName [displayName]'
             },
             {
                 option: '-p, --partsToClone <partsToClone>',
@@ -73,9 +96,12 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         const partsToClone = args.options.partsToClone.replace(/\s/g, '').split(',');
         for (const partToClone of partsToClone) {
             const part = partToClone.toLowerCase();

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamRemoveCommand extends GraphCommand_1.default {
@@ -17,17 +18,37 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
         telemetryProps.confirm = (!(!args.options.confirm)).toString();
         return telemetryProps;
     }
+    getTeamId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.name)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            return group.id;
+        });
+    }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
         const removeTeam = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.teamId)}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
+            this
+                .getTeamId(args)
+                .then((teamId) => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${encodeURIComponent(teamId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.delete(requestOptions);
+            })
                 .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         };
         if (args.options.confirm) {
@@ -52,7 +73,13 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--teamId [teamId]'
             },
             {
                 option: '--confirm'
@@ -62,9 +89,18 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!args.options.id && !args.options.name && !args.options.teamId) {
+            return 'Specify either id or name';
+        }
+        if (args.options.name && (args.options.id || args.options.teamId)) {
+            return 'Specify either id or name but not both';
+        }
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         return true;
     }
 }

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

@@ -20,8 +20,8 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.displayName) {
-            requestBody.displayName = options.displayName;
+        if (options.name) {
+            requestBody.displayName = options.name;
         }
         if (options.description) {
             requestBody.description = options.description;
@@ -38,9 +38,17 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         return requestBody;
     }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
+        if (args.options.displayName) {
+            args.options.name = args.options.displayName;
+            this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
+        }
         const data = this.mapRequestBody(args.options);
         const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.teamId)}`,
+            url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -51,10 +59,19 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
             .patch(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    optionSets() {
+        return [['id', 'teamId']];
+    }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '--teamId [teamId]'
+            },
+            {
+                option: '-n, --name [name]'
             },
             {
                 option: '--displayName [displayName]'
@@ -77,9 +94,12 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         if (args.options.visibility) {
             if (args.options.visibility.toLowerCase() !== 'private' && args.options.visibility.toLowerCase() !== 'public') {
                 return `${args.options.visibility} is not a valid visibility type. Allowed values are Private|Public`;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
@@ -11,33 +12,68 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
     get description() {
         return 'Restores an archived Microsoft Teams team';
     }
+    getTeamId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.name)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            return group.id;
+        });
+    }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
         const endpoint = `${this.resource}/v1.0`;
-        const requestOptions = {
-            url: `${endpoint}/teams/${encodeURIComponent(args.options.teamId)}/unarchive`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
+        this
+            .getTeamId(args)
+            .then((teamId) => {
+            const requestOptions = {
+                url: `${endpoint}/teams/${encodeURIComponent(teamId)}/unarchive`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        })
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--teamId [teamId]'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!args.options.id && !args.options.name && !args.options.teamId) {
+            return 'Specify either id or name';
+        }
+        if (args.options.name && (args.options.id || args.options.teamId)) {
+            return 'Specify either id or name but not both';
+        }
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         return true;
     }
 }

package/dist/m365/teams/commands.js

@@ -8,6 +8,7 @@ exports.default = {
     APP_REMOVE: `${prefix} app remove`,
     APP_UNINSTALL: `${prefix} app uninstall`,
     APP_UPDATE: `${prefix} app update`,
+    CACHE_REMOVE: `${prefix} cache remove`,
     CHANNEL_ADD: `${prefix} channel add`,
     CHANNEL_GET: `${prefix} channel get`,
     CHANNEL_LIST: `${prefix} channel list`,

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js

@@ -34,15 +34,7 @@ class TenantServiceAnnouncementHealthGetCommand extends GraphCommand_1.default {
             },
             responseType: 'json'
         };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const serviceHealth = response;
-            if (!serviceHealth) {
-                return Promise.reject(`Error fetching service health`);
-            }
-            return Promise.resolve(serviceHealth);
-        });
+        return request_1.default.get(requestOptions);
     }
     options() {
         const options = [