@pnp/cli-microsoft365 7.3.0-beta.e0b37b9 → 7.4.0-beta.2324d53

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

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions, _FlowEnvironmentGetCommand_initTelemetry;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowEnvironmentGetCommand extends AzmgmtCommand {
+class FlowEnvironmentGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
     }
@@ -28,7 +28,7 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name ?? ''}...`);
         }
-        let requestUrl = `${this.resource}providers/Microsoft.ProcessSimple/environments/`;
+        let requestUrl = `${this.resource}/providers/Microsoft.ProcessSimple/environments/`;
         if (args.options.name) {
             requestUrl += `${formatting.encodeQueryParameter(args.options.name)}`;
         }

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

@@ -1,7 +1,7 @@
 import { odata } from '../../../../utils/odata.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowEnvironmentListCommand extends AzmgmtCommand {
+class FlowEnvironmentListCommand extends PowerAutomateCommand {
     get name() {
         return commands.ENVIRONMENT_LIST;
     }
@@ -16,7 +16,7 @@ class FlowEnvironmentListCommand extends AzmgmtCommand {
             await logger.logToStderr(`Retrieving list of Microsoft Flow environments...`);
         }
         try {
-            const res = await odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
+            const res = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
             if (res.length > 0) {
                 if (args.options.output !== 'json') {
                     res.forEach(e => {

package/dist/m365/flow/commands/flow-disable.js

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowDisableCommand_instances, _FlowDisableCommand_initTelemetry, _FlowDisableCommand_initOptions;
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowDisableCommand extends AzmgmtCommand {
+class FlowDisableCommand extends PowerAutomateCommand {
     get name() {
         return commands.DISABLE;
     }
@@ -26,7 +26,7 @@ class FlowDisableCommand extends AzmgmtCommand {
             await logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/stop?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/stop?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/flow/commands/flow-enable.js

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowEnableCommand_instances, _FlowEnableCommand_initTelemetry, _FlowEnableCommand_initOptions;
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowEnableCommand extends AzmgmtCommand {
+class FlowEnableCommand extends PowerAutomateCommand {
     get name() {
         return commands.ENABLE;
     }
@@ -26,7 +26,7 @@ class FlowEnableCommand extends AzmgmtCommand {
             await logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/start?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/start?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/flow/commands/flow-get.js

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowGetCommand_instances, _FlowGetCommand_initTelemetry, _FlowGetCommand_initOptions;
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowGetCommand extends AzmgmtCommand {
+class FlowGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.GET;
     }
@@ -29,7 +29,7 @@ class FlowGetCommand extends AzmgmtCommand {
             await logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -5,9 +5,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
 import { formatting } from '../../../utils/formatting.js';
-import { AzmgmtItemsListCommand } from '../../base/AzmgmtItemsListCommand.js';
+import { odata } from '../../../utils/odata.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowListCommand extends AzmgmtItemsListCommand {
+class FlowListCommand extends PowerAutomateCommand {
     get name() {
         return commands.LIST;
     }
@@ -28,31 +29,32 @@ class FlowListCommand extends AzmgmtItemsListCommand {
     async commandAction(logger, args) {
         try {
             const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
+            let items = [];
             if (sharingStatus === 'personal') {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
                 let url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
                 url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
-                await this.getAllItems(url, logger, false);
+                items = await odata.getAllItems(url);
             }
             else {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions);
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             // Remove duplicates
-            this.items = this.items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
-            if (this.items.length > 0) {
-                this.items.forEach(i => {
+            items = items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
+            if (items.length > 0) {
+                items.forEach(i => {
                     i.displayName = i.properties.displayName;
                 });
-                await logger.log(this.items);
+                await logger.log(items);
             }
             else {
                 if (this.verbose) {
@@ -65,7 +67,7 @@ class FlowListCommand extends AzmgmtItemsListCommand {
         }
     }
     getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
-        let url = `${this.resource}providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
+        let url = `${this.resource}/providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
         if (filter === 'personal') {
             url += `&$filter=search('personal')`;
         }

package/dist/m365/flow/commands/flow-remove.js

@@ -8,9 +8,9 @@ import { cli } from '../../../cli/cli.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import { validation } from '../../../utils/validation.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
 import commands from '../commands.js';
-class FlowRemoveCommand extends AzmgmtCommand {
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
+class FlowRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.REMOVE;
     }
@@ -30,7 +30,7 @@ class FlowRemoveCommand extends AzmgmtCommand {
         }
         const removeFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                 fullResponse: true,
                 headers: {
                     accept: 'application/json'

package/dist/m365/flow/commands/owner/owner-ensure.js

@@ -9,9 +9,9 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerEnsureCommand extends AzmgmtCommand {
+class FlowOwnerEnsureCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_ENSURE;
     }
@@ -52,7 +52,7 @@ class FlowOwnerEnsureCommand extends AzmgmtCommand {
                 type = 'Group';
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

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

@@ -8,9 +8,9 @@ import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerListCommand extends AzmgmtCommand {
+class FlowOwnerListCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_LIST;
     }
@@ -32,7 +32,7 @@ class FlowOwnerListCommand extends AzmgmtCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Listing owners for flow ${args.options.flowName} in environment ${args.options.environmentName}`);
             }
