@pnp/cli-microsoft365 7.7.0-beta.a12fb3e → 7.7.0-beta.cec4ca2

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

@@ -4,8 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemSetCommand_instances, _SpoListItemSetCommand_initTelemetry, _SpoListItemSetCommand_initOptions, _SpoListItemSetCommand_initValidators, _SpoListItemSetCommand_initTypes, _SpoListItemSetCommand_initOptionSets;
-import os from 'os';
-import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { basic } from '../../../../utils/basic.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -35,11 +33,9 @@ class SpoListItemSetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         let contentTypeName = '';
-        let listId = '';
         try {
             let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                listId = args.options.listId;
                 requestUrl += `/lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else if (args.options.listTitle) {
@@ -49,20 +45,6 @@ class SpoListItemSetCommand extends SpoCommand {
                 const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            if (args.options.systemUpdate && !args.options.listId) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Getting list id...`);
-                }
-                const listRequestOptions = {
-                    url: `${requestUrl}?$select=Id`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const list = await request.get(listRequestOptions);
-                listId = list.Id;
-            }
             if (args.options.contentType) {
                 if (this.verbose) {
                     await logger.logToStderr(`Getting content types for list...`);
@@ -101,94 +83,10 @@ class SpoListItemSetCommand extends SpoCommand {
                     await logger.logToStderr(`using content type name: ${contentTypeName}`);
                 }
             }
-            let res = undefined;
-            if (args.options.systemUpdate) {
-                if (this.debug) {
-                    await logger.logToStderr(`getting request digest for systemUpdate request`);
-                }
-                res = await spo.getRequestDigest(args.options.webUrl);
-            }
-            if (this.verbose) {
-                await logger.logToStderr(`Updating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
-            }
-            const formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
-            let objectIdentity = '';
-            if (args.options.systemUpdate) {
-                objectIdentity = await this.requestObjectIdentity(args.options.webUrl, logger, formDigestValue);
-            }
-            const additionalContentType = (args.options.systemUpdate && args.options.contentType && contentTypeName !== '') ? `
-          <Method Name="ParseAndSetFieldValue" Id="1" ObjectPathId="147">
-            <Parameters>
-              <Parameter Type="String">ContentType</Parameter>
-              <Parameter Type="String">${contentTypeName}</Parameter>
-            </Parameters>
-          </Method>`
-                : ``;
-            const requestBody = args.options.systemUpdate ?
-                `<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>
-            ${this.mapRequestBody(args.options).join('')}${additionalContentType}
-            <Method Name="SystemUpdate" Id="2" ObjectPathId="147" />
-          </Actions>
-          <ObjectPaths>
-            <Identity Id="147" Name="${objectIdentity}:list:${listId}:item:${args.options.id},1" />
-          </ObjectPaths>
-        </Request>`
-                : {
-                    formValues: this.mapRequestBody(args.options)
-                };
-            if (args.options.contentType && contentTypeName !== '' && !args.options.systemUpdate) {
-                if (this.debug) {
-                    await logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
-                }
-                requestBody.formValues.push({
-                    FieldName: 'ContentType',
-                    FieldValue: contentTypeName
-                });
-            }
-            const requestOptions = args.options.systemUpdate ?
-                {
-                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'Content-Type': 'text/xml',
-                        'X-RequestDigest': formDigestValue
-                    },
-                    data: requestBody
-                } :
-                {
-                    url: `${requestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    data: requestBody,
-                    responseType: 'json'
-                };
-            const response = await request.post(requestOptions);
-            let itemId = 0;
-            if (args.options.systemUpdate) {
-                if (response.indexOf("ErrorMessage") > -1) {
-                    throw `Error occurred in systemUpdate operation - ${response}`;
-                }
-                else {
-                    itemId = Number(args.options.id);
-                }
-            }
-            else {
-                // Response is from /ValidateUpdateListItem POST call, perform get on updated item to get all field values
-                const fieldValues = response.value;
-                if (fieldValues.some(f => f.HasException)) {
-                    throw `Updating the items has failed with the following errors: ${os.EOL}${fieldValues.filter(f => f.HasException).map(f => { return `- ${f.FieldName} - ${f.ErrorMessage}`; }).join(os.EOL)}`;
-                }
-                itemId = fieldValues[0].ItemId;
-            }
-            const requestOptionsItems = {
-                url: `${requestUrl}/items(${itemId})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const item = await request.get(requestOptionsItems);
+            const properties = this.mapRequestBody(args.options);
+            const item = args.options.systemUpdate ?
+                await spo.systemUpdateListItem(requestUrl, args.options.id, logger, this.verbose, properties, contentTypeName)
+                : await spo.updateListItem(requestUrl, args.options.id, properties, contentTypeName);
             delete item.ID;
             await logger.log(item);
         }
@@ -197,7 +95,7 @@ class SpoListItemSetCommand extends SpoCommand {
         }
     }
     mapRequestBody(options) {
-        const requestBody = [];
+        const filteredData = {};
         const excludeOptions = [
             'listTitle',
             'listId',
@@ -216,57 +114,12 @@ class SpoListItemSetCommand extends SpoCommand {
             't',
             '_'
         ];
-        Object.keys(options).forEach(key => {
-            if (excludeOptions.indexOf(key) === -1) {
-                if (options.systemUpdate) {
-                    requestBody.push(`
-          <Method Name="ParseAndSetFieldValue" Id="1" ObjectPathId="147">
-            <Parameters>
-              <Parameter Type="String">${key}</Parameter>
-              <Parameter Type="String">${options[key].toString()}</Parameter>
-            </Parameters>
-          </Method>`);
-                }
-                else {
-                    requestBody.push({ FieldName: key, FieldValue: options[key].toString() });
-                }
+        for (const key of Object.keys(options)) {
+            if (!excludeOptions.includes(key)) {
+                filteredData[key] = options[key];
             }
-        });
-        return requestBody;
-    }
-    /**
-     * Requests web object identity for the current web.
-     * This request has to be send before we can construct the property bag request.
-     * The response data looks like:
-     * _ObjectIdentity_=<GUID>|<GUID>:site:<GUID>:web:<GUID>
-     * _ObjectType_=SP.Web
-     * ServerRelativeUrl=/sites/contoso
-     * The ObjectIdentity is needed to create another request to retrieve the property bag or set property.
-     * @param webUrl web url
-     * @param cmd command cmd
-     */
-    async requestObjectIdentity(webUrl, logger, formDigestValue) {
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': 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><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
-        };
-        const response = await request.post(requestOptions);
-        if (this.debug) {
-            await logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
-        }
-        const json = JSON.parse(response);
-        const contents = json.find(x => { return x['ErrorInfo']; });
-        if (contents && contents.ErrorInfo) {
-            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
-        }
-        const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
-        if (identityObject) {
-            return identityObject['_ObjectIdentity_'];
         }
-        throw 'Cannot proceed. _ObjectIdentity_ not found'; // this is not supposed to happen
+        return filteredData;
     }
 }
 _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTelemetry = function _SpoListItemSetCommand_initTelemetry() {

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

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddCommand_initOptions, _SpoPageAddCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -12,8 +11,6 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from '../file/file-get.js';
-import spoListItemSetCommand from '../listitem/listitem-set.js';
 import { Page, supportedPageLayouts, supportedPromoteAs } from './Page.js';
 class SpoPageAddCommand extends SpoCommand {
     get name() {
@@ -64,7 +61,8 @@ class SpoPageAddCommand extends SpoCommand {
             };
             const template = await request.post(requestOptions);
             itemId = template.UniqueId;
-            const listItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+            const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+            const listItemId = file.Id;
             const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
             if (pageProps) {
                 pageId = pageProps.Id;
@@ -93,15 +91,11 @@ class SpoPageAddCommand extends SpoCommand {
                         break;
                     case 'NewsPage':
                         const listItemSetOptions = {
-                            webUrl: args.options.webUrl,
-                            listUrl: listServerRelativeUrl,
-                            id: listItemId,
-                            systemUpdate: true,
-                            FirstPublishedDate: new Date().toISOString(),
-                            verbose: this.verbose,
-                            debug: this.debug
+                            FirstPublishedDate: new Date().toISOString()
                         };
-                        await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                        const listUrl = urlUtil.getServerRelativePath(args.options.webUrl, listServerRelativeUrl);
+                        const requestUrl = `${args.options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listUrl)}')`;
+                        await spo.systemUpdateListItem(requestUrl, listItemId, logger, this.verbose, listItemSetOptions);
                         break;
                     case 'Template':
                         requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${listItemId})/SavePageAsTemplate`;
@@ -212,18 +206,6 @@ class SpoPageAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getFileListItemId(webUrl, serverRelativeFileUrl) {
-        const fileGetOptions = {
-            webUrl: webUrl,
-            url: serverRelativeFileUrl,
-            asListItem: true,
-            verbose: this.verbose,
-            debug: this.debug
-        };
-        const fileGetOutput = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
-        const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
-        return fileGetOutputJson.Id;
-    }
 }
 _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry = function _SpoPageAddCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -5,7 +5,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetCommand_initOptions, _SpoPageSetCommand_initTypes, _SpoPageSetCommand_initValidators;
 import { Auth } from '../../../../Auth.js';
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -13,8 +12,6 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from '../file/file-get.js';
-import spoListItemSetCommand from '../listitem/listitem-set.js';
 import { Page, supportedPageLayouts, supportedPromoteAs } from './Page.js';
 class SpoPageSetCommand extends SpoCommand {
     get name() {
@@ -49,6 +46,8 @@ class SpoPageSetCommand extends SpoCommand {
         }
         const listServerRelativeUrl = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages`;
         const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
+        const listUrl = urlUtil.getServerRelativePath(args.options.webUrl, listServerRelativeUrl);
+        const requestUrl = `${args.options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listUrl)}')`;
         const needsToSavePage = !!args.options.title || !!args.options.description;
         try {
             const requestDigestResult = await spo.getRequestDigest(args.options.webUrl);
@@ -65,21 +64,16 @@ class SpoPageSetCommand extends SpoCommand {
                 authorByline = page.AuthorByline;
             }
             if (args.options.layoutType) {
-                const itemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                const itemId = file.Id;
                 const listItemSetOptions = {
-                    webUrl: args.options.webUrl,
-                    listUrl: listServerRelativeUrl,
-                    id: itemId,
-                    systemUpdate: true,
-                    PageLayoutType: args.options.layoutType,
-                    verbose: this.verbose,
-                    debug: this.debug
+                    PageLayoutType: args.options.layoutType
                 };
                 if (args.options.layoutType === 'Article') {
                     listItemSetOptions.PromotedState = 0;
                     listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
                 }
-                await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                await spo.systemUpdateListItem(requestUrl, itemId, logger, this.verbose, listItemSetOptions);
             }
             if (args.options.promoteAs) {
                 const requestOptions = {
@@ -101,21 +95,17 @@ class SpoPageSetCommand extends SpoCommand {
                         await request.post(requestOptions);
                         break;
                     case 'NewsPage':
-                        const newsPageItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                        const newsPageItem = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                        const newsPageItemId = newsPageItem.Id;
                         const listItemSetOptions = {
-                            webUrl: args.options.webUrl,
-                            listUrl: listServerRelativeUrl,
-                            id: newsPageItemId,
-                            systemUpdate: true,
                             PromotedState: 2,
-                            FirstPublishedDate: new Date().toISOString(),
-                            verbose: this.verbose,
-                            debug: this.debug
+                            FirstPublishedDate: new Date().toISOString()
                         };
-                        await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                        await spo.systemUpdateListItem(requestUrl, newsPageItemId, logger, this.verbose, listItemSetOptions);
                         break;
                     case 'Template':
-                        const templateItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                        const templateItem = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                        const templateItemId = templateItem.Id;
                         requestOptions.headers = {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',
@@ -210,17 +200,12 @@ class SpoPageSetCommand extends SpoCommand {
                 await request.post(requestOptions);
             }
             if (args.options.demoteFrom === 'NewsPage') {
-                const fileId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                const fileId = file.Id;
                 const listItemSetOptions = {
-                    webUrl: args.options.webUrl,
-                    listUrl: listServerRelativeUrl,
-                    id: fileId,
-                    systemUpdate: true,
-                    PromotedState: 0,
-                    verbose: this.verbose,
-                    debug: this.debug
+                    PromotedState: 0
                 };
-                await cli.executeCommandWithOutput(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                await spo.systemUpdateListItem(requestUrl, fileId, logger, this.verbose, listItemSetOptions);
             }
             let requestOptions;
             if (!args.options.publish) {
@@ -254,18 +239,6 @@ class SpoPageSetCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getFileListItemId(webUrl, serverRelativeFileUrl) {
-        const fileGetOptions = {
-            webUrl: webUrl,
-            url: serverRelativeFileUrl,
-            asListItem: true,
-            verbose: this.verbose,
-            debug: this.debug
-        };
-        const fileGetOutput = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
-        const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
-        return fileGetOutputJson.Id;
-    }
 }
 _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry = function _SpoPageSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -317,6 +290,9 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
+        if (!args.options.layoutType && !args.options.promoteAs && !args.options.demoteFrom && args.options.commentsEnabled === undefined && !args.options.publish && !args.options.description && !args.options.title && !args.options.content) {
+            return 'Specify at least one option to update.';
+        }
         if (args.options.layoutType &&
             supportedPageLayouts.indexOf(args.options.layoutType) < 0) {
             return `${args.options.layoutType} is not a valid option for layoutType. Allowed values ${supportedPageLayouts.join(', ')}`;

package/dist/m365/spo/commands/site/site-apppermission-remove.js

@@ -15,7 +15,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
         return commands.SITE_APPPERMISSION_REMOVE;
     }
     get description() {
-        return 'Removes an application permission from the site';
+        return 'Removes a specific application permission from a site';
     }
     constructor() {
         super();
@@ -48,7 +48,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
     }
     async getPermissionIds(siteId, options) {
         if (options.id) {
-            return Promise.resolve([options.id]);
+            return [options.id];
         }
         const permissionsObject = await this.getPermissions(siteId);
         let permissions = permissionsObject.value;
@@ -61,7 +61,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
         const spRequestOptions = {
             url: `${this.resource}/v1.0/sites/${siteId}/permissions/${permissionId}`,
             headers: {
-                'accept': 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
@@ -69,16 +69,16 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         if (args.options.force) {
-            await this.removeSiteAppPermission(logger, args.options);
+            await this.removeSiteAppPermission(args.options);
         }
         else {
             const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?` });
             if (result) {
-                await this.removeSiteAppPermission(logger, args.options);
+                await this.removeSiteAppPermission(args.options);
             }
         }
     }
-    async removeSiteAppPermission(logger, options) {
+    async removeSiteAppPermission(options) {
         try {
             const siteId = await spo.getSpoGraphSiteId(options.siteUrl);
             const permissionIdsToRemove = await this.getPermissionIds(siteId, options);
@@ -86,8 +86,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
             for (const permissionId of permissionIdsToRemove) {
                 tasks.push(this.removePermissions(siteId, permissionId));
             }
-            const response = await Promise.all(tasks);
-            await logger.log(response);
+            await Promise.all(tasks);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -100,7 +99,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            force: (!!args.options.force).toString()
+            force: !!args.options.force
         });
     });
 }, _SpoSiteAppPermissionRemoveCommand_initOptions = function _SpoSiteAppPermissionRemoveCommand_initOptions() {

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

@@ -6,7 +6,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -25,11 +24,12 @@ class SpoSiteHubSiteConnectCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const res = await spo.getRequestDigest(args.options.siteUrl);
+            if (this.verbose) {
+                await logger.logToStderr(`Connecting site collection ${args.options.siteUrl} to hub site ${args.options.id}...`);
+            }
             const requestOptions = {
                 url: `${args.options.siteUrl}/_api/site/JoinHubSite('${formatting.encodeQueryParameter(args.options.id)}')`,
                 headers: {
-                    'X-RequestDigest': res.FormDigestValue,
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'

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

@@ -6,7 +6,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteHubSiteDisconnectCommand_instances, _SpoSiteHubSiteDisconnectCommand_initTelemetry, _SpoSiteHubSiteDisconnectCommand_initOptions, _SpoSiteHubSiteDisconnectCommand_initValidators;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -15,7 +14,7 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
         return commands.SITE_HUBSITE_DISCONNECT;
     }
     get description() {
-        return 'Disconnects the specifies site collection from its hub site';
+        return 'Disconnects the specified site collection from its hub site';
     }
     constructor() {
         super();
@@ -37,14 +36,12 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
     }
     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...`);
+                await logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hub site...`);
             }
             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'

package/dist/utils/prompt.js

@@ -3,6 +3,8 @@ import { cli } from '../cli/cli.js';
 let inquirerInput;
 let inquirerConfirm;
 let inquirerSelect;
+;
+;
 export const prompt = {
     /* c8 ignore next 9 */
     async forInput(config) {