@pnp/cli-microsoft365 10.0.0-beta.04ac437 → 10.0.0-beta.58f28f9

package/dist/Auth.js

@@ -117,7 +117,7 @@ export class Auth {
     async restoreAuth() {
         // check if auth has been restored previously
         if (this._connection.active) {
-            return Promise.resolve();
+            return;
         }
         try {
             const connection = await this.getConnectionInfoFromStorage();
@@ -473,7 +473,7 @@ export class Auth {
             }
             if (userName && process.env.ACC_CLOUD) {
                 // reject for now since the Azure Cloud Shell does not support user-managed identity 
-                return Promise.reject('Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity');
+                throw 'Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity';
             }
             requestOptions.url = `${process.env.IDENTITY_ENDPOINT}?resource=${encodeURIComponent(resource)}`;
         }
@@ -483,7 +483,7 @@ export class Auth {
             }
             if (userName && process.env.ACC_CLOUD) {
                 // reject for now since the Azure Cloud Shell does not support user-managed identity 
-                return Promise.reject('Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity');
+                throw 'Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity';
             }
             requestOptions.url = `${process.env.MSI_ENDPOINT}?resource=${encodeURIComponent(resource)}`;
         }

package/dist/AuthServer.js

@@ -26,7 +26,7 @@ export class AuthServer {
                 await this.logger.logToStderr(url);
                 await this.logger.logToStderr('');
             }
-            this.openUrl(url);
+            await this.openUrl(url);
         };
         this.httpRequest = async (request, response) => {
             if (this.debug) {
@@ -80,19 +80,19 @@ export class AuthServer {
     get server() {
         return this.httpServer;
     }
-    openUrl(url) {
-        browserUtil.open(url)
-            .then(async (_) => {
+    async openUrl(url) {
+        try {
+            await browserUtil.open(url);
             await this.logger.logToStderr("To sign in, use the web browser that just has been opened. Please sign-in there.");
-        })
-            .catch(_ => {
+        }
+        catch {
             const errorResponse = {
                 error: "Can't open the default browser",
                 errorDescription: "Was not able to open a browser instance. Try again later or use a different authentication method."
             };
             this.reject(errorResponse);
             this.httpServer.close();
-        });
+        }
     }
 }
 export default new AuthServer();

package/dist/api.js

@@ -3,7 +3,7 @@ export async function executeCommand(commandName, options, listener) {
     cli.loadAllCommandsInfo();
     await cli.loadCommandFromArgs(commandName.split(' '));
     if (!cli.commandToExecute) {
-        return Promise.reject(`Command not found: ${commandName}`);
+        throw `Command not found: ${commandName}`;
     }
     return cli.executeCommandWithOutput(cli.commandToExecute.command, { options: options ?? {} }, listener);
 }

package/dist/config.js

@@ -14,6 +14,7 @@ export default {
         'https://graph.microsoft.com/ChannelMessage.Send',
         'https://graph.microsoft.com/ChannelSettings.ReadWrite.All',
         'https://graph.microsoft.com/Chat.ReadWrite',
+        'https://graph.microsoft.com/Community.ReadWrite.All',
         'https://graph.microsoft.com/Directory.AccessAsUser.All',
         'https://graph.microsoft.com/Directory.ReadWrite.All',
         'https://graph.microsoft.com/ExternalConnection.ReadWrite.All',

package/dist/m365/cli/commands/cli-doctor.js

@@ -31,8 +31,8 @@ class CliDoctorCommand extends Command {
             },
             cliVersion: app.packageJson().version,
             nodeVersion: process.version,
-            cliAadAppId: auth.connection.appId,
-            cliAadAppTenant: validation.isValidGuid(auth.connection.tenant) ? 'single' : auth.connection.tenant,
+            cliEntraAppId: auth.connection.appId,
+            cliEntraAppTenant: validation.isValidGuid(auth.connection.tenant) ? 'single' : auth.connection.tenant,
             authMode: auth.connection.authType,
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
             cliConfig: cli.getConfig().all,

package/dist/m365/cli/commands.js

@@ -11,7 +11,6 @@ export default {
     CONFIG_SET: `${prefix} config set`,
     CONSENT: `${prefix} consent`,
     DOCTOR: `${prefix} doctor`,
-    ISSUE: `${prefix} issue`,
-    RECONSENT: `${prefix} reconsent`
+    ISSUE: `${prefix} issue`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
+var _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initOptionSets, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
@@ -31,8 +31,9 @@ class EntraM365GroupSetCommand extends GraphCommand {
         this.pollingInterval = 500;
         __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_SET, commands.M365GROUP_SET);
@@ -40,23 +41,24 @@ class EntraM365GroupSetCommand extends GraphCommand {
             if ((args.options.allowExternalSenders !== undefined || args.options.autoSubscribeNewMembers !== undefined) && accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken)) {
                 throw `Option 'allowExternalSenders' and 'autoSubscribeNewMembers' can only be used when using delegated permissions.`;
             }
-            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
+            const groupId = args.options.id || await entraGroup.getGroupIdByDisplayName(args.options.displayName);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
-                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }
             if (this.verbose) {
-                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
+                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id || args.options.displayName}...`);
             }
-            if (args.options.displayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
+            if (args.options.newDisplayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
                 const update = {
-                    displayName: args.options.displayName,
+                    displayName: args.options.newDisplayName,
                     description: args.options.description !== '' ? args.options.description : null
                 };
                 if (args.options.isPrivate !== undefined) {
                     update.visibility = args.options.isPrivate ? 'Private' : 'Public';
                 }
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
                     headers: {
                         'accept': 'application/json;odata.metadata=none'
                     },
@@ -74,7 +76,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                     hideFromOutlookClients: args.options.hideFromOutlookClients
                 };
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -89,7 +91,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                     await logger.logToStderr(`Setting group logo ${fullPath}...`);
                 }
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/photo/$value`,
+                    url: `${this.resource}/v1.0/groups/${groupId}/photo/$value`,
                     headers: {
                         'content-type': this.getImageContentType(fullPath)
                     },
@@ -114,7 +116,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 };
                 const res = await request.get(requestOptions);
                 await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/owners/$ref`,
+                    url: `${this.resource}/v1.0/groups/${groupId}/owners/$ref`,
                     headers: {
                         'content-type': 'application/json'
                     },
@@ -141,7 +143,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 };
                 const res = await request.get(requestOptions);
                 await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/members/$ref`,
+                    url: `${this.resource}/v1.0/groups/${groupId}/members/$ref`,
                     headers: {
                         'content-type': 'application/json'
                     },
@@ -188,7 +190,9 @@ class EntraM365GroupSetCommand extends GraphCommand {
 _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_initTelemetry = function _EntraM365GroupSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
             displayName: typeof args.options.displayName !== 'undefined',
+            newDisplayName: typeof args.options.newDisplayName !== 'undefined',
             description: typeof args.options.description !== 'undefined',
             owners: typeof args.options.owners !== 'undefined',
             members: typeof args.options.members !== 'undefined',
@@ -202,9 +206,11 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
     });
 }, _EntraM365GroupSetCommand_initOptions = function _EntraM365GroupSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
+    }, {
+        option: '--newDisplayName [newDisplayName]'
     }, {
         option: '-d, --description [description]'
     }, {
@@ -229,12 +235,14 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
         option: '--hideFromOutlookClients [hideFromOutlookClients]',
         autocomplete: ['true', 'false']
     });
+}, _EntraM365GroupSetCommand_initOptionSets = function _EntraM365GroupSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
 }, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
     this.types.boolean.push('isPrivate', 'allowEternalSenders', 'autoSubscribeNewMembers', 'hideFromAddressLists', 'hideFromOutlookClients');
-    this.types.string.push('id', 'displayName', 'description', 'owners', 'members', 'logoPath');
+    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'owners', 'members', 'logoPath');
 }, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!args.options.displayName &&
+        if (!args.options.newDisplayName &&
             args.options.description === undefined &&
             !args.options.members &&
             !args.options.owners &&
@@ -246,7 +254,7 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
             args.options.hideFromOutlookClients === undefined) {
             return 'Specify at least one option to update.';
         }
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.owners) {

package/dist/m365/entra/commands/m365group/m365group-user-add.js

@@ -35,19 +35,15 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_ADD, commands.M365GROUP_USER_ADD);
-        if (args.options.userName) {
-            await this.warn(logger, `Option 'userName' is deprecated. Please use 'ids' or 'userNames' instead.`);
-        }
         try {
-            const userNames = args.options.userNames || args.options.userName;
             const providedGroupId = await this.getGroupId(logger, args);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(providedGroupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`);
             }
-            const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+            const userIds = await this.getUserIds(logger, args.options.ids, args.options.userNames);
             if (this.verbose) {
-                await logger.logToStderr(`Adding user(s) ${args.options.ids || userNames} to group ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}...`);
+                await logger.logToStderr(`Adding user(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}...`);
             }
             await this.addUsers(providedGroupId, userIds, args.options.role);
         }
@@ -122,14 +118,11 @@ _EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddC
             teamName: typeof args.options.teamName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             ids: typeof args.options.ids !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
+            userNames: typeof args.options.userNames !== 'undefined'
         });
     });
 }, _EntraM365GroupUserAddCommand_initOptions = function _EntraM365GroupUserAddCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --userName [userName]'
-    }, {
         option: '--ids [ids]'
     }, {
         option: '--userNames [userNames]'
@@ -172,9 +165,9 @@ _EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddC
     });
 }, _EntraM365GroupUserAddCommand_initOptionSets = function _EntraM365GroupUserAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
-    this.optionSets.push({ options: ['userName', 'ids', 'userNames'] });
+    this.optionSets.push({ options: ['ids', 'userNames'] });
 }, _EntraM365GroupUserAddCommand_initTypes = function _EntraM365GroupUserAddCommand_initTypes() {
-    this.types.string.push('userName', 'ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
+    this.types.string.push('ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
 };
 export default new EntraM365GroupUserAddCommand();
 //# sourceMappingURL=m365group-user-add.js.map

package/dist/m365/entra/commands/oauth2grant/oauth2grant-list.js

@@ -4,8 +4,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraOAuth2GrantListCommand_instances, _EntraOAuth2GrantListCommand_initOptions, _EntraOAuth2GrantListCommand_initValidators;
-import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
@@ -35,17 +35,8 @@ class EntraOAuth2GrantListCommand extends GraphCommand {
             await logger.logToStderr(`Retrieving list of OAuth grants for the service principal...`);
         }
         try {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${formatting.encodeQueryParameter(args.options.spObjectId)}'`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value && res.value.length > 0) {
-                await logger.log(res.value);
-            }
+            const res = await odata.getAllItems(`${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${formatting.encodeQueryParameter(args.options.spObjectId)}'`);
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/external/commands/item/item-add.js

@@ -45,8 +45,7 @@ class ExternalItemAddCommand extends GraphCommand {
             properties: {}
         };
         // we need to rewrite the @odata properties to the correct format
-        // because . in @odata.type is interpreted by minimist as a child property
-        // we also need to extract multiple values for collections into arrays
+        // to extract multiple values for collections into arrays
         this.rewriteCollectionProperties(args.options);
         this.addUnknownOptionsToPayload(requestBody.properties, args.options);
         const requestOptions = {
@@ -81,11 +80,9 @@ class ExternalItemAddCommand extends GraphCommand {
     }
     rewriteCollectionProperties(options) {
         Object.getOwnPropertyNames(options).forEach(name => {
-            if (!name.endsWith('@odata')) {
+            if (!name.includes('@odata')) {
                 return;
             }
-            options[`${name}.type`] = options[name].type;
-            delete options[name];
             // convert the value of a collection to an array
             const nameWithoutOData = name.substring(0, name.indexOf('@odata'));
             if (options[nameWithoutOData]) {

package/dist/m365/flow/commands/environment/environment-list.js

@@ -23,8 +23,8 @@ class FlowEnvironmentListCommand extends PowerAutomateCommand {
                         e.displayName = e.properties.displayName;
                     });
                 }
-                await logger.log(res);
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/app/app-list.js

@@ -33,13 +33,8 @@ class PaAppListCommand extends PowerAppsCommand {
                 apps.forEach(a => {
                     a.displayName = a.properties.displayName;
                 });
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
             }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/connector/connector-list.js

@@ -35,13 +35,8 @@ class PaConnectorListCommand extends PowerAppsCommand {
                 connectors.forEach(c => {
                     c.displayName = c.properties.displayName;
                 });
-                await logger.log(connectors);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No custom connectors found');
-                }
             }
+            await logger.log(connectors);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/environment/environment-list.js

@@ -28,8 +28,8 @@ class PaEnvironmentListCommand extends PowerAppsCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pp/commands/environment/environment-list.js

@@ -47,8 +47,8 @@ class PpEnvironmentListCommand extends PowerPlatformCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/app/app-instance-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
-import request from '../../../../request.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.js';
@@ -28,24 +28,9 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving installed apps in site at ${args.options.siteUrl}...`);
         }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
         try {
-            const apps = await request.get(requestOptions);
-            if (apps.value && apps.value.length > 0) {
-                await logger.log(apps.value);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
-            }
+            const apps = await odata.getAllItems(`${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`);
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -37,14 +37,7 @@ class SpoAppListCommand extends SpoAppBaseCommand {
                 await logger.logToStderr(`Retrieving apps...`);
             }
             const apps = await odata.getAllItems(`${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`);
-            if (apps && apps.length > 0) {
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
-            }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -26,14 +26,7 @@ class SpoFeatureListCommand extends SpoCommand {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         try {
             const features = await odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
-            if (features && features.length > 0) {
-                await logger.log(features);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No activated Features found');
-                }
-            }
+            await logger.log(features);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -49,13 +49,8 @@ class SpoListWebhookListCommand extends SpoCommand {
                 res.forEach(w => {
                     w.clientState = w.clientState || '';
                 });
-                await logger.log(res);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No webhooks found');
-                }
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -50,14 +50,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand {
         };
         try {
             const attachmentFiles = await request.get(requestOptions);
-            if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
-                await logger.log(attachmentFiles.AttachmentFiles);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No attachments found');
-                }
-            }
+            await logger.log(attachmentFiles.AttachmentFiles);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -48,8 +48,8 @@ class SpoPageListCommand extends SpoCommand {
                     return p;
                 });
                 pages.filter(p => p.ListItemAllFields).forEach(page => delete page.ListItemAllFields.ID);
-                await logger.log(pages);
             }
+            await logger.log(pages);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/page/page-template-list.js

@@ -30,9 +30,7 @@ class SpoPageTemplateListCommand extends SpoCommand {
         }
         try {
             const res = await odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages/templates`);
-            if (res && res.length > 0) {
-                await logger.log(res);
-            }
+            await logger.log(res);
         }
         catch (err) {
             // The API returns a 404 when no templates are created on the site collection

package/dist/m365/spo/commands/site/site-admin-list.js

@@ -17,6 +17,9 @@ class SpoSiteAdminListCommand extends SpoCommand {
     get description() {
         return 'Lists all administrators of a specific SharePoint site';
     }
+    defaultProperties() {
+        return ['Id', 'LoginName', 'Title', 'PrincipalTypeString'];
+    }
     constructor() {
         super();
         _SpoSiteAdminListCommand_instances.add(this);
@@ -46,20 +49,16 @@ class SpoSiteAdminListCommand extends SpoCommand {
         const requestOptions = {
             url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
             headers: {
-                accept: 'application/json;odata=nometadata',
-                'content-type': 'application/json;charset=utf-8'
-            }
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const responseContent = JSON.parse(response);
         const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
-        const mappedResult = responseContent.value.map((u) => ({
-            Id: null,
+        const mappedResult = response.value.map((u) => ({
             Email: u.email,
             LoginName: u.loginName,
             Title: u.name,
-            PrincipalType: null,
-            PrincipalTypeString: null,
             IsPrimaryAdmin: u.loginName === primaryAdminLoginName
         }));
         await logger.log(mappedResult);
@@ -78,7 +77,6 @@ class SpoSiteAdminListCommand extends SpoCommand {
         }
         const requestOptions = {
             url: `${args.options.siteUrl}/_api/web/siteusers?$filter=IsSiteAdmin eq true`,
-            method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -114,6 +112,7 @@ _SpoSiteAdminListCommand_instances = new WeakSet(), _SpoSiteAdminListCommand_ini
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
 }, _SpoSiteAdminListCommand_initTypes = function _SpoSiteAdminListCommand_initTypes() {
     this.types.string.push('siteUrl');
+    this.types.boolean.push('asAdmin');
 };
 export default new SpoSiteAdminListCommand();
 //# sourceMappingURL=site-admin-list.js.map

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

@@ -77,11 +77,11 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'content-type': 'application/json;charset=utf-8'
-            }
+            },
+            responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const responseContent = JSON.parse(response);
-        return responseContent.value;
+        return response.value;
     }
     async getCorrectLoginName(options) {
         if (options.userId || options.userName) {
@@ -116,7 +116,8 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
                     siteId: siteId,
                     secondaryAdministratorLoginNames: admins.map(u => u.loginName)
                 }
-            }
+            },
+            responseType: 'json'
         };
         await request.post(requestOptions);
     }

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

@@ -22,9 +22,7 @@ class SpoSiteScriptListCommand extends SpoCommand {
                 responseType: 'json'
             };
             const res = await request.post(requestOptions);
-            if (res.value && res.value.length > 0) {
-                await logger.log(res.value);
-            }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);