@pnp/cli-microsoft365 9.0.0 → 9.1.0-beta.2d61838

package/dist/Auth.js

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

package/dist/AuthServer.js

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

package/dist/Command.js

@@ -522,7 +522,10 @@ class Command {
             quote: cli.getConfig().get(settingsNames.csvQuote),
             quoted: cli.getSettingWithDefaultValue(settingsNames.csvQuoted, false),
             // eslint-disable-next-line camelcase
-            quoted_empty: cli.getSettingWithDefaultValue(settingsNames.csvQuotedEmpty, false)
+            quoted_empty: cli.getSettingWithDefaultValue(settingsNames.csvQuotedEmpty, false),
+            cast: {
+                boolean: (value) => value ? '1' : '0'
+            }
         });
     }
     getMdOutput(logStatement, command, options) {

package/dist/api.js

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

package/dist/config.js

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

package/dist/m365/base/PowerAutomateCommand.js

@@ -2,7 +2,7 @@ import auth, { CloudType } from '../../Auth.js';
 import Command, { CommandError } from '../../Command.js';
 import { accessToken } from '../../utils/accessToken.js';
 export default class PowerAutomateCommand extends Command {
-    get resource() {
+    static get resource() {
         return 'https://api.flow.microsoft.com';
     }
     async initAction(args, logger) {

package/dist/m365/commands/login.js

@@ -101,7 +101,7 @@ class LoginCommand extends Command {
                     auth.connection.authType = AuthType.Certificate;
                     auth.connection.certificate = getCertificate(args.options);
                     auth.connection.thumbprint = args.options.thumbprint;
-                    auth.connection.password = args.options.password || cli.getConfig().get(settingsNames.clientCertificatePassword);
+                    auth.connection.password = args.options.password ?? cli.getConfig().get(settingsNames.clientCertificatePassword);
                     break;
                 case 'identity':
                     auth.connection.authType = AuthType.Identity;

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

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

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

@@ -0,0 +1,135 @@
+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 _FileMoveCommand_instances, _FileMoveCommand_initTelemetry, _FileMoveCommand_initOptions, _FileMoveCommand_initValidators;
+import GraphCommand from '../../base/GraphCommand.js';
+import { setTimeout } from 'timers/promises';
+import commands from '../commands.js';
+import request from '../../../request.js';
+import { spo } from '../../../utils/spo.js';
+import { urlUtil } from '../../../utils/urlUtil.js';
+import { driveUtil } from '../../../utils/driveUtil.js';
+import { validation } from '../../../utils/validation.js';
+class FileMoveCommand extends GraphCommand {
+    get name() {
+        return commands.MOVE;
+    }
+    get description() {
+        return 'Moves a file to another location using the Microsoft Graph';
+    }
+    constructor() {
+        super();
+        _FileMoveCommand_instances.add(this);
+        this.pollingInterval = 10000;
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const { webUrl, sourceUrl, targetUrl, nameConflictBehavior, newName, verbose } = args.options;
+            const sourcePath = this.getAbsoluteUrl(webUrl, sourceUrl);
+            const destinationPath = this.getAbsoluteUrl(webUrl, targetUrl);
+            const { driveId, itemId } = await this.getDriveIdAndItemId(webUrl, sourcePath, sourceUrl, logger, verbose);
+            const targetSiteUrl = urlUtil.getTargetSiteAbsoluteUrl(webUrl, targetUrl);
+            const targetFolderUrl = this.getAbsoluteUrl(targetSiteUrl, targetUrl);
+            const { driveId: targetDriveId, itemId: targetItemId } = await this.getDriveIdAndItemId(targetSiteUrl, targetFolderUrl, targetUrl, logger, verbose);
+            const requestOptions = this.getRequestOptions(driveId, itemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior);
+            if (verbose) {
+                await logger.logToStderr(`Moving file '${sourcePath}' to '${destinationPath}'...`);
+            }
+            if (driveId === targetDriveId) {
+                await request.patch(requestOptions);
+            }
+            else {
+                const response = await request.post(requestOptions);
+                await this.waitUntilCopyOperationCompleted(response.headers.location, logger);
+                const itemUrl = `${this.resource}/v1.0/drives/${driveId}/items/${itemId}`;
+                await request.delete({ url: itemUrl, headers: requestOptions.headers });
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
+    async getDriveIdAndItemId(webUrl, folderUrl, sourceUrl, logger, verbose) {
+        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const drive = await driveUtil.getDriveByUrl(siteId, new URL(folderUrl));
+        const itemId = await driveUtil.getDriveItemId(drive, new URL(folderUrl));
+        return { driveId: drive.id, itemId };
+    }
+    getRequestOptions(sourceDriveId, sourceItemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior) {
+        const apiUrl = sourceDriveId === targetDriveId
+            ? `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}`
+            : `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}/copy`;
+        const queryParameters = nameConflictBehavior && nameConflictBehavior !== 'fail'
+            ? `@microsoft.graph.conflictBehavior=${nameConflictBehavior}`
+            : '';
+        const urlWithQuery = `${apiUrl}${queryParameters ? `?${queryParameters}` : ''}`;
+        const requestOptions = {
+            url: urlWithQuery,
+            headers: { accept: 'application/json;odata.metadata=none' },
+            responseType: 'json',
+            fullResponse: true,
+            data: { parentReference: { driveId: targetDriveId, id: targetItemId } }
+        };
+        if (newName) {
+            const sourceFileName = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const sourceFileExtension = sourceFileName.includes('.') ? sourceFileName.substring(sourceFileName.lastIndexOf('.')) : '';
+            const newNameExtension = newName.includes('.') ? newName.substring(newName.lastIndexOf('.')) : '';
+            requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, "")}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
+        }
+        return requestOptions;
+    }
+    async waitUntilCopyOperationCompleted(monitorUrl, logger) {
+        const requestOptions = {
+            url: monitorUrl,
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.status === 'completed') {
+            if (this.verbose) {
+                await logger.logToStderr('Copy operation completed succesfully. Returning...');
+            }
+            return;
+        }
+        else if (response.status === 'failed') {
+            throw response.error.message;
+        }
+        else {
+            if (this.verbose) {
+                await logger.logToStderr(`Still copying. Retrying in ${this.pollingInterval / 1000} seconds...`);
+            }
+            await setTimeout(this.pollingInterval);
+            await this.waitUntilCopyOperationCompleted(monitorUrl, logger);
+        }
+    }
+}
+_FileMoveCommand_instances = new WeakSet(), _FileMoveCommand_initTelemetry = function _FileMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            targetUrl: typeof args.options.targetUrl !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined'
+        });
+    });
+}, _FileMoveCommand_initOptions = function _FileMoveCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-s, --sourceUrl <sourceUrl>' }, { option: '-t, --targetUrl <targetUrl>' }, { option: '--newName [newName]' }, { option: '--nameConflictBehavior [nameConflictBehavior]', autocomplete: this.nameConflictBehaviorOptions });
+}, _FileMoveCommand_initValidators = function _FileMoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return validation.isValidSharePointUrl(args.options.webUrl);
+    });
+};
+export default new FileMoveCommand();
+//# sourceMappingURL=file-move.js.map

package/dist/m365/file/commands.js

@@ -3,6 +3,7 @@ export default {
     ADD: `${prefix} add`,
     CONVERT_PDF: `${prefix} convert pdf`,
     COPY: `${prefix} copy`,
-    LIST: `${prefix} list`
+    LIST: `${prefix} list`,
+    MOVE: `${prefix} move`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -28,7 +28,7 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
         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 = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/`;
         if (args.options.name) {
             requestUrl += `${formatting.encodeQueryParameter(args.options.name)}`;
         }

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

@@ -16,7 +16,7 @@ class FlowEnvironmentListCommand extends PowerAutomateCommand {
             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(`${PowerAutomateCommand.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

@@ -26,7 +26,7 @@ class FlowDisableCommand extends PowerAutomateCommand {
             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: `${PowerAutomateCommand.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

@@ -26,7 +26,7 @@ class FlowEnableCommand extends PowerAutomateCommand {
             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: `${PowerAutomateCommand.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-export.js

@@ -11,6 +11,7 @@ import { formatting } from '../../../utils/formatting.js';
 import { validation } from '../../../utils/validation.js';
 import PowerPlatformCommand from '../../base/PowerPlatformCommand.js';
 import commands from '../commands.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 class FlowExportCommand extends PowerPlatformCommand {
     get name() {
         return commands.EXPORT;
@@ -27,15 +28,15 @@ class FlowExportCommand extends PowerPlatformCommand {
     }
     async commandAction(logger, args) {
         let filenameFromApi = '';
-        const formatArgument = args.options.format ? args.options.format.toLowerCase() : '';
+        const formatArgument = args.options.format?.toLowerCase() || '';
         if (this.verbose) {
             await logger.logToStderr(`Retrieving package resources for Microsoft Flow ${args.options.name}...`);
         }
         try {
             let res;
             if (formatArgument === 'json') {
-                if (this.debug) {
-                    await logger.logToStderr('format = json, skipping listing package resources step');
+                if (this.verbose) {
+                    await logger.logToStderr('format = json, skipping listing package resources step.');
                 }
             }
             else {
@@ -61,7 +62,7 @@ class FlowExportCommand extends PowerPlatformCommand {
             }
             let requestOptions = {
                 url: formatArgument === 'json' ?
-                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`
+                    `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`
                     : `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
@@ -76,17 +77,17 @@ class FlowExportCommand extends PowerPlatformCommand {
                         ? res.resources[key].suggestedCreationType = 'Update'
                         : res.resources[key].suggestedCreationType = 'Existing';
                 });
-                requestOptions['data'] = {
-                    "includedResourceIds": [
+                requestOptions.data = {
+                    includedResourceIds: [
                         `/providers/Microsoft.Flow/flows/${args.options.name}`
                     ],
-                    "details": {
-                        "displayName": args.options.packageDisplayName,
-                        "description": args.options.packageDescription,
-                        "creator": args.options.packageCreatedBy,
-                        "sourceEnvironment": args.options.packageSourceEnvironment
+                    details: {
+                        displayName: args.options.packageDisplayName,
+                        description: args.options.packageDescription,
+                        creator: args.options.packageCreatedBy,
+                        sourceEnvironment: args.options.packageSourceEnvironment
                     },
-                    "resources": res.resources
+                    resources: res.resources
                 };
             }
             res = formatArgument === 'json' ? await request.get(requestOptions) : await request.post(requestOptions);
@@ -99,13 +100,13 @@ class FlowExportCommand extends PowerPlatformCommand {
             // Replace all illegal characters from the file name
             const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
             filenameFromApi = filenameFromApi.replace(illegalCharsRegEx, '_');
-            if (this.debug) {
-                await logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}`);
+            if (this.verbose) {
+                await logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}.`);
                 await logger.logToStderr('');
             }
             requestOptions = {
                 url: formatArgument === 'json' ?
-                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/exportToARMTemplate?api-version=2016-11-01`
+                    `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/exportToARMTemplate?api-version=2016-11-01`
                     : downloadFileUrl,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
                 // to utf8 and binary data is corrupt
@@ -124,7 +125,7 @@ class FlowExportCommand extends PowerPlatformCommand {
             fs.writeFileSync(path, file, 'binary');
             if (!args.options.path || this.verbose) {
                 if (this.verbose) {
-                    await logger.logToStderr(`File saved to path '${path}'`);
+                    await logger.logToStderr(`File saved to path '${path}'.`);
                 }
                 else {
                     await logger.log(path);

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

@@ -29,7 +29,7 @@ class FlowGetCommand extends PowerAutomateCommand {
             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&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
+            url: `${PowerAutomateCommand.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&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -67,7 +67,7 @@ class FlowListCommand extends PowerAutomateCommand {
         }
     }
     getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
-        const baseEndpoint = `${this.resource}/providers/Microsoft.ProcessSimple`;
+        const baseEndpoint = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple`;
         const environmentSegment = `/environments/${formatting.encodeQueryParameter(environmentName)}`;
         const adminSegment = `/scopes/admin${environmentSegment}/v2`;
         const flowsEndpoint = '/flows?api-version=2016-11-01';

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

@@ -30,7 +30,7 @@ class FlowRemoveCommand extends PowerAutomateCommand {
         }
         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: `${PowerAutomateCommand.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

@@ -52,7 +52,7 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
                 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: `${PowerAutomateCommand.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

@@ -32,7 +32,7 @@ class FlowOwnerListCommand extends PowerAutomateCommand {
             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(`${PowerAutomateCommand.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

@@ -47,7 +47,7 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
                     idToRemove = await entraGroup.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: `${PowerAutomateCommand.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/recyclebinitem/recyclebinitem-list.js

@@ -0,0 +1,47 @@
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
+import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    environmentName: zod.alias('e', z.string())
+})
+    .strict();
+class FlowRecycleBinItemListCommand extends PowerAutomateCommand {
+    get name() {
+        return commands.RECYCLEBINITEM_LIST;
+    }
+    get description() {
+        return 'Lists all soft-deleted Power Automate flows within an environment';
+    }
+    defaultProperties() {
+        return ['name', 'displayName'];
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Getting list of soft-deleted flows in environment ${args.options.environmentName}...`);
+            }
+            const flows = await odata.getAllItems(`${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/v2/flows?api-version=2016-11-01&include=softDeletedFlows`);
+            const deletedFlows = flows.filter(flow => flow.properties.state === 'Deleted');
+            if (cli.shouldTrimOutput(args.options.output)) {
+                deletedFlows.forEach(flow => {
+                    flow.displayName = flow.properties.displayName;
+                });
+            }
+            await logger.log(deletedFlows);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new FlowRecycleBinItemListCommand();
+//# sourceMappingURL=recyclebinitem-list.js.map

package/dist/m365/flow/commands/recyclebinitem/recyclebinitem-restore.js

@@ -0,0 +1,48 @@
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
+import request from '../../../../request.js';
+const options = globalOptionsZod
+    .extend({
+    environmentName: zod.alias('e', z.string()),
+    flowName: zod.alias('n', z.string()
+        .refine(name => validation.isValidGuid(name), name => ({
+        message: `'${name}' is not a valid GUID.`
+    })))
+})
+    .strict();
+class FlowRecycleBinItemRestoreCommand extends PowerAutomateCommand {
+    get name() {
+        return commands.RECYCLEBINITEM_RESTORE;
+    }
+    get description() {
+        return 'Restores a soft-deleted Power Automate flow';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Restoring soft-deleted flow ${args.options.flowName} from environment ${args.options.environmentName}...`);
+            }
+            const requestOptions = {
+                url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${args.options.flowName}/restore?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new FlowRecycleBinItemRestoreCommand();
+//# sourceMappingURL=recyclebinitem-restore.js.map

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

@@ -30,7 +30,7 @@ class FlowRunCancelCommand extends PowerAutomateCommand {
         }
         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: `${PowerAutomateCommand.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

@@ -35,7 +35,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
         }
         const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         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)}?${actionsParameter}api-version=2016-11-01`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -32,7 +32,7 @@ class FlowRunListCommand extends PowerAutomateCommand {
         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 = `${PowerAutomateCommand.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 ')}`;