@pnp/cli-microsoft365 7.0.0-beta.4ebf3ad → 7.0.0-beta.5fdb9e3

package/dist/m365/spo/commands/navigation/navigation-node-set.js

@@ -119,8 +119,8 @@ _SpoNavigationNodeSetCommand_instances = new WeakSet(), _SpoNavigationNodeSetCom
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.audienceIds === undefined && !args.options.url && args.options.isExternal === undefined && !args.options.title && args.options.openInNewWindow === undefined) {
-            return `Please specify atleast one property to update.`;
+        if (args.options.audienceIds === undefined && args.options.url === undefined && args.options.isExternal === undefined && !args.options.title && args.options.openInNewWindow === undefined) {
+            return `Please specify at least one property to update.`;
         }
         if (args.options.audienceIds) {
             const audienceIdsSplitted = args.options.audienceIds.split(',');

package/dist/m365/spo/commands/orgassetslibrary/orgassetslibrary-add.js

@@ -10,6 +10,12 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var OrgAssetType;
+(function (OrgAssetType) {
+    OrgAssetType[OrgAssetType["ImageDocumentLibrary"] = 1] = "ImageDocumentLibrary";
+    OrgAssetType[OrgAssetType["OfficeTemplateLibrary"] = 2] = "OfficeTemplateLibrary";
+    OrgAssetType[OrgAssetType["OfficeFontLibrary"] = 4] = "OfficeFontLibrary";
+})(OrgAssetType || (OrgAssetType = {}));
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
     get name() {
         return commands.ORGASSETSLIBRARY_ADD;
@@ -30,6 +36,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
         try {
+            const orgAssetType = this.getOrgAssetType(args.options.orgAssetType);
             spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
@@ -37,7 +44,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
                 headers: {
                     'X-RequestDigest': reqDigest.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">${orgAssetType}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             const res = await request.post(requestOptions);
             const json = JSON.parse(res);
@@ -50,12 +57,23 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand {
             this.handleRejectedPromise(err);
         }
     }
+    getOrgAssetType(orgAssetType) {
+        switch (orgAssetType) {
+            case 'OfficeTemplateLibrary':
+                return OrgAssetType.OfficeTemplateLibrary;
+            case 'OfficeFontLibrary':
+                return OrgAssetType.OfficeFontLibrary;
+            default:
+                return OrgAssetType.ImageDocumentLibrary;
+        }
+    }
 }
 _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.cdnType || 'Private',
-            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined'
+            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined',
+            orgAssetType: args.options.orgAssetType
         });
     });
 }, _SpoOrgAssetsLibraryAddCommand_initOptions = function _SpoOrgAssetsLibraryAddCommand_initOptions() {
@@ -65,7 +83,10 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         option: '--thumbnailUrl [thumbnailUrl]'
     }, {
         option: '--cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
+        autocomplete: SpoOrgAssetsLibraryAddCommand.cdnTypes
+    }, {
+        option: '--orgAssetType [orgAssetType]',
+        autocomplete: SpoOrgAssetsLibraryAddCommand.orgAssetTypes
     });
 }, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -73,8 +94,16 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
+        if (args.options.cdnType && SpoOrgAssetsLibraryAddCommand.cdnTypes.indexOf(args.options.cdnType) < 0) {
+            return `${args.options.cdnType} is not a valid value for cdnType. Valid values are ${SpoOrgAssetsLibraryAddCommand.cdnTypes.join(', ')}`;
+        }
+        if (args.options.orgAssetType && SpoOrgAssetsLibraryAddCommand.orgAssetTypes.indexOf(args.options.orgAssetType) < 0) {
+            return `${args.options.orgAssetType} is not a valid value for orgAssetType. Valid values are ${SpoOrgAssetsLibraryAddCommand.orgAssetTypes.join(', ')}`;
+        }
         return validation.isValidSharePointUrl(args.options.libraryUrl);
     });
 };
+SpoOrgAssetsLibraryAddCommand.orgAssetTypes = ['ImageDocumentLibrary', 'OfficeTemplateLibrary', 'OfficeFontLibrary'];
+SpoOrgAssetsLibraryAddCommand.cdnTypes = ['Public', 'Private'];
 export default new SpoOrgAssetsLibraryAddCommand();
 //# sourceMappingURL=orgassetslibrary-add.js.map

package/dist/m365/spo/commands/propertybag/propertybag-base.js

@@ -13,7 +13,7 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
      * Gets property bag for a folder or site rootFolder of a site where return type is "_ObjectType_\":\"SP.Folder\".
      * This method is executed when folder option is specified. PnP PowerShell behaves the same way.
      */
-    getFolderPropertyBag(identityResp, webUrl, folder, logger) {
+    async getFolderPropertyBag(identityResp, webUrl, folder, logger) {
         let serverRelativeUrl = folder;
         if (identityResp.serverRelativeUrl !== '/') {
             serverRelativeUrl = `${identityResp.serverRelativeUrl}${serverRelativeUrl}`;
@@ -25,31 +25,31 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><Query Id="12" ObjectPathId="9"><Query SelectAllProperties="false"><Properties><Property Name="Properties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="9" ParentId="5" Name="GetFolderByServerRelativeUrl"><Parameters><Parameter Type="String">${serverRelativeUrl}</Parameter></Parameters></Method><Identity Id="5" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            return request
-                .post(requestOptions)
-                .then(async (res) => {
-                if (this.debug) {
-                    await logger.logToStderr('Attempt to get Properties key values');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const propertiesObj = json.find(x => { return x['Properties']; });
-                if (propertiesObj) {
-                    return resolve(propertiesObj['Properties']);
-                }
-                reject('Cannot proceed. Properties not found'); // this is not suppose to happen
-            }, (err) => { reject(err); });
-        });
+        try {
+            const res = await request.post(requestOptions);
+            if (this.debug) {
+                await logger.logToStderr('Attempt to get Properties key values');
+            }
+            const json = JSON.parse(res);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            const propertiesObj = json.find(x => { return x['Properties']; });
+            if (propertiesObj) {
+                return propertiesObj['Properties'];
+            }
+            throw 'Cannot proceed. Properties not found'; // this is not suppose to happen
+        }
+        catch (err) {
+            throw err;
+        }
     }
     /**
      * Gets property bag for site or sitecollection where return type is "_ObjectType_\":\"SP.Web\".
      * This method is executed when no folder specified. PnP PowerShell behaves the same way.
      */
-    getWebPropertyBag(identityResp, webUrl, logger) {
+    async getWebPropertyBag(identityResp, webUrl, logger) {
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {
@@ -57,23 +57,25 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="97" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /><Property Name="AllProperties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then(async (res) => {
-                if (this.debug) {
-                    await logger.logToStderr('Attempt to get AllProperties key values');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const allPropertiesObj = json.find(x => { return x['AllProperties']; });
-                if (allPropertiesObj) {
-                    return resolve(allPropertiesObj['AllProperties']);
-                }
-                reject('Cannot proceed. AllProperties not found'); // this is not supposed to happen
-            }, (err) => { reject(err); });
-        });
+        try {
+            const res = await request.post(requestOptions);
+            if (this.debug) {
+                await logger.logToStderr('Attempt to get AllProperties key values');
+            }
+            const json = JSON.parse(res);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            const allPropertiesObj = json.find(x => { return x['AllProperties']; });
+            if (allPropertiesObj) {
+                return allPropertiesObj['AllProperties'];
+            }
+            throw 'Cannot proceed. AllProperties not found'; // this is not supposed to happen
+        }
+        catch (err) {
+            throw err;
+        }
     }
     /**
      * The property bag item data returned from the client.svc/ProcessQuery response
@@ -108,7 +110,7 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
         }
         return { key: objKey, value: objValue };
     }
-    static setProperty(name, value, webUrl, formDigest, identityResp, logger, debug, folder) {
+    static async setProperty(name, value, webUrl, formDigest, identityResp, logger, debug, folder) {
         let objectType = 'AllProperties';
         if (folder) {
             objectType = 'Properties';
@@ -120,18 +122,20 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting.escapeXml(name)}</Parameter><Parameter Type="String">${formatting.escapeXml(value)}</Parameter></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then((res) => {
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                else {
-                    resolve(res);
-                }
-            }, (err) => { reject(err); });
-        });
+        try {
+            const res = await request.post(requestOptions);
+            const json = JSON.parse(res);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            else {
+                return res;
+            }
+        }
+        catch (err) {
+            throw err;
+        }
     }
     /**
      * Detects if the site in question has no script enabled or not. Detection is done
@@ -141,14 +145,14 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
      * @param options command options
      * @param cmd command instance
      */
-    static isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
-        return new Promise((resolve, reject) => {
-            spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug)
-                .then((basePermissionsResp) => {
-                resolve(basePermissionsResp.has(PermissionKind.AddAndCustomizePages) === false);
-            })
-                .catch(err => reject(err));
-        });
+    static async isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
+        try {
+            const basePermissionsResp = await spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug);
+            return basePermissionsResp.has(PermissionKind.AddAndCustomizePages) === false;
+        }
+        catch (err) {
+            throw err;
+        }
     }
 }
 //# sourceMappingURL=propertybag-base.js.map

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

@@ -27,24 +27,8 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
         __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeProperty = async () => {
-            try {
-                const contextResponse = await spo.getRequestDigest(args.options.webUrl);
-                this.formDigestValue = contextResponse.FormDigestValue;
-                let identityResp = await spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
-                const opts = args.options;
-                if (opts.folder) {
-                    // get the folder guid instead of the web guid
-                    identityResp = await spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
-                }
-                await this.removeProperty(identityResp, args.options);
-            }
-            catch (err) {
-                this.handleRejectedPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeProperty();
+            await this.removeProperty(args);
         }
         else {
             const result = await Cli.prompt({
@@ -54,11 +38,27 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
                 message: `Are you sure you want to remove the ${args.options.key} property?`
             });
             if (result.continue) {
-                await removeProperty();
+                await this.removeProperty(args);
             }
         }
     }
-    removeProperty(identityResp, options) {
+    async removeProperty(args) {
+        try {
+            const contextResponse = await spo.getRequestDigest(args.options.webUrl);
+            this.formDigestValue = contextResponse.FormDigestValue;
+            let identityResp = await spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+            const opts = args.options;
+            if (opts.folder) {
+                // get the folder guid instead of the web guid
+                identityResp = await spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+            }
+            await this.removePropertyWithIdentityResp(identityResp, args.options);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+    async removePropertyWithIdentityResp(identityResp, options) {
         let objectType = 'AllProperties';
         if (options.folder) {
             objectType = 'Properties';
@@ -70,18 +70,15 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting.escapeXml(options.key)}</Parameter><Parameter Type="Null" /></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then((res) => {
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                else {
-                    resolve(res);
-                }
-            }, (err) => { reject(err); });
-        });
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x['ErrorInfo']; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+        }
+        else {
+            return res;
+        }
     }
 }
 _SpoPropertyBagRemoveCommand_instances = new WeakSet(), _SpoPropertyBagRemoveCommand_initTelemetry = function _SpoPropertyBagRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/site/FlowsPolicy.js

@@ -0,0 +1,7 @@
+export var FlowsPolicy;
+(function (FlowsPolicy) {
+    FlowsPolicy[FlowsPolicy["Unknown"] = 0] = "Unknown";
+    FlowsPolicy[FlowsPolicy["Disabled"] = 1] = "Disabled";
+    FlowsPolicy[FlowsPolicy["Enabled"] = 2] = "Enabled";
+})(FlowsPolicy || (FlowsPolicy = {}));
+//# sourceMappingURL=FlowsPolicy.js.map

package/dist/m365/spo/commands/site/site-ensure.js

@@ -79,7 +79,7 @@ class SpoSiteEnsureCommand extends SpoCommand {
                     expectedWebTemplate = 'SITEPAGEPUBLISHING#0';
                     break;
                 case 'ClassicSite':
-                    expectedWebTemplate = args.options.webTemplate;
+                    expectedWebTemplate = args.options.webTemplate || 'STS#0';
                     break;
                 default:
                     throw `${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`;
@@ -138,7 +138,7 @@ class SpoSiteEnsureCommand extends SpoCommand {
         };
         const validationResult = await spoSiteAddCommand.validate({ options: options }, Cli.getCommandInfo(spoSiteAddCommand));
         if (validationResult !== true) {
-            return Promise.reject(validationResult);
+            throw validationResult;
         }
         return Cli.executeCommandWithOutput(spoSiteAddCommand, { options: { ...options, _: [] } });
     }
@@ -161,7 +161,7 @@ class SpoSiteEnsureCommand extends SpoCommand {
         };
         const validationResult = await spoSiteSetCommand.validate({ options: options }, Cli.getCommandInfo(spoSiteSetCommand));
         if (validationResult !== true) {
-            return Promise.reject(validationResult);
+            throw validationResult;
         }
         return Cli.executeCommandWithOutput(spoSiteSetCommand, { options: { ...options, _: [] } });
     }

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -25,28 +25,8 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const disconnectHubSite = async () => {
-            try {
-                const res = await spo.getRequestDigest(args.options.siteUrl);
-                if (this.verbose) {
-                    await logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue,
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await disconnectHubSite();
+            await this.disconnectHubSite(logger, args);
         }
         else {
             const result = await Cli.prompt({
@@ -56,8 +36,28 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
                 message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
             });
             if (result.continue) {
-                await disconnectHubSite();
+                await this.disconnectHubSite(logger, args);
+            }
+        }
+    }
+    async disconnectHubSite(logger, args) {
+        try {
+            const res = await spo.getRequestDigest(args.options.siteUrl);
+            if (this.verbose) {
+                await logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
             }
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                headers: {
+                    'X-RequestDigest': res.FormDigestValue,
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

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

@@ -44,45 +44,35 @@ class SpoSiteListCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
-        return new Promise((resolve, reject) => {
-            spo
-                .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
-                .then((res) => {
-                let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
-                if (deleted) {
-                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    data: requestBody
-                };
-                return request.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                    return;
-                }
-                else {
-                    const sites = json[json.length - 1];
-                    this.allSites.push(...sites._Child_Items_);
-                    if (sites.NextStartIndexFromSharePoint) {
-                        this
-                            .getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger)
-                            .then(_ => resolve(), err => reject(err));
-                    }
-                    else {
-                        resolve();
-                    }
-                }
-            }, err => reject(err));
-        });
+    async getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
+        const res = await spo.ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug);
+        let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
+        if (deleted) {
+            requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+        }
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': res.FormDigestValue
+            },
+            data: requestBody
+        };
+        const res1 = await request.post(requestOptions);
+        const json = JSON.parse(res1);
+        const response = json[0];
+        logger.log(response);
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+        else {
+            const sites = json[json.length - 1];
+            logger.log(sites);
+            this.allSites.push(...sites._Child_Items_);
+            if (sites.NextStartIndexFromSharePoint) {
+                await this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger);
+            }
+            return;
+        }
     }
     getWebTemplateId(options) {
         if (options.webTemplate) {