@pnp/cli-microsoft365 6.0.0-beta.cd80a69 → 6.0.0-beta.d557a48

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

@@ -13,9 +13,10 @@ 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 _SpoFolderListCommand_instances, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
+var _SpoFolderListCommand_instances, _SpoFolderListCommand_initTelemetry, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
 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");
@@ -24,6 +25,7 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoFolderListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initValidators).call(this);
     }
@@ -39,32 +41,53 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl}...`);
+                logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl} ${args.options.recursive ? '(recursive)' : ''}...`);
             }
-            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/folders`;
+            try {
+                const resp = yield this.getFolderList(args.options.webUrl, args.options.parentFolderUrl, args.options.recursive);
+                logger.log(resp);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getFolderList(webUrl, parentFolderUrl, recursive, folders = []) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, parentFolderUrl);
             const requestOptions = {
-                url: requestUrl,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            try {
-                const resp = yield request_1.default.get(requestOptions);
-                logger.log(resp.value);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            const resp = yield request_1.default.get(requestOptions);
+            if (resp.value.length > 0) {
+                for (const folder of resp.value) {
+                    folders.push(folder);
+                    if (recursive) {
+                        yield this.getFolderList(webUrl, folder.ServerRelativeUrl, recursive, folders);
+                    }
+                }
             }
+            return folders;
         });
     }
 }
-_SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
+_SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelemetry = function _SpoFolderListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            recursive: !!args.options.recursive
+        });
+    });
+}, _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-p, --parentFolderUrl <parentFolderUrl>'
+    }, {
+        option: '--recursive [recursive]'
     });
 }, _SpoFolderListCommand_initValidators = function _SpoFolderListCommand_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/folder/folder-roleinheritance-break.js

@@ -20,6 +20,7 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const commands_1 = require("../../commands");
 class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
     constructor() {
@@ -38,10 +39,19 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const keepExistingPermissions = !args.options.clearExistingPermissions;
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const roleFolderUrl = urlUtil_1.urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             const breakFolderRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (roleFolderUrl.split('/').length === 2) {
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                    }
+                    else {
+                        requestUrl += `GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/ListItemAllFields`;
+                    }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folderUrl)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                        url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,
                         headers: {
                             accept: 'application/json'
                         },

package/dist/m365/spo/commands/folder/folder-roleinheritance-reset.js

@@ -16,9 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFolderRoleInheritanceResetCommand_instances, _SpoFolderRoleInheritanceResetCommand_initTelemetry, _SpoFolderRoleInheritanceResetCommand_initOptions, _SpoFolderRoleInheritanceResetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
+const formatting_1 = require("../../../../utils/formatting");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const commands_1 = require("../../commands");
 class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
     constructor() {
@@ -36,10 +38,19 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const roleFolderUrl = urlUtil_1.urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             const resetFolderRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (roleFolderUrl.split('/').length === 2) {
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                    }
+                    else {
+                        requestUrl += `GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/ListItemAllFields`;
+                    }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${args.options.folderUrl}')/ListItemAllFields/resetroleinheritance`,
+                        url: `${requestUrl}/resetroleinheritance`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },

package/dist/m365/spo/commands/hubsite/hubsite-connect.js

