@pnp/cli-microsoft365 10.10.0-beta.bd186ba → 10.10.0

package/dist/cli/cli.js

@@ -34,7 +34,7 @@ let currentCommandName;
 let optionsFromArgs;
 const defaultHelpMode = 'options';
 const defaultHelpTarget = 'console';
-const helpModes = ['options', 'examples', 'remarks', 'response', 'full'];
+const helpModes = ['options', 'examples', 'remarks', 'permissions', 'response', 'full'];
 const helpTargets = ['console', 'web'];
 const yargsConfiguration = {
     'parse-numbers': true,
@@ -791,7 +791,7 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
     }
     let errorMessage = error instanceof CommandError ? error.message : error;
     if (error instanceof ZodError) {
-        errorMessage = error.errors.map(e => `${e.path.join('.')}: ${e.message}`).join(os.EOL);
+        errorMessage = error.errors.map(e => (e.path.length > 0 ? `${e.path.join('.')}: ${e.message}` : e.message)).join(os.EOL);
     }
     if ((!args.options.output || args.options.output === 'json') &&
         !cli.getSettingWithDefaultValue(settingsNames.printErrorsAsPlainText, true)) {

package/dist/m365/app/commands/permission/permission-add.js

@@ -4,6 +4,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
 import commands from '../../commands.js';
+import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
 const options = appCommandOptions
     .extend({
     applicationPermissions: z.string().optional(),
@@ -58,7 +59,13 @@ class AppPermissionAddCommand extends AppCommand {
             };
             await request.patch(addPermissionsRequestOptions);
             if (args.options.grantAdminConsent) {
-                const appServicePrincipal = servicePrincipals.find(sp => sp.appId === this.appId);
+                let appServicePrincipal = servicePrincipals.find(sp => sp.appId === this.appId);
+                if (!appServicePrincipal) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Creating service principal for app ${this.appId}...`);
+                    }
+                    appServicePrincipal = await entraServicePrincipal.createServicePrincipal(this.appId);
+                }
                 await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
             }
         }

package/dist/m365/base/SpoCommand.js

@@ -28,6 +28,7 @@ export default class SpoCommand extends Command {
             'parentWebUrl',
             'previewImageUrl',
             'siteLogoUrl',
+            'siteThumbnailUrl',
             'siteUrl',
             'StartASiteFormUrl',
             'targetUrl',

package/dist/m365/entra/commands/app/app-permission-add.js

@@ -11,6 +11,7 @@ import request from "../../../../request.js";
 import { validation } from "../../../../utils/validation.js";
 import { formatting } from "../../../../utils/formatting.js";
 import { cli } from "../../../../cli/cli.js";
+import { entraServicePrincipal } from "../../../../utils/entraServicePrincipal.js";
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -58,7 +59,10 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             if (args.options.grantAdminConsent) {
                 let appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
                 if (!appServicePrincipal) {
-                    appServicePrincipal = await this.createServicePrincipal(appObject.appId, logger);
+                    if (this.verbose) {
+                        await logger.logToStderr(`Creating service principal for app ${appObject.appId}...`);
+                    }
+                    appServicePrincipal = await entraServicePrincipal.createServicePrincipal(appObject.appId);
                 }
                 await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
             }
@@ -67,23 +71,6 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async createServicePrincipal(appId, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Creating service principal for app ${appId}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json;odata=nometadata'
-            },
-            data: {
-                appId
-            },
-            responseType: 'json'
-        };
-        return await request.post(requestOptions);
-    }
     async getAppObject(options) {
         let appNotFoundMessage = '';
         let apps = [];

package/dist/m365/entra/commands/organization/organization-set.js

@@ -0,0 +1,104 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { odata } from '../../../../utils/odata.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional()),
+    displayName: zod.alias('d', z.string().optional()),
+    marketingNotificationEmails: z.string().refine(emails => validation.isValidUserPrincipalNameArray(emails) === true, invalidEmails => ({
+        message: `The following marketing notification emails are invalid: ${invalidEmails}.`
+    })).transform((value) => value.split(',')).optional(),
+    securityComplianceNotificationMails: z.string().refine(emails => validation.isValidUserPrincipalNameArray(emails) === true, invalidEmails => ({
+        message: `The following security compliance notification emails are invalid: ${invalidEmails}.`
+    })).transform((value) => value.split(',')).optional(),
+    securityComplianceNotificationPhones: z.string().transform((value) => value.split(',')).optional(),
+    technicalNotificationMails: z.string().refine(emails => validation.isValidUserPrincipalNameArray(emails) === true, invalidEmails => ({
+        message: `The following technical notification emails are invalid: ${invalidEmails}.`
+    })).transform((value) => value.split(',')).optional(),
+    contactEmail: z.string().refine(id => validation.isValidUserPrincipalName(id), id => ({
+        message: `'${id}' is not a valid email.`
+    })).optional(),
+    statementUrl: z.string().optional()
+})
+    .strict();
+class EntraOrganizationSetCommand extends GraphCommand {
+    get name() {
+        return commands.ORGANIZATION_SET;
+    }
+    get description() {
+        return 'Updates info about the organization';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.id && options.displayName), {
+            message: 'Specify either id or displayName, but not both'
+        })
+            .refine(options => options.id || options.displayName, {
+            message: 'Specify either id or displayName'
+        })
+            .refine(options => [options.contactEmail, options.marketingNotificationEmails, options.securityComplianceNotificationMails, options.securityComplianceNotificationPhones,
+            options.statementUrl, options.technicalNotificationMails].filter(o => o !== undefined).length > 0, {
+            message: 'Specify at least one of the following options: contactEmail, marketingNotificationEmails, securityComplianceNotificationMails, securityComplianceNotificationPhones, statementUrl, or technicalNotificationMails'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            let organizationId = args.options.id;
+            if (args.options.displayName) {
+                organizationId = await this.getOrganizationIdByDisplayName(args.options.displayName);
+            }
+            if (args.options.verbose) {
+                await logger.logToStderr(`Updating organization with ID ${organizationId}...`);
+            }
+            const data = {
+                marketingNotificationEmails: args.options.marketingNotificationEmails,
+                securityComplianceNotificationMails: args.options.securityComplianceNotificationMails,
+                securityComplianceNotificationPhones: args.options.securityComplianceNotificationPhones,
+                technicalNotificationMails: args.options.technicalNotificationMails
+            };
+            if (args.options.contactEmail || args.options.statementUrl) {
+                data.privacyProfile = {};
+            }
+            if (args.options.contactEmail) {
+                data.privacyProfile.contactEmail = args.options.contactEmail;
+            }
+            if (args.options.statementUrl) {
+                data.privacyProfile.statementUrl = args.options.statementUrl;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/organization/${organizationId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getOrganizationIdByDisplayName(displayName) {
+        const url = `${this.resource}/v1.0/organization?$select=id,displayName`;
+        // the endpoint always returns one item
+        const organizations = await odata.getAllItems(url);
+        if (organizations[0].displayName !== displayName) {
+            throw `The specified organization '${displayName}' does not exist.`;
+        }
+        return organizations[0].id;
+    }
+}
+export default new EntraOrganizationSetCommand();
+//# sourceMappingURL=organization-set.js.map

package/dist/m365/entra/commands.js

@@ -84,6 +84,7 @@ export default {
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,
     OAUTH2GRANT_SET: `${prefix} oauth2grant set`,
     ORGANIZATION_LIST: `${prefix} organization list`,
+    ORGANIZATION_SET: `${prefix} organization set`,
     PIM_ROLE_ASSIGNMENT_ADD: `${prefix} pim role assignment add`,
     PIM_ROLE_ASSIGNMENT_LIST: `${prefix} pim role assignment list`,
     PIM_ROLE_ASSIGNMENT_REMOVE: `${prefix} pim role assignment remove`,

package/dist/m365/file/commands/file-copy.js

@@ -63,7 +63,7 @@ class FileCopyCommand extends GraphCommand {
     async getCopyUrl(options, sourcePath, logger) {
         const { webUrl, sourceUrl, verbose, nameConflictBehavior } = options;
         const folderUrl = new URL(sourcePath);
-        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const siteId = await spo.getSiteIdByMSGraph(webUrl, logger, verbose);
         const drive = await this.getDocumentLibrary(siteId, folderUrl, sourceUrl, logger);
         const itemId = await this.getStartingFolderId(drive, folderUrl, logger);
         const queryParameters = nameConflictBehavior && nameConflictBehavior !== 'fail'
@@ -74,7 +74,7 @@ class FileCopyCommand extends GraphCommand {
     }
     async getTargetDriveAndItemId(webUrl, targetUrl, logger, verbose) {
         const targetSiteUrl = urlUtil.getTargetSiteAbsoluteUrl(webUrl, targetUrl);
-        const targetSiteId = await spo.getSiteId(targetSiteUrl, logger, verbose);
+        const targetSiteId = await spo.getSiteIdByMSGraph(targetSiteUrl, logger, verbose);
         const targetFolderUrl = new URL(this.getAbsoluteUrl(targetSiteUrl, targetUrl));
         const targetDrive = await this.getDocumentLibrary(targetSiteId, targetFolderUrl, targetUrl, logger);
         const targetDriveId = targetDrive.id;

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

@@ -59,7 +59,7 @@ class FileMoveCommand extends GraphCommand {
         return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
     }
     async getDriveIdAndItemId(webUrl, folderUrl, sourceUrl, logger, verbose) {
-        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const siteId = await spo.getSiteIdByMSGraph(webUrl, logger, verbose);
         const driveDetails = await drive.getDriveByUrl(siteId, new URL(folderUrl), logger, verbose);
         const itemId = await drive.getDriveItemId(driveDetails, new URL(folderUrl), logger, verbose);
         return { driveId: driveDetails.id, itemId };

package/dist/m365/planner/commands/tenant/tenant-settings-list.js

@@ -8,9 +8,6 @@ class PlannerTenantSettingsListCommand extends PlannerCommand {
     get description() {
         return 'Lists the Microsoft Planner configuration of the tenant';
     }
-    defaultProperties() {
-        return ['isPlannerAllowed', 'allowCalendarSharing', 'allowTenantMoveWithDataLoss', 'allowTenantMoveWithDataMigration', 'allowRosterCreation', 'allowPlannerMobilePushNotifications'];
-    }
     async commandAction(logger) {
         const requestOptions = {
             url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,

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/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`;