@pnp/cli-microsoft365 6.2.0-beta.d0cdaa3 → 6.2.0-beta.d5442a1

package/.eslintrc.js

@@ -5,11 +5,13 @@ const dictionary = [
   'activation',
   'activations',
   'adaptive',
+  'ai',
   'app',
   'apply',
   'approve',
   'assets',
   'bin',
+  'builder',
   'catalog',
   'checklist',
   'client',
@@ -31,6 +33,7 @@ const dictionary = [
   'home',
   'hub',
   'in',
+  'info',
   'inheritance',
   'init',
   'install',
@@ -39,9 +42,11 @@ const dictionary = [
   'issue',
   'label',
   'list',
+  'link',
   'management',
   'member',
   'messaging',
+  'model',
   'news',
   'oauth2',
   'office365',
@@ -60,6 +65,7 @@ const dictionary = [
   'service',
   'setting',
   'settings',
+  'sharing',
   'side',
   'site',
   'status',

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/pp/commands/aibuildermodel/aibuildermodel-list.js

@@ -0,0 +1,68 @@
+"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 _PpAiBuilderModelListCommand_instances, _PpAiBuilderModelListCommand_initTelemetry, _PpAiBuilderModelListCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const odata_1 = require("../../../../utils/odata");
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpAiBuilderModelListCommand extends PowerPlatformCommand_1.default {
+    get name() {
+        return commands_1.default.AIBUILDERMODEL_LIST;
+    }
+    get description() {
+        return 'List available AI builder models in the specified Power Platform environment.';
+    }
+    defaultProperties() {
+        return ['msdyn_name', 'msdyn_aimodelid', 'createdon', 'modifiedon'];
+    }
+    constructor() {
+        super();
+        _PpAiBuilderModelListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpAiBuilderModelListCommand_instances, "m", _PpAiBuilderModelListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpAiBuilderModelListCommand_instances, "m", _PpAiBuilderModelListCommand_initOptions).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving available AI Builder models`);
+            }
+            try {
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const aimodels = yield odata_1.odata.getAllItems(`${dynamicsApiUrl}/api/data/v9.0/msdyn_aimodels?$filter=iscustomizable/Value eq true`);
+                logger.log(aimodels);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PpAiBuilderModelListCommand_instances = new WeakSet(), _PpAiBuilderModelListCommand_initTelemetry = function _PpAiBuilderModelListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PpAiBuilderModelListCommand_initOptions = function _PpAiBuilderModelListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '--asAdmin'
+    });
+};
+module.exports = new PpAiBuilderModelListCommand();
+//# sourceMappingURL=aibuildermodel-list.js.map

package/dist/m365/pp/commands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pp';
 exports.default = {
+    AIBUILDERMODEL_LIST: `${prefix} aibuildermodel list`,
     CARD_CLONE: `${prefix} card clone`,
     CARD_GET: `${prefix} card get`,
     CARD_LIST: `${prefix} card list`,

package/dist/m365/purview/commands/retentionlabel/retentionlabel-get.js

@@ -0,0 +1,70 @@
+"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 _PurviewRetentionLabelGetCommand_instances, _PurviewRetentionLabelGetCommand_initOptions, _PurviewRetentionLabelGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+class PurviewRetentionLabelGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONLABEL_GET;
+    }
+    get description() {
+        return 'Retrieve the specified retention label';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionLabelGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionLabelGetCommand_instances, "m", _PurviewRetentionLabelGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionLabelGetCommand_instances, "m", _PurviewRetentionLabelGetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving retention label with id ${args.options.id}`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/labels/retentionLabels/${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);
+            }
+        });
+    }
+}
+_PurviewRetentionLabelGetCommand_instances = new WeakSet(), _PurviewRetentionLabelGetCommand_initOptions = function _PurviewRetentionLabelGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    });
+}, _PurviewRetentionLabelGetCommand_initValidators = function _PurviewRetentionLabelGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `'${args.options.id}' is not a valid GUID.`;
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewRetentionLabelGetCommand();
+//# sourceMappingURL=retentionlabel-get.js.map

package/dist/m365/purview/commands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
+    RETENTIONLABEL_GET: `${prefix} retentionlabel get`,
     RETENTIONLABEL_LIST: `${prefix} retentionlabel list`,
     RETENTIONLABEL_REMOVE: `${prefix} retentionlabel remove`,
     RETENTIONLABEL_SET: `${prefix} retentionlabel set`

