@pnp/cli-microsoft365 6.1.0-beta.3e0114a → 6.1.0-beta.539ef23

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

@@ -0,0 +1,142 @@
+"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 _PurviewRetentionLabelSetCommand_instances, _PurviewRetentionLabelSetCommand_initTelemetry, _PurviewRetentionLabelSetCommand_initOptions, _PurviewRetentionLabelSetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_1 = require("../../../../utils/validation");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PurviewRetentionLabelSetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONLABEL_SET;
+    }
+    get description() {
+        return 'Update a retention label';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionLabelSetCommand_instances.add(this);
+        this.allowedBehaviorDuringRetentionPeriodValues = ['doNotRetain', 'retain', 'retainAsRecord', 'retainAsRegulatoryRecord'];
+        this.allowedActionAfterRetentionPeriodValues = ['none', 'delete', 'startDispositionReview'];
+        this.allowedRetentionTriggerValues = ['dateLabeled', 'dateCreated', 'dateModified', 'dateOfEvent'];
+        this.allowedDefaultRecordBehaviorValues = ['startLocked', 'startUnlocked'];
+        __classPrivateFieldGet(this, _PurviewRetentionLabelSetCommand_instances, "m", _PurviewRetentionLabelSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionLabelSetCommand_instances, "m", _PurviewRetentionLabelSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionLabelSetCommand_instances, "m", _PurviewRetentionLabelSetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.log(`Starting to update retention label with id ${args.options.id}`);
+            }
+            const requestBody = this.mapRequestBody(args.options);
+            const requestOptions = {
+                url: `${this.resource}/beta/security/labels/retentionLabels/${args.options.id}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json',
+                data: requestBody
+            };
+            yield request_1.default.patch(requestOptions);
+        });
+    }
+    mapRequestBody(options) {
+        const requestBody = {};
+        const excludeOptions = [
+            'debug',
+            'verbose',
+            'output',
+            'id',
+            'retentionDuration'
+        ];
+        Object.keys(options).forEach(key => {
+            if (excludeOptions.indexOf(key) === -1) {
+                requestBody[key] = `${options[key]}`;
+            }
+        });
+        if (options.retentionDuration) {
+            requestBody['retentionDuration'] = {
+                '@odata.type': 'microsoft.graph.security.retentionDurationInDays',
+                'days': options.retentionDuration
+            };
+        }
+        return requestBody;
+    }
+}
+_PurviewRetentionLabelSetCommand_instances = new WeakSet(), _PurviewRetentionLabelSetCommand_initTelemetry = function _PurviewRetentionLabelSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            behaviorDuringRetentionPeriod: typeof args.options.behaviorDuringRetentionPeriod !== 'undefined',
+            actionAfterRetentionPeriod: typeof args.options.actionAfterRetentionPeriod !== 'undefined',
+            retentionDuration: typeof args.options.retentionDuration !== 'undefined',
+            retentionTrigger: typeof args.options.retentionTrigger !== 'undefined',
+            defaultRecordBehavior: typeof args.options.defaultRecordBehavior !== 'undefined',
+            descriptionForUsers: typeof args.options.descriptionForUsers !== 'undefined',
+            descriptionForAdmins: typeof args.options.descriptionForAdmins !== 'undefined',
+            labelToBeApplied: typeof args.options.labelToBeApplied !== 'undefined'
+        });
+    });
+}, _PurviewRetentionLabelSetCommand_initOptions = function _PurviewRetentionLabelSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--behaviorDuringRetentionPeriod [behaviorDuringRetentionPeriod]',
+        autocomplete: this.allowedBehaviorDuringRetentionPeriodValues
+    }, {
+        option: '--actionAfterRetentionPeriod [actionAfterRetentionPeriod]',
+        autocomplete: this.allowedActionAfterRetentionPeriodValues
+    }, {
+        option: '--retentionDuration [retentionDuration]'
+    }, {
+        option: '-t, --retentionTrigger [retentionTrigger]',
+        autocomplete: this.allowedRetentionTriggerValues
+    }, {
+        option: '--defaultRecordBehavior [defaultRecordBehavior]',
+        autocomplete: this.allowedDefaultRecordBehaviorValues
+    }, {
+        option: '--descriptionForUsers [descriptionForUsers]'
+    }, {
+        option: '--descriptionForAdmins [descriptionForAdmins]'
+    }, {
+        option: '--labelToBeApplied [labelToBeApplied]'
+    });
+}, _PurviewRetentionLabelSetCommand_initValidators = function _PurviewRetentionLabelSetCommand_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.`;
+        }
+        const { actionAfterRetentionPeriod, behaviorDuringRetentionPeriod, defaultRecordBehavior, descriptionForAdmins, descriptionForUsers, labelToBeApplied, retentionDuration, retentionTrigger } = args.options;
+        if ([actionAfterRetentionPeriod, behaviorDuringRetentionPeriod, defaultRecordBehavior, descriptionForAdmins, descriptionForUsers, labelToBeApplied, retentionDuration, retentionTrigger].every(i => typeof i === 'undefined')) {
+            return `Specify at least one property to update.`;
+        }
+        if (behaviorDuringRetentionPeriod && this.allowedBehaviorDuringRetentionPeriodValues.indexOf(behaviorDuringRetentionPeriod) === -1) {
+            return `'${behaviorDuringRetentionPeriod}' is not a valid value for the behaviorDuringRetentionPeriod option. Allowed values are ${this.allowedBehaviorDuringRetentionPeriodValues.join('|')}`;
+        }
+        if (actionAfterRetentionPeriod && this.allowedActionAfterRetentionPeriodValues.indexOf(actionAfterRetentionPeriod) === -1) {
+            return `'${actionAfterRetentionPeriod}' is not a valid value for the actionAfterRetentionPeriod option. Allowed values are ${this.allowedActionAfterRetentionPeriodValues.join('|')}`;
+        }
+        if (retentionTrigger && this.allowedRetentionTriggerValues.indexOf(retentionTrigger) === -1) {
+            return `'${retentionTrigger}' is not a valid value for the retentionTrigger option. Allowed values are ${this.allowedRetentionTriggerValues.join('|')}`;
+        }
+        if (defaultRecordBehavior && this.allowedDefaultRecordBehaviorValues.indexOf(defaultRecordBehavior) === -1) {
+            return `'${defaultRecordBehavior}' is not a valid value for the defaultRecordBehavior option. Allowed values are ${this.allowedDefaultRecordBehaviorValues.join('|')}`;
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewRetentionLabelSetCommand();
+//# sourceMappingURL=retentionlabel-set.js.map

package/dist/m365/purview/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
     RETENTIONLABEL_LIST: `${prefix} retentionlabel list`,
-    RETENTIONLABEL_REMOVE: `${prefix} retentionlabel remove`
+    RETENTIONLABEL_REMOVE: `${prefix} retentionlabel remove`,
+    RETENTIONLABEL_SET: `${prefix} retentionlabel set`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/search/commands/externalconnection/externalconnection-schema-add.js

@@ -0,0 +1,86 @@
+"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 _SearchExternalConnectionSchemaAddCommand_instances, _SearchExternalConnectionSchemaAddCommand_initOptions, _SearchExternalConnectionSchemaAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class SearchExternalConnectionSchemaAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.EXTERNALCONNECTION_SCHEMA_ADD;
+    }
+    get description() {
+        return 'This command allows the administrator to add a schema to a specific external connection for use in Microsoft Search.';
+    }
+    constructor() {
+        super();
+        _SearchExternalConnectionSchemaAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionSchemaAddCommand_instances, "m", _SearchExternalConnectionSchemaAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionSchemaAddCommand_instances, "m", _SearchExternalConnectionSchemaAddCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding schema to external connection with id ${args.options.externalConnectionId}`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/external/connections/${args.options.externalConnectionId}/schema`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: args.options.schema
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SearchExternalConnectionSchemaAddCommand_instances = new WeakSet(), _SearchExternalConnectionSchemaAddCommand_initOptions = function _SearchExternalConnectionSchemaAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --externalConnectionId <externalConnectionId>'
+    }, {
+        option: '-s, --schema <schema>'
+    });
+}, _SearchExternalConnectionSchemaAddCommand_initValidators = function _SearchExternalConnectionSchemaAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.externalConnectionId.length < 3 || args.options.externalConnectionId.length > 32) {
+            return 'externalConnectionId must be between 3 and 32 characters in length.';
+        }
+        const alphaNumericRegEx = /[^\w]|_/g;
+        if (alphaNumericRegEx.test(args.options.externalConnectionId)) {
+            return 'externalConnectionId must only contain alphanumeric characters.';
+        }
+        if (args.options.externalConnectionId.length > 9 &&
+            args.options.externalConnectionId.startsWith('Microsoft')) {
+            return 'ID cannot begin with Microsoft';
+        }
+        const schemaObject = JSON.parse(args.options.schema);
+        if (schemaObject.baseType === undefined || schemaObject.baseType !== 'microsoft.graph.externalItem') {
+            return `The schema needs a required property 'baseType' with value 'microsoft.graph.externalItem'`;
+        }
+        if (!schemaObject.properties || schemaObject.properties.length > 128) {
+            return `We need atleast one property and a maximum of 128 properties in the schema object`;
+        }
+        return true;
+    }));
+};
+module.exports = new SearchExternalConnectionSchemaAddCommand();
+//# sourceMappingURL=externalconnection-schema-add.js.map

