@pnp/cli-microsoft365 7.11.0-beta.c513557 → 8.0.0-beta.b0e3dab

package/dist/Auth.js

@@ -364,7 +364,7 @@ export class Auth {
             cli.spinner.start();
         }
         if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
-            browserUtil.open(response.verificationUri);
+            await browserUtil.open(response.verificationUri);
         }
         if (cli.getSettingWithDefaultValue(settingsNames.copyDeviceCodeToClipboard, false)) {
             // _clipboardy is never set before hitting this line, but this check

package/dist/AuthServer.js

@@ -16,23 +16,23 @@ export class AuthServer {
             this.resource = resource;
             this.httpServer = http.createServer(this.httpRequest).listen(0, this.httpListener);
         };
-        this.httpListener = () => {
+        this.httpListener = async () => {
             const requestState = Math.random().toString(16).substr(2, 20);
             const address = this.httpServer.address();
             this.generatedServerUrl = `http://localhost:${address.port}`;
             const url = `${Auth.getEndpointForResource('https://login.microsoftonline.com', this.connection.cloudType)}/${this.connection.tenant}/oauth2/authorize?response_type=code&client_id=${this.connection.appId}&redirect_uri=${this.generatedServerUrl}&state=${requestState}&resource=${this.resource}&prompt=select_account`;
             if (this.debug) {
-                this.logger.logToStderr('Redirect URL:');
-                this.logger.logToStderr(url);
-                this.logger.logToStderr('');
+                await this.logger.logToStderr('Redirect URL:');
+                await this.logger.logToStderr(url);
+                await this.logger.logToStderr('');
             }
             this.openUrl(url);
         };
-        this.httpRequest = (request, response) => {
+        this.httpRequest = async (request, response) => {
             if (this.debug) {
-                this.logger.logToStderr('Response:');
-                this.logger.logToStderr(request.url);
-                this.logger.logToStderr('');
+                await this.logger.logToStderr('Response:');
+                await this.logger.logToStderr(request.url);
+                await this.logger.logToStderr('');
             }
             // url.parse is deprecated but we can't move to URL, because it doesn't
             // support server-relative URLs
@@ -82,8 +82,8 @@ export class AuthServer {
     }
     openUrl(url) {
         browserUtil.open(url)
-            .then(_ => {
-            this.logger.logToStderr("To sign in, use the web browser that just has been opened. Please sign-in there.");
+            .then(async (_) => {
+            await this.logger.logToStderr("To sign in, use the web browser that just has been opened. Please sign-in there.");
         })
             .catch(_ => {
             const errorResponse = {

package/dist/Command.js

@@ -88,7 +88,7 @@ class Command {
             }
             if (!prompted) {
                 prompted = true;
-                cli.error('🌶️  Provide values for the following parameters:');
+                await cli.error('🌶️  Provide values for the following parameters:');
             }
             const answer = optionInfo.autocomplete !== undefined
                 ? await prompt.forSelection({ message: `${optionInfo.name}: `, choices: optionInfo.autocomplete.map((choice) => { return { name: choice, value: choice }; }) })
@@ -96,9 +96,9 @@ class Command {
             args.options[optionInfo.name] = answer;
         }
         if (prompted) {
-            cli.error('');
+            await cli.error('');
         }
-        this.processOptions(args.options);
+        await this.processOptions(args.options);
         return true;
     }
     async validateOptionSets(args, command) {
@@ -129,17 +129,17 @@ class Command {
         return true;
     }
     async promptForOptionSetNameAndValue(args, optionSet) {
-        cli.error(`🌶️  Please specify one of the following options:`);
+        await cli.error(`🌶️  Please specify one of the following options:`);
         const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: optionSet.options.map((choice) => { return { name: choice, value: choice }; }) });
         const optionValue = await prompt.forInput({ message: `${selectedOptionName}:` });
         args.options[selectedOptionName] = optionValue;
-        cli.error('');
+        await cli.error('');
     }
     async promptForSpecificOption(args, commonOptions) {
-        cli.error(`🌶️  Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
+        await cli.error(`🌶️  Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
         const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: commonOptions.map((choice) => { return { name: choice, value: choice }; }) });
         commonOptions.filter(y => y !== selectedOptionName).map(optionName => args.options[optionName] = undefined);
-        cli.error('');
+        await cli.error('');
     }
     async validateOutput(args) {
         if (args.options.output &&
@@ -179,7 +179,7 @@ class Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         if (!auth.connection.active) {
             throw new CommandError('Log in to Microsoft 365 first');
         }
@@ -308,13 +308,13 @@ class Command {
     handleRejectedPromise(rawResponse) {
         this.handleError(rawResponse);
     }
-    initAction(args, logger) {
+    async initAction(args, logger) {
         this.debug = args.options.debug || process.env.CLIMICROSOFT365_DEBUG === '1';
         this.verbose = this.debug || args.options.verbose || process.env.CLIMICROSOFT365_VERBOSE === '1';
         request.debug = this.debug;
         request.logger = logger;
         if (this.debug && auth.connection.identityName !== undefined) {
-            logger.logToStderr(`Executing command as '${auth.connection.identityName}', appId: ${auth.connection.appId}, tenantId: ${auth.connection.identityTenantId}`);
+            await logger.logToStderr(`Executing command as '${auth.connection.identityName}', appId: ${auth.connection.appId}, tenantId: ${auth.connection.identityTenantId}`);
         }
         telemetry.trackEvent(this.getUsedCommandName(), this.getTelemetryProperties(args));
     }

package/dist/chili/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { chili } from './chili.js';
 try {
-    (async () => await chili.startConversation(process.argv.slice(2)))();
+    await (async () => await chili.startConversation(process.argv.slice(2)))();
 }
 catch (err) {
     console.error(`🛑 An error has occurred while searching documentation: ${err}`);

package/dist/cli/cli.js

@@ -144,23 +144,23 @@ async function execute(rawArgs) {
         await cli.executeCommand(cli.commandToExecute.command, cli.optionsFromArgs);
         const endTotal = process.hrtime.bigint();
         timings.total.push(Number(endTotal - start));
-        printTimings(rawArgs);
+        await printTimings(rawArgs);
         process.exit(0);
     }
     catch (err) {
         const endTotal = process.hrtime.bigint();
         timings.total.push(Number(endTotal - start));
-        printTimings(rawArgs);
+        await printTimings(rawArgs);
         await cli.closeWithError(err, cli.optionsFromArgs);
         /* c8 ignore next */
     }
 }
-function printTimings(rawArgs) {
+async function printTimings(rawArgs) {
     if (rawArgs.some(arg => arg === '--debug')) {
-        cli.error('');
-        cli.error('Timings:');
-        Object.getOwnPropertyNames(timings).forEach(key => {
-            cli.error(`${key}: ${timings[key].reduce((a, b) => a + b, 0) / 1e6}ms`);
+        await cli.error('');
+        await cli.error('Timings:');
+        Object.getOwnPropertyNames(timings).forEach(async (key) => {
+            await cli.error(`${key}: ${timings[key].reduce((a, b) => a + b, 0) / 1e6}ms`);
         });
     }
 }
@@ -179,7 +179,7 @@ async function executeCommand(command, args) {
         },
         logToStderr: async (message) => {
             if (args.options.output !== 'none') {
-                cli.error(message);
+                await cli.error(message);
             }
         }
     };
@@ -801,7 +801,7 @@ async function promptForSelection(config) {
         cli.spinner.stop();
     }
     const answer = await prompt.forSelection(config);
-    cli.error('');
+    await cli.error('');
     // Restart the spinner if it was running before the prompt
     /* c8 ignore next 3 */
     if (spinnerSpinning) {
@@ -816,7 +816,7 @@ async function promptForConfirmation(config) {
         cli.spinner.stop();
     }
     const answer = await prompt.forConfirmation(config);
-    cli.error('');
+    await cli.error('');
     // Restart the spinner if it was running before the prompt
     /* c8 ignore next 3 */
     if (spinnerSpinning) {
@@ -829,7 +829,7 @@ async function handleMultipleResultsFound(message, values) {
     if (!prompt) {
         throw new Error(`${message} Found: ${Object.keys(values).join(', ')}.`);
     }
-    cli.error(`🌶️  ${message} `);
+    await cli.error(`🌶️  ${message} `);
     const choices = Object.keys(values).map((choice) => { return { name: choice, value: choice }; });
     const response = await cli.promptForSelection({ message: `Please choose one:`, choices });
     return values[response];

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { cli } from './cli/cli.js';
 import { app } from './utils/app.js';
-(async () => {
+await (async () => {
     // required to make console.log() in combination with piped output synchronous
     // on Windows/in PowerShell so that the output is not trimmed by calling
     // process.exit() after executing the command, while the output is still

package/dist/m365/base/AnonymousCommand.js

@@ -1,7 +1,7 @@
 import Command from '../../Command.js';
 export default class AnonymousCommand extends Command {
     async action(logger, args) {
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }
 }

package/dist/m365/base/DelegatedGraphCommand.js

@@ -5,8 +5,8 @@ import GraphCommand from './GraphCommand.js';
  * This command class is for delegated-only Graph commands.
  */
 export default class DelegatedGraphCommand extends GraphCommand {
-    initAction(args, logger) {
-        super.initAction(args, logger);
+    async initAction(args, logger) {
+        await super.initAction(args, logger);
         if (!auth.connection.active) {
             // we fail no login in the base command command class
             return;

package/dist/m365/base/PowerAppsCommand.js

@@ -5,8 +5,8 @@ export default class PowerAppsCommand extends Command {
     get resource() {
         return 'https://api.powerapps.com';
     }
-    initAction(args, logger) {
-        super.initAction(args, logger);
+    async initAction(args, logger) {
+        await super.initAction(args, logger);
         if (!auth.connection.active) {
             // we fail no login in the base command command class
             return;

package/dist/m365/base/PowerAutomateCommand.js

@@ -5,8 +5,8 @@ export default class PowerAutomateCommand extends Command {
     get resource() {
         return 'https://api.flow.microsoft.com';
     }
-    initAction(args, logger) {
-        super.initAction(args, logger);
+    async initAction(args, logger) {
+        await super.initAction(args, logger);
         if (!auth.connection.active) {
             // we fail no login in the base command command class
             return;

package/dist/m365/base/PowerBICommand.js

@@ -5,8 +5,8 @@ export default class PowerBICommand extends Command {
     get resource() {
         return 'https://api.powerbi.com';
     }
-    initAction(args, logger) {
-        super.initAction(args, logger);
+    async initAction(args, logger) {
+        await super.initAction(args, logger);
         if (!auth.connection.active) {
             // we fail no login in the base command command class
             return;

package/dist/m365/base/PowerPlatformCommand.js

@@ -5,8 +5,8 @@ export default class PowerPlatformCommand extends Command {
     get resource() {
         return 'https://api.bap.microsoft.com';
     }
-    initAction(args, logger) {
-        super.initAction(args, logger);
+    async initAction(args, logger) {
+        await super.initAction(args, logger);
         if (!auth.connection.active) {
             // we fail no login in the base command command class
             return;

package/dist/m365/base/VivaEngageCommand.js

@@ -5,8 +5,8 @@ export default class VivaEngageCommand extends Command {
     get resource() {
         return 'https://www.yammer.com/api';
     }
-    initAction(args, logger) {
-        super.initAction(args, logger);
+    async initAction(args, logger) {
+        await super.initAction(args, logger);
         if (!auth.connection.active) {
             // we fail no login in the base command command class
             return;

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

@@ -33,7 +33,7 @@ class CliConsentCommand extends AnonymousCommand {
         await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${config.tenant}/oauth2/v2.0/authorize?client_id=${config.cliEntraAppId}&response_type=code&scope=${encodeURIComponent(scope)}`);
     }
     async action(logger, args) {
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }
 }

package/dist/m365/commands/login.js

@@ -98,7 +98,7 @@ class LoginCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }
 }

package/dist/m365/commands/logout.js

@@ -32,7 +32,7 @@ class LogoutCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger);
     }
 }

package/dist/m365/commands/status.js

@@ -49,7 +49,7 @@ class StatusCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger);
     }
 }

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

@@ -39,7 +39,7 @@ class ConnectionListCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger);
     }
 }

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

@@ -46,7 +46,7 @@ class ConnectionRemoveCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }
 }

package/dist/m365/connection/commands/connection-set.js

@@ -34,7 +34,7 @@ class ConnectionSetCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }
 }

package/dist/m365/connection/commands/connection-use.js

@@ -38,7 +38,7 @@ class ConnectionUseCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        this.initAction(args, logger);
+        await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }
 }

package/dist/m365/entra/commands/app/app-permission-add.js

@@ -61,7 +61,10 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             };
             await request.patch(addPermissionsRequestOptions);
             if (args.options.grantAdminConsent) {
-                const appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
+                let appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
+                if (!appServicePrincipal) {
+                    appServicePrincipal = await this.createServicePrincipal(appObject.appId, logger);
+                }
                 await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
             }
         }
@@ -69,6 +72,23 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async createServicePrincipal(appId, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Creating service principal for app ${appId}...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            data: {
+                appId
+            },
+            responseType: 'json'
+        };
+        return await request.post(requestOptions);
+    }
     async getAppObject(options) {
         let appNotFoundMessage = '';
         let apps = [];

package/dist/m365/entra/commands/app/app-permission-remove.js

@@ -49,6 +49,11 @@ class EntraAppPermissionRemoveCommand extends GraphCommand {
                     const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
                     this.removePermissionsFromResourceArray(applicationPermissions, appObject.requiredResourceAccess);
                 }
+                for (let i = 0; i < appObject.requiredResourceAccess.length; i++) {
+                    if (appObject.requiredResourceAccess[i].resourceAccess?.length === 0) {
+                        appObject.requiredResourceAccess.splice(i, 1);
+                    }
+                }
                 const removePermissionRequestOptions = {
                     url: `${this.resource}/v1.0/applications/${appObject.id}`,
                     headers: {
@@ -270,6 +275,18 @@ _EntraAppPermissionRemoveCommand_instances = new WeakSet(), _EntraAppPermissionR
         if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
             return `${args.options.appObjectId} is not a valid GUID`;
         }
+        if (args.options.delegatedPermissions) {
+            const invalidPermissions = validation.isValidPermission(args.options.delegatedPermissions);
+            if (Array.isArray(invalidPermissions)) {
+                return `Delegated permission(s) ${invalidPermissions.join(', ')} are not fully-qualified`;
+            }
+        }
+        if (args.options.applicationPermissions) {
+            const invalidPermissions = validation.isValidPermission(args.options.applicationPermissions);
+            if (Array.isArray(invalidPermissions)) {
+                return `Application permission(s) ${invalidPermissions.join(', ')} are not fully-qualified`;
+            }
+        }
         return true;
     });
 }, _EntraAppPermissionRemoveCommand_initOptionSets = function _EntraAppPermissionRemoveCommand_initOptionSets() {

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

@@ -139,6 +139,7 @@ class EntraM365GroupAddCommand extends GraphCommand {
         const userArr = users.split(',').map(o => o.trim());
         let promises = [];
         let userIds = [];
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         promises = userArr.map(user => {
             const requestOptions = {
                 url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,

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

@@ -32,7 +32,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
             if (args.options.role === 'Guest') {
-                this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
+                await this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
             }
             const groupId = await this.getGroupId(args.options, logger);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);

package/dist/m365/external/commands/connection/connection-doctor.js

@@ -112,7 +112,7 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
         checks = checks.filter((check, index, self) => self.findIndex(c => c.id === check.id) === index);
         for (const check of checks) {
             if (this.debug) {
-                logger.logToStderr(`Running check ${check.id}...`);
+                await logger.logToStderr(`Running check ${check.id}...`);
             }
             // don't show spinner if running tests
             /* c8 ignore next 3 */

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

@@ -39,19 +39,19 @@ class ExternalConnectionSchemaAddCommand extends GraphCommand {
         try {
             const res = await request.patch(requestOptions);
             const location = res.headers.location;
-            logger.log(location);
+            await logger.log(location);
             if (!args.options.wait) {
                 return;
             }
             let status;
             do {
                 if (this.verbose) {
-                    logger.logToStderr(`Waiting 60 seconds...`);
+                    await 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...`);
+                    await logger.logToStderr(`Checking schema operation status...`);
                 }
                 const operation = await request.get({
                     url: location,
@@ -62,7 +62,7 @@ class ExternalConnectionSchemaAddCommand extends GraphCommand {
                 });
                 status = operation.status;
                 if (this.verbose) {
-                    logger.logToStderr(`Schema operation status: ${status}`);
+                    await logger.logToStderr(`Schema operation status: ${status}`);
                 }
                 if (status === 'failed') {
                     throw `Provisioning schema failed: ${operation.error?.message}`;

package/dist/m365/file/commands/file-copy.js

@@ -31,7 +31,7 @@ class FileCopyCommand extends GraphCommand {
             const sourcePath = this.getAbsoluteUrl(webUrl, sourceUrl);
             const destinationPath = this.getAbsoluteUrl(webUrl, targetUrl);
             if (this.verbose) {
-                logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
+                await logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
             }
             const copyUrl = await this.getCopyUrl(args.options, sourcePath, logger);
             const { targetDriveId, targetItemId } = await this.getTargetDriveAndItemId(webUrl, targetUrl, logger, verbose);
@@ -83,7 +83,7 @@ class FileCopyCommand extends GraphCommand {
     }
     async getDocumentLibrary(siteId, folderUrl, folderUrlFromUser, logger) {
         if (this.verbose) {
-            logger.logToStderr(`Getting document library...`);
+            await logger.logToStderr(`Getting document library...`);
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
@@ -110,7 +110,7 @@ class FileCopyCommand extends GraphCommand {
     }
     async getStartingFolderId(documentLibrary, folderUrl, logger) {
         if (this.verbose) {
-            logger.logToStderr(`Getting starting folder id...`);
+            await logger.logToStderr(`Getting starting folder id...`);
         }
         const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(`${documentLibrary.webUrl}`, 'i'), '').replace(/\/+$/, '');
         const requestOptions = {

package/dist/m365/flow/commands/flow-list.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 _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
+var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators, _FlowListCommand_initTypes;
 import { formatting } from '../../../utils/formatting.js';
 import { odata } from '../../../utils/odata.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
@@ -13,7 +13,7 @@ class FlowListCommand extends PowerAutomateCommand {
         return commands.LIST;
     }
     get description() {
-        return 'Lists Microsoft Flows in the given environment';
+        return 'Lists Power Automate flows in the given environment';
     }
     defaultProperties() {
         return ['name', 'displayName'];
@@ -25,8 +25,12 @@ class FlowListCommand extends PowerAutomateCommand {
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin && ' as admin'} in environment '${args.options.environmentName}'...`);
+        }
         try {
             const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
             let items = [];
@@ -50,34 +54,25 @@ class FlowListCommand extends PowerAutomateCommand {
             }
             // Remove duplicates
             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;
+            if (args.options.output && args.options.output !== 'json') {
+                items.forEach(flow => {
+                    flow.displayName = flow.properties.displayName;
                 });
-                await logger.log(items);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No Flows found');
-                }
             }
+            await logger.log(items);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
     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`;
-        if (filter === 'personal') {
-            url += `&$filter=search('personal')`;
-        }
-        else if (filter === 'team') {
-            url += `&$filter=search('team')`;
-        }
-        if (includeSolutionFlows) {
-            url += '&include=includeSolutionCloudFlows';
-        }
-        return url;
+        const baseEndpoint = `${this.resource}/providers/Microsoft.ProcessSimple`;
+        const environmentSegment = `/environments/${formatting.encodeQueryParameter(environmentName)}`;
+        const adminSegment = `/scopes/admin${environmentSegment}/v2`;
+        const flowsEndpoint = '/flows?api-version=2016-11-01';
+        const filterQuery = filter === 'personal' || filter === 'team' ? `&$filter=search('${filter}')` : '';
+        const includeQuery = includeSolutionFlows ? '&include=includeSolutionCloudFlows' : '';
+        return `${baseEndpoint}${asAdmin ? adminSegment : environmentSegment}${flowsEndpoint}${filterQuery}${includeQuery}`;
     }
 }
 _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
@@ -105,10 +100,13 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
             return `The options asAdmin and sharingStatus cannot be specified together.`;
         }
         if (args.options.sharingStatus && !this.allowedSharingStatuses.some(status => status === args.options.sharingStatus)) {
-            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(',')}`;
+            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(', ')}`;
         }
         return true;
     });
+}, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
+    this.types.string.push('environmentName', 'sharingStatus');
+    this.types.boolean.push('includeSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

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

@@ -128,7 +128,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
                 link = response.properties.packageLink.value;
             }
             else {
-                setTimeout(this.pollingInterval);
+                await setTimeout(this.pollingInterval);
             }
             if (this.verbose) {
                 await logger.logToStderr(`Current status of the get package link: ${status}`);