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

package/dist/m365/spo/commands/group/{group-user-remove.js → group-member-remove.js}

@@ -13,27 +13,28 @@ 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 _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators, _SpoGroupUserRemoveCommand_initOptionSets;
+var _SpoGroupMemberRemoveCommand_instances, _SpoGroupMemberRemoveCommand_initTelemetry, _SpoGroupMemberRemoveCommand_initOptions, _SpoGroupMemberRemoveCommand_initValidators, _SpoGroupMemberRemoveCommand_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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
+class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoGroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptionSets).call(this);
+        _SpoGroupMemberRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptionSets).call(this);
     }
     get name() {
-        return commands_1.default.GROUP_USER_REMOVE;
+        return commands_1.default.GROUP_MEMBER_REMOVE;
     }
     get description() {
-        return 'Removes the specified user from a SharePoint group';
+        return 'Removes the specified member from a SharePoint group';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43,8 +44,8 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
                 }
                 const loginName = `i:0#.f|membership|${args.options.userName}`;
                 const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                    ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                    : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
+                    ? `GetById('${args.options.groupId}')`
+                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -79,7 +80,7 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand_initTelemetry = function _SpoGroupUserRemoveCommand_initTelemetry() {
+_SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCommand_initTelemetry = function _SpoGroupMemberRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: (!(!args.options.groupId)).toString(),
@@ -87,7 +88,7 @@ _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand
             confirm: (!(!args.options.confirm)).toString()
         });
     });
-}, _SpoGroupUserRemoveCommand_initOptions = function _SpoGroupUserRemoveCommand_initOptions() {
+}, _SpoGroupMemberRemoveCommand_initOptions = function _SpoGroupMemberRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -99,15 +100,15 @@ _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand
     }, {
         option: '--confirm'
     });
-}, _SpoGroupUserRemoveCommand_initValidators = function _SpoGroupUserRemoveCommand_initValidators() {
+}, _SpoGroupMemberRemoveCommand_initValidators = function _SpoGroupMemberRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
-}, _SpoGroupUserRemoveCommand_initOptionSets = function _SpoGroupUserRemoveCommand_initOptionSets() {
-    this.optionSets.push(['groupName', 'groupId']);
+}, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['groupName', 'groupId'] });
 };
-module.exports = new SpoGroupUserRemoveCommand();
-//# sourceMappingURL=group-user-remove.js.map
+module.exports = new SpoGroupMemberRemoveCommand();
+//# sourceMappingURL=group-member-remove.js.map

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

@@ -121,7 +121,7 @@ _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTel
         return true;
     }));
 }, _SpoGroupRemoveCommand_initOptionSets = function _SpoGroupRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoGroupRemoveCommand();
 //# sourceMappingURL=group-remove.js.map

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

@@ -173,7 +173,7 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
         return true;
     }));
 }, _SpoGroupSetCommand_initOptionSets = function _SpoGroupSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoGroupSetCommand();
 //# sourceMappingURL=group-set.js.map

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.url);
+                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.url}/_api/site/JoinHubSite('${encodeURIComponent(args.options.hubSiteId)}')`,
+                    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, --url <url>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-u, --url [url]'
     }, {
-        option: '-i, --hubSiteId <hubSiteId>'
+        option: '--parentId [parentId]'
+    }, {
+        option: '--parentTitle [parentTitle]'
+    }, {
+        option: '--parentUrl [parentUrl]'
     });
+}, _SpoHubSiteConnectCommand_initOptionSets = function _SpoHubSiteConnectCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'url'] }, { options: ['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.url);
-        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.hubSiteId)) {
-            return `${args.options.hubSiteId} 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.url);
                     if (this.verbose) {
-                        logger.logToStderr(`Disconnecting site collection ${args.options.url} 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.url} 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, --url <url>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-u, --url [url]'
     }, {
         option: '--confirm'
     });
+}, _SpoHubSiteDisconnectCommand_initOptionSets = function _SpoHubSiteDisconnectCommand_initOptionSets() {
+    this.optionSets.push({ options: ['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.url); }));
+    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/hubsite/hubsite-get.js

@@ -131,7 +131,7 @@ _SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelem
         return true;
     }));
 }, _SpoHubSiteGetCommand_initOptionSets = function _SpoHubSiteGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'url']);
+    this.optionSets.push({ options: ['id', 'title', 'url'] });
 };
 module.exports = new SpoHubSiteGetCommand();
 //# sourceMappingURL=hubsite-get.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteListCommand_instances, _SpoHubSiteListCommand_initTelemetry, _SpoHubSiteListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,21 +42,14 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                let requestOptions = {
-                    url: `${spoAdminUrl}/_api/hubsites`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const hubSitesResult = yield request_1.default.get(requestOptions);
-                const hubSites = hubSitesResult.value;
+                const hubSitesResult = yield odata_1.odata.getAllItems(`${spoAdminUrl}/_api/hubsites`);
+                const hubSites = hubSitesResult;
                 if (!(args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
                     if (this.debug) {
                         logger.logToStderr('Retrieving associated sites...');
                         logger.logToStderr('');
                     }
-                    requestOptions = {
+                    const requestOptions = {
                         url: `${spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/RenderListDataAsStream`,
                         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

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

@@ -41,7 +41,7 @@ class SpoListContentTypeAddCommand extends SpoCommand_1.default {
         return __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(`Adding content type ${args.options.contentTypeId} to list ${list} in site at ${args.options.webUrl}...`);
+                logger.logToStderr(`Adding content type ${args.options.id} to list ${list} in site at ${args.options.webUrl}...`);
             }
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.listId) {
@@ -55,7 +55,7 @@ class SpoListContentTypeAddCommand extends SpoCommand_1.default {
                 requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             const requestBody = {
-                contentTypeId: args.options.contentTypeId
+                contentTypeId: args.options.id
             };
             const requestOptions = {
                 url: `${requestUrl}/ContentTypes/AddAvailableContentType`,
@@ -93,7 +93,7 @@ _SpoListContentTypeAddCommand_instances = new WeakSet(), _SpoListContentTypeAddC
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '-c, --contentTypeId <contentTypeId>'
+        option: '-i, --id <id>'
     });
 }, _SpoListContentTypeAddCommand_initValidators = function _SpoListContentTypeAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -107,9 +107,9 @@ _SpoListContentTypeAddCommand_instances = new WeakSet(), _SpoListContentTypeAddC
         return true;
     }));
 }, _SpoListContentTypeAddCommand_initTypes = function _SpoListContentTypeAddCommand_initTypes() {
-    this.types.string.push('contentTypeId', 'c');
+    this.types.string.push('id', 'i');
 }, _SpoListContentTypeAddCommand_initOptionSets = function _SpoListContentTypeAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListContentTypeAddCommand();
 //# sourceMappingURL=list-contenttype-add.js.map