@pnp/cli-microsoft365 6.2.0-beta.01dcbcb → 6.2.0-beta.725ebd5

package/dist/m365/aad/commands/approleassignment/approleassignment-add.js

@@ -58,6 +58,9 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
             };
             try {
                 const servicePrincipalResult = yield request_1.default.get(getServicePrinciplesRequestOptions);
+                if (servicePrincipalResult.value.length === 0) {
+                    return Promise.reject(`The specified service principal doesn't exist`);
+                }
                 if (servicePrincipalResult.value.length > 1) {
                     throw 'More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.';
                 }

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -22,6 +22,7 @@ const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const SpoGroupMemberListCommand = require("./group-member-list");
 class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.GROUP_MEMBER_REMOVE;
@@ -58,54 +59,89 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeUserfromSPGroup = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
-                }
-                let requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                    ? `GetById('${args.options.groupId}')`
-                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}`;
-                if (args.options.userId) {
-                    requestUrl += `/users/removeById(${args.options.userId})`;
-                }
-                else {
-                    const userName = yield this.getUserName(logger, args);
-                    const loginName = `i:0#.f|membership|${userName}`;
-                    requestUrl += `/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
-                }
-                const requestOptions = {
-                    url: requestUrl,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
                 if (this.debug) {
                     logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
                 }
-                yield removeUserfromSPGroup();
+                yield this.removeUserfromSPGroup(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email} from the SharePoint group?`
+                    message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email || args.options.aadGroupId || args.options.aadGroupName} from the SharePoint group?`
                 });
                 if (result.continue) {
-                    yield removeUserfromSPGroup();
+                    yield this.removeUserfromSPGroup(logger, args);
                 }
             }
         });
     }
+    removeUserfromSPGroup(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId || args.options.aadGroupId || args.options.aadGroupName} from Group: ${args.options.groupId || args.options.groupName}`);
+            }
+            let requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                ? `GetById('${args.options.groupId}')`
+                : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}`;
+            if (args.options.userId) {
+                requestUrl += `/users/removeById(${args.options.userId})`;
+            }
+            else if (args.options.userName || args.options.email) {
+                const userName = yield this.getUserName(logger, args);
+                const loginName = `i:0#.f|membership|${userName}`;
+                requestUrl += `/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
+            }
+            else {
+                const aadGroupId = yield this.getGroupId(args);
+                requestUrl += `/users/RemoveById(${aadGroupId})`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getGroupId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const options = {
+                webUrl: args.options.webUrl,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            if (args.options.groupId) {
+                options.groupId = args.options.groupId;
+            }
+            else {
+                options.groupName = args.options.groupName;
+            }
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupMemberListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const getGroupMemberListOutput = JSON.parse(output.stdout);
+            let foundgroups;
+            if (args.options.aadGroupId) {
+                foundgroups = getGroupMemberListOutput.filter((x) => { return x.LoginName.indexOf(args.options.aadGroupId) > -1 && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
+            }
+            else {
+                foundgroups = getGroupMemberListOutput.filter((x) => { return x.Title === args.options.aadGroupName && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
+            }
+            if (foundgroups.length === 0) {
+                throw `The Azure AD group ${args.options.aadGroupId || args.options.aadGroupName} is not found in SharePoint group ${args.options.groupId || args.options.groupName}`;
+            }
+            return foundgroups[0].Id;
+        });
+    }
 }
 _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCommand_initTelemetry = function _SpoGroupMemberRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -115,6 +151,8 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
             userName: (!(!args.options.userName)).toString(),
             email: (!(!args.options.email)).toString(),
             userId: (!(!args.options.userId)).toString(),
+            aadGroupId: (!(!args.options.groupId)).toString(),
+            aadGroupName: (!(!args.options.groupName)).toString(),
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -131,6 +169,10 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         option: '--email [email]'
     }, {
         option: '--userId [userId]'
+    }, {
+        option: '--aadGroupId [aadGroupId]'
+    }, {
+        option: '--aadGroupName [aadGroupName]'
     }, {
         option: '--confirm'
     });
@@ -148,10 +190,13 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         if (args.options.email && !validation_1.validation.isValidUserPrincipalName(args.options.email)) {
             return `${args.options.email} is not a valid email`;
         }
+        if (args.options.aadGroupId && !validation_1.validation.isValidGuid(args.options.aadGroupId)) {
+            return `${args.options.aadGroupId} is not a valid GUID`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId'] });
+    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'aadGroupId', 'aadGroupName'] });
 };
 module.exports = new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

package/dist/m365/spo/commands/list/list-retentionlabel-ensure.js

@@ -42,6 +42,10 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             this.showDeprecationWarning(logger, commands_1.default.LIST_LABEL_SET, commands_1.default.LIST_RETENTIONLABEL_ENSURE);
+            if (args.options.label) {
+                args.options.name = args.options.label;
+                this.warn(logger, `Option 'label' is deprecated. Please use 'name' instead`);
+            }
             if (args.options.blockDelete) {
                 this.warn(logger, `Option 'blockDelete' is deprecated.`);
             }
@@ -81,7 +85,7 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
                     },
                     data: {
                         listUrl: listAbsoluteUrl,
-                        complianceTagValue: args.options.label,
+                        complianceTagValue: args.options.name,
                         blockDelete: args.options.blockDelete || false,
                         blockEdit: args.options.blockEdit || false,
                         syncToItems: args.options.syncToItems || false
@@ -99,6 +103,8 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
 _SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetentionLabelEnsureCommand_initTelemetry = function _SpoListRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            name: (!(!args.options.name)).toString(),
+            label: (!(!args.options.label)).toString(),
             listId: (!(!args.options.listId)).toString(),
             listTitle: (!(!args.options.listTitle)).toString(),
             listUrl: (!(!args.options.listUrl)).toString(),
@@ -111,7 +117,9 @@ _SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetention
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--label <label>'
+        option: '--name [name]'
+    }, {
+        option: '--label [label]'
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {

package/dist/m365/spo/commands/listitem/ListItemRetentionLabel.js

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

package/dist/m365/spo/commands/listitem/SiteRetentionLabel.js

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

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-ensure.js

@@ -0,0 +1,161 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoListItemRetentionLabelEnsureCommand_instances, _SpoListItemRetentionLabelEnsureCommand_initTelemetry, _SpoListItemRetentionLabelEnsureCommand_initOptions, _SpoListItemRetentionLabelEnsureCommand_initValidators, _SpoListItemRetentionLabelEnsureCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoWebRetentionLabelListCommand = require("../web/web-retentionlabel-list");
+const Cli_1 = require("../../../../cli/Cli");
+class SpoListItemRetentionLabelEnsureCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.LISTITEM_RETENTIONLABEL_ENSURE;
+    }
+    get description() {
+        return 'Apply a retention label to a list item';
+    }
+    constructor() {
+        super();
+        _SpoListItemRetentionLabelEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelEnsureCommand_instances, "m", _SpoListItemRetentionLabelEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelEnsureCommand_instances, "m", _SpoListItemRetentionLabelEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelEnsureCommand_instances, "m", _SpoListItemRetentionLabelEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelEnsureCommand_instances, "m", _SpoListItemRetentionLabelEnsureCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const labelInformation = yield this.getLabelInformation(args.options, logger);
+                yield this.applyLabel(args.options, labelInformation, logger);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getLabelInformation(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cmdOptions = {
+                webUrl: options.webUrl,
+                output: 'json',
+                debug: options.debug,
+                verbose: options.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoWebRetentionLabelListCommand, { options: Object.assign(Object.assign({}, cmdOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const labels = JSON.parse(output.stdout);
+            const label = labels.find(l => l.TagName === options.name || l.TagId === options.id);
+            if (this.verbose && label !== undefined) {
+                logger.logToStderr(`Retention label found in the list of available labels: '${label.TagName}' / '${label.TagId}'...`);
+            }
+            if (label === undefined) {
+                throw new Error(`The specified retention label does not exist`);
+            }
+            return {
+                complianceTag: label.TagName,
+                isTagPolicyHold: label.BlockDelete,
+                isTagPolicyRecord: label.BlockEdit,
+                isEventBasedTag: label.IsEventTag,
+                isTagSuperLock: label.SuperLock,
+                isUnlockedAsDefault: label.UnlockedAsDefault
+            };
+        });
+    }
+    applyLabel(options, labelInformation, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Applying retention label to item in list '${options.listId || options.listTitle || options.listUrl}' in site at ${options.webUrl}...`);
+            }
+            let requestUrl = `${options.webUrl}/_api/web`;
+            if (options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/items(${options.listItemId})/SetComplianceTag()`;
+            }
+            else if (options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/items(${options.listItemId})/SetComplianceTag()`;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                requestUrl += `/GetList(@listUrl)/items(${options.listItemId})/SetComplianceTag()?@listUrl='${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}'`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: labelInformation,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+}
+_SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemRetentionLabelEnsureCommand_initTelemetry = function _SpoListItemRetentionLabelEnsureCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            id: typeof args.options.id !== 'undefined'
+        });
+    });
+}, _SpoListItemRetentionLabelEnsureCommand_initOptions = function _SpoListItemRetentionLabelEnsureCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listItemId <listItemId>'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-i, --id [id]'
+    });
+}, _SpoListItemRetentionLabelEnsureCommand_initValidators = function _SpoListItemRetentionLabelEnsureCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const id = parseInt(args.options.listItemId);
+        if (isNaN(id)) {
+            return `${args.options.listItemId} is not a valid list item ID`;
+        }
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.listId &&
+            !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        if (args.options.id &&
+            !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoListItemRetentionLabelEnsureCommand_initOptionSets = function _SpoListItemRetentionLabelEnsureCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+    this.optionSets.push({ options: ['name', 'id'] });
+};
+module.exports = new SpoListItemRetentionLabelEnsureCommand();
+//# sourceMappingURL=listitem-retentionlabel-ensure.js.map