package/dist/m365/search/commands.js

@@ -5,6 +5,7 @@ exports.default = {
     EXTERNALCONNECTION_ADD: `${prefix} externalconnection add`,
     EXTERNALCONNECTION_GET: `${prefix} externalconnection get`,
     EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`,
-    EXTERNALCONNECTION_REMOVE: `${prefix} externalconnection remove`
+    EXTERNALCONNECTION_REMOVE: `${prefix} externalconnection remove`,
+    EXTERNALCONNECTION_SCHEMA_ADD: `${prefix} externalconnection schema add`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -20,6 +20,7 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const SpoUserGetCommand = require("../user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupMemberAddCommand extends SpoCommand_1.default {
@@ -43,10 +44,10 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const groupId = yield this.getGroupId(args);
+                const groupId = yield this.getGroupId(args, logger);
                 const resolvedUsernameList = yield this.getValidUsers(args, logger);
                 if (this.verbose) {
-                    logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+                    logger.logToStderr(`Adding user(s) to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
                 }
                 const data = {
                     url: args.options.webUrl,
@@ -73,7 +74,10 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    getGroupId(args) {
+    getGroupId(args, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting group Id for SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+        }
         const getGroupMethod = args.options.groupName ?
             `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
             `GetById('${args.options.groupId}')`;
@@ -100,34 +104,23 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
         }
         const validUserNames = [];
         const invalidUserNames = [];
-        const userInfo = args.options.userName ? args.options.userName : args.options.email;
+        const userIdentifiers = args.options.userName || args.options.email || args.options.userId.toString();
         return Promise
-            .all(userInfo.split(',').map(singleUserName => {
-            const options = {
-                output: 'json',
-                debug: args.options.debug,
-                verbose: args.options.verbose
-            };
-            if (args.options.userName) {
-                options.userName = singleUserName.trim();
-            }
-            else {
-                options.email = singleUserName.trim();
-            }
-            return Cli_1.Cli
-                .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
-                .then((getUserGetOutput) => {
-                if (this.debug) {
-                    logger.logToStderr(getUserGetOutput.stderr);
+            .all(userIdentifiers.split(',').map((userIdentifier) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.userId) {
+                    yield this.spoUserGet(args.options, userIdentifier.trim(), logger, validUserNames);
                 }
-                validUserNames.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
-            }, (err) => {
-                if (this.debug) {
-                    logger.logToStderr(err.stderr);
+                else {
+                    yield this.aadUserGet(args.options, userIdentifier.trim(), logger, validUserNames);
                 }
-                invalidUserNames.push(singleUserName);
-            });
-        }))
+            }
+            catch (err) {
+                logger.logToStderr(err.stderr);
+                invalidUserNames.push(userIdentifier);
+                return err;
+            }
+        })))
             .then(() => {
             if (invalidUserNames.length > 0) {
                 return Promise.reject(`Users not added to the group because the following users don't exist: ${invalidUserNames.join(', ')}`);
@@ -135,6 +128,38 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
             return Promise.resolve(validUserNames);
         });
     }
