@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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");
@@ -28,72 +37,65 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['ID', 'SiteUrl', 'Title'];
     }
-    commandAction(logger, args, cb) {
-        let hubSites;
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/hubsites`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            hubSites = res.value;
-            if (args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json') {
-                return Promise.resolve();
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('Retrieving associated sites...');
-                    logger.logToStderr('');
-                }
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/RenderListDataAsStream`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    parameters: {
-                        ViewXml: "<View><Query><Where><And><And><IsNull><FieldRef Name=\"TimeDeleted\"/></IsNull><Neq><FieldRef Name=\"State\"/><Value Type='Integer'>0</Value></Neq></And><Neq><FieldRef Name=\"HubSiteId\"/><Value Type='Text'>{00000000-0000-0000-0000-000000000000}</Value></Neq></And></Where><OrderBy><FieldRef Name='Title' Ascending='true' /></OrderBy></Query><ViewFields><FieldRef Name=\"Title\"/><FieldRef Name=\"SiteUrl\"/><FieldRef Name=\"SiteId\"/><FieldRef Name=\"HubSiteId\"/></ViewFields><RowLimit Paged=\"TRUE\">" + this.batchSize + "</RowLimit></View>",
-                        DatesInUtc: true
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield utils_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;
+                if (!(args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+                    if (this.debug) {
+                        logger.logToStderr('Retrieving associated sites...');
+                        logger.logToStderr('');
+                    }
+                    requestOptions = {
+                        url: `${spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/RenderListDataAsStream`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            parameters: {
+                                ViewXml: "<View><Query><Where><And><And><IsNull><FieldRef Name=\"TimeDeleted\"/></IsNull><Neq><FieldRef Name=\"State\"/><Value Type='Integer'>0</Value></Neq></And><Neq><FieldRef Name=\"HubSiteId\"/><Value Type='Text'>{00000000-0000-0000-0000-000000000000}</Value></Neq></And></Where><OrderBy><FieldRef Name='Title' Ascending='true' /></OrderBy></Query><ViewFields><FieldRef Name=\"Title\"/><FieldRef Name=\"SiteUrl\"/><FieldRef Name=\"SiteId\"/><FieldRef Name=\"HubSiteId\"/></ViewFields><RowLimit Paged=\"TRUE\">" + this.batchSize + "</RowLimit></View>",
+                                DatesInUtc: true
+                            }
+                        }
+                    };
+                    if (this.debug) {
+                        logger.logToStderr(`Will retrieve associated sites (including the hub sites) in batches of ${this.batchSize}`);
+                    }
+                    const res = yield this.getSites(requestOptions, requestOptions.url, logger);
+                    if (res) {
+                        hubSites.forEach(h => {
+                            const filteredSites = res.filter(f => {
+                                // Only include sites of which the Site Id is not the same as the
+                                // Hub Site ID (as this site is the actual hub site) and of which the
+                                // Hub Site ID matches the ID of the Hub
+                                return f.SiteId !== f.HubSiteId
+                                    && f.HubSiteId.toUpperCase() === `{${h.ID.toUpperCase()}}`;
+                            });
+                            h.AssociatedSites = filteredSites.map(a => {
+                                return {
+                                    Title: a.Title,
+                                    SiteUrl: a.SiteUrl
+                                };
+                            });
+                        });
                     }
                 }
-            };
-            if (this.debug) {
-                logger.logToStderr(`Will retrieve associated sites (including the hub sites) in batches of ${this.batchSize}`);
+                logger.log(hubSites);
             }
-            return this.getSites(requestOptions, requestOptions.url, logger);
-        })
-            .then((res) => {
-            if (res) {
-                hubSites.forEach(h => {
-                    const filteredSites = res.filter(f => {
-                        // Only include sites of which the Site Id is not the same as the
-                        // Hub Site ID (as this site is the actual hub site) and of which the
-                        // Hub Site ID matches the ID of the Hub
-                        return f.SiteId !== f.HubSiteId
-                            && f.HubSiteId.toUpperCase() === `{${h.ID.toUpperCase()}}`;
-                    });
-                    h.AssociatedSites = filteredSites.map(a => {
-                        return {
-                            Title: a.Title,
-                            SiteUrl: a.SiteUrl
-                        };
-                    });
-                });
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(hubSites);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getSites(reqOptions, nonPagedUrl, logger, sites = [], batchNumber = 0) {
         return new Promise((resolve, reject) => {

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

@@ -32,24 +32,25 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
     get description() {
         return 'Registers the specified site collection as a hub site';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getRequestDigest(args.options.url)
-            .then((res) => {
-            const requestOptions = {
-                url: `${args.options.url}/_api/site/RegisterHubSite`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.url);
+                const requestOptions = {
+                    url: `${args.options.url}/_api/site/RegisterHubSite`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue,
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoHubSiteRegisterCommand_instances = new WeakSet(), _SpoHubSiteRegisterCommand_initOptions = function _SpoHubSiteRegisterCommand_initOptions() {

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoHubSiteRightsGrantCommand_instances, _SpoHubSiteRightsGrantCommand_initOptions, _SpoHubSiteRightsGrantCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -34,41 +33,37 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
     get description() {
         return 'Grants permissions to join the hub site for one or more principals';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Granting permissions to join the hub site ${args.options.url} to principals ${args.options.principals}...`);
+    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);
+                if (this.verbose) {
+                    logger.logToStderr(`Granting permissions to join the hub site ${args.options.url} to principals ${args.options.principals}...`);
+                }
+                const principals = args.options.principals
+                    .split(',')
+                    .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
+                    .join('');
+                const grantedRights = '1';
+                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="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_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>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
             }
-            const principals = args.options.principals
-                .split(',')
-                .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
-                .join('');
-            const grantedRights = '1';
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.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">${utils_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>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantCommand_initOptions = function _SpoHubSiteRightsGrantCommand_initOptions() {

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

@@ -16,7 +16,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteRightsRevokeCommand_instances, _SpoHubSiteRightsRevokeCommand_initTelemetry, _SpoHubSiteRightsRevokeCommand_initOptions, _SpoHubSiteRightsRevokeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -36,60 +35,52 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
     get description() {
         return 'Revokes rights to join sites to the specified hub site for one or more principals';
     }
-    commandAction(logger, args, cb) {
-        const revokeRights = () => {
-            let spoAdminUrl = '';
-            if (this.verbose) {
-                logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.url}...`);
-            }
-            utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((_spoAdminUrl) => {
-                spoAdminUrl = _spoAdminUrl;
-                return utils_1.spo.getRequestDigest(spoAdminUrl);
-            })
-                .then((res) => {
-                const principals = args.options.principals
-                    .split(',')
-                    .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
-                    .join('');
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.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">${utils_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>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                    return;
-                }
-                cb();
-            }, (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            revokeRights();
-        }
-        else {
-            cli_1.Cli.prompt({
-                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?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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}...`);
+                    }
+                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const principals = args.options.principals
+                        .split(',')
+                        .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
+                        .join('');
+                    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="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_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>`
+                    };
+                    const res = yield request_1.default.post(requestOptions);
+                    const json = JSON.parse(res);
+                    const response = json[0];
+                    if (response.ErrorInfo) {
+                        throw response.ErrorInfo.ErrorMessage;
+                    }
                 }
-                else {
-                    revokeRights();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield revokeRights();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    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?`
+                });
+                if (result.continue) {
+                    yield revokeRights();
+                }
+            }
+        });
     }
 }
 _SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevokeCommand_initTelemetry = function _SpoHubSiteRightsRevokeCommand_initTelemetry() {

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoHubSiteSetCommand_instances, _SpoHubSiteSetCommand_initTelemetry, _SpoHubSiteSetCommand_initOptions, _SpoHubSiteSetCommand_initValidators, _SpoHubSiteSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -36,46 +35,42 @@ class SpoHubSiteSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates properties of the specified hub site';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Updating hub site ${args.options.id}...`);
+    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);
+                if (this.verbose) {
+                    logger.logToStderr(`Updating hub site ${args.options.id}...`);
+                }
+                const title = typeof args.options.title === 'string' ? `<SetProperty Id="13" ObjectPathId="10" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>` : '';
+                const description = typeof args.options.description === 'string' ? `<SetProperty Id="15" ObjectPathId="10" Name="Description"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter></SetProperty>` : '';
+                const logoUrl = typeof args.options.logoUrl === 'string' ? `<SetProperty Id="14" ObjectPathId="10" Name="LogoUrl"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.logoUrl)}</Parameter></SetProperty>` : '';
+                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="9" ObjectPathId="8" /><ObjectPath Id="11" ObjectPathId="10" /><Query Id="12" ObjectPathId="10"><Query SelectAllProperties="true"><Properties /></Query></Query>${title}${logoUrl}${description}<Method Name="Update" Id="16" ObjectPathId="10" /></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="10" ParentId="8" Name="GetHubSitePropertiesById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const hubSite = json.pop();
+                    delete hubSite._ObjectType_;
+                    hubSite.ID = hubSite.ID.replace('/Guid(', '').replace(')/', '');
+                    hubSite.SiteId = hubSite.SiteId.replace('/Guid(', '').replace(')/', '');
+                    logger.log(hubSite);
+                }
             }
-            const title = typeof args.options.title === 'string' ? `<SetProperty Id="13" ObjectPathId="10" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>` : '';
-            const description = typeof args.options.description === 'string' ? `<SetProperty Id="15" ObjectPathId="10" Name="Description"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter></SetProperty>` : '';
-            const logoUrl = typeof args.options.logoUrl === 'string' ? `<SetProperty Id="14" ObjectPathId="10" Name="LogoUrl"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.logoUrl)}</Parameter></SetProperty>` : '';
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.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="9" ObjectPathId="8" /><ObjectPath Id="11" ObjectPathId="10" /><Query Id="12" ObjectPathId="10"><Query SelectAllProperties="true"><Properties /></Query></Query>${title}${logoUrl}${description}<Method Name="Update" Id="16" ObjectPathId="10" /></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="10" ParentId="8" Name="GetHubSitePropertiesById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            else {
-                const hubSite = json.pop();
-                delete hubSite._ObjectType_;
-                hubSite.ID = hubSite.ID.replace('/Guid(', '').replace(')/', '');
-                hubSite.SiteId = hubSite.SiteId.replace('/Guid(', '').replace(')/', '');
-                logger.log(hubSite);
-            }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoHubSiteSetCommand_instances = new WeakSet(), _SpoHubSiteSetCommand_initTelemetry = function _SpoHubSiteSetCommand_initTelemetry() {

package/dist/m365/spo/commands/hubsite/hubsite-theme-sync.js

@@ -32,20 +32,25 @@ class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
     get description() {
         return 'Applies any theme updates from the parent hub site.';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr('Syncing hub site theme...');
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/SyncHubSiteTheme`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr('Syncing hub site theme...');
+                }
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/SyncHubSiteTheme`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoHubSiteThemeSyncCommand_initOptions = function _SpoHubSiteThemeSyncCommand_initOptions() {

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

@@ -32,43 +32,42 @@ class SpoHubSiteUnregisterCommand extends SpoCommand_1.default {
         return commands_1.default.HUBSITE_UNREGISTER;
     }
     get description() {
-        return 'Unregisters the specifies site collection as a hub site';
+        return 'Unregisters the specified site collection as a hub site';
     }
-    commandAction(logger, args, cb) {
-        const unregisterHubSite = () => {
-            utils_1.spo
-                .getRequestDigest(args.options.url)
-                .then((res) => {
-                const requestOptions = {
-                    url: `${args.options.url}/_api/site/UnregisterHubSite`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue,
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            unregisterHubSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to unregister the site collection ${args.options.url} as a hub site?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const unregisterHubSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const res = yield utils_1.spo.getRequestDigest(args.options.url);
+                    const requestOptions = {
+                        url: `${args.options.url}/_api/site/UnregisterHubSite`,
+                        headers: {
+                            'X-RequestDigest': res.FormDigestValue,
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    unregisterHubSite();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield unregisterHubSite();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to unregister the site collection ${args.options.url} as a hub site?`
+                });
+                if (result.continue) {
+                    yield unregisterHubSite();
+                }
+            }
+        });
     }
 }
 _SpoHubSiteUnregisterCommand_instances = new WeakSet(), _SpoHubSiteUnregisterCommand_initTelemetry = function _SpoHubSiteUnregisterCommand_initTelemetry() {