@pnp/cli-microsoft365 6.1.0-beta.4fefcde → 6.1.0-beta.6108255

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-retentionlabel-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 _SpoListRetentionLabelSetCommand_instances, _SpoListRetentionLabelSetCommand_initTelemetry, _SpoListRetentionLabelSetCommand_initOptions, _SpoListRetentionLabelSetCommand_initValidators, _SpoListRetentionLabelSetCommand_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,9 +21,9 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoListRetentionLabelSetCommand extends SpoCommand_1.default {
+class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
     get name() {
-        return commands_1.default.LIST_RETENTIONLABEL_SET;
+        return commands_1.default.LIST_RETENTIONLABEL_ENSURE;
     }
     alias() {
         return [commands_1.default.LIST_LABEL_SET];
@@ -33,15 +33,21 @@ class SpoListRetentionLabelSetCommand extends SpoCommand_1.default {
     }
     constructor() {
         super();
-        _SpoListRetentionLabelSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_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_SET);
+            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 = '';
@@ -90,7 +96,7 @@ class SpoListRetentionLabelSetCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoListRetentionLabelSetCommand_instances = new WeakSet(), _SpoListRetentionLabelSetCommand_initTelemetry = function _SpoListRetentionLabelSetCommand_initTelemetry() {
+_SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetentionLabelEnsureCommand_initTelemetry = function _SpoListRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: (!(!args.options.listId)).toString(),
@@ -101,7 +107,7 @@ _SpoListRetentionLabelSetCommand_instances = new WeakSet(), _SpoListRetentionLab
             blockEdit: args.options.blockEdit || false
         });
     });
-}, _SpoListRetentionLabelSetCommand_initOptions = function _SpoListRetentionLabelSetCommand_initOptions() {
+}, _SpoListRetentionLabelEnsureCommand_initOptions = function _SpoListRetentionLabelEnsureCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -119,15 +125,15 @@ _SpoListRetentionLabelSetCommand_instances = new WeakSet(), _SpoListRetentionLab
     }, {
         option: '--blockEdit'
     });
-}, _SpoListRetentionLabelSetCommand_initValidators = function _SpoListRetentionLabelSetCommand_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);
     }));
-}, _SpoListRetentionLabelSetCommand_initOptionSets = function _SpoListRetentionLabelSetCommand_initOptionSets() {
+}, _SpoListRetentionLabelEnsureCommand_initOptionSets = function _SpoListRetentionLabelEnsureCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
-module.exports = new SpoListRetentionLabelSetCommand();
-//# sourceMappingURL=list-retentionlabel-set.js.map
+module.exports = new SpoListRetentionLabelEnsureCommand();
+//# sourceMappingURL=list-retentionlabel-ensure.js.map

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

@@ -41,7 +41,7 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeListItem = () => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
-                    logger.logToStderr(`Removing list from list ${args.options.listId || args.options.listTitle || args.options.listUrl} item in site at ${args.options.webUrl}...`);
+                    logger.logToStderr(`Removing list item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
                 }
                 let requestUrl = `${args.options.webUrl}/_api/web`;
                 if (args.options.listId) {

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

@@ -0,0 +1,143 @@
+"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 _SpoListItemRetentionLabelRemoveCommand_instances, _SpoListItemRetentionLabelRemoveCommand_initTelemetry, _SpoListItemRetentionLabelRemoveCommand_initOptions, _SpoListItemRetentionLabelRemoveCommand_initValidators, _SpoListItemRetentionLabelRemoveCommand_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 SpoListItemRetentionLabelRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.LISTITEM_RETENTIONLABEL_REMOVE;
+    }
+    get description() {
+        return 'Clear the retention label from a list item';
+    }
+    constructor() {
+        super();
+        _SpoListItemRetentionLabelRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeListItemRetentionLabel(logger, args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the retentionlabel from list item ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield this.removeListItemRetentionLabel(logger, args);
+                }
+            }
+        });
+    }
+    removeListItemRetentionLabel(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing retention label from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
+            }
+            try {
+                let url = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    url += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/items(${args.options.listItemId})/SetComplianceTag()`;
+                }
+                else if (args.options.listTitle) {
+                    url += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/items(${args.options.listItemId})/SetComplianceTag()`;
+                }
+                else {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    url += `/GetList(@a1)/items(@a2)/SetComplianceTag()?@a1='${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}'&@a2='${args.options.listItemId}'`;
+                }
+                const requestBody = {
+                    "complianceTag": "",
+                    "isTagPolicyHold": false,
+                    "isTagPolicyRecord": false,
+                    "isEventBasedTag": false,
+                    "isTagSuperLock": false,
+                    "isUnlockedAsDefault": false
+                };
+                const requestOptions = {
+                    url: url,
+                    method: 'POST',
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoListItemRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListItemRetentionLabelRemoveCommand_initTelemetry = function _SpoListItemRetentionLabelRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoListItemRetentionLabelRemoveCommand_initOptions = function _SpoListItemRetentionLabelRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --listItemId <listItemId>'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoListItemRetentionLabelRemoveCommand_initValidators = function _SpoListItemRetentionLabelRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const id = parseInt(args.options.listItemId);
+        if (isNaN(id)) {
+            return `${args.options.listItemId} is not a valid list item ID`;
+        }
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.listId &&
+            !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoListItemRetentionLabelRemoveCommand_initOptionSets = function _SpoListItemRetentionLabelRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+};
+module.exports = new SpoListItemRetentionLabelRemoveCommand();
+//# sourceMappingURL=listitem-retentionlabel-remove.js.map

package/dist/m365/spo/commands.js

@@ -115,8 +115,8 @@ exports.default = {
     LIST_LABEL_SET: `${prefix} list label set`,
     LIST_LIST: `${prefix} list list`,
     LIST_REMOVE: `${prefix} list remove`,
+    LIST_RETENTIONLABEL_ENSURE: `${prefix} list retentionlabel ensure`,
     LIST_RETENTIONLABEL_GET: `${prefix} list retentionlabel get`,
-    LIST_RETENTIONLABEL_SET: `${prefix} list retentionlabel set`,
     LIST_ROLEASSIGNMENT_REMOVE: `${prefix} list roleassignment remove`,
     LIST_ROLEASSIGNMENT_ADD: `${prefix} list roleassignment add`,
     LIST_ROLEINHERITANCE_BREAK: `${prefix} list roleinheritance break`,
@@ -145,6 +145,7 @@ exports.default = {
     LISTITEM_RECORD_DECLARE: `${prefix} listitem record declare`,
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_RETENTIONLABEL_REMOVE: `${prefix} listitem retentionlabel remove`,
     LISTITEM_ROLEASSIGNMENT_ADD: `${prefix} listitem roleassignment add`,
     LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,
     LISTITEM_ROLEINHERITANCE_BREAK: `${prefix} listitem roleinheritance break`,

package/dist/request.js

@@ -61,7 +61,8 @@ class Request {
         this.req = axios_1.default.create({
             headers: {
                 'user-agent': `NONISV|SharePointPnP|CLIMicrosoft365/${packageJSON.version}`,
-                'accept-encoding': 'gzip, deflate'
+                'accept-encoding': 'gzip, deflate',
+                'X-ClientService-ClientTag': `M365CLI:${packageJSON.version}`
             },
             decompress: true,
             responseType: 'text',