+    aadUserGet(options, userIdentifier, logger, validUserNames) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Get UPN from Azure AD for user ${userIdentifier}`);
+            }
+            const aadUserGetCommandoptions = Object.assign(Object.assign(Object.assign({}, (options.userName && { userName: userIdentifier })), (options.email && { email: userIdentifier })), { output: 'json', debug: options.debug, verbose: options.verbose });
+            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
+            if (this.debug) {
+                logger.logToStderr(aadUserGetOutput.stderr);
+            }
+            validUserNames.push(JSON.parse(aadUserGetOutput.stdout).userPrincipalName);
+        });
+    }
+    spoUserGet(options, userIdentifier, logger, validUserNames) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Get UPN from SharePoint for user ${userIdentifier}`);
+            }
+            const spoUserGetCommandoptions = {
+                id: userIdentifier,
+                webUrl: options.webUrl,
+                output: 'json',
+                debug: options.debug,
+                verbose: options.verbose
+            };
+            const spoUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, spoUserGetCommandoptions), { _: [] }) });
+            if (this.debug) {
+                logger.logToStderr(spoUserGetOutput.stderr);
+            }
+            validUserNames.push(JSON.parse(spoUserGetOutput.stdout).UserPrincipalName);
+        });
+    }
     getFormattedUserList(activeUserList) {
         const generatedPeoplePicker = JSON.stringify(activeUserList.map(singleUsername => {
             return { Key: singleUsername.trim() };
@@ -148,7 +173,8 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined'
+            email: typeof args.options.email !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -162,6 +188,8 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         option: '--userName [userName]'
     }, {
         option: '--email [email]'
+    }, {
+        option: '--userId [userId]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -172,10 +200,20 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified groupId ${args.options.groupId} is not a number`;
         }
+        const userIdReg = new RegExp(/^[0-9,]*$/);
+        if (args.options.userId && !userIdReg.test(args.options.userId)) {
+            return `${args.options.userId} is not a number or a comma seperated value`;
+        }
+        if (args.options.userName && args.options.userName.split(',').some(e => !validation_1.validation.isValidUserPrincipalName(e))) {
+            return `${args.options.userName} contains one or more invalid usernames`;
+        }
+        if (args.options.email && args.options.email.split(',').some(e => !validation_1.validation.isValidUserPrincipalName(e))) {
+            return `${args.options.email} contains one or more invalid email addresses`;
+        }
         return true;
     }));
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email', 'userId'] });
 };
 module.exports = new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

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

