@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

package/dist/m365/spo/commands/list/list-contenttype-default-set.js

@@ -198,7 +198,7 @@ _SpoListContentTypeDefaultSetCommand_instances = new WeakSet(), _SpoListContentT
 }, _SpoListContentTypeDefaultSetCommand_initTypes = function _SpoListContentTypeDefaultSetCommand_initTypes() {
     this.types.string.push('contentTypeId', 'c');
 }, _SpoListContentTypeDefaultSetCommand_initOptionSets = function _SpoListContentTypeDefaultSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListContentTypeDefaultSetCommand();
 //# sourceMappingURL=list-contenttype-default-set.js.map

package/dist/m365/spo/commands/list/list-contenttype-list.js

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_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 urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -56,17 +56,9 @@ class SpoListContentTypeListCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            const requestOptions = {
-                url: `${requestUrl}/ContentTypes`,
-                method: 'GET',
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(`${requestUrl}/ContentTypes`);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -106,7 +98,7 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
         return true;
     }));
 }, _SpoListContentTypeListCommand_initOptionSets = function _SpoListContentTypeListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListContentTypeListCommand();
 //# sourceMappingURL=list-contenttype-list.js.map

package/dist/m365/spo/commands/list/list-contenttype-remove.js

@@ -43,7 +43,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
             const removeContentTypeFromList = () => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
                     const list = (args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl);
-                    logger.logToStderr(`Removing content type ${args.options.contentTypeId} from list ${list} in site at ${args.options.webUrl}...`);
+                    logger.logToStderr(`Removing content type ${args.options.id} from list ${list} in site at ${args.options.webUrl}...`);
                 }
                 let requestUrl = `${args.options.webUrl}/_api/web/`;
                 if (args.options.listId) {
@@ -57,7 +57,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
                 const requestOptions = {
-                    url: `${requestUrl}/ContentTypes('${encodeURIComponent(args.options.contentTypeId)}')`,
+                    url: `${requestUrl}/ContentTypes('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`,
                     headers: {
                         'X-HTTP-Method': 'DELETE',
                         'If-Match': '*',
@@ -80,7 +80,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the content type ${args.options.contentTypeId} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeContentTypeFromList();
@@ -108,7 +108,7 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '-c, --contentTypeId <contentTypeId>'
+        option: '-i, --id <id>'
     }, {
         option: '--confirm'
     });
@@ -126,9 +126,9 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
         return true;
     }));
 }, _SpoListContentTypeRemoveCommand_initTypes = function _SpoListContentTypeRemoveCommand_initTypes() {
-    this.types.string.push('contentTypeId', 'c');
+    this.types.string.push('id', 'i');
 }, _SpoListContentTypeRemoveCommand_initOptionSets = function _SpoListContentTypeRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListContentTypeRemoveCommand();
 //# sourceMappingURL=list-contenttype-remove.js.map

package/dist/m365/spo/commands/list/list-get.js

@@ -17,6 +17,7 @@ var _SpoListGetCommand_instances, _SpoListGetCommand_initTelemetry, _SpoListGetC
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,14 +42,18 @@ class SpoListGetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving information for list in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
+            else if (args.options.title) {
+                requestUrl += `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
             }
-            let propertiesSelect = args.options.properties ? `?$select=${encodeURIComponent(args.options.properties)}` : ``;
+            else if (args.options.url) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            let propertiesSelect = args.options.properties ? `?$select=${formatting_1.formatting.encodeQueryParameter(args.options.properties)}` : ``;
             propertiesSelect += args.options.withPermissions ? `${args.options.properties ? '&' : '?'}$expand=HasUniqueRoleAssignments,RoleAssignments/Member,RoleAssignments/RoleDefinitionBindings` : ``;
             const requestOptions = {
                 url: requestUrl + propertiesSelect,
@@ -77,6 +82,7 @@ _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
             title: (!(!args.options.title)).toString(),
+            url: (!(!args.options.url)).toString(),
             properties: (!(!args.options.properties)).toString(),
             withPermissions: typeof args.options.withPermissions !== 'undefined'
         });
@@ -88,6 +94,8 @@ _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry =
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
+    }, {
+        option: '--url [url]'
     }, {
         option: '-p, --properties [properties]'
     }, {
@@ -107,7 +115,7 @@ _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry =
         return true;
     }));
 }, _SpoListGetCommand_initOptionSets = function _SpoListGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title', 'url'] });
 };
 module.exports = new SpoListGetCommand();
 //# sourceMappingURL=list-get.js.map

package/dist/m365/spo/commands/list/list-label-get.js

@@ -40,32 +40,41 @@ class SpoListLabelGetCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.verbose) {
-                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                    logger.logToStderr(`Getting label set on the list ${list} in site at ${args.options.webUrl}...`);
+                    logger.logToStderr(`Getting label set on the list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
                 }
