@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.01ba480

package/dist/m365/spo/commands/feature/feature-enable.js

@@ -45,9 +45,9 @@ class SpoFeatureEnableCommand extends SpoCommand_1.default {
                 force = false;
             }
             if (this.verbose) {
-                logger.logToStderr(`Enabling feature '${args.options.featureId}' on scope '${scope}' for url '${args.options.url}' (force='${force}')...`);
+                logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
             }
-            const url = `${args.options.url}/_api/${scope}/features/add(featureId=guid'${args.options.featureId}',force=${force})`;
+            const url = `${args.options.webUrl}/_api/${scope}/features/add(featureId=guid'${args.options.id}',force=${force})`;
             const requestOptions = {
                 url: url,
                 headers: {
@@ -72,9 +72,9 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
     });
 }, _SpoFeatureEnableCommand_initOptions = function _SpoFeatureEnableCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --featureId <id>'
+        option: '-i, --id <id>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']
@@ -88,7 +88,7 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return validation_1.validation.isValidSharePointUrl(args.options.url);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFeatureEnableCommand_initTypes = function _SpoFeatureEnableCommand_initTypes() {
     this.types.string.push('scope', 's');

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

@@ -37,7 +37,7 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const scope = (args.options.scope) ? args.options.scope : 'Web';
             const requestOptions = {
-                url: `${args.options.url}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
+                url: `${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -68,7 +68,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
     });
 }, _SpoFeatureListCommand_initOptions = function _SpoFeatureListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']
@@ -81,7 +81,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return validation_1.validation.isValidSharePointUrl(args.options.url);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoFeatureListCommand();

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

@@ -38,10 +38,6 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.fieldTitle) {
-                args.options.title = args.options.fieldTitle;
-                this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-            }
             let listRestUrl = '';
             if (args.options.listId) {
                 listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
@@ -98,8 +94,6 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '--fieldTitle [fieldTitle]'
     }, {
         option: '-t, --title [title]'
     });
@@ -118,7 +112,7 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldGetCommand_initOptionSets = function _SpoFieldGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'fieldTitle']);
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoFieldGetCommand();
 //# sourceMappingURL=field-get.js.map

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

@@ -39,10 +39,6 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.fieldTitle) {
-                args.options.title = args.options.fieldTitle;
-                this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-            }
             let messageEnd;
             if (args.options.listId || args.options.listTitle) {
                 messageEnd = `in list ${args.options.listId || args.options.listTitle}`;
@@ -163,8 +159,6 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '--fieldTitle [fieldTitle]'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -187,7 +181,7 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         return true;
     }));
 }, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'fieldTitle', 'group']);
+    this.optionSets.push(['id', 'title', 'group']);
 };
 module.exports = new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map

package/dist/m365/spo/commands/field/field-set.js

@@ -43,9 +43,6 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.name) {
-                this.warn(logger, `Option 'name' is deprecated. Please use 'title' instead.`);
-            }
             try {
                 const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestDigest = reqDigest.FormDigestValue;
@@ -123,7 +120,6 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             'listTitle',
             'listUrl',
             'id',
-            'name',
             'title',
             'updateExistingLists',
             'debug',
@@ -142,7 +138,6 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
@@ -160,8 +155,6 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -188,7 +181,7 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'name']);
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map

package/dist/m365/spo/commands/file/file-checkin.js

@@ -60,8 +60,8 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             if (args.options.id) {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
-            if (args.options.fileUrl) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkin(comment='${comment}',checkintype=${type})`;
+            if (args.options.url) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -83,7 +83,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.fileUrl)).toString(),
+            url: (!(!args.options.url)).toString(),
             type: args.options.type || 'Major',
             comment: typeof args.options.comment !== 'undefined'
         });
@@ -92,7 +92,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -125,7 +125,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
         return true;
     }));
 }, _SpoFileCheckinCommand_initOptionSets = function _SpoFileCheckinCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'id']);
+    this.optionSets.push(['url', 'id']);
 };
 module.exports = new SpoFileCheckinCommand();
 //# sourceMappingURL=file-checkin.js.map

package/dist/m365/spo/commands/file/file-checkout.js

@@ -40,8 +40,8 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
             if (args.options.id) {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkout`;
             }