@@ -19,6 +19,7 @@ const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 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");
 class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
@@ -36,16 +37,42 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptionSets).call(this);
     }
+    getUserName(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userName) {
+                return args.options.userName;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about the user ${args.options.email}`);
+            }
+            const options = {
+                email: args.options.email,
+                output: 'json',
+                debug: args.options.debug,
+                verbose: args.options.verbose
+            };
+            const userGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const userOutput = JSON.parse(userGetOutput.stdout);
+            return userOutput.userPrincipalName;
+        });
+    }
     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 with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+                    logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
                 }
-                const loginName = `i:0#.f|membership|${args.options.userName}`;
-                const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                let requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
                     ? `GetById('${args.options.groupId}')`
-                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
+                    : `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: {
@@ -71,7 +98,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
+                    message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email} from the SharePoint group?`
                 });
                 if (result.continue) {
                     yield removeUserfromSPGroup();
@@ -85,6 +112,9 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         Object.assign(this.telemetryProperties, {
             groupId: (!(!args.options.groupId)).toString(),
             groupName: (!(!args.options.groupName)).toString(),
+            userName: (!(!args.options.userName)).toString(),
+            email: (!(!args.options.email)).toString(),
+            userId: (!(!args.options.userId)).toString(),
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -96,7 +126,11 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--userName <userName>'
+        option: '--userName [userName]'
+    }, {
+        option: '--email [email]'
+    }, {
+        option: '--userId [userId]'
     }, {
         option: '--confirm'
     });
@@ -105,10 +139,19 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
+        if (args.options.userId && isNaN(args.options.userId)) {
+            return `Specified "userId" ${args.options.userId} is not valid`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        if (args.options.email && !validation_1.validation.isValidUserPrincipalName(args.options.email)) {
+            return `${args.options.email} is not a valid email`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] });
+    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId'] });
 };
 module.exports = new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