@@ -13,60 +13,135 @@ 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 _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initValidators;
+var _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initTelemetry, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initOptionSets, _SpoHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
-const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 class SpoHubSiteConnectCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoHubSiteConnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.HUBSITE_CONNECT;
     }
     get description() {
-        return 'Connects the specified site collection to the given hub site';
+        return 'Connect a hub site to a parent hub site';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Connecting hub site '${args.options.id || args.options.title || args.options.url}' to hub site '${args.options.parentId || args.options.parentTitle || args.options.parentUrl}'...`);
+            }
             try {
-                const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const hubSites = yield this.getHubSites(spoAdminUrl);
+                const hubSite = this.getSpecificHubSite(hubSites, args.options.id, args.options.title, args.options.url);
+                const parentHubSite = this.getSpecificHubSite(hubSites, args.options.parentId, args.options.parentTitle, args.options.parentUrl);
                 const requestOptions = {
-                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
+                    url: `${spoAdminUrl}/_api/HubSites/GetById('${hubSite.ID}')`,
                     headers: {
-                        'X-RequestDigest': res.FormDigestValue,
-                        accept: 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata',
+                        'if-match': hubSite['odata.etag']
                     },
-                    responseType: 'json'
+                    responseType: 'json',
+                    data: {
+                        ParentHubSiteId: parentHubSite.ID
+                    }
                 };
-                yield request_1.default.post(requestOptions);
+                yield request_1.default.patch(requestOptions);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
+    getHubSites(spoAdminUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${spoAdminUrl}/_api/HubSites?$select=ID,Title,SiteUrl&$top=5000`,
+                headers: {
+                    accept: 'application/json;odata=minimalmetadata'
+                },
+                responseType: 'json'
+            };
+            const hubSites = yield request_1.default.get(requestOptions);
+            return hubSites.value;
+        });
+    }
+    getSpecificHubSite(hubSites, id, title, url) {
+        let filteredHubSites = [];
+        if (id) {
+            filteredHubSites = hubSites.filter(site => site.ID.toLowerCase() === id.toLowerCase());
+        }
+        else if (title) {
+            filteredHubSites = hubSites.filter(site => site.Title.toLowerCase() === title.toLowerCase());
+        }
+        else if (url) {
+            filteredHubSites = hubSites.filter(site => site.SiteUrl.toLowerCase() === url.toLowerCase());
+        }
+        if (filteredHubSites.length === 0) {
+            throw `The specified hub site '${id || title || url}' does not exist.`;
+        }
+        if (filteredHubSites.length > 1) {
+            throw `Multiple hub sites with name '${title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+        }
+        return filteredHubSites[0];
+    }
 }
-_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
+_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initTelemetry = function _SpoHubSiteConnectCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            parentId: typeof args.options.parentId !== 'undefined',
+            parentTitle: typeof args.options.parentTitle !== 'undefined',
+            parentUrl: typeof args.options.parentUrl !== 'undefined'
+        });
+    });
+}, _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-u, --url [url]'
     }, {
-        option: '-i, --id <id>'
+        option: '--parentId [parentId]'
+    }, {
+        option: '--parentTitle [parentTitle]'
+    }, {
+        option: '--parentUrl [parentUrl]'
     });
+}, _SpoHubSiteConnectCommand_initOptionSets = function _SpoHubSiteConnectCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title', 'url'], ['parentId', 'parentTitle', 'parentUrl']);
 }, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `'${args.options.id}' is not a valid GUID`;
+        }
+        if (args.options.parentId && !validation_1.validation.isValidGuid(args.options.parentId)) {
+            return `'${args.options.parentId}' is not a valid GUID`;
         }
-        if (!validation_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (args.options.url) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
+        if (args.options.parentUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.parentUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
         }
         return true;
     }));

package/dist/m365/spo/commands/hubsite/hubsite-disconnect.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 _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initValidators;
+var _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initOptionSets, _SpoHubSiteDisconnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -28,30 +28,35 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.HUBSITE_DISCONNECT;
     }
     get description() {
-        return 'Disconnects the specifies site collection from its hub site';
+        return 'Disconnect a hub site from its parent hub site';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
                     if (this.verbose) {
-                        logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
+                        logger.logToStderr(`Disconnecting hub site '${args.options.id || args.options.title || args.options.url}' from its parent hub site...`);
                     }
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const hubSite = yield this.getHubSite(spoAdminUrl, args.options);
                     const requestOptions = {
-                        url: `${args.options.url}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                        url: `${spoAdminUrl}/_api/HubSites/GetById('${hubSite.ID}')`,
                         headers: {
-                            'X-RequestDigest': res.FormDigestValue,
-                            accept: 'application/json;odata=nometadata'
+                            accept: 'application/json;odata=nometadata',
+                            'if-match': hubSite['odata.etag']
                         },
-                        responseType: 'json'
+                        responseType: 'json',
+                        data: {
+                            ParentHubSiteId: '00000000-0000-0000-0000-000000000000'
+                        }
                     };
-                    yield request_1.default.post(requestOptions);
+                    yield request_1.default.patch(requestOptions);
                 }
                 catch (err) {
                     this.handleRejectedODataJsonPromise(err);
@@ -65,7 +70,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
+                    message: `Are you sure you want disconnect hub site '${args.options.id || args.options.title || args.options.url}' from its parent hub site?`
                 });
                 if (result.continue) {
                     yield disconnectHubSite();
@@ -73,21 +78,72 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
             }
         });
     }