package/dist/m365/spo/commands.js

@@ -148,6 +148,7 @@ exports.default = {
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_RECORD_UNLOCK: `${prefix} listitem record unlock`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_RETENTIONLABEL_ENSURE: `${prefix} listitem retentionlabel ensure`,
     LISTITEM_RETENTIONLABEL_REMOVE: `${prefix} listitem retentionlabel remove`,
     LISTITEM_ROLEASSIGNMENT_ADD: `${prefix} listitem roleassignment add`,
     LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,

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

@@ -15,9 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChatListCommand_instances, _TeamsChatListCommand_initTelemetry, _TeamsChatListCommand_initOptions, _TeamsChatListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const accessToken_1 = require("../../../../utils/accessToken");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const validation_1 = require("../../../../utils/validation");
 class TeamsChatListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.CHAT_LIST;
@@ -31,16 +34,26 @@ class TeamsChatListCommand extends GraphCommand_1.default {
     constructor() {
         super();
         _TeamsChatListCommand_instances.add(this);
+        this.supportedTypes = ['oneOnOne', 'group', 'meeting'];
         __classPrivateFieldGet(this, _TeamsChatListCommand_instances, "m", _TeamsChatListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatListCommand_instances, "m", _TeamsChatListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatListCommand_instances, "m", _TeamsChatListCommand_initValidators).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const filter = args.options.type !== undefined ? `?$filter=chatType eq '${args.options.type}'` : '';
-            const endpoint = `${this.resource}/v1.0/chats${filter}`;
+            const isAppOnlyAuth = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+            if (isAppOnlyAuth && !args.options.userId && !args.options.userName) {
+                throw `The option 'userId' or 'userName' is required when obtaining chats using app only permissions`;
+            }
+            else if (!isAppOnlyAuth && (args.options.userId || args.options.userName)) {
+                throw `The options 'userId' or 'userName' cannot be used when obtaining chats using delegated permissions`;
+            }
+            let requestUrl = `${this.resource}/v1.0/${!isAppOnlyAuth ? 'me' : `users/${args.options.userId || args.options.userName}`}/chats`;
+            if (args.options.type) {
+                requestUrl += `?$filter=chatType eq '${args.options.type}'`;
+            }
             try {
-                const items = yield odata_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(requestUrl);
                 logger.log(items);
             }
             catch (err) {
@@ -58,13 +71,22 @@ _TeamsChatListCommand_instances = new WeakSet(), _TeamsChatListCommand_initTelem
 }, _TeamsChatListCommand_initOptions = function _TeamsChatListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
-        autocomplete: ['oneOnOne', 'group', 'meeting']
+        autocomplete: this.supportedTypes
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
     });
 }, _TeamsChatListCommand_initValidators = function _TeamsChatListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const supportedTypes = ['oneOnOne', 'group', 'meeting'];