-                let requestUrl = '';
-                if (args.options.listId) {
+                let listServerRelativeUrl = '';
+                if (args.options.listUrl) {
                     if (this.debug) {
-                        logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
+                        logger.logToStderr(`Retrieving List from URL '${args.options.listUrl}'...`);
                     }
-                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder&$select=RootFolder`;
+                    listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 }
                 else {
-                    if (this.debug) {
-                        logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
+                    if (args.options.listId) {
+                        if (this.debug) {
+                            logger.logToStderr(`Retrieving List from Id '${args.options.listId}'...`);
+                        }
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder&$select=RootFolder`;
+                    }
+                    else if (args.options.listTitle) {
+                        if (this.debug) {
+                            logger.logToStderr(`Retrieving List from Title '${args.options.listTitle}'...`);
+                        }
+                        requestUrl += `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder&$select=RootFolder`;
                     }
-                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder&$select=RootFolder`;
+                    const requestOptions = {
+                        url: requestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const listInstance = yield request_1.default.get(requestOptions);
+                    listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
                 }
-                let requestOptions = {
-                    url: requestUrl,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const listInstance = yield request_1.default.get(requestOptions);
-                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
-                requestOptions = {
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
+                const reqOptions = {
                     url: `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_GetListComplianceTag`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
@@ -76,7 +85,7 @@ class SpoListLabelGetCommand extends SpoCommand_1.default {
                         listUrl: listAbsoluteUrl
                     }
                 };
-                const res = yield request_1.default.post(requestOptions);
+                const res = yield request_1.default.post(reqOptions);
                 if (res['odata.null'] !== true) {
                     logger.log(res);
                 }
@@ -91,7 +100,8 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString()
+            listTitle: (!(!args.options.listTitle)).toString(),
+            listUrl: (!(!args.options.listUrl)).toString()
         });
     });
 }, _SpoListLabelGetCommand_initOptions = function _SpoListLabelGetCommand_initOptions() {
@@ -101,6 +111,8 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initT
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListLabelGetCommand_initValidators = function _SpoListLabelGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -116,7 +128,7 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initT
         return true;
     }));
 }, _SpoListLabelGetCommand_initOptionSets = function _SpoListLabelGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListLabelGetCommand();
 //# sourceMappingURL=list-label-get.js.map

package/dist/m365/spo/commands/list/list-label-set.js

@@ -123,7 +123,7 @@ _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initT
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoListLabelSetCommand_initOptionSets = function _SpoListLabelSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListLabelSetCommand();
 //# sourceMappingURL=list-label-set.js.map

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

@@ -13,9 +13,9 @@ 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 _SpoListListCommand_instances, _SpoListListCommand_initTelemetry, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
+var _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -23,7 +23,6 @@ class SpoListListCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoListListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initValidators).call(this);
     }
@@ -41,21 +40,12 @@ class SpoListListCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
             }
-            const suffix = args.options.executeWithLimitedPermissions ? '&$select=RootFolder/ServerRelativeUrl,*' : '';
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder${suffix}`,
-                method: 'GET',
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const listInstances = yield request_1.default.get(requestOptions);
-                listInstances.value.forEach(l => {
+                const listInstances = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/lists?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,*`);
+                listInstances.forEach(l => {
                     l.Url = l.RootFolder.ServerRelativeUrl;
                 });
-                logger.log(listInstances.value);
+                logger.log(listInstances);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -63,17 +53,9 @@ class SpoListListCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initTelemetry = function _SpoListListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            executeWithLimitedPermissions: !!args.options.executeWithLimitedPermissions
-        });
-    });
-}, _SpoListListCommand_initOptions = function _SpoListListCommand_initOptions() {
+_SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions = function _SpoListListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--executeWithLimitedPermissions'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

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

@@ -114,7 +114,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
         return true;
     }));
 }, _SpoListRemoveCommand_initOptionSets = function _SpoListRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoListRemoveCommand();
 //# sourceMappingURL=list-remove.js.map

package/dist/m365/spo/commands/list/list-roleassignment-add.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 _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators;
+var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -32,6 +32,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_ROLEASSIGNMENT_ADD;
@@ -190,29 +191,10 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
         if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
             return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
         }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        if (listOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least list id or title or list url`;
-        }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id or upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id or upn or groupName`;
-        }
-        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
-        if (roleDefinitionOptions.some(item => item !== undefined) && roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either roleDefinitionId id or roleDefinitionName`;
-        }
-        if (roleDefinitionOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least roleDefinitionId id or roleDefinitionName`;
-        }
         return true;
     }));
+}, _SpoListRoleAssignmentAddCommand_initOptionSets = function _SpoListRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
 };
 module.exports = new SpoListRoleAssignmentAddCommand();
 //# sourceMappingURL=list-roleassignment-add.js.map

package/dist/m365/spo/commands/list/list-roleassignment-remove.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 _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_initValidators;
+var _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_initValidators, _SpoListRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -31,6 +31,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_ROLEASSIGNMENT_REMOVE;
@@ -179,22 +180,10 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        if (listOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least list id or title or list url`;
-        }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id or upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id or upn or groupName`;
-        }
         return true;
     }));
+}, _SpoListRoleAssignmentRemoveCommand_initOptionSets = function _SpoListRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] });
 };
 module.exports = new SpoListRoleAssignmentRemoveCommand();
 //# sourceMappingURL=list-roleassignment-remove.js.map

package/dist/m365/spo/commands/list/list-roleinheritance-break.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleInheritanceBreakCommand_instances, _SpoListRoleInheritanceBreakCommand_initTelemetry, _SpoListRoleInheritanceBreakCommand_initOptions, _SpoListRoleInheritanceBreakCommand_initValidators, _SpoListRoleInheritanceBreakCommand_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");
@@ -37,39 +38,56 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
         return 'Breaks role inheritance on list or library';
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Breaking role inheritance of list in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = `${args.options.webUrl}/_api/web/`;
-            if (args.options.listId) {
-                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            const breakListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
+                    if (args.options.listId) {
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                    }
+                    else if (args.options.listTitle) {
+                        requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                    }
+                    let keepExistingPermissions = true;
+                    if (args.options.clearExistingPermissions) {
+                        keepExistingPermissions = !args.options.clearExistingPermissions;
+                    }
+                    const requestOptions = {
+                        url: `${requestUrl}breakroleinheritance(${keepExistingPermissions})`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakListRoleInheritance();
             }
-            else if (args.options.listTitle) {
-                requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-            }
-            else if (args.options.listUrl) {
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            let keepExistingPermissions = true;
-            if (args.options.clearExistingPermissions) {
-                keepExistingPermissions = !args.options.clearExistingPermissions;
-            }
-            const requestOptions = {
-                url: `${requestUrl}breakroleinheritance(${keepExistingPermissions})`,
-                method: 'POST',
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            try {
-                yield request_1.default.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to break the role inheritance of ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+                });
+                if (result.continue) {
+                    yield breakListRoleInheritance();
+                }
             }
         });
     }
@@ -80,7 +98,8 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            clearExistingPermissions: args.options.clearExistingPermissions === true
+            clearExistingPermissions: args.options.clearExistingPermissions === true,
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListRoleInheritanceBreakCommand_initOptions = function _SpoListRoleInheritanceBreakCommand_initOptions() {
@@ -94,6 +113,8 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '--listUrl [listUrl]'
     }, {
         option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListRoleInheritanceBreakCommand_initValidators = function _SpoListRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -107,7 +128,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         return true;
     }));
 }, _SpoListRoleInheritanceBreakCommand_initOptionSets = function _SpoListRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListRoleInheritanceBreakCommand();
 //# sourceMappingURL=list-roleinheritance-break.js.map