@pnp/cli-microsoft365 6.0.0-beta.e1e0a1b → 6.0.0-beta.f94d570

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

@@ -17,10 +17,19 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
         telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
         telemetryProps.listUrl = typeof args.options.listUrl !== 'undefined';
         telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.fieldTitle = typeof args.options.fieldTitle !== 'undefined';
+        telemetryProps.title = typeof args.options.title !== 'undefined';
         return telemetryProps;
     }
+    optionSets() {
+        return [
+            ['id', 'title', 'fieldTitle']
+        ];
+    }
     commandAction(logger, args, cb) {
+        if (args.options.fieldTitle) {
+            args.options.title = args.options.fieldTitle;
+            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
+        }
         let listRestUrl = '';
         if (args.options.listId) {
             listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
@@ -37,7 +46,7 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         else {
-            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.fieldTitle)}')`;
+            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
         }
         const requestOptions = {
             url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
@@ -72,6 +81,9 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             },
             {
                 option: '--fieldTitle [fieldTitle]'
+            },
+            {
+                option: '-t, --title [title]'
             }
         ];
         const parentOptions = super.options();
@@ -82,9 +94,6 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.fieldTitle) {
-            return 'Specify id or fieldTitle, one is required';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }

package/dist/m365/spo/commands/field/field-remove.js

@@ -19,11 +19,20 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
         telemetryProps.listUrl = typeof args.options.listUrl !== 'undefined';
         telemetryProps.id = typeof args.options.id !== 'undefined';
         telemetryProps.group = typeof args.options.group !== 'undefined';
-        telemetryProps.fieldTitle = typeof args.options.fieldTitle !== 'undefined';
+        telemetryProps.title = typeof args.options.title !== 'undefined';
         telemetryProps.confirm = (!(!args.options.confirm)).toString();
         return telemetryProps;
     }