+    getHubSite(spoAdminUrl, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                headers: {
+                    accept: 'application/json;odata=minimalmetadata'
+                },
+                responseType: 'json'
+            };
+            if (options.id) {
+                requestOptions.url = `${spoAdminUrl}/_api/HubSites/GetById('${options.id}')?$select=ID`;
+                const result = yield request_1.default.get(requestOptions);
+                return result;
+            }
+            requestOptions.url = `${spoAdminUrl}/_api/HubSites?$select=ID,Title,SiteUrl&$top=5000`;
+            const hubSitesResponse = yield request_1.default.get(requestOptions);
+            const hubSites = hubSitesResponse.value;
+            let filteredHubSites = [];
+            if (options.title) {
+                filteredHubSites = hubSites.filter(site => site.Title.toLowerCase() === options.title.toLowerCase());
+            }
+            else if (options.url) {
+                filteredHubSites = hubSites.filter(site => site.SiteUrl.toLowerCase() === options.url.toLowerCase());
+            }
+            if (filteredHubSites.length === 0) {
+                throw `The specified hub site '${options.title || options.url}' does not exist.`;
+            }
+            if (filteredHubSites.length > 1) {
+                throw `Multiple hub sites with name '${options.title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+            }
+            return filteredHubSites[0];
+        });
+    }
 }
 _SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCommand_initTelemetry = function _SpoHubSiteDisconnectCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
         });
     });
 }, _SpoHubSiteDisconnectCommand_initOptions = function _SpoHubSiteDisconnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-u, --url [url]'
     }, {
         option: '--confirm'
     });
+}, _SpoHubSiteDisconnectCommand_initOptionSets = function _SpoHubSiteDisconnectCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title', 'url']);
 }, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `'${args.options.id}' is not a valid GUID`;
+        }
+        if (args.options.url) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
+        return true;
+    }));
 };
 module.exports = new SpoHubSiteDisconnectCommand();
 //# sourceMappingURL=hubsite-disconnect.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;
@@ -63,7 +64,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
                 }
                 else if (args.options.groupName) {
                     args.options.principalId = yield this.getGroupPrincipalId(args.options);
-                    this.addRoleAssignment(requestUrl, logger, args.options);
+                    yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
@@ -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(['listId', 'listTitle', 'listUrl'], ['principalId', 'upn', 'groupName'], ['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(['listId', 'listTitle', 'listUrl'], ['principalId', 'upn', 'groupName']);
 };
 module.exports = new SpoListRoleAssignmentRemoveCommand();
 //# sourceMappingURL=list-roleassignment-remove.js.map

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

@@ -18,6 +18,7 @@ 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");
@@ -44,19 +45,23 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
             }
             const breakListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
                     if (args.options.listId) {
-                        requestUrl += `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
-                    else {
-                        requestUrl += `/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    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})`,
+                        url: `${requestUrl}breakroleinheritance(${keepExistingPermissions})`,
                         method: 'POST',
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -92,6 +97,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             clearExistingPermissions: args.options.clearExistingPermissions === true,
             confirm: (!(!args.options.confirm)).toString()
         });
@@ -103,6 +109,8 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
@@ -120,7 +128,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         return true;
     }));
 }, _SpoListRoleInheritanceBreakCommand_initOptionSets = function _SpoListRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListRoleInheritanceBreakCommand();
 //# sourceMappingURL=list-roleinheritance-break.js.map