-            if (args.options.fileUrl) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkout`;
+            if (args.options.url) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkout`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -63,14 +63,14 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
-            fileUrl: (!(!args.options.fileUrl)).toString()
+            url: (!(!args.options.url)).toString()
         });
     });
 }, _SpoFileCheckoutCommand_initOptions = function _SpoFileCheckoutCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     });
@@ -88,7 +88,7 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
         return true;
     }));
 }, _SpoFileCheckoutCommand_initOptionSets = function _SpoFileCheckoutCommand_initOptionSets() {
-    this.optionSets.push(['id', 'fileUrl']);
+    this.optionSets.push(['id', 'url']);
 };
 module.exports = new SpoFileCheckoutCommand();
 //# sourceMappingURL=file-checkout.js.map

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

@@ -37,7 +37,7 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
         return 'Generates a sharing information report for the specified file';
     }
     getExcludedOptionsWithUrls() {
-        return ['url'];
+        return ['fileUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -93,11 +93,11 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
     }
     getNeededFileInformation(args) {
         let requestUrl = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.id)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+        if (args.options.fileId) {
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.fileId)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${encodeURIComponent(args.options.url)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${encodeURIComponent(args.options.fileUrl)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -116,17 +116,17 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
 _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetCommand_initTelemetry = function _SpoFileSharinginfoGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString()
+            fileId: (!(!args.options.fileId)).toString(),
+            fileUrl: (!(!args.options.fileUrl)).toString()
         });
     });
 }, _SpoFileSharinginfoGetCommand_initOptions = function _SpoFileSharinginfoGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id [id]'
+        option: '-i, --fileId [fileId]'
     }, {
-        option: '-u, --url [url]'
+        option: '-f, --fileUrl [fileUrl]'
     });
 }, _SpoFileSharinginfoGetCommand_initValidators = function _SpoFileSharinginfoGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -134,15 +134,15 @@ _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetC
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id) {
-            if (!validation_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
+        if (args.options.fileId) {
+            if (!validation_1.validation.isValidGuid(args.options.fileId)) {
+                return `${args.options.fileId} is not a valid GUID`;
             }
         }
         return true;
     }));
 }, _SpoFileSharinginfoGetCommand_initOptionSets = function _SpoFileSharinginfoGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'url']);
+    this.optionSets.push(['fileId', 'fileUrl']);
 };
 module.exports = new SpoFileSharinginfoGetCommand();
 //# sourceMappingURL=file-sharinginfo-get.js.map

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

@@ -45,8 +45,8 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             if (args.options.id) {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
             }
-            else if (args.options.folderUrl) {
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            else if (args.options.url) {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
             }
             const requestOptions = {
@@ -72,15 +72,15 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
 _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemetry = function _SpoFolderGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            folderUrl: (!(!args.options.folderUrl)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
         });
     });
 }, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl [folderUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     });
@@ -98,7 +98,7 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
         return true;
     }));
 }, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
-    this.optionSets.push(['folderUrl', 'id']);
+    this.optionSets.push(['url', 'id']);
 };
 module.exports = new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map

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

@@ -41,7 +41,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
                 }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;
@@ -71,7 +71,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.folderUrl} located in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeFolder();
@@ -91,7 +91,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --url <url>'
     }, {
         option: '--recycle'
     }, {

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

@@ -41,11 +41,11 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
                 const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const formDigestValue = contextResponse.FormDigestValue;
                 const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-                const folderObjectIdentity = yield spo_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.folderUrl, formDigestValue);
+                const folderObjectIdentity = yield spo_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
                 if (this.verbose) {
-                    logger.logToStderr(`Renaming folder ${args.options.folderUrl} to ${args.options.name}`);
+                    logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
                 }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
                 const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
                 const requestOptions = {
@@ -72,7 +72,7 @@ _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initO
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --url <url>'
     }, {
         option: '-n, --name <name>'
     });

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-register.js

