@pnp/cli-microsoft365 10.7.0 → 10.8.0-beta.708bf27

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

@@ -4,19 +4,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoSiteSetCommand_instances, _SpoSiteSetCommand_initTelemetry, _SpoSiteSetCommand_initOptions, _SpoSiteSetCommand_initValidators, _SpoSiteSetCommand_initTypes;
-import { cli } from '../../../../cli/cli.js';
-import { CommandError } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.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 entraM365GroupSetCommand from '../../../entra/commands/m365group/m365group-set.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';
-import spoSiteDesignApplyCommand from '../sitedesign/sitedesign-apply.js';
 import { FlowsPolicy } from './FlowsPolicy.js';
 import { setTimeout } from 'timers/promises';
 class SpoSiteSetCommand extends SpoCommand {
@@ -55,9 +52,6 @@ class SpoSiteSetCommand extends SpoCommand {
             await this.waitForSiteUpdateCompletion(logger, args, lockState);
         }
         catch (err) {
-            if (err instanceof CommandError) {
-                err = err.message;
-            }
             this.handleRejectedPromise(err);
         }
     }
@@ -233,13 +227,7 @@ class SpoSiteSetCommand extends SpoCommand {
             promises.push(request.post(requestOptions));
         }
         if (typeof args.options.isPublic !== 'undefined') {
-            const commandOptions = {
-                id: this.groupId,
-                isPrivate: (args.options.isPublic === false),
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            promises.push(cli.executeCommand(entraM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+            promises.push(entraGroup.setGroup(this.groupId, (args.options.isPublic === false), undefined, undefined, logger, this.verbose));
         }
         if (args.options.description) {
             promises.push(this.setGroupifiedSiteDescription(args.options.description));
@@ -383,14 +371,7 @@ class SpoSiteSetCommand extends SpoCommand {
         if (typeof args.options.siteDesignId === 'undefined') {
             return;
         }
-        const options = {
-            webUrl: args.options.url,
-            id: args.options.siteDesignId,
-            asTask: false,
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return cli.executeCommand(spoSiteDesignApplyCommand, { options: { ...options, _: [] } });
+        return spo.applySiteDesign(args.options.url, args.options.siteDesignId, logger, this.verbose);
     }
     async loadSiteIds(siteUrl, logger) {
         if (this.debug) {

package/dist/m365/teams/commands/app/app-install.js

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsAppInstallCommand extends GraphCommand {
@@ -63,16 +63,10 @@ class TeamsAppInstallCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Checking if user ${args.options.userId} exists...`);
         }
-        const options = {
-            id: args.options.userId,
-            output: 'json',
-            debug: args.options.debug,
-            verbose: args.options.verbose
-        };
         try {
-            const res = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...options, _: [] } });
+            const res = await entraUser.getUpnByUserId(args.options.userId, logger, this.verbose);
             if (this.verbose) {
-                await logger.logToStderr(res.stderr);
+                await logger.logToStderr(res);
             }
             return true;
         }

package/dist/m365/viva/commands/connections/connections-app-create.js

@@ -8,10 +8,9 @@ import AdmZip from 'adm-zip';
 import fs from 'fs';
 import path from 'path';
 import { v4 } from 'uuid';
-import { cli } from '../../../../cli/cli.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
-import spoWebGetCommand from '../../../spo/commands/web/web-get.js';
 import commands from '../../commands.js';
+import { spo } from '../../../../utils/spo.js';
 class VivaConnectionsAppCreateCommand extends AnonymousCommand {
     get name() {
         return commands.CONNECTIONS_APP_CREATE;
@@ -27,14 +26,13 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand {
     }
     async commandAction(logger, args) {
         try {
-            const getWebOutput = await this.getWeb(args, logger);
+            const web = await this.getWeb(args, logger);
             if (this.debug) {
-                await logger.logToStderr(getWebOutput.stderr);
+                await logger.logToStderr(web);
             }
             if (this.verbose) {
                 await logger.logToStderr(`Site found at ${args.options.portalUrl}. Checking if it's a communication site...`);
             }
-            const web = JSON.parse(getWebOutput.stdout);
             if (web.WebTemplate !== 'SITEPAGEPUBLISHING' ||
                 web.Configuration !== 0) {
                 throw `Site ${args.options.portalUrl} is not a Communication Site. Please specify a different site and try again.`;
@@ -137,13 +135,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand {
         if (this.verbose) {
             await logger.logToStderr(`Checking if site ${args.options.url} exists...`);
         }
-        const options = {
-            url: args.options.portalUrl,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return cli.executeCommandWithOutput(spoWebGetCommand, { options: { ...options, _: [] } });
+        return await spo.getWeb(args.options.portalUrl, logger, this.verbose);
     }
 }
 _VivaConnectionsAppCreateCommand_instances = new WeakSet(), _VivaConnectionsAppCreateCommand_initOptions = function _VivaConnectionsAppCreateCommand_initOptions() {

package/dist/utils/entraGroup.js

@@ -103,11 +103,17 @@ export const entraGroup = {
         }
         return groups[0].id;
     },
-    async setGroup(id, isPrivate, logger, verbose) {
+    async setGroup(id, isPrivate, displayName, description, logger, verbose) {
         if (verbose && logger) {
             await logger.logToStderr(`Updating Microsoft 365 Group ${id}...`);
         }
         const update = {};
+        if (displayName) {
+            update.displayName = displayName;
+        }
+        if (description) {
+            update.description = description;
+        }
         if (typeof isPrivate !== 'undefined') {
             update.visibility = isPrivate ? 'Private' : 'Public';
         }

package/dist/utils/entraUser.js

@@ -112,9 +112,15 @@ export const entraUser = {
     },
     /**
      * Retrieve the UPN of a user by its ID.
+     * Returns the UPN as string
      * @param id User ID.
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
      */
-    async getUpnByUserId(id) {
+    async getUpnByUserId(id, logger, verbose) {
+        if (verbose && logger) {
+            await logger.logToStderr(`Retrieving the upn for user ${id}`);
+        }
         const requestOptions = {
             url: `${graphResource}/v1.0/users/${id}?$select=userPrincipalName`,
             headers: {

package/dist/utils/spo.js

@@ -1003,7 +1003,7 @@ export const spo = {
                     promises.push(request.post(requestOptions));
                 }
                 if (typeof isPublic !== 'undefined') {
-                    promises.push(entraGroup.setGroup(groupId, (isPublic === false), logger, verbose));
+                    promises.push(entraGroup.setGroup(groupId, (isPublic === false), undefined, undefined, logger, verbose));
                 }
                 if (typeof owners !== 'undefined') {
                     promises.push(spo.setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose));

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.7.0",
+  "version": "10.8.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pnp/cli-microsoft365",
-      "version": "10.7.0",
+      "version": "10.8.0",
       "license": "MIT",
       "dependencies": {
         "@azure/msal-common": "^15.5.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.7.0",
+  "version": "10.8.0-beta.708bf27",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -312,4 +312,4 @@
     "sinon": "^20.0.0",
     "source-map-support": "^0.5.21"
   }
-}
+}