@pnp/cli-microsoft365 7.3.0-beta.e0b37b9 → 7.3.0

package/dist/Auth.js

@@ -570,6 +570,9 @@ export class Auth {
             resource.endsWith('.api.bap.microsoft.com')) {
             resource = 'https://service.powerapps.com/';
         }
+        if (resource === 'https://api.flow.microsoft.com') {
+            resource = 'https://management.azure.com/';
+        }
         if (resource === 'https://api.powerbi.com') {
             // api.powerbi.com is not a valid resource
             // we need to use https://analysis.windows.net/powerbi/api instead

package/dist/m365/aad/commands/administrativeunit/administrativeunit-member-get.js

@@ -0,0 +1,112 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadAdministrativeUnitMemberGetCommand_instances, _AadAdministrativeUnitMemberGetCommand_initTelemetry, _AadAdministrativeUnitMemberGetCommand_initOptions, _AadAdministrativeUnitMemberGetCommand_initValidators, _AadAdministrativeUnitMemberGetCommand_initOptionSets;
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import request from '../../../../request.js';
+class AadAdministrativeUnitMemberGetCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_MEMBER_GET;
+    }
+    get description() {
+        return 'Retrieve a specific member (user, group, or device) of an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitMemberGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnitId = args.options.administrativeUnitId;
+        try {
+            if (args.options.administrativeUnitName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving Administrative Unit Id...`);
+                }
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            const url = this.getRequestUrl(administrativeUnitId, args.options.id, args.options);
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=minimal'
+                },
+                responseType: 'json'
+            };
+            const result = await request.get(requestOptions);
+            const odataType = result['@odata.type'];
+            if (odataType) {
+                result.type = odataType.replace('#microsoft.graph.', '');
+            }
+            delete result['@odata.type'];
+            delete result['@odata.context'];
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getRequestUrl(administrativeUnitId, memberId, options) {
+        const queryParameters = [];
+        if (options.properties) {
+            const allProperties = options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            const expandProperties = allProperties.filter(prop => prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+            if (expandProperties.length > 0) {
+                const fieldExpands = expandProperties.map(p => {
+                    const properties = p.split('/');
+                    return `${properties[0]}($select=${properties[1]})`;
+                });
+                queryParameters.push(`$expand=${fieldExpands.join(',')}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        return `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/${memberId}${queryString}`;
+    }
+}
+_AadAdministrativeUnitMemberGetCommand_instances = new WeakSet(), _AadAdministrativeUnitMemberGetCommand_initTelemetry = function _AadAdministrativeUnitMemberGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
+            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitMemberGetCommand_initOptions = function _AadAdministrativeUnitMemberGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-u, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: '-p, --properties [properties]'
+    });
+}, _AadAdministrativeUnitMemberGetCommand_initValidators = function _AadAdministrativeUnitMemberGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitMemberGetCommand_initOptionSets = function _AadAdministrativeUnitMemberGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+};
+export default new AadAdministrativeUnitMemberGetCommand();
+//# sourceMappingURL=administrativeunit-member-get.js.map

package/dist/m365/aad/commands.js

@@ -5,6 +5,7 @@ export default {
     ADMINISTRATIVEUNIT_LIST: `${prefix} administrativeunit list`,
     ADMINISTRATIVEUNIT_REMOVE: `${prefix} administrativeunit remove`,
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
+    ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,

package/dist/m365/base/PowerAutomateCommand.js

@@ -0,0 +1,18 @@
+import auth, { CloudType } from '../../Auth.js';
+import Command, { CommandError } from '../../Command.js';
+export default class PowerAutomateCommand extends Command {
+    get resource() {
+        return 'https://api.flow.microsoft.com';
+    }
+    initAction(args, logger) {
+        super.initAction(args, logger);
+        if (!auth.service.connected) {
+            // we fail no login in the base command command class
+            return;
+        }
+        if (auth.service.cloudType !== CloudType.Public) {
+            throw new CommandError(`Power Automate commands only support the public cloud at the moment. We'll add support for other clouds in the future. Sorry for the inconvenience.`);
+        }
+    }
+}
+//# sourceMappingURL=PowerAutomateCommand.js.map

package/dist/m365/external/commands/connection/connection-schema-add.js

@@ -33,10 +33,41 @@ class ExternalConnectionSchemaAddCommand extends GraphCommand {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json',
-            data: args.options.schema
+            data: args.options.schema,
+            fullResponse: true
         };
         try {
-            await request.post(requestOptions);
+            const res = await request.patch(requestOptions);
+            const location = res.headers.location;
+            logger.log(location);
+            if (!args.options.wait) {
+                return;
+            }
+            let status;
+            do {
+                if (this.verbose) {
+                    logger.logToStderr(`Waiting 60 seconds...`);
+                }
+                // waiting 60s before polling as recommended by Microsoft
+                await new Promise(resolve => setTimeout(resolve, 60000));
+                if (this.debug) {
+                    logger.logToStderr(`Checking schema operation status...`);
+                }
+                const operation = await request.get({
+                    url: location,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                });
+                status = operation.status;
+                if (this.verbose) {
+                    logger.logToStderr(`Schema operation status: ${status}`);
+                }
+                if (status === 'failed') {
+                    throw `Provisioning schema failed: ${operation.error?.message}`;
+                }
+            } while (status === 'inprogress');
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -48,6 +79,8 @@ _ExternalConnectionSchemaAddCommand_instances = new WeakSet(), _ExternalConnecti
         option: '-i, --externalConnectionId <externalConnectionId>'
     }, {
         option: '-s, --schema <schema>'
+    }, {
+        option: '--wait'
     });
 }, _ExternalConnectionSchemaAddCommand_initValidators = function _ExternalConnectionSchemaAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -67,7 +100,7 @@ _ExternalConnectionSchemaAddCommand_instances = new WeakSet(), _ExternalConnecti
             return `The schema needs a required property 'baseType' with value 'microsoft.graph.externalItem'`;
         }
         if (!schemaObject.properties || schemaObject.properties.length > 128) {
-            return `We need atleast one property and a maximum of 128 properties in the schema object`;
+            return `We need at least one property and a maximum of 128 properties in the schema object`;
         }
         return true;
     });

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'
             },