-            const response = await odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
+            const response = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
             if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(response);
             }

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -10,9 +10,9 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerRemoveCommand extends AzmgmtCommand {
+class FlowOwnerRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_REMOVE;
     }
@@ -47,7 +47,7 @@ class FlowOwnerRemoveCommand extends AzmgmtCommand {
                     idToRemove = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
                 }
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                    url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },

package/dist/m365/flow/commands/run/run-cancel.js

@@ -8,9 +8,9 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunCancelCommand extends AzmgmtCommand {
+class FlowRunCancelCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_CANCEL;
     }
@@ -30,7 +30,7 @@ class FlowRunCancelCommand extends AzmgmtCommand {
         }
         const cancelFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

package/dist/m365/flow/commands/run/run-get.js

@@ -7,9 +7,9 @@ var _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions, _FlowRunGetCom
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunGetCommand extends AzmgmtCommand {
+class FlowRunGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_GET;
     }
@@ -31,7 +31,7 @@ class FlowRunGetCommand extends AzmgmtCommand {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -5,10 +5,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRunListCommand_instances, _FlowRunListCommand_initTelemetry, _FlowRunListCommand_initOptions, _FlowRunListCommand_initValidators;
 import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import { AzmgmtItemsListCommand } from '../../../base/AzmgmtItemsListCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunListCommand extends AzmgmtItemsListCommand {
+class FlowRunListCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_LIST;
     }
@@ -30,20 +31,20 @@ class FlowRunListCommand extends AzmgmtItemsListCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
         }
-        let url = `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+        let url = `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
         const filters = this.getFilters(args.options);
         if (filters.length > 0) {
             url += `&$filter=${filters.join(' and ')}`;
         }
         try {
-            await this.getAllItems(url, logger, true);
-            if (args.options.output !== 'json' && this.items.length > 0) {
-                this.items.forEach(i => {
+            const items = await odata.getAllItems(url);
+            if (args.options.output !== 'json' && items.length > 0) {
+                items.forEach(i => {
                     i.startTime = i.properties.startTime;
                     i.status = i.properties.status;
                 });
             }
-            await logger.log(this.items);
+            await logger.log(items);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -9,9 +9,9 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
 import commands from '../../commands.js';
-class FlowRunResubmitCommand extends AzmgmtCommand {
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
+class FlowRunResubmitCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_RESUBMIT;
     }
@@ -36,7 +36,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
                     await logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                 }
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
+                    url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -60,7 +60,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
     }
     async getTriggerName(environment, flow) {
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -32,8 +32,13 @@ class PaAppGetCommand extends PowerAppsCommand {
     async commandAction(logger, args) {
         try {
             if (args.options.name) {
+                let endpoint = `${this.resource}/providers/Microsoft.PowerApps`;
+                if (args.options.asAdmin) {
+                    endpoint += `/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}`;
+                }
+                endpoint += `/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`;
                 const requestOptions = {
-                    url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                    url: endpoint,
                     headers: {
                         accept: 'application/json'
                     },
@@ -50,8 +55,8 @@ class PaAppGetCommand extends PowerAppsCommand {
                     await logger.logToStderr(`Retrieving information about Microsoft Power App with displayName '${args.options.displayName}'...`);
                 }
                 const getAppsOutput = await this.getApps(args, logger);
-                const allApps = JSON.parse(getAppsOutput.stdout);
-                if (allApps.length > 0) {
+                if (getAppsOutput.stdout && JSON.parse(getAppsOutput.stdout).length > 0) {
+                    const allApps = JSON.parse(getAppsOutput.stdout);
                     const app = allApps.find((a) => {
                         return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
                     });
@@ -59,15 +64,11 @@ class PaAppGetCommand extends PowerAppsCommand {
                         await logger.log(this.setProperties(app));
                     }
                     else {
-                        if (this.verbose) {
-                            await logger.logToStderr(`No app found with displayName '${args.options.displayName}'`);
-                        }
+                        throw `No app found with displayName '${args.options.displayName}'.`;
                     }
                 }
                 else {
-                    if (this.verbose) {
-                        await logger.logToStderr('No apps found');
-                    }
+                    throw 'No apps found.';
                 }
             }
         }
@@ -82,7 +83,9 @@ class PaAppGetCommand extends PowerAppsCommand {
         const options = {
             output: 'json',
             debug: this.debug,
-            verbose: this.verbose
+            verbose: this.verbose,
+            environmentName: args.options.environmentName,
+            asAdmin: args.options.asAdmin
         };
         return await cli.executeCommandWithOutput(paAppListCommand, { options: { ...options, _: [] } });
     }
@@ -98,7 +101,9 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             name: typeof args.options.name !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
+            displayName: typeof args.options.displayName !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined'
         });
     });
 }, _PaAppGetCommand_initOptions = function _PaAppGetCommand_initOptions() {
@@ -106,12 +111,22 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
         option: '-n, --name [name]'
     }, {
         option: '-d, --displayName [displayName]'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--asAdmin'
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.name && !validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'When specifying the asAdmin option, the environment option is required as well.';
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'When specifying the environment option, the asAdmin option is required as well.';
+        }
         return true;
     });
 }, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {

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

@@ -30,8 +30,13 @@ class PaAppRemoveCommand extends PowerAppsCommand {
             await logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
         }
         const removePaApp = async () => {
+            let endpoint = `${this.resource}/providers/Microsoft.PowerApps`;
+            if (args.options.asAdmin) {
+                endpoint += `/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}`;
+            }
+            endpoint += `/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`;
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`,
+                url: endpoint,
                 fullResponse: true,
                 headers: {
                     accept: 'application/json'
@@ -64,7 +69,9 @@ class PaAppRemoveCommand extends PowerAppsCommand {
 _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry = function _PaAppRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: typeof args.options.force !== 'undefined'
+            force: typeof args.options.force !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined'
         });
     });
 }, _PaAppRemoveCommand_initOptions = function _PaAppRemoveCommand_initOptions() {
@@ -72,12 +79,22 @@ _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry
         option: '-n, --name <name>'
     }, {
         option: '-f, --force'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-e, --environmentName [environmentName]'
     });
 }, _PaAppRemoveCommand_initValidators = function _PaAppRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'When specifying the asAdmin option, the environment option is required as well.';
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'When specifying the environment option, the asAdmin option is required as well.';
+        }
         return true;
     });
 };

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -8,7 +8,7 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import SpoGroupMemberListCommand from './group-member-list.js';

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

@@ -7,7 +7,7 @@ var _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupS
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 class SpoGroupSetCommand extends SpoCommand {

package/dist/m365/spo/commands/listitem/listitem-batch-add.js

@@ -35,9 +35,9 @@ class SpoListItemBatchAddCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Starting to create batch items from csv at path ${args.options.filePath}`);
+                await logger.logToStderr(`Starting to create batch items from csv ${args.options.filePath ? `at path ${args.options.filePath}` : 'from content'}`);
             }