-        if (args.options.type !== undefined && supportedTypes.indexOf(args.options.type) === -1) {
-            return `${args.options.type} is not a valid chatType. Accepted values are ${supportedTypes.join(', ')}`;
+        if (args.options.type !== undefined && this.supportedTypes.indexOf(args.options.type) === -1) {
+            return `${args.options.type} is not a valid chatType. Accepted values are ${this.supportedTypes.join(', ')}`;
+        }
+        if (args.options.userId && args.options.userName) {
+            return `You can only specify either 'userId' or 'userName'`;
+        }
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
         }
         return true;
     }));

package/docs/docs/cmd/spo/file/file-sharinglink-list.md

@@ -72,9 +72,9 @@ m365 spo file sharinglink list --webUrl https://contoso.sharepoint.com/sites/dem
           }
         ],
         "link": {
-          "scope": "anonymous",
+          "scope": "organization",
           "type": "view",
-          "webUrl": "https://contoso.sharepoint.com/:b:/s/demo/EY50lub3559MtRKfj2hrZqoBWnHOpGIcgi4gzw9XiWYJ-A",
+          "webUrl": "https://contoso.sharepoint.com/:w:/s/demo/EY50lub3559MtRKfj2hrZqoBWnHOpGIcgi4gzw9XiWYJ-A",
           "preventsDownload": false
         }
       }