package/dist/m365/spo/commands/list/{list-label-set.js → list-retentionlabel-ensure.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 _SpoListLabelSetCommand_instances, _SpoListLabelSetCommand_initTelemetry, _SpoListLabelSetCommand_initOptions, _SpoListLabelSetCommand_initValidators, _SpoListLabelSetCommand_initOptionSets;
+var _SpoListRetentionLabelEnsureCommand_instances, _SpoListRetentionLabelEnsureCommand_initTelemetry, _SpoListRetentionLabelEnsureCommand_initOptions, _SpoListRetentionLabelEnsureCommand_initValidators, _SpoListRetentionLabelEnsureCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -21,23 +21,33 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoListLabelSetCommand extends SpoCommand_1.default {
+class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
     get name() {
-        return commands_1.default.LIST_LABEL_SET;
+        return commands_1.default.LIST_RETENTIONLABEL_ENSURE;
+    }
+    alias() {
+        return [commands_1.default.LIST_LABEL_SET];
     }
     get description() {
-        return 'Sets classification label on the specified list';
+        return 'Sets a default retention label on the specified list or library.';
     }
     constructor() {
         super();
-        _SpoListLabelSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initOptionSets).call(this);
+        _SpoListRetentionLabelEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initOptionSets).call(this);
     }
     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.blockDelete) {
+                this.warn(logger, `Option 'blockDelete' is deprecated.`);
+            }
+            if (args.options.blockEdit) {
+                this.warn(logger, `Option 'blockEdit' is deprecated.`);
+            }
             try {
                 let listRestUrl = '';
                 let listServerRelativeUrl = '';
@@ -86,7 +96,7 @@ class SpoListLabelSetCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initTelemetry = function _SpoListLabelSetCommand_initTelemetry() {
+_SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetentionLabelEnsureCommand_initTelemetry = function _SpoListRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: (!(!args.options.listId)).toString(),
@@ -97,7 +107,7 @@ _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initT
             blockEdit: args.options.blockEdit || false
         });
     });
-}, _SpoListLabelSetCommand_initOptions = function _SpoListLabelSetCommand_initOptions() {
+}, _SpoListRetentionLabelEnsureCommand_initOptions = function _SpoListRetentionLabelEnsureCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -115,15 +125,15 @@ _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initT
     }, {
         option: '--blockEdit'
     });
-}, _SpoListLabelSetCommand_initValidators = function _SpoListLabelSetCommand_initValidators() {
+}, _SpoListRetentionLabelEnsureCommand_initValidators = function _SpoListRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
-}, _SpoListLabelSetCommand_initOptionSets = function _SpoListLabelSetCommand_initOptionSets() {
+}, _SpoListRetentionLabelEnsureCommand_initOptionSets = function _SpoListRetentionLabelEnsureCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
-module.exports = new SpoListLabelSetCommand();
-//# sourceMappingURL=list-label-set.js.map
+module.exports = new SpoListRetentionLabelEnsureCommand();
+//# sourceMappingURL=list-retentionlabel-ensure.js.map