@pnp/cli-microsoft365 10.0.0-beta.787c5f1 → 10.0.0-beta.7be7794

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
+var _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initOptionSets, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
@@ -15,6 +15,9 @@ import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import auth from '../../../../Auth.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
 class EntraM365GroupSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_SET;
@@ -31,8 +34,9 @@ class EntraM365GroupSetCommand extends GraphCommand {
         this.pollingInterval = 500;
         __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_SET, commands.M365GROUP_SET);
@@ -40,23 +44,24 @@ class EntraM365GroupSetCommand extends GraphCommand {
             if ((args.options.allowExternalSenders !== undefined || args.options.autoSubscribeNewMembers !== undefined) && accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken)) {
                 throw `Option 'allowExternalSenders' and 'autoSubscribeNewMembers' can only be used when using delegated permissions.`;
             }
-            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
+            const groupId = args.options.id || await entraGroup.getGroupIdByDisplayName(args.options.displayName);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
-                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }
             if (this.verbose) {
-                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
+                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id || args.options.displayName}...`);
             }
-            if (args.options.displayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
+            if (args.options.newDisplayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
                 const update = {
-                    displayName: args.options.displayName,
+                    displayName: args.options.newDisplayName,
                     description: args.options.description !== '' ? args.options.description : null
                 };
                 if (args.options.isPrivate !== undefined) {
                     update.visibility = args.options.isPrivate ? 'Private' : 'Public';
                 }
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
                     headers: {
                         'accept': 'application/json;odata.metadata=none'
                     },
@@ -74,7 +79,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                     hideFromOutlookClients: args.options.hideFromOutlookClients
                 };
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -89,7 +94,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                     await logger.logToStderr(`Setting group logo ${fullPath}...`);
                 }
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/photo/$value`,
+                    url: `${this.resource}/v1.0/groups/${groupId}/photo/$value`,
                     headers: {
                         'content-type': this.getImageContentType(fullPath)
                     },
@@ -100,59 +105,13 @@ class EntraM365GroupSetCommand extends GraphCommand {
             else if (this.debug) {
                 await logger.logToStderr('logoPath not set. Skipping');
             }
-            if (args.options.owners) {
-                const owners = args.options.owners.split(',').map(o => o.trim());
-                if (this.verbose) {
-                    await logger.logToStderr('Retrieving user information to set group owners...');
-                }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                const res = await request.get(requestOptions);
-                await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/owners/$ref`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json',
-                    data: {
-                        "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
-                    }
-                })));
+            const ownerIds = await this.getUserIds(logger, args.options.ownerIds, args.options.ownerUserNames);
+            const memberIds = await this.getUserIds(logger, args.options.memberIds, args.options.memberUserNames);
+            if (ownerIds.length > 0) {
+                await this.updateUsers(logger, groupId, 'owners', ownerIds);
             }
-            else if (this.debug) {
-                await logger.logToStderr('Owners not set. Skipping');
-            }
-            if (args.options.members) {
-                const members = args.options.members.split(',').map(o => o.trim());
-                if (this.verbose) {
-                    await logger.logToStderr('Retrieving user information to set group members...');
-                }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                const res = await request.get(requestOptions);
-                await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/members/$ref`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json',
-                    data: {
-                        "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
-                    }
-                })));
-            }
-            else if (this.debug) {
-                await logger.logToStderr('Members not set. Skipping');
+            if (memberIds.length > 0) {
+                await this.updateUsers(logger, groupId, 'members', memberIds);
             }
         }
         catch (err) {
@@ -184,14 +143,99 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 return 'image/jpeg';
         }
     }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (userNames) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user IDs...`);
+            }
+            return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
+        }
+        return [];
+    }
+    async updateUsers(logger, groupId, role, userIds) {
+        const groupUsers = await odata.getAllItems(`${this.resource}/v1.0/groups/${groupId}/${role}/microsoft.graph.user?$select=id`);
+        const userIdsToAdd = userIds.filter(userId => !groupUsers.some(groupUser => groupUser.id === userId));
+        const userIdsToRemove = groupUsers.filter(groupUser => !userIds.some(userId => groupUser.id === userId)).map(user => user.id);
+        if (this.verbose) {
+            await logger.logToStderr(`Adding ${userIdsToAdd.length} ${role}...`);
+        }
+        for (let i = 0; i < userIdsToAdd.length; i += 400) {
+            const userIdsBatch = userIdsToAdd.slice(i, i + 400);
+            const batchRequestOptions = this.getBatchRequestOptions();
+            // only 20 requests per one batch are allowed
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                // only 20 users can be added in one request
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                batchRequestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none',
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${role}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(batchRequestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Removing ${userIdsToRemove.length} ${role}...`);
+        }
+        for (let i = 0; i < userIdsToRemove.length; i += 20) {
+            const userIdsBatch = userIdsToRemove.slice(i, i + 20);
+            const batchRequestOptions = this.getBatchRequestOptions();
+            userIdsBatch.map(userId => {
+                batchRequestOptions.data.requests.push({
+                    id: userId,
+                    method: 'DELETE',
+                    url: `/groups/${groupId}/${role}/${userId}/$ref`
+                });
+            });
+            const res = await request.post(batchRequestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+    }
+    getBatchRequestOptions() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/$batch`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none',
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                requests: []
+            }
+        };
+        return requestOptions;
+    }
 }
 _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_initTelemetry = function _EntraM365GroupSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
             displayName: typeof args.options.displayName !== 'undefined',
+            newDisplayName: typeof args.options.newDisplayName !== 'undefined',
             description: typeof args.options.description !== 'undefined',
-            owners: typeof args.options.owners !== 'undefined',
-            members: typeof args.options.members !== 'undefined',
+            ownerIds: typeof args.options.ownerIds !== 'undefined',
+            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
+            memberIds: typeof args.options.memberIds !== 'undefined',
+            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
             isPrivate: !!args.options.isPrivate,
             logoPath: typeof args.options.logoPath !== 'undefined',
             allowExternalSenders: !!args.options.allowExternalSenders,
@@ -202,15 +246,21 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
     });
 }, _EntraM365GroupSetCommand_initOptions = function _EntraM365GroupSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
+    }, {
+        option: '--newDisplayName [newDisplayName]'
     }, {
         option: '-d, --description [description]'
     }, {
-        option: '--owners [owners]'
+        option: '--ownerIds [ownerIds]'
     }, {
-        option: '--members [members]'
+        option: '--ownerUserNames [ownerUserNames]'
+    }, {
+        option: '--memberIds [memberIds]'
+    }, {
+        option: '--memberUserNames [memberUserNames]'
     }, {
         option: '--isPrivate [isPrivate]',
         autocomplete: ['true', 'false']
@@ -229,36 +279,64 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
         option: '--hideFromOutlookClients [hideFromOutlookClients]',
         autocomplete: ['true', 'false']
     });
+}, _EntraM365GroupSetCommand_initOptionSets = function _EntraM365GroupSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+    this.optionSets.push({
+        options: ['ownerIds', 'ownerUserNames'],
+        runsWhen: (args) => {
+            return args.options.ownerIds !== undefined || args.options.ownerUserNames !== undefined;
+        }
+    });
+    this.optionSets.push({
+        options: ['memberIds', 'memberUserNames'],
+        runsWhen: (args) => {
+            return args.options.memberIds !== undefined || args.options.memberUserNames !== undefined;
+        }
+    });
 }, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
     this.types.boolean.push('isPrivate', 'allowEternalSenders', 'autoSubscribeNewMembers', 'hideFromAddressLists', 'hideFromOutlookClients');
-    this.types.string.push('id', 'displayName', 'description', 'owners', 'members', 'logoPath');
+    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'logoPath');
 }, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!args.options.displayName &&
+        if (!args.options.newDisplayName &&
             args.options.description === undefined &&
-            !args.options.members &&
-            !args.options.owners &&
+            args.options.ownerIds === undefined &&
+            args.options.ownerUserNames === undefined &&
+            args.options.memberIds === undefined &&
+            args.options.memberUserNames === undefined &&
             args.options.isPrivate === undefined &&
-            !args.options.logoPath &&
+            args.options.logoPath === undefined &&
             args.options.allowExternalSenders === undefined &&
             args.options.autoSubscribeNewMembers === undefined &&
             args.options.hideFromAddressLists === undefined &&
             args.options.hideFromOutlookClients === undefined) {
             return 'Specify at least one option to update.';
         }
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.owners) {
-            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.owners);
-            if (isValidArray !== true) {
-                return `Option 'owners' contains one or more invalid UPNs: ${isValidArray}.`;
+        if (args.options.ownerIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ownerIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ownerIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if (args.options.ownerUserNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'ownerUserNames': ${isValidUPNArrayResult}.`;
+            }
+        }
+        if (args.options.memberIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.memberIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'memberIds': ${isValidGUIDArrayResult}.`;
             }
         }
-        if (args.options.members) {
-            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.members);
-            if (isValidArray !== true) {
-                return `Option 'members' contains one or more invalid UPNs: ${isValidArray}.`;
+        if (args.options.memberUserNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.memberUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'memberUserNames': ${isValidUPNArrayResult}.`;
             }
         }
         if (args.options.logoPath) {

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

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

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

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

package/dist/m365/entra/commands.js

@@ -41,9 +41,9 @@ export default {
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_SET: `${prefix} group set`,
-    GROUP_USER_ADD: `${prefix} group user add`,
-    GROUP_USER_LIST: `${prefix} group user list`,
-    GROUP_USER_SET: `${prefix} group user set`,
+    GROUP_MEMBER_ADD: `${prefix} group member add`,
+    GROUP_MEMBER_LIST: `${prefix} group member list`,
+    GROUP_MEMBER_SET: `${prefix} group member set`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
     GROUPSETTING_LIST: `${prefix} groupsetting list`,

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-list.js

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

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

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