@pnp/cli-microsoft365 10.10.0-beta.3dc1bcf → 10.10.0-beta.eb74779

package/dist/cli/cli.js

@@ -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/spo/commands/site/site-set.js

@@ -62,7 +62,7 @@ class SpoSiteSetCommand extends SpoCommand {
         if (this.debug) {
             await logger.logToStderr(`Setting the site its logo...`);
         }
-        const logoUrl = args.options.siteLogoUrl ? urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
+        const logoUrl = args.options.siteLogoUrl ? urlUtil.getUrlRelativePath(args.options.siteLogoUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {
@@ -84,7 +84,7 @@ class SpoSiteSetCommand extends SpoCommand {
         if (this.debug) {
             await logger.logToStderr(`Setting the site thumbnail...`);
         }
-        const thumbnailUrl = args.options.siteThumbnailUrl ? urlUtil.getServerRelativePath(args.options.url, args.options.siteThumbnailUrl) : "";
+        const thumbnailUrl = args.options.siteThumbnailUrl ? urlUtil.getUrlRelativePath(args.options.siteThumbnailUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {

package/dist/utils/entraServicePrincipal.js

@@ -1,6 +1,7 @@
 import { odata } from './odata.js';
 import { formatting } from './formatting.js';
 import { cli } from '../cli/cli.js';
+import request from '../request.js';
 export const entraServicePrincipal = {
     /**
      * Get service principal by its appId
@@ -52,6 +53,26 @@ export const entraServicePrincipal = {
             url += `?$select=${properties}`;
         }
         return odata.getAllItems(url);
+    },
+    /**
+     * Create a new service principal for the specified application.
+     * @param appId Application ID of the application for which to create a service principal.
+     * @returns The created service principal.
+     */
+    async createServicePrincipal(appId) {
+        const url = `https://graph.microsoft.com/v1.0/servicePrincipals`;
+        const requestOptions = {
+            url: url,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            data: {
+                appId
+            },
+            responseType: 'json'
+        };
+        return await request.post(requestOptions);
     }
 };
 //# sourceMappingURL=entraServicePrincipal.js.map