package/docs/docs/cmd/spo/group/group-member-remove.md

@@ -20,36 +20,54 @@ m365 spo group member remove [options]
 : Name of the SharePoint group from which user has to be removed. Specify either `groupName` or `groupId`, but not both.
 
 `--userName [userName]`
-: The UPN (user principal name, eg. megan.bowen@contoso.com) of the user that needs to be removed. Specify either `userName`, `email`, or `userId`, but not multiple.
+: The UPN (user principal name, eg. megan.bowen@contoso.com) of the user that needs to be removed. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
 
 `--email [email]`
-: The email of the user to remove as a member. Specify either `userName`, `email`, or `userId`, but not multiple.
+: The email of the user to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
 
 `--userId [userId]`
-: The user Id (Id of the site user, eg. 14) of the user to remove as a member. Specify either `userName`, `email`, or `userId`, but not multiple.
+: The user Id (Id of the site user, eg. 14) of the user to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
+
+`--aadGroupId [aadGroupId]`
+: The object Id of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
+
+`--aadGroupName [aadGroupName]`
+: The name of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
 
-Remove a user from a SharePoint group by userName.
+Remove a user from a SharePoint group based on the id on a given web
 
 ```sh
 m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userName "Alex.Wilber@contoso.com"
 ```
 
-Remove a user from a SharePoint group by email.
+Remove a user from a SharePoint group based on the username on a given web
 
 ```sh
 m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --email "Alex.Wilber@contoso.com"
 ```
 
