@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

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

@@ -13,26 +13,27 @@ 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 _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators, _SpoGroupUserListCommand_initOptionSets;
+var _SpoGroupMemberListCommand_instances, _SpoGroupMemberListCommand_initTelemetry, _SpoGroupMemberListCommand_initOptions, _SpoGroupMemberListCommand_initValidators, _SpoGroupMemberListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoGroupUserListCommand extends SpoCommand_1.default {
+class SpoGroupMemberListCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoGroupUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptionSets).call(this);
+        _SpoGroupMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptionSets).call(this);
     }
     get name() {
-        return commands_1.default.GROUP_USER_LIST;
+        return commands_1.default.GROUP_MEMBER_LIST;
     }
     get description() {
-        return `List members of a SharePoint Group`;
+        return `List the members of a SharePoint Group`;
     }
     defaultProperties() {
         return ['Title', 'UserPrincipalName', 'Id', 'Email'];
@@ -43,8 +44,8 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving the list of members from the SharePoint group :  ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
             }
             const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users`;
+                ? `GetById('${args.options.groupId}')`
+                : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users`;
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -54,7 +55,7 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
             };
             try {
                 const response = yield request_1.default.get(requestOptions);
-                logger.log(response);
+                logger.log(response.value);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -62,14 +63,14 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_initTelemetry = function _SpoGroupUserListCommand_initTelemetry() {
+_SpoGroupMemberListCommand_instances = new WeakSet(), _SpoGroupMemberListCommand_initTelemetry = function _SpoGroupMemberListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined'
         });
     });
-}, _SpoGroupUserListCommand_initOptions = function _SpoGroupUserListCommand_initOptions() {
+}, _SpoGroupMemberListCommand_initOptions = function _SpoGroupMemberListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -77,15 +78,15 @@ _SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_ini
     }, {
         option: '--groupName [groupName]'
     });
-}, _SpoGroupUserListCommand_initValidators = function _SpoGroupUserListCommand_initValidators() {
+}, _SpoGroupMemberListCommand_initValidators = function _SpoGroupMemberListCommand_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 utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
-}, _SpoGroupUserListCommand_initOptionSets = function _SpoGroupUserListCommand_initOptionSets() {
+}, _SpoGroupMemberListCommand_initOptionSets = function _SpoGroupMemberListCommand_initOptionSets() {
     this.optionSets.push(['groupName', 'groupId']);
 };
-module.exports = new SpoGroupUserListCommand();
-//# sourceMappingURL=group-user-list.js.map
+module.exports = new SpoGroupMemberListCommand();
+//# sourceMappingURL=group-member-list.js.map

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");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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: {
@@ -66,7 +67,7 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
                 yield removeUserfromSPGroup();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -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 utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
-}, _SpoGroupUserRemoveCommand_initOptionSets = function _SpoGroupUserRemoveCommand_initOptionSets() {
+}, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
     this.optionSets.push(['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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupRemoveCommand_instances, _SpoGroupRemoveCommand_initTelemetry, _SpoGroupRemoveCommand_initOptions, _SpoGroupRemoveCommand_initValidators, _SpoGroupRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupRemoveCommand extends SpoCommand_1.default {
@@ -78,7 +78,7 @@ class SpoGroupRemoveCommand extends SpoCommand_1.default {
                 yield removeGroup();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -111,7 +111,7 @@ _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTel
     });
 }, _SpoGroupRemoveCommand_initValidators = function _SpoGroupRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupSetCommand_initOptions, _SpoGroupSetCommand_initValidators, _SpoGroupSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -90,7 +90,7 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
             debug: options.debug,
             verbose: options.verbose
         };
-        return cli_1.Cli
+        return Cli_1.Cli
             .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, cmdOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
@@ -151,7 +151,7 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
     });
 }, _SpoGroupSetCommand_initValidators = function _SpoGroupSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -166,7 +166,7 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
             args.options.allowRequestToJoinLeave, args.options.autoAcceptRequestToJoinLeave
         ];
         for (const option of booleanOptions) {
-            if (typeof option !== 'undefined' && !utils_1.validation.isValidBoolean(option)) {
+            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
                 return `Value '${option}' is not a valid boolean`;
             }
         }

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
@@ -23,7 +23,7 @@ class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 if (this.verbose) {
                     logger.logToStderr(`Getting the current value of the HideDefaultThemes setting...`);
                 }

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHideDefaultThemesSetCommand_instances, _SpoHideDefaultThemesSetCommand_initTelemetry, _SpoHideDefaultThemesSetCommand_initOptions, _SpoHideDefaultThemesSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHideDefaultThemesSetCommand extends SpoCommand_1.default {
@@ -36,7 +36,7 @@ class SpoHideDefaultThemesSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 if (this.verbose) {
                     logger.logToStderr(`Setting the value of the HideDefaultThemes setting to ${args.options.hideDefaultThemes}...`);
                 }

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteGetCommand extends SpoCommand_1.default {
@@ -23,7 +23,7 @@ class SpoHomeSiteGetCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestOptions = {
                     url: `${spoUrl}/_api/SP.SPHSite/Details`,
                     headers: {

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

@@ -15,10 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoHomeSiteRemoveCommand_instances, _SpoHomeSiteRemoveCommand_initTelemetry, _SpoHomeSiteRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
@@ -38,8 +38,8 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeHomeSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                     const requestOptions = {
                         url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
@@ -65,7 +65,7 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
                 yield removeHomeSite();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

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

@@ -17,7 +17,9 @@ var _SpoHomeSiteSetCommand_instances, _SpoHomeSiteSetCommand_initOptions, _SpoHo
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteSetCommand extends SpoCommand_1.default {
@@ -36,14 +38,14 @@ class SpoHomeSiteSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 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="57" ObjectPathId="56" /><Method Name="SetSPHSite" Id="58" ObjectPathId="56"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="56" 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="57" ObjectPathId="56" /><Method Name="SetSPHSite" Id="58" ObjectPathId="56"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="56" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -66,7 +68,7 @@ _SpoHomeSiteSetCommand_instances = new WeakSet(), _SpoHomeSiteSetCommand_initOpt
         option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoHomeSiteSetCommand_initValidators = function _SpoHomeSiteSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoHomeSiteSetCommand();
 //# sourceMappingURL=homesite-set.js.map

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

@@ -13,59 +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 utils_1 = require("../../../../utils");
+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 utils_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: '--parentId [parentId]'
     }, {
-        option: '-i, --id <id>'
+        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 = utils_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 (!utils_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-data-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteDataGetCommand_instances, _SpoHubSiteDataGetCommand_initTelemetry, _SpoHubSiteDataGetCommand_initOptions, _SpoHubSiteDataGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
@@ -76,7 +76,7 @@ _SpoHubSiteDataGetCommand_instances = new WeakSet(), _SpoHubSiteDataGetCommand_i
         option: '-f, --forceRefresh'
     });
 }, _SpoHubSiteDataGetCommand_initValidators = function _SpoHubSiteDataGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoHubSiteDataGetCommand();
 //# sourceMappingURL=hubsite-data-get.js.map