+    optionSets() {
+        return [
+            ['id', 'title', 'fieldTitle', 'group']
+        ];
+    }
     commandAction(logger, args, cb) {
+        if (args.options.fieldTitle) {
+            args.options.title = args.options.fieldTitle;
+            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
+        }
         let messageEnd;
         if (args.options.listId || args.options.listTitle) {
             messageEnd = `in list ${args.options.listId || args.options.listTitle}`;
@@ -31,16 +40,16 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
         else {
             messageEnd = `in site ${args.options.webUrl}`;
         }
-        const removeField = (listRestUrl, fieldId, fieldTitle) => {
+        const removeField = (listRestUrl, fieldId, title) => {
             if (this.verbose) {
-                logger.logToStderr(`Removing field ${fieldId || fieldTitle} ${messageEnd}...`);
+                logger.logToStderr(`Removing field ${fieldId || title} ${messageEnd}...`);
             }
             let fieldRestUrl = '';
             if (fieldId) {
                 fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(fieldId)}')`;
             }
             else {
-                fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(fieldTitle)}')`;
+                fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(title)}')`;
             }
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
@@ -97,7 +106,7 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
                 }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
             }
             else {
-                removeField(listRestUrl, args.options.id, args.options.fieldTitle)
+                removeField(listRestUrl, args.options.id, args.options.title)
                     .then(() => {
                     // REST post call doesn't return anything
                     cb();
@@ -108,7 +117,7 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
             prepareRemoval();
         }
         else {
-            const confirmMessage = `Are you sure you want to remove the ${args.options.group ? 'fields' : 'field'} ${args.options.id || args.options.fieldTitle || 'from group ' + args.options.group} ${messageEnd}?`;
+            const confirmMessage = `Are you sure you want to remove the ${args.options.group ? 'fields' : 'field'} ${args.options.id || args.options.title || 'from group ' + args.options.group} ${messageEnd}?`;
             cli_1.Cli.prompt({
                 type: 'confirm',
                 name: 'continue',
@@ -142,7 +151,10 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
                 option: '-i, --id [id]'
             },
             {
-                option: '-t, --fieldTitle [fieldTitle]'
+                option: '--fieldTitle [fieldTitle]'
+            },
+            {
+                option: '-t, --title [title]'
             },
             {
                 option: '-g, --group [group]'
@@ -159,9 +171,6 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.fieldTitle && !args.options.group) {
-            return 'Specify id, fieldTitle, or group. One is required';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }

package/dist/m365/spo/commands/file/file-rename.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const removeCommand = require('./file-remove');
+class SpoFileRenameCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_RENAME;
+    }
+    get description() {
+        return 'Renames a file';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.force = !!args.options.force;
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const webUrl = args.options.webUrl;
+        const originalFileServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
+        this
+            .getFile(originalFileServerRelativeUrl, webUrl)
+            .then((_) => {
+            if (args.options.force) {
+                return this.deleteFile(webUrl, args.options.sourceUrl, args.options.targetFileName);
+            }
+            return Promise.resolve();
+        })
+            .then(_ => {
+            const requestBody = {
+                formValues: [{
+                        FieldName: 'FileLeafRef',
+                        FieldValue: args.options.targetFileName
+                    }]
+            };
+            const requestOptions = {
+                url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(originalFileServerRelativeUrl)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        })
+            .then((resp) => {
+            logger.log(resp.value);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getFile(originalFileServerRelativeUrl, webUrl) {
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(originalFileServerRelativeUrl)}')?$select=UniqueId`;
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions);
+    }
+    deleteFile(webUrl, sourceUrl, targetFileName) {
+        const targetFileServerRelativeUrl = `${utils_1.urlUtil.getServerRelativePath(webUrl, sourceUrl.substring(0, sourceUrl.lastIndexOf('/')))}/${targetFileName}`;
+        const options = {
+            webUrl: webUrl,
+            url: targetFileServerRelativeUrl,
+            recycle: true,
+            confirm: true,
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(removeCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
+            .then(_ => {
+            return Promise.resolve();
+        }, (err) => {
+            if (err.error !== null && err.error.message !== null && err.error.message.includes('does not exist')) {
+                return Promise.resolve();
+            }
+            return Promise.reject(err);
+        });
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            },
+            {
+                option: '-s, --sourceUrl <sourceUrl>'
+            },
+            {
+                option: '-t, --targetFileName <targetFileName>'
+            },
+            {
+                option: '--force'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoFileRenameCommand();
+//# sourceMappingURL=file-rename.js.map

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

@@ -15,6 +15,7 @@ class SpoGroupGetCommand extends SpoCommand_1.default {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.id = (!(!args.options.id)).toString();
         telemetryProps.name = (!(!args.options.name)).toString();
+        telemetryProps.associatedGroup = args.options.associatedGroup;
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
@@ -28,6 +29,19 @@ class SpoGroupGetCommand extends SpoCommand_1.default {
         else if (args.options.name) {
             requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetByName('${encodeURIComponent(args.options.name)}')`;
         }
+        else if (args.options.associatedGroup) {
+            switch (args.options.associatedGroup.toLowerCase()) {
+                case 'owner':
+                    requestUrl = `${args.options.webUrl}/_api/web/AssociatedOwnerGroup`;
+                    break;
+                case 'member':
+                    requestUrl = `${args.options.webUrl}/_api/web/AssociatedMemberGroup`;
+                    break;
+                case 'visitor':
+                    requestUrl = `${args.options.webUrl}/_api/web/AssociatedVisitorGroup`;
+                    break;
+            }
+        }
         const requestOptions = {
             url: requestUrl,
             method: 'GET',
@@ -53,21 +67,27 @@ class SpoGroupGetCommand extends SpoCommand_1.default {
             },
             {
                 option: '--name [name]'
+            },
+            {
+                option: '--associatedGroup [associatedGroup]',
+                autocomplete: ['Owner', 'Member', 'Visitor']
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
+    optionSets() {
+        return [
+            ['id', 'name', 'associatedGroup']
+        ];
+    }
     validate(args) {
-        if (args.options.id && args.options.name) {
-            return 'Use either "id" or "name", but not all.';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name, one is required';
-        }
         if (args.options.id && isNaN(args.options.id)) {
             return `Specified id ${args.options.id} is not a number`;
         }
+        if (args.options.associatedGroup && ['owner', 'member', 'visitor'].indexOf(args.options.associatedGroup.toLowerCase()) === -1) {
+            return `${args.options.associatedGroup} is not a valid associatedGroup value. Allowed values are Owner|Member|Visitor.`;
+        }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -73,7 +73,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     }
     mapRequestBody(permission, appInfo) {
         const requestBody = {
-            roles: permission.split(',')
+            roles: [permission]
         };
         requestBody.grantedToIdentities = [];
         requestBody.grantedToIdentities.push({ application: { "id": appInfo.appId, "displayName": appInfo.displayName } });
@@ -129,11 +129,8 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        const permissions = args.options.permission.split(',');
-        for (let i = 0; i < permissions.length; i++) {
-            if (['read', 'write'].indexOf(permissions[i]) === -1) {
-                return `${permissions[i]} is not a valid permission value. Allowed values read|write|read,write`;
-            }
+        if (['read', 'write', 'owner'].indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are read|write|owner`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }

package/dist/m365/spo/commands/site/site-apppermission-set.js

@@ -83,7 +83,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
                     'content-type': 'application/json;odata=nometadata'
                 },
                 data: {
-                    roles: args.options.permission.split(',')
+                    roles: [args.options.permission]
                 },
                 responseType: 'json'
             };
@@ -122,11 +122,8 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        const permissions = args.options.permission.split(',');
-        for (let i = 0; i < permissions.length; i++) {
-            if (['read', 'write'].indexOf(permissions[i]) === -1) {
-                return `${permissions[i]} is not a valid permission value. Allowed values are read|write|read,write`;
-            }
+        if (['read', 'write', 'owner'].indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are read|write|owner`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }

package/dist/m365/spo/commands.js

@@ -54,6 +54,7 @@ exports.default = {
     FILE_LIST: `${prefix} file list`,
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
+    FILE_RENAME: `${prefix} file rename`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
     FOLDER_ADD: `${prefix} folder add`,
     FOLDER_COPY: `${prefix} folder copy`,

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

@@ -124,10 +124,10 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
                 option: '--channelName [channelName]'
             },
             {
-                option: '--tabId [tabId]'
+                option: '-i, --tabId [tabId]'
             },
             {
-                option: '--tabName [tabName]'
+                option: '-n, --tabName [tabName]'
             }
         ];
         const parentOptions = super.options();

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-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/docs/docs/cmd/spo/field/field-get.md

@@ -23,10 +23,13 @@ m365 spo field get [options]
 : Server- or web-relative URL of the list where the field is located. Specify only one of listTitle, listId or listUrl
 
 `-i, --id [id]`
-: The ID of the field to retrieve. Specify id or fieldTitle but not both
+: The ID of the field to retrieve. Specify id or title but not both
 
 `--fieldTitle [fieldTitle]`
-: The display name (case-sensitive) of the field to retrieve. Specify id or fieldTitle but not both
+: (deprecated. Use `title` instead) The display name (case-sensitive) of the field to retrieve. Specify id or fieldTitle but not both
+
+`-t, --title [title]`
+: The display name (case-sensitive) of the field to remove. Specify id or title, or group but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -47,5 +50,5 @@ m365 spo field get --webUrl https://contoso.sharepoint.com/sites/contoso-sales -
 Retrieves list column by display name located in site _https://contoso.sharepoint.com/sites/contoso-sales_. Retrieves the list by its url
 
 ```sh
-m365 spo field get --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl 'Lists/Events' --fieldTitle 'Title'
+m365 spo field get --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl "Lists/Events" --title "Title"
 ```

package/docs/docs/cmd/spo/field/field-remove.md

@@ -23,13 +23,16 @@ m365 spo field remove [options]
 : Server- or web-relative URL of the list where the field is located. Specify only one of `listTitle`, `listId` or `listUrl`
 
 `-i, --id [id]`
-: The ID of the field to remove. Specify id, fieldTitle, or group
+: The ID of the field to remove. Specify id, title, or group
 
-`-t, --fieldTitle [fieldTitle]`
-: The display name (case-sensitive) of the field to remove. Specify id, fieldTitle, or group
+`--fieldTitle [fieldTitle]`
+: (deprecated. Use `title` instead) The display name (case-sensitive) of the field to remove. Specify id, fieldTitle, or group
+
+`-t, --title [title]`
+: The display name (case-sensitive) of the field to remove. Specify id, title, or group
 
 `-g, --group [group]`
-: Delete all fields from this group (case-sensitive). Specify id, fieldTitle, or group
+: Delete all fields from this group (case-sensitive). Specify id, title, or group
 
 `--confirm`
 : Don't prompt for confirming removing the field
@@ -53,11 +56,11 @@ m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sale
 Remove the list column with the specified display name, located in site _https://contoso.sharepoint.com/sites/contoso-sales_. Retrieves the list by its url
 
 ```sh
-m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl 'Lists/Events' --fieldTitle 'Title'
+m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl "Lists/Events" --title "Title"
 ```
 
 Remove all site columns from group _MyGroup_
 
 ```sh
-m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --group 'MyGroup'
+m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --group "MyGroup"
 ```

package/docs/docs/cmd/spo/file/file-rename.md

@@ -0,0 +1,43 @@
+# spo file rename
+
+Renames a file
+
+## Usage
+
+```sh
+m365 spo file rename [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: The URL of the site where the file is located
+
+`-s, --sourceUrl <sourceUrl>`
+: Site-relative URL of the file to rename
+
+`-t, --targetFileName <targetFileName>`
+: New file name of the file
+
+`--force`
+: If a file already exists with target file name, it will be moved to the recycle bin. If omitted, the rename operation will be canceled if a file already exists with the specified file name
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+If you try to rename a file without the `--force` flag and a file with this name already exists, the operation will be cancelled.
+
+## Examples
+
+Renames a file with server-relative URL _/Shared Documents/Test1.docx_ located in site _<https://contoso.sharepoint.com/sites/project-x>_ to _Test2.docx_
+
+```sh
+m365 spo file rename --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl '/Shared Documents/Test1.docx' --targetFileName 'Test2.docx'
+```
+
+Renames a file with server-relative URL _/Shared Documents/Test1.docx_ located in site _<https://contoso.sharepoint.com/sites/project-x>_ to _Test2.docx_. If the file with the target file name already exists, this file will be moved to the recycle bin
+
+```sh
+m365 spo file rename --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl '/Shared Documents/Test1.docx' --targetFileName 'Test2.docx' --force
+```

package/docs/docs/cmd/spo/group/group-get.md

@@ -11,13 +11,16 @@ m365 spo group get [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site where the group is located
+: URL of the site where the group is located.
 
 `-i, --id [id]`
-: ID of the site group to get. Use either `id` or `name`, but not all. e.g `7`
+: ID of the site group to get. Use either `id`, `name` or `associatedGroup` but not multiple.
 
 `--name [name]`
-: Name of the site group to get. Specify either `id` or `name` but not both e.g `Team Site Members`
+: Name of the site group to get. Use either `id`, `name` or `associatedGroup` but not multiple.
+
+`--associatedGroup [associatedGroup]`
+: Type of the associated group to get. Available values: `Owner`, `Member`, `Visitor`. Use either `id`, `name` or `associatedGroup` but not multiple.
 
 --8<-- "docs/cmd/_global.md"
 
@@ -34,3 +37,9 @@ Get group with name _Team Site Members_ for web _https://contoso.sharepoint.com/
 ```sh
 m365 spo group get --webUrl https://contoso.sharepoint.com/sites/project-x --name "Team Site Members"
 ```
+
+Get the associated owner group of a specified site
+
+```sh
+m365 spo group get --webUrl https://contoso.sharepoint.com/sites/project-x --associatedGroup Owner
+```

package/docs/docs/cmd/spo/site/site-apppermission-add.md

@@ -14,7 +14,7 @@ m365 spo site apppermission add [options]
 : URL of the site collection to add the permission
 
 `-p, --permission <permission>`
-: Permission to site (`read`, `write`, `read,write`). If multiple permissions have to be granted, they have to be comma separated ex. `read,write`
+: Permission to site (`read`, `write`, or `owner`)
 
 `-i, --appId [appId]`
 : Client ID of the Azure AD app for which to grant permissions

package/docs/docs/cmd/spo/site/site-apppermission-set.md

@@ -23,7 +23,7 @@ m365 spo site apppermission set [options]
 : Display name of the Azure AD app for which to update permissions. Specify `permissionId`, `appId` or `appDisplayName`
 
 `-p, --permission <permission>`
-: Permission to site (`read`, `write`, `read,write`). If multiple permissions have to be granted, they have to be comma separated ex. `read,write`
+: Permission to site (`read`, `write`, or `owner`)
 
 --8<-- "docs/cmd/_global.md"
 

package/docs/docs/cmd/teams/tab/tab-get.md

@@ -22,10 +22,10 @@ m365 teams tab get [options]
 `--channelName [channelName]`
 : The display name of the Microsoft Teams channel where the tab is located. Specify either channelId or channelName but not both
 
-`--tabId [tabId]`
+`-i, --tabId [tabId]`
 : The ID of the Microsoft Teams tab. Specify either tabId or tabName but not both
 
-`--tabName [tabName]`
+`-n, --tabName [tabName]`
 : The display name of the Microsoft Teams tab. Specify either tabId or tabName but not both
 
 --8<-- "docs/cmd/_global.md"

package/docs/docs/cmd/teams/team/team-clone.md

@@ -10,11 +10,17 @@ m365 teams team clone [options]
 
 ## Options
 
-`-i, --teamId <teamId>`
+`-i, --id [id]`
 : The ID of the Microsoft Teams team to clone
 
-`-n, --displayName <displayName>`
-: The display name for the new Microsoft Teams Team
+`--teamId [teamId]`
+: (deprecated. Use `id` instead) The ID of the Microsoft Teams team to clone
+
+`-n, --name [name]`
+: The display name for the new Microsoft Teams Team to clone
+
+`--displayName [displayName]`
+: (deprecated. Use `name` instead) The display name for the new Microsoft Teams Team to clone
 
 `-p, --partsToClone <partsToClone>`
 : A comma-separated list of the parts to clone. Allowed values are `apps,channels,members,settings,tabs`
@@ -41,11 +47,11 @@ When tabs are cloned, they are put into an unconfigured state. The first time yo
 Creates a clone of a Microsoft Teams team with mandatory parameters
 
 ```sh
-m365 teams team clone --teamId 15d7a78e-fd77-4599-97a5-dbb6372846c5 --displayName "Library Assist" --partsToClone "apps,tabs,settings,channels,members"
+m365 teams team clone --id 15d7a78e-fd77-4599-97a5-dbb6372846c5 --name "Library Assist" --partsToClone "apps,tabs,settings,channels,members"
 ```
 
 Creates a clone of a Microsoft Teams team with mandatory and optional parameters
 
 ```sh
-m365 teams team clone --teamId 15d7a78e-fd77-4599-97a5-dbb6372846c5 --displayName "Library Assist" --partsToClone "apps,tabs,settings,channels,members" --description "Self help community for library" --classification "Library" --visibility "public"
+m365 teams team clone --id 15d7a78e-fd77-4599-97a5-dbb6372846c5 --name "Library Assist" --partsToClone "apps,tabs,settings,channels,members" --description "Self help community for library" --classification "Library" --visibility "public"
 ```

package/docs/docs/cmd/teams/team/team-set.md

@@ -10,11 +10,17 @@ m365 teams team set [options]
 
 ## Options
 
-`-i, --teamId <teamId>`
+`-i, --id [id]`
 : The ID of the Microsoft Teams team for which to update settings
 
+`--teamId [teamId]`
+: (deprecated. Use `id` instead) The ID of the Microsoft Teams team for which to update settings
+
+`-n, --name [name]`
+: The display name for the Microsoft Teams team for which to update settings
+
 `--displayName [displayName]`
-: The display name for the Microsoft Teams team
+: (deprecated. Use `name` instead) The display name for the Microsoft Teams team for which to update settings
 
 `--description [description]`
 : The description for the Microsoft Teams team
@@ -35,11 +41,11 @@ m365 teams team set [options]
 Set Microsoft Teams team visibility as Private
 
 ```sh
-m365 teams team set --teamId '00000000-0000-0000-0000-000000000000' --visibility Private
+m365 teams team set --id "00000000-0000-0000-0000-000000000000" --visibility Private
 ```
 
 Set Microsoft Teams team classification as MBI
 
 ```sh
-m365 teams team set --teamId '00000000-0000-0000-0000-000000000000' --classification MBI
+m365 teams team set --id "00000000-0000-0000-0000-000000000000" --classification MBI
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.0.0-beta.e1e0a1b",
+  "version": "6.0.0-beta.f94d570",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",