-Remove a user from a SharePoint group by id.
+Remove a user from a SharePoint group by email.
 
 ```sh
 m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --userId 14
 ```
 
+Remove an Azure AD group from a SharePoint group based on the Azure AD group name on a given web
+
+```sh
+m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --aadGroupName "Azure AD Security Group"
+```
+
+Remove an Azure AD group from a SharePoint group based on the Azure AD group ID on a given web
+
+```sh
+m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --aadGroupId "5786b8e8-c495-4734-b345-756733960730"
+```
+
 ## Response
 
 The command won't return a response on success.

package/docs/docs/cmd/spo/list/list-retentionlabel-ensure.md

@@ -19,8 +19,11 @@ m365 spo list label set [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the list is located.
 
+`--name <name>`
+: The label name to set on the list.
+
 `--label <label>`
-: The label to set on the list.
+: (deprecated. Use `name` instead) The label name to set on the list.
 
 `-t, --listTitle [listTitle]`
 : The title of the list on which to set the label. Specify either `listTitle`, `listId`, or `listUrl` but not multiple.
@@ -48,16 +51,16 @@ A list retention label is a default label that will be applied to all new items
 
 ## Examples
 
-Sets retention label on the list with specified site-relative URL located in the specified site.
+Sets a retention label by name on a given list
 
 ```sh
-m365 spo list retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl 'Shared Documents' --label 'Some label'
+m365 spo list retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl 'Shared Documents' --name 'Some label'
 ```
 
-Sets retention label and disables editing and deleting items on the list and all existing items for the list with specified title located in the specified site.
+Sets a retention label by name and disables editing and deleting items on the list and all existing items for a given list
 
 ```sh
-m365 spo list retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'Documents' --label 'Some label' --blockEdit --blockDelete --syncToItems
+m365 spo list retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'Documents' --name 'Some label' --blockEdit --blockDelete --syncToItems
 ```
 
 ## Response

package/docs/docs/cmd/spo/listitem/listitem-retentionlabel-ensure.md

@@ -0,0 +1,58 @@
+# spo listitem retentionlabel ensure
+
+Apply a retention label to a list item
+
+## Usage
+
+```sh
+m365 spo listitem retentionlabel ensure [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site where the retentionlabel from a listitem to apply is located
+
+`--listItemId <listItemId>`
+: The ID of the list item for which the retention label should be applied.
+
+`--listId [listId]`
+: ID of the list where the retention label should be applied. Specify either `listTitle`, `listId` or `listUrl`
+
+`--listTitle [listTitle]`
+: Title of the list where the retention label should be applied. Specify either `listTitle`, `listId` or `listUrl`
+
+`--listUrl [listUrl]`
+: Server- or site-relative URL of the list. Specify either `listTitle`, `listId` or `listUrl`
+
+`-n, --name [name]`
+: The name of the retention label. Specify either `name` or `id`.
+
+`-i, --id [id]`
+: The id of the retention label. Specify either `name` or `id`.
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Applies the retention label _Some label_ to a list item in a given site based on the list id and label name
+
+```sh
+m365 spo listitem retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf --listItemId 1 --name 'Some label'
+```
+
+Applies a retention label to a list item in a given site based on the list title and label id
+
+```sh
+m365 spo listitem retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'List 1' --listItemId 1 --id '7a621a91-063b-461b-aff6-d713d5fb23eb'
+```
+
+Applies the retention label _Some label_ to a list item in a given site based on the server relative list url
+
+```sh
+m365 spo listitem retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl /sites/project-x/lists/TestList --listItemId 1 --name 'Some label'
+```
+
+## Response
+
+The command won't return a response on success.