@@ -36,9 +36,9 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.url);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
                 const requestOptions = {
-                    url: `${args.options.url}/_api/site/RegisterHubSite`,
+                    url: `${args.options.siteUrl}/_api/site/RegisterHubSite`,
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -56,10 +56,10 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
 }
 _SpoHubSiteRegisterCommand_instances = new WeakSet(), _SpoHubSiteRegisterCommand_initOptions = function _SpoHubSiteRegisterCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoHubSiteRegisterCommand_initValidators = function _SpoHubSiteRegisterCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoHubSiteRegisterCommand();
 //# sourceMappingURL=hubsite-register.js.map

package/dist/m365/spo/commands/hubsite/hubsite-rights-grant.js

@@ -41,7 +41,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
                 const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
-                    logger.logToStderr(`Granting permissions to join the hub site ${args.options.url} to principals ${args.options.principals}...`);
+                    logger.logToStderr(`Granting permissions to join the hub site ${args.options.hubSiteUrl} to principals ${args.options.principals}...`);
                 }
                 const principals = args.options.principals
                     .split(',')
@@ -53,7 +53,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -70,7 +70,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
 }
 _SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantCommand_initOptions = function _SpoHubSiteRightsGrantCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -79,7 +79,7 @@ _SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantC
     });
 }, _SpoHubSiteRightsGrantCommand_initValidators = function _SpoHubSiteRightsGrantCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.hubSiteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/hubsite/hubsite-rights-revoke.js

@@ -42,7 +42,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
             const revokeRights = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (this.verbose) {
-                        logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.url}...`);
+                        logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.hubSiteUrl}...`);
                     }
                     const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                     const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
@@ -55,7 +55,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                         headers: {
                             'X-RequestDigest': reqDigest.FormDigestValue
                         },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                     };
                     const res = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(res);
@@ -76,7 +76,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.url} from the specified users?`
+                    message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.hubSiteUrl} from the specified users?`
                 });
                 if (result.continue) {
                     yield revokeRights();
@@ -93,14 +93,14 @@ _SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevok
     });
 }, _SpoHubSiteRightsRevokeCommand_initOptions = function _SpoHubSiteRightsRevokeCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
     }, {
         option: '-p, --principals <principals>'
     }, {
         option: '--confirm'
     });
 }, _SpoHubSiteRightsRevokeCommand_initValidators = function _SpoHubSiteRightsRevokeCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.hubSiteUrl); }));
 };
 module.exports = new SpoHubSiteRightsRevokeCommand();
 //# sourceMappingURL=hubsite-rights-revoke.js.map

package/dist/m365/spo/commands/knowledgehub/knowledgehub-set.js

@@ -41,14 +41,14 @@ class SpoKnowledgehubSetCommand extends SpoCommand_1.default {
                 const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
-                    logger.logToStderr(`Adding ${args.options.url} as the Knowledge Hub Site`);
+                    logger.logToStderr(`Adding ${args.options.siteUrl} as the Knowledge Hub Site`);
                 }
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions> <ObjectPath Id="35" ObjectPathId="34" /> <Method Name="SetKnowledgeHubSite" Id="36" ObjectPathId="34"> <Parameters> <Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter> </Parameters> </Method> </Actions> <ObjectPaths> <Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /> </ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions> <ObjectPath Id="35" ObjectPathId="34" /> <Method Name="SetKnowledgeHubSite" Id="36" ObjectPathId="34"> <Parameters> <Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter> </Parameters> </Method> </Actions> <ObjectPaths> <Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /> </ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -66,10 +66,10 @@ class SpoKnowledgehubSetCommand extends SpoCommand_1.default {
 }
 _SpoKnowledgehubSetCommand_instances = new WeakSet(), _SpoKnowledgehubSetCommand_initOptions = function _SpoKnowledgehubSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoKnowledgehubSetCommand_initValidators = function _SpoKnowledgehubSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoKnowledgehubSetCommand();
 //# sourceMappingURL=knowledgehub-set.js.map