@pnp/cli-microsoft365 6.2.0-beta.01dcbcb → 6.2.0-beta.0ce0a85

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/file/file-sharinglink-get.js

@@ -0,0 +1,116 @@
+"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 _SpoFileSharingLinkGetCommand_instances, _SpoFileSharingLinkGetCommand_initTelemetry, _SpoFileSharingLinkGetCommand_initOptions, _SpoFileSharingLinkGetCommand_initValidators, _SpoFileSharingLinkGetCommand_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");
+class SpoFileSharingLinkGetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_SHARINGLINK_GET;
+    }
+    get description() {
+        return 'Gets details about a specific sharing link of a file';
+    }
+    constructor() {
+        super();
+        _SpoFileSharingLinkGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkGetCommand_instances, "m", _SpoFileSharingLinkGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkGetCommand_instances, "m", _SpoFileSharingLinkGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkGetCommand_instances, "m", _SpoFileSharingLinkGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkGetCommand_instances, "m", _SpoFileSharingLinkGetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving sharing link for file ${args.options.fileUrl || args.options.fileId} with id ${args.options.id}...`);
+            }
+            try {
+                const fileDetails = yield this.getNeededFileInformation(args);
+                const requestOptions = {
+                    url: `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getNeededFileInformation(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.fileUrl) {
+                const fileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')`;
+            }
+            else {
+                requestUrl += `GetFileById('${args.options.fileId}')`;
+            }
+            requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId';
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return res;
+        });
+    }
+}
+_SpoFileSharingLinkGetCommand_instances = new WeakSet(), _SpoFileSharingLinkGetCommand_initTelemetry = function _SpoFileSharingLinkGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            fileId: typeof args.options.fileId !== 'undefined'
+        });
+    });
+}, _SpoFileSharingLinkGetCommand_initOptions = function _SpoFileSharingLinkGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--fileUrl [fileUrl]'
+    }, {
+        option: '--fileId [fileId]'
+    }, {
+        option: '-i, --id <id>'
+    });
+}, _SpoFileSharingLinkGetCommand_initValidators = function _SpoFileSharingLinkGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFileSharingLinkGetCommand_initOptionSets = function _SpoFileSharingLinkGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
+};
+module.exports = new SpoFileSharingLinkGetCommand();
+//# sourceMappingURL=file-sharinglink-get.js.map

package/dist/m365/spo/commands/file/file-sharinglink-list.js

@@ -29,7 +29,7 @@ class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
         return 'Lists all the sharing links of a specific file';
     }
     defaultProperties() {
-        return ['id', 'roles', 'link'];
+        return ['id', 'scope', 'roles', 'link'];
     }
     constructor() {
         super();
@@ -46,7 +46,11 @@ class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
             }
             try {
                 const fileDetails = yield this.getFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
-                const sharingLinks = yield odata_1.odata.getAllItems(`https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions?$filter=Link ne null`);
+                let url = `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions?$filter=Link ne null`;
+                if (args.options.scope) {
+                    url += ` and Link/Scope eq '${args.options.scope}'`;
+                }
+                const sharingLinks = yield odata_1.odata.getAllItems(url);
                 if (!args.options.output || args.options.output === 'json' || args.options.output === 'md') {
                     logger.log(sharingLinks);
                 }
@@ -56,7 +60,8 @@ class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
                         return {
                             id: i.id,
                             roles: i.roles.join(','),
-                            link: i.link.webUrl
+                            link: i.link.webUrl,
+                            scope: i.link.scope
                         };
                     }));
                 }
@@ -91,7 +96,8 @@ _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkLis
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             fileId: typeof args.options.fileId !== 'undefined',
-            fileUrl: typeof args.options.fileUrl !== 'undefined'
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
         });
     });
 }, _SpoFileSharingLinkListCommand_initOptions = function _SpoFileSharingLinkListCommand_initOptions() {
@@ -101,6 +107,9 @@ _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkLis
         option: '-i, --fileId [fileId]'
     }, {
         option: '-f, --fileUrl [fileUrl]'
+    }, {
+        option: '--scope [scope]',
+        autocomplete: SpoFileSharingLinkListCommand.scope
     });
 }, _SpoFileSharingLinkListCommand_initValidators = function _SpoFileSharingLinkListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -111,10 +120,14 @@ _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkLis
         if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
             return `${args.options.fileId} is not a valid GUID`;
         }
+        if (args.options.scope && SpoFileSharingLinkListCommand.scope.indexOf(args.options.scope) === -1) {
+            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${SpoFileSharingLinkListCommand.scope.join(',')}`;
+        }
         return true;
     }));
 }, _SpoFileSharingLinkListCommand_initOptionSets = function _SpoFileSharingLinkListCommand_initOptionSets() {
     this.optionSets.push({ options: ['fileId', 'fileUrl'] });
 };
+SpoFileSharingLinkListCommand.scope = ['anonymous', 'users', 'organization'];
 module.exports = new SpoFileSharingLinkListCommand();
 //# sourceMappingURL=file-sharinglink-list.js.map

package/dist/m365/spo/commands/file/file-sharinglink-remove.js

@@ -0,0 +1,135 @@
+"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 _SpoFileSharingLinkRemoveCommand_instances, _SpoFileSharingLinkRemoveCommand_initTelemetry, _SpoFileSharingLinkRemoveCommand_initOptions, _SpoFileSharingLinkRemoveCommand_initValidators, _SpoFileSharingLinkRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+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");
+class SpoFileSharingLinkRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_SHARINGLINK_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific sharing link of a file';
+    }
+    constructor() {
+        super();
+        _SpoFileSharingLinkRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSharingLink = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Removing sharing link of file ${args.options.fileUrl || args.options.fileId} with id ${args.options.id}...`);
+                    }
+                    const fileDetails = yield this.getNeededFileInformation(args);
+                    const requestOptions = {
+                        url: `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions/${args.options.id}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield removeSharingLink();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove sharing link ${args.options.id} of file ${args.options.fileUrl || args.options.fileId}?`
+                });
+                if (result.continue) {
+                    yield removeSharingLink();
+                }
+            }
+        });
+    }
+    getNeededFileInformation(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.fileUrl) {
+                const fileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')`;
+            }
+            else {
+                requestUrl += `GetFileById('${args.options.fileId}')`;
+            }
+            requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId';
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return res;
+        });
+    }
+}
+_SpoFileSharingLinkRemoveCommand_instances = new WeakSet(), _SpoFileSharingLinkRemoveCommand_initTelemetry = function _SpoFileSharingLinkRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            fileId: typeof args.options.fileId !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileSharingLinkRemoveCommand_initOptions = function _SpoFileSharingLinkRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--fileUrl [fileUrl]'
+    }, {
+        option: '--fileId [fileId]'
+    }, {
+        option: '-i, --id <id>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileSharingLinkRemoveCommand_initValidators = function _SpoFileSharingLinkRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFileSharingLinkRemoveCommand_initOptionSets = function _SpoFileSharingLinkRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
+};
+module.exports = new SpoFileSharingLinkRemoveCommand();
+//# sourceMappingURL=file-sharinglink-remove.js.map

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