package/dist/m365/spo/commands/file/GraphFileDetails.js

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

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoFileSharinginfoGetCommand_instances, _SpoFileSharinginfoGetCommand_initTelemetry, _SpoFileSharinginfoGetCommand_initOptions, _SpoFileSharinginfoGetCommand_initValidators, _SpoFileSharinginfoGetCommand_initOptionSets;
+var _SpoFileSharingInfoGetCommand_instances, _SpoFileSharingInfoGetCommand_initTelemetry, _SpoFileSharingInfoGetCommand_initOptions, _SpoFileSharingInfoGetCommand_initValidators, _SpoFileSharingInfoGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -21,7 +21,7 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const FileSharingPrincipalType_1 = require("./FileSharingPrincipalType");
-class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
+class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.FILE_SHARINGINFO_GET;
     }
@@ -30,11 +30,11 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
     }
     constructor() {
         super();
-        _SpoFileSharinginfoGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initOptionSets).call(this);
+        _SpoFileSharingInfoGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileSharingInfoGetCommand_instances, "m", _SpoFileSharingInfoGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingInfoGetCommand_instances, "m", _SpoFileSharingInfoGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingInfoGetCommand_instances, "m", _SpoFileSharingInfoGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingInfoGetCommand_instances, "m", _SpoFileSharingInfoGetCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['fileUrl'];
@@ -113,14 +113,14 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
         }));
     }
 }
-_SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetCommand_initTelemetry = function _SpoFileSharinginfoGetCommand_initTelemetry() {
+_SpoFileSharingInfoGetCommand_instances = new WeakSet(), _SpoFileSharingInfoGetCommand_initTelemetry = function _SpoFileSharingInfoGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             fileId: (!(!args.options.fileId)).toString(),
             fileUrl: (!(!args.options.fileUrl)).toString()
         });
     });
-}, _SpoFileSharinginfoGetCommand_initOptions = function _SpoFileSharinginfoGetCommand_initOptions() {
+}, _SpoFileSharingInfoGetCommand_initOptions = function _SpoFileSharingInfoGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -128,7 +128,7 @@ _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetC
     }, {
         option: '-f, --fileUrl [fileUrl]'
     });
-}, _SpoFileSharinginfoGetCommand_initValidators = function _SpoFileSharinginfoGetCommand_initValidators() {
+}, _SpoFileSharingInfoGetCommand_initValidators = function _SpoFileSharingInfoGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
@@ -141,8 +141,8 @@ _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetC
         }
         return true;
     }));
-}, _SpoFileSharinginfoGetCommand_initOptionSets = function _SpoFileSharinginfoGetCommand_initOptionSets() {
+}, _SpoFileSharingInfoGetCommand_initOptionSets = function _SpoFileSharingInfoGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['fileId', 'fileUrl'] });
 };
-module.exports = new SpoFileSharinginfoGetCommand();
+module.exports = new SpoFileSharingInfoGetCommand();
 //# sourceMappingURL=file-sharinginfo-get.js.map

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

@@ -0,0 +1,120 @@
+"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 _SpoFileSharingLinkListCommand_instances, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_SHARINGLINK_LIST;
+    }
+    get description() {
+        return 'Lists all the sharing links of a specific file';
+    }
+    defaultProperties() {
+        return ['id', 'roles', 'link'];
+    }
+    constructor() {
+        super();
+        _SpoFileSharingLinkListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving sharing links for file ${args.options.fileId || args.options.fileUrl}...`);
+            }
+            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`);
+                if (!args.options.output || args.options.output === 'json' || args.options.output === 'md') {
+                    logger.log(sharingLinks);
+                }
+                else {
+                    //converted to text friendly output
+                    logger.log(sharingLinks.map(i => {
+                        return {
+                            id: i.id,
+                            roles: i.roles.join(','),
+                            link: i.link.webUrl
+                        };
+                    }));
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getFileDetails(webUrl, fileId, fileUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${webUrl}/_api/web/`;
+            if (fileId) {
+                requestUrl += `GetFileById('${fileId}')`;
+            }
+            else if (fileUrl) {
+                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileUrl)}')`;
+            }
+            const requestOptions = {
+                url: requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId',
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return res;
+        });
+    }
+}
+_SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkListCommand_initTelemetry = function _SpoFileSharingLinkListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileId: typeof args.options.fileId !== 'undefined',
+            fileUrl: typeof args.options.fileUrl !== 'undefined'
+        });
+    });
+}, _SpoFileSharingLinkListCommand_initOptions = function _SpoFileSharingLinkListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --fileId [fileId]'
+    }, {
+        option: '-f, --fileUrl [fileUrl]'
+    });
+}, _SpoFileSharingLinkListCommand_initValidators = function _SpoFileSharingLinkListCommand_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;
+    }));
+}, _SpoFileSharingLinkListCommand_initOptionSets = function _SpoFileSharingLinkListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
+};
+module.exports = new SpoFileSharingLinkListCommand();
+//# sourceMappingURL=file-sharinglink-list.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