-            const csvContent = fs.readFileSync(args.options.filePath, 'utf8');
+            const csvContent = args.options.filePath ? fs.readFileSync(args.options.filePath, 'utf8') : args.options.csvContent;
             const jsonContent = formatting.parseCsvToJson(csvContent);
             await this.addItemsAsBatch(jsonContent, args.options, logger);
         }
@@ -97,7 +97,7 @@ class SpoListItemBatchAddCommand extends SpoCommand {
             batchBody.push(`Accept: application/json;odata=nometadata\n`);
             batchBody.push(`Content-Type: application/json;odata=verbose\n`);
             batchBody.push(`If-Match: *\n\n`);
-            batchBody.push(`{\n"formValues": ${JSON.stringify(item)}\n}`);
+            batchBody.push(`{\n"formValues": ${JSON.stringify(this.formatFormValues(item))}\n}`);
         });
         // close batch body
         batchBody.push(`\n\n`);
@@ -105,6 +105,13 @@ class SpoListItemBatchAddCommand extends SpoCommand {
         batchBody.push(`--batch_${batchId}--\n`);
         return batchBody;
     }
+    formatFormValues(input) {
+        // Fix for PS 7
+        return input.map(obj => ({
+            FieldName: obj.FieldName.replace(/\\"/g, ''),
+            FieldValue: obj.FieldValue.replace(/\\"/g, '')
+        }));
+    }
     parseBatchResponseBody(response) {
         const batchResults = [];
         response.split('\r\n')
@@ -151,6 +158,8 @@ class SpoListItemBatchAddCommand extends SpoCommand {
 _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddCommand_initTelemetry = function _SpoListItemBatchAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            filePath: typeof args.options.filePath !== 'undefined',
+            csvContent: typeof args.options.csvContent !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined'
@@ -158,9 +167,11 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
     });
 }, _SpoListItemBatchAddCommand_initOptions = function _SpoListItemBatchAddCommand_initOptions() {
     this.options.unshift({
-        option: '-p, --filePath <filePath>'
-    }, {
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-p, --filePath [filePath]'
+    }, {
+        option: '-c, --csvContent [csvContent]'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -178,7 +189,7 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
             !validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!fs.existsSync(args.options.filePath)) {
+        if (args.options.filePath && !fs.existsSync(args.options.filePath)) {
             return `File with path ${args.options.filePath} does not exist`;
         }
         return true;
@@ -186,7 +197,7 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
 }, _SpoListItemBatchAddCommand_initTypes = function _SpoListItemBatchAddCommand_initTypes() {
     this.types.string.push('webUrl', 'filePath', 'listId', 'listTitle', 'listUrl');
 }, _SpoListItemBatchAddCommand_initOptionSets = function _SpoListItemBatchAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['filePath', 'csvContent'] });
 };
 export default new SpoListItemBatchAddCommand();
 //# sourceMappingURL=listitem-batch-add.js.map