@pnp/cli-microsoft365 5.5.0-beta.b580b06 → 5.5.0-beta.f0f7ad7

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN015008_FILE_eslintrc_js.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN015008_FILE_eslintrc_js = void 0;
+const utils_1 = require("../../../../../../utils");
 const FileAddRemoveRule_1 = require("./FileAddRemoveRule");
 class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
     constructor(add, contents) {
@@ -9,6 +10,12 @@ class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
     get id() {
         return 'FN015008';
     }
+    visit(project, notifications) {
+        if (utils_1.spfx.isReactProject(project)) {
+            this.contents = this.contents.replace('@microsoft/eslint-config-spfx/lib/profiles/default', '@microsoft/eslint-config-spfx/lib/profiles/react');
+        }
+        super.visit(project, notifications);
+    }
 }
 exports.FN015008_FILE_eslintrc_js = FN015008_FILE_eslintrc_js;
 //# sourceMappingURL=FN015008_FILE_eslintrc_js.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.0.js

@@ -27,6 +27,7 @@ const FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
 const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
 const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
 const FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1 = require("./rules/FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9");
+const FN002019_DEVDEP_spfx_fast_serve_helpers_1 = require("./rules/FN002019_DEVDEP_spfx_fast_serve_helpers");
 const FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1 = require("./rules/FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5");
 const FN002021_DEVDEP_rushstack_eslint_config_1 = require("./rules/FN002021_DEVDEP_rushstack_eslint_config");
 const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
@@ -67,6 +68,7 @@ module.exports = [
     new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('', false),
     new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('1.15.2'),
     new FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1.FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9('', false),
+    new FN002019_DEVDEP_spfx_fast_serve_helpers_1.FN002019_DEVDEP_spfx_fast_serve_helpers('1.15.2'),
     new FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1.FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5('0.2.2'),
     new FN002021_DEVDEP_rushstack_eslint_config_1.FN002021_DEVDEP_rushstack_eslint_config('2.5.1'),
     new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.15.0'),
@@ -78,10 +80,10 @@ module.exports = [
     new FN012017_TSC_extends_1.FN012017_TSC_extends('./node_modules/@microsoft/rush-stack-compiler-4.5/includes/tsconfig-web.json'),
     new FN015003_FILE_tslint_json_1.FN015003_FILE_tslint_json(false, ''),
     new FN015008_FILE_eslintrc_js_1.FN015008_FILE_eslintrc_js(true, `require('@rushstack/eslint-config/patch/modern-module-resolution');
-  module.exports = {
-    extends: ['@microsoft/eslint-config-spfx/lib/profiles/react'],
-    parserOptions: { tsconfigRootDir: __dirname }
-  };`),
+module.exports = {
+  extends: ['@microsoft/eslint-config-spfx/lib/profiles/default'],
+  parserOptions: { tsconfigRootDir: __dirname }
+};`),
     new FN023002_GITIGNORE_heft_1.FN023002_GITIGNORE_heft()
 ];
 //# sourceMappingURL=upgrade-1.15.0.js.map

package/dist/m365/spo/base-permissions.js

@@ -22,6 +22,15 @@ class BasePermissions {
     set low(value) {
         this._low = value;
     }
+    parse() {
+        const result = [];
+        for (const permissionKind in PermissionKind) {
+            if (this.has(PermissionKind[permissionKind])) {
+                result.push(permissionKind);
+            }
+        }
+        return result;
+    }
     has(perm) {
         let hasPermission = false;
         if (perm === PermissionKind.FullMask) {

package/dist/m365/spo/commands/hubsite/hubsite-get.js

@@ -11,37 +11,87 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specified hub site';
     }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.title = typeof args.options.title !== 'undefined';
+        telemetryProps.url = typeof args.options.url !== 'undefined';
+        return telemetryProps;
+    }
     commandAction(logger, args, cb) {
         utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
-            const requestOptions = {
-                url: `${spoUrl}/_api/hubsites/getbyid('${encodeURIComponent(args.options.id)}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
+            if (args.options.id) {
+                return this.getHubSiteById(spoUrl, args.options);
+            }
+            else {
+                return this.getHubSite(spoUrl, args.options);
+            }
         })
             .then((res) => {
             logger.log(res);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    getHubSiteById(spoUrl, options) {
+        const requestOptions = {
+            url: `${spoUrl}/_api/hubsites/getbyid('${options.id}')`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions);
+    }
+    getHubSite(spoUrl, options) {
+        const requestOptions = {
+            url: `${spoUrl}/_api/hubsites`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            let hubSites = response.value;
+            if (options.title) {
+                hubSites = hubSites.filter(site => site.Title.toLocaleLowerCase() === options.title.toLocaleLowerCase());
+            }
+            else if (options.url) {
+                hubSites = hubSites.filter(site => site.SiteUrl.toLocaleLowerCase() === options.url.toLocaleLowerCase());
+            }
+            if (hubSites.length === 0) {
+                return Promise.reject(`The specified hub site ${options.title || options.url} does not exist`);
+            }
+            if (hubSites.length > 1) {
+                return Promise.reject(`Multiple hub sites with ${options.title || options.url} found. Please disambiguate: ${hubSites.map(site => site.SiteUrl).join(', ')}`);
+            }
+            return hubSites[0];
+        });
+    }
     options() {
         const options = [
-            {
-                option: '-i, --id <id>'
-            }
+            { option: '-i, --id [id]' },
+            { option: '-t, --title [title]' },
+            { option: '-u, --url [url]' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
+    optionSets() {
+        return [
+            ['id', 'title', 'url']
+        ];
+    }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
+        if (args.options.url) {
+            return utils_1.validation.isValidSharePointUrl(args.options.url);
+        }
         return true;
     }
 }

package/dist/m365/spo/commands/listitem/listitem-get.js

@@ -24,15 +24,15 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
-        const propertiesSelect = args.options.properties ?
-            `?$select=${encodeURIComponent(args.options.properties)}` :
-            ((!args.options.output || args.options.output === 'text') ?
-                `?$select=Id,Title` :
-                ``);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')` :
+            `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+        const propertiesSelect = args.options.properties ? args.options.properties.split(',') : [];
+        const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
+        const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
+        const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
+        const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
         const requestOptions = {
-            url: `${listRestUrl}/items(${args.options.id})${propertiesSelect}`,
+            url: `${listRestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -41,7 +41,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
         request_1.default
             .get(requestOptions)
             .then((response) => {
-            delete response["ID"];
+            delete response['ID'];
             logger.log(response);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));

package/dist/m365/spo/commands/listitem/listitem-list.js

@@ -36,6 +36,9 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         let formDigestValue = '';
         const fieldsArray = args.options.fields ? args.options.fields.split(",")
             : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
+        const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
+        const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
+        const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
         const listRestUrl = listIdArgument ?
             `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
             : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`;
@@ -75,8 +78,9 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
             const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
             const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+            const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
             const fieldSelect = fieldsArray.length > 0 ?
-                `?$select=${encodeURIComponent(fieldsArray.join(","))}&${rowLimit}&${skipToken}&${filter}` :
+                `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
                 `?${rowLimit}&${skipToken}&${filter}`;
             const requestBody = args.options.camlQuery ?
                 {

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

@@ -281,11 +281,11 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                     requestBody.push(`
             <Parameters>
               <Parameter Type="String">${key}</Parameter>
-              <Parameter Type="String">${options[key]}</Parameter>
+              <Parameter Type="String">${options[key].toString()}</Parameter>
             </Parameters>`);
                 }
                 else {
-                    requestBody.push({ FieldName: key, FieldValue: options[key] });
+                    requestBody.push({ FieldName: key, FieldValue: options[key].toString() });
                 }
             }
         });

package/dist/m365/spo/commands/roledefinition/RoleDefinition.js

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

package/dist/m365/spo/commands/roledefinition/RoleType.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RoleType = void 0;
+var RoleType;
+(function (RoleType) {
+    RoleType[RoleType["None"] = 0] = "None";
+    RoleType[RoleType["Guest"] = 1] = "Guest";
+    RoleType[RoleType["Reader"] = 2] = "Reader";
+    RoleType[RoleType["Contributor"] = 3] = "Contributor";
+    RoleType[RoleType["WebDesigner"] = 4] = "WebDesigner";
+    RoleType[RoleType["Administrator"] = 5] = "Administrator";
+    RoleType[RoleType["Editor"] = 6] = "Editor";
+    RoleType[RoleType["Reviewer"] = 7] = "Reviewer";
+    RoleType[RoleType["System"] = 8] = "System";
+})(RoleType = exports.RoleType || (exports.RoleType = {}));
+//# sourceMappingURL=RoleType.js.map

package/dist/m365/spo/commands/roledefinition/roledefinition-get.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
+const commands_1 = require("../../commands");
+const RoleType_1 = require("./RoleType");
+class SpoRoleDefinitionGetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.ROLEDEFINITION_GET;
+    }
+    get description() {
+        return 'Gets specified role definition from web by id';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting role definition from ${args.options.webUrl}...`);
+        }
+        const requestOptions = {
+            url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const permissions = new base_permissions_1.BasePermissions();
+            permissions.high = response.BasePermissions.High;
+            permissions.low = response.BasePermissions.Low;
+            response.BasePermissionsValue = permissions.parse();
+            response.RoleTypeKindValue = RoleType_1.RoleType[response.RoleTypeKind];
+            logger.log(response);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            },
+            {
+                option: '-i, --id <id>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (isNaN(args.options.id)) {
+            return `${args.options.id} is not a number`;
+        }
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoRoleDefinitionGetCommand();
+//# sourceMappingURL=roledefinition-get.js.map

package/dist/m365/spo/commands.js

@@ -167,6 +167,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/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-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-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/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 = [

package/dist/utils/accessToken.js

@@ -57,6 +57,24 @@ exports.accessToken = {
         catch (_a) {
         }
         return userName;
+    },
+    getUserIdFromAccessToken(accessToken) {
+        let userId = '';
+        if (!accessToken || accessToken.length === 0) {
+            return userId;
+        }
+        const chunks = accessToken.split('.');
+        if (chunks.length !== 3) {
+            return userId;
+        }
+        const tokenString = Buffer.from(chunks[1], 'base64').toString();
+        try {
+            const token = JSON.parse(tokenString);
+            userId = token.oid;
+        }
+        catch (_a) {
+        }
+        return userId;
     }
 };
 //# sourceMappingURL=accessToken.js.map