@pnp/cli-microsoft365 10.9.0-beta.bc13e90 → 10.10.0-beta.1bb5ba0

package/dist/m365/purview/commands/threatassessment/threatassessment-get.js

@@ -24,11 +24,15 @@ class PurviewThreatAssessmentGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.includeResults) {
+                await this.warn(logger, `Parameter 'includeResults' is deprecated. Please use 'withResults' instead`);
+            }
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving threat assessment with id ${args.options.id}`);
             }
+            const shouldIncludeResults = args.options.includeResults || args.options.withResults;
             const requestOptions = {
-                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${args.options.includeResults ? '?$expand=results' : ''}`,
+                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${shouldIncludeResults ? '?$expand=results' : ''}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -45,7 +49,8 @@ class PurviewThreatAssessmentGetCommand extends GraphCommand {
 _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAssessmentGetCommand_initTelemetry = function _PurviewThreatAssessmentGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeResults: !!args.options.includeResults
+            includeResults: !!args.options.includeResults,
+            withResults: !!args.options.withResults
         });
     });
 }, _PurviewThreatAssessmentGetCommand_initOptions = function _PurviewThreatAssessmentGetCommand_initOptions() {
@@ -53,6 +58,8 @@ _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAsse
         option: '-i, --id <id>'
     }, {
         option: '--includeResults'
+    }, {
+        option: '--withResults'
     });
 }, _PurviewThreatAssessmentGetCommand_initValidators = function _PurviewThreatAssessmentGetCommand_initValidators() {
     this.validators.push(async (args) => {

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

@@ -9,7 +9,6 @@ import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
-import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -87,72 +86,11 @@ class SpoContentTypeAddCommand extends SpoCommand {
         }
     }
     async getParentInfo(options, logger) {
-        const siteId = await this.getSiteId(options.webUrl, logger);
-        const webId = await this.getWebId(options.webUrl, logger);
-        const listId = await this.getListId(options, logger);
+        const siteId = await spo.getSiteIdBySPApi(options.webUrl, logger, this.verbose);
+        const webId = await spo.getWebId(options.webUrl, logger, this.verbose);
+        const listId = options.listId ? options.listId : await spo.getListId(options.webUrl, options.listTitle, options.listUrl, logger, this.verbose);
         return `<Identity Id="5" Name="1a48869e-c092-0000-1f61-81ec89809537|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}" />`;
     }
-    async getSiteId(webUrl, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving site collection id...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/site?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const siteResponse = await request.get(requestOptions);
-        return siteResponse.Id;
-    }
-    async getWebId(webUrl, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving web id...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/web?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const webResponse = await request.get(requestOptions);
-        return webResponse.Id;
-    }
-    async getListId(options, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving list id...`);
-        }
-        let listId = '';
-        if (options.listId) {
-            return options.listId;
-        }
-        else if (options.listTitle) {
-            const requestOptions = {
-                url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const listResponse = await request.get(requestOptions);
-            listId = listResponse.Id;
-        }
-        else if (options.listUrl) {
-            const listServerRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-            const requestOptions = {
-                url: `${options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const listResponse = await request.get(requestOptions);
-            listId = listResponse.Id;
-        }
-        return listId;
-    }
 }
 _SpoContentTypeAddCommand_instances = new WeakSet(), _SpoContentTypeAddCommand_initTelemetry = function _SpoContentTypeAddCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/contenttype/contenttype-field-remove.js

@@ -8,7 +8,6 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
-import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -33,30 +32,12 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
                 if (this.debug) {
                     await logger.logToStderr(`Get SiteId required by ProcessQuery endpoint.`);
                 }
-                // GET SiteId
-                let requestOptions = {
-                    url: `${args.options.webUrl}/_api/site?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const site = await request.get(requestOptions);
-                const siteId = site.Id;
+                const siteId = await spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose);
                 if (this.debug) {
                     await logger.logToStderr(`SiteId: ${siteId}`);
                     await logger.logToStderr(`Get WebId required by ProcessQuery endpoint.`);
                 }
-                // GET WebId
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/web?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const web = await request.get(requestOptions);
-                const webId = web.Id;
+                const webId = await spo.getWebId(args.options.webUrl, logger, this.verbose);
                 if (this.debug) {
                     await logger.logToStderr(`WebId: ${webId}`);
                 }
@@ -64,11 +45,8 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
                 if (args.options.listId) {
                     listId = args.options.listId;
                 }
-                else if (args.options.listTitle) {
-                    listId = await this.getListIdFromListTitle(args.options.webUrl, args.options.listTitle);
-                }
-                else if (args.options.listUrl) {
-                    listId = await this.getListIdFromListUrl(args.options.webUrl, args.options.listUrl);
+                if (args.options.listTitle || args.options.listUrl) {
+                    listId = await spo.getListId(args.options.webUrl, args.options.listTitle, args.options.listUrl, logger, this.verbose);
                 }
                 if (this.debug) {
                     await logger.logToStderr(`ListId: ${listId}`);
@@ -88,7 +66,7 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
                 else {
                     requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="77" ObjectPathId="76" /><ObjectPath Id="79" ObjectPathId="78" /><Method Name="DeleteObject" Id="80" ObjectPathId="78" /><Method Name="Update" Id="81" ObjectPathId="24"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="76" ParentId="24" Name="FieldLinks" /><Method Id="78" ParentId="76" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Identity Id="24" Name="6b3ec69e-00a7-0000-55a3-61f8d779d2b3|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
                 }
-                requestOptions = {
+                const requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': requestDigest
@@ -116,29 +94,6 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
             }
         }
     }
-    async getListIdFromListTitle(webUrl, listTitle) {
-        const requestOptions = {
-            url: `${webUrl}/_api/lists/GetByTitle('${formatting.encodeQueryParameter(listTitle)}')?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const list = await request.get(requestOptions);
-        return list.Id;
-    }
-    async getListIdFromListUrl(webUrl, listUrl) {
-        const listServerRelativeUrl = urlUtil.getServerRelativePath(webUrl, listUrl);
-        const requestOptions = {
-            url: `${webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const list = await request.get(requestOptions);
-        return list.Id;
-    }
 }
 _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFieldRemoveCommand_initTelemetry = function _SpoContentTypeFieldRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -102,32 +102,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand {
                 throw 'DONE';
             }
             if (!this.siteId) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Retrieving site collection id...`);
-                }
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/site?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const site = await request.get(requestOptions);
-                this.siteId = site.Id;
+                this.siteId = await spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose);
             }
             if (!this.webId) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Retrieving site id...`);
-                }
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/web?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const web = await request.get(requestOptions);
-                this.webId = web.Id;
+                this.webId = await spo.getWebId(args.options.webUrl, logger, this.verbose);
             }
             if (this.verbose) {
                 await logger.logToStderr(`Updating field link...`);
@@ -172,30 +150,8 @@ class SpoContentTypeFieldSetCommand extends SpoCommand {
             }
         }
         await this.updateField(xField, requiresUpdate, logger, args);
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving site collection id...`);
-        }
-        const requestOptionsSiteId = {
-            url: `${args.options.webUrl}/_api/site?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const resSiteId = await request.get(requestOptionsSiteId);
-        this.siteId = resSiteId.Id;
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving site id...`);
-        }
-        const requestOptionsWebId = {
-            url: `${args.options.webUrl}/_api/web?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const resWebId = await request.get(requestOptionsWebId);
-        this.webId = resWebId.Id;
+        this.siteId = await spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose);
+        this.webId = await spo.getWebId(args.options.webUrl, logger, this.verbose);
         await this.ensureRequestDigest(args.options.webUrl, logger);
         const requestOptions = {
             url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,

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

@@ -7,6 +7,7 @@ var _SpoContentTypeSetCommand_instances, _SpoContentTypeSetCommand_initTelemetry
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -33,8 +34,8 @@ class SpoContentTypeSetCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const contentTypeId = await this.getContentTypeId(logger, args.options);
-            const siteId = await this.getSiteId(logger, args.options.webUrl);
-            const webId = await this.getWebId(logger, args.options.webUrl);
+            const siteId = await spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose);
+            const webId = await spo.getWebId(args.options.webUrl, logger, this.verbose);
             await this.updateContentType(logger, siteId, webId, contentTypeId, args.options);
         }
         catch (err) {
@@ -80,7 +81,7 @@ class SpoContentTypeSetCommand extends SpoCommand {
             headers: {
                 'Content-Type': 'text/xml'
             },
-            data: await this.getCsomCallXmlBody(options, siteId, webId, contentTypeId)
+            data: await this.getCsomCallXmlBody(options, siteId, webId, contentTypeId, logger)
         };
         const res = await request.post(requestOptions);
         const json = JSON.parse(res);
@@ -89,9 +90,9 @@ class SpoContentTypeSetCommand extends SpoCommand {
             throw response.ErrorInfo.ErrorMessage;
         }
     }
-    async getCsomCallXmlBody(options, siteId, webId, contentTypeId) {
+    async getCsomCallXmlBody(options, siteId, webId, contentTypeId, logger) {
         const payload = this.getRequestPayload(options);
-        const list = await this.getListId(options);
+        const list = await this.getListId(options, logger);
         return `<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>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}${list}:contenttype:${formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`;
     }
     getRequestPayload(options) {
@@ -122,35 +123,7 @@ class SpoContentTypeSetCommand extends SpoCommand {
         }
         return payload.join('');
     }
-    async getSiteId(logger, webUrl) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving site collection id...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/site?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const site = await request.get(requestOptions);
-        return site.Id;
-    }
-    async getWebId(logger, webUrl) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving web id...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/web?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const web = await request.get(requestOptions);
-        return web.Id;
-    }
-    async getListId(options) {
+    async getListId(options, logger) {
         if (!options.listId && !options.listTitle && !options.listUrl) {
             return '';
         }
@@ -158,30 +131,7 @@ class SpoContentTypeSetCommand extends SpoCommand {
         if (options.listId) {
             return baseString += options.listId;
         }
-        else if (options.listTitle) {
-            const requestOptions = {
-                url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const listResponse = await request.get(requestOptions);
-            baseString += listResponse.Id;
-        }
-        else if (options.listUrl) {
-            const listServerRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-            const requestOptions = {
-                url: `${options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const listResponse = await request.get(requestOptions);
-            baseString += listResponse.Id;
-        }
-        return baseString;
+        return baseString += await spo.getListId(options.webUrl, options.listTitle, options.listUrl, logger, this.verbose);
     }
 }
 _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_initTelemetry = function _SpoContentTypeSetCommand_initTelemetry() {

package/dist/m365/spo/commands/contenttype/contenttype-sync.js

@@ -33,7 +33,7 @@ class SpoContentTypeSyncCommand extends SpoCommand {
         const url = new URL(webUrl);
         const baseUrl = 'https://graph.microsoft.com/v1.0/sites/';
         try {
-            const siteUrl = url.pathname === '/' ? url.host : await spo.getSiteId(webUrl, logger, this.verbose);
+            const siteUrl = url.pathname === '/' ? url.host : await spo.getSiteIdByMSGraph(webUrl, logger, this.verbose);
             const listPath = listId || listTitle || listUrl ? `/lists/${listId || listTitle || await this.getListIdByUrl(webUrl, listUrl, logger)}` : '';
             const contentTypeId = await this.getContentTypeId(baseUrl, url, args.options, logger);
             if (this.verbose) {
@@ -64,7 +64,7 @@ class SpoContentTypeSyncCommand extends SpoCommand {
         if (options.id) {
             return options.id;
         }
-        const siteId = await spo.getSiteId(`${url.origin}/sites/contenttypehub`, logger, this.verbose);
+        const siteId = await spo.getSiteIdByMSGraph(`${url.origin}/sites/contenttypehub`, logger, this.verbose);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving content type Id by name...`);
         }

package/dist/m365/spo/commands/file/file-move.js

@@ -35,6 +35,9 @@ class SpoFileMoveCommand extends SpoCommand {
             const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
             const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
             const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
+            if (args.options.includeItemPermissions) {
+                await this.warn(logger, `Parameter 'includeItemPermissions' is deprecated. Please use 'withItemPermissions' instead`);
+            }
             if (this.verbose) {
                 await logger.logToStderr(`Moving file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
             }
@@ -46,7 +49,7 @@ class SpoFileMoveCommand extends SpoCommand {
             const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
-                includeItemPermissions: !!args.options.includeItemPermissions,
+                includeItemPermissions: !!args.options.includeItemPermissions || !!args.options.withItemPermissions,
                 newName: newName,
                 operation: 'move'
             });
@@ -119,6 +122,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
             includeItemPermissions: !!args.options.includeItemPermissions,
+            withItemPermissions: !!args.options.withItemPermissions,
             bypassSharedLock: !!args.options.bypassSharedLock,
             skipWait: !!args.options.skipWait
         });
@@ -139,6 +143,8 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
         autocomplete: this.nameConflictBehaviorOptions
     }, {
         option: '--includeItemPermissions'
+    }, {
+        option: '--withItemPermissions'
     }, {
         option: '--bypassSharedLock'
     }, {
@@ -162,7 +168,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFileMoveCommand_initTypes = function _SpoFileMoveCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('includeItemPermissions', 'bypassSharedLock', 'skipWait');
+    this.types.boolean.push('includeItemPermissions', 'withItemPermissions', 'bypassSharedLock', 'skipWait');
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

package/dist/m365/spo/commands/folder/folder-sharinglink-add.js

@@ -38,7 +38,7 @@ class SpoFolderSharingLinkAddCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
             const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
             const requestOptions = {

package/dist/m365/spo/commands/folder/folder-sharinglink-clear.js

@@ -39,7 +39,7 @@ class SpoFolderSharingLinkClearCommand extends SpoCommand {
                 const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
                 const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
                 const folderUrl = new URL(absoluteFolderUrl);
-                const siteId = await spo.getSiteId(args.options.webUrl);
+                const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
                 const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
                 const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
                 let requestUrl = `https://graph.microsoft.com/v1.0/drives/${driveDetails.id}/items/${itemId}/permissions?$filter=Link ne null`;

package/dist/m365/spo/commands/folder/folder-sharinglink-get.js

@@ -35,7 +35,7 @@ class SpoFolderSharingLinkGetCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const drive = await driveItem.getDriveByUrl(siteId, folderUrl);
             const itemId = await driveItem.getDriveItemId(drive, folderUrl);
             const requestUrl = `https://graph.microsoft.com/v1.0/drives/${drive.id}/items/${itemId}/permissions/${args.options.id}`;

package/dist/m365/spo/commands/folder/folder-sharinglink-list.js

@@ -40,7 +40,7 @@ class SpoFolderSharingLinkListCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
             const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
             let requestUrl = `https://graph.microsoft.com/v1.0/drives/${driveDetails.id}/items/${itemId}/permissions?$filter=Link ne null`;

package/dist/m365/spo/commands/folder/folder-sharinglink-remove.js

@@ -37,7 +37,7 @@ class SpoFolderSharingLinkRemoveCommand extends SpoCommand {
                 const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
                 const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
                 const folderUrl = new URL(absoluteFolderUrl);
-                const siteId = await spo.getSiteId(args.options.webUrl);
+                const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
                 const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
                 const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
                 const requestOptions = {

package/dist/m365/spo/commands/folder/folder-sharinglink-set.js

@@ -35,7 +35,7 @@ class SpoFolderSharingLinkSetCommand extends SpoCommand {
             const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
             const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
             const folderUrl = new URL(absoluteFolderUrl);
-            const siteId = await spo.getSiteId(args.options.webUrl);
+            const siteId = await spo.getSiteIdByMSGraph(args.options.webUrl);
             const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
             const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
             const requestOptions = {

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

@@ -29,12 +29,20 @@ class SpoHubSiteGetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.includeAssociatedSites) {
+                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
+            }
             const spoUrl = await spo.getSpoUrl(logger, this.debug);
             const hubSite = args.options.id ? await this.getHubSiteById(spoUrl, args.options) : await this.getHubSite(spoUrl, args.options);
-            if (args.options.includeAssociatedSites && (args.options.output && args.options.output !== 'json')) {
-                throw 'includeAssociatedSites option is only allowed with json output mode';
+            if ((args.options.includeAssociatedSites || args.options.withAssociatedSites) && (args.options.output && args.options.output !== 'json')) {
+                if (args.options.includeAssociatedSites) {
+                    throw 'includeAssociatedSites option is only allowed with json output mode';
+                }
+                else {
+                    throw 'withAssociatedSites option is only allowed with json output mode';
+                }
             }
-            if (args.options.includeAssociatedSites === true && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
+            if ((args.options.includeAssociatedSites === true || args.options.withAssociatedSites === true) && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 const associatedSitesCommandOutput = await this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
                 const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);
@@ -100,11 +108,12 @@ _SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             url: typeof args.options.url !== 'undefined',
-            includeAssociatedSites: args.options.includeAssociatedSites === true
+            includeAssociatedSites: args.options.includeAssociatedSites === true,
+            withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteGetCommand_initOptions = function _SpoHubSiteGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' }, { option: '--withAssociatedSites' });
 }, _SpoHubSiteGetCommand_initValidators = function _SpoHubSiteGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {

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

@@ -29,10 +29,14 @@ class SpoHubSiteListCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.includeAssociatedSites) {
+                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
+            }
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const hubSitesResult = await odata.getAllItems(`${spoAdminUrl}/_api/hubsites`);
             const hubSites = hubSitesResult;
-            if (!(args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+            const shouldIncludeAssociatedSites = args.options.includeAssociatedSites || args.options.withAssociatedSites;
+            if (!(shouldIncludeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
                 if (this.debug) {
                     await logger.logToStderr('Retrieving associated sites...');
                     await logger.logToStderr('');
@@ -104,12 +108,15 @@ class SpoHubSiteListCommand extends SpoCommand {
 _SpoHubSiteListCommand_instances = new WeakSet(), _SpoHubSiteListCommand_initTelemetry = function _SpoHubSiteListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeAssociatedSites: args.options.includeAssociatedSites === true
+            includeAssociatedSites: args.options.includeAssociatedSites === true,
+            withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteListCommand_initOptions = function _SpoHubSiteListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --includeAssociatedSites'
+    }, {
+        option: '--withAssociatedSites'
     });
 };
 export default new SpoHubSiteListCommand();