@pnp/cli-microsoft365 9.1.0-beta.9a7d76f → 10.0.0-beta.04ac437

package/dist/Auth.js

@@ -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);
         }

package/dist/cli/cli.js

@@ -60,7 +60,7 @@ function getSettingWithDefaultValue(settingName, defaultValue) {
     }
 }
 function getClientId() {
-    return cli.getSettingWithDefaultValue(settingsNames.clientId, process.env.CLIMICROSOFT365_ENTRAAPPID || process.env.CLIMICROSOFT365_AADAPPID);
+    return cli.getSettingWithDefaultValue(settingsNames.clientId, process.env.CLIMICROSOFT365_ENTRAAPPID);
 }
 function getTenant() {
     return cli.getSettingWithDefaultValue(settingsNames.tenantId, process.env.CLIMICROSOFT365_TENANT || 'common');

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

@@ -33,12 +33,12 @@ class AppPermissionAddCommand extends AppCommand {
             const appObject = await this.getAppObject();
             const servicePrincipals = await odata.getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
             const appPermissions = [];
-            if (args.options.delegatedPermission) {
-                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermission, ScopeType.Scope, appPermissions, logger);
+            if (args.options.delegatedPermissions) {
+                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermissions, ScopeType.Scope, appPermissions, logger);
                 this.addPermissionsToResourceArray(delegatedPermissions, appObject.requiredResourceAccess);
             }
-            if (args.options.applicationPermission) {
-                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermission, ScopeType.Role, appPermissions, logger);
+            if (args.options.applicationPermissions) {
+                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
                 this.addPermissionsToResourceArray(applicationPermissions, appObject.requiredResourceAccess);
             }
             const addPermissionsRequestOptions = {
@@ -198,17 +198,17 @@ _AppPermissionAddCommand_instances = new WeakSet(), _AppPermissionAddCommand_ini
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            applicationPermission: typeof args.options.applicationPermission !== 'undefined',
-            delegatedPermission: typeof args.options.delegatedPermission !== 'undefined',
+            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
+            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
             grantAdminConsent: !!args.options.grantAdminConsent
         });
     });
 }, _AppPermissionAddCommand_initOptions = function _AppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermission [applicationPermission]' }, { option: '--delegatedPermission [delegatedPermission]' }, { option: '--grantAdminConsent' });
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermissions [applicationPermissions]' }, { option: '--delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
 }, _AppPermissionAddCommand_initOptionSets = function _AppPermissionAddCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['applicationPermission', 'delegatedPermission'],
-        runsWhen: (args) => args.options.delegatedPermission === undefined && args.options.applicationPermission === undefined
+        options: ['applicationPermissions', 'delegatedPermissions'],
+        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
     });
 };
 export default new AppPermissionAddCommand();

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

@@ -23,12 +23,8 @@ class CliConsentCommand extends AnonymousCommand {
     }
     async commandAction(logger, args) {
         let scope = '';
-        switch (args.options.service) {
-            case 'yammer':
-                await this.warn(logger, 'The yammer service is deprecated. Please use the VivaEngage service instead.');
-            case 'VivaEngage':
-                scope = 'https://api.yammer.com/user_impersonation';
-                break;
+        if (args.options.service === 'VivaEngage') {
+            scope = 'https://api.yammer.com/user_impersonation';
         }
         await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${cli.getTenant()}/oauth2/v2.0/authorize?client_id=${cli.getClientId()}&response_type=code&scope=${encodeURIComponent(scope)}`);
     }
@@ -50,7 +46,7 @@ _CliConsentCommand_instances = new WeakSet(), _CliConsentCommand_initTelemetry =
     });
 }, _CliConsentCommand_initValidators = function _CliConsentCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.service !== 'VivaEngage' && args.options.service !== 'yammer') {
+        if (args.options.service !== 'VivaEngage') {
             return `${args.options.service} is not a valid value for the service option. Allowed values: VivaEngage`;
         }
         return true;

package/dist/m365/cli/commands/config/config-set.js

@@ -36,7 +36,6 @@ class CliConfigSetCommand extends AnonymousCommand {
             case settingsNames.printErrorsAsPlainText:
             case settingsNames.prompt:
             case settingsNames.showHelpOnFailure:
-            case settingsNames.showSpinner:
                 value = args.options.value === 'true';
                 break;
             default:

package/dist/m365/commands/setupPresets.js

@@ -4,8 +4,7 @@ export const interactivePreset = {
     output: 'text',
     printErrorsAsPlainText: true,
     prompt: true,
-    showHelpOnFailure: true,
-    showSpinner: true
+    showHelpOnFailure: true
 };
 export const scriptingPreset = {
     autoOpenLinksInBrowser: false,
@@ -13,8 +12,7 @@ export const scriptingPreset = {
     output: 'json',
     printErrorsAsPlainText: false,
     prompt: false,
-    showHelpOnFailure: false,
-    showSpinner: false
+    showHelpOnFailure: false
 };
 export const powerShellPreset = {
     errorOutput: 'stdout'

package/dist/m365/commands/status.js

@@ -30,8 +30,8 @@ class StatusCommand extends Command {
             const connections = await auth.getAllConnections();
             if (this.verbose) {
                 const message = connections.length > 0
-                    ? `Logged out from Microsoft 365, signed in connections available`
-                    : 'Logged out from Microsoft 365';
+                    ? `Logged out, signed in connections available`
+                    : 'Logged out';
                 await logger.logToStderr(message);
             }
             else {

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

@@ -30,12 +30,12 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initOptionSets).call(this);
     }
     async getAppId(args) {
-        if (args.options.appId) {
-            return args.options.appId;
+        if (args.options.id) {
+            return args.options.id;
         }
         let spMatchQuery = '';
-        if (args.options.appName) {
-            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.appName)}'`;
+        if (args.options.displayName) {
+            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.displayName)}'`;
         }
         else if (args.options.objectId) {
             spMatchQuery = `id eq '${formatting.encodeQueryParameter(args.options.objectId)}'`;
@@ -54,7 +54,7 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.displayName}' found.`, resultAsKeyValuePair);
             return result.appId;
         }
         return spItem.appId;
@@ -85,31 +85,31 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
 _EntraEnterpriseAppAddCommand_instances = new WeakSet(), _EntraEnterpriseAppAddCommand_initTelemetry = function _EntraEnterpriseAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            appId: (!(!args.options.appId)).toString(),
-            appName: (!(!args.options.appName)).toString(),
+            id: (!(!args.options.id)).toString(),
+            displayName: (!(!args.options.displayName)).toString(),
             objectId: (!(!args.options.objectId)).toString()
         });
     });
 }, _EntraEnterpriseAppAddCommand_initOptions = function _EntraEnterpriseAppAddCommand_initOptions() {
     this.options.unshift({
-        option: '--appId [appId]'
+        option: '-i, --id [id]'
     }, {
-        option: '--appName [appName]'
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--objectId [objectId]'
     });
 }, _EntraEnterpriseAppAddCommand_initValidators = function _EntraEnterpriseAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid appId GUID`;
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+            return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     });
 }, _EntraEnterpriseAppAddCommand_initOptionSets = function _EntraEnterpriseAppAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appName', 'objectId'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
 };
 export default new EntraEnterpriseAppAddCommand();
 //# sourceMappingURL=enterpriseapp-add.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-get.js

@@ -30,15 +30,15 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptionSets).call(this);
     }
     async getSpId(args) {
-        if (args.options.appObjectId) {
-            return args.options.appObjectId;
+        if (args.options.objectId) {
+            return args.options.objectId;
         }
         let spMatchQuery = '';
-        if (args.options.appDisplayName) {
-            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+        if (args.options.displayName) {
+            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.displayName)}'`;
         }
-        else if (args.options.appId) {
-            spMatchQuery = `appId eq '${formatting.encodeQueryParameter(args.options.appId)}'`;
+        else if (args.options.id) {
+            spMatchQuery = `appId eq '${formatting.encodeQueryParameter(args.options.id)}'`;
         }
         const idRequestOptions = {
             url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
@@ -54,7 +54,7 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.displayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return spItem.id;
@@ -85,31 +85,31 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
 _EntraEnterpriseAppGetCommand_instances = new WeakSet(), _EntraEnterpriseAppGetCommand_initTelemetry = function _EntraEnterpriseAppGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            appId: (!(!args.options.appId)).toString(),
-            appDisplayName: (!(!args.options.appDisplayName)).toString(),
-            appObjectId: (!(!args.options.appObjectId)).toString()
+            id: (!(!args.options.id)).toString(),
+            displayName: (!(!args.options.displayName)).toString(),
+            objectId: (!(!args.options.objectId)).toString()
         });
     });
 }, _EntraEnterpriseAppGetCommand_initOptions = function _EntraEnterpriseAppGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --appId [appId]'
+        option: '-i, --id [id]'
     }, {
-        option: '-n, --appDisplayName [appDisplayName]'
+        option: '-n, --displayName [displayName]'
     }, {
-        option: '--appObjectId [appObjectId]'
+        option: '--objectId [objectId]'
     });
 }, _EntraEnterpriseAppGetCommand_initValidators = function _EntraEnterpriseAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid appId GUID`;
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid objectId GUID`;
+        if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
+            return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     });
 }, _EntraEnterpriseAppGetCommand_initOptionSets = function _EntraEnterpriseAppGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appDisplayName', 'appObjectId'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
 };
 export default new EntraEnterpriseAppGetCommand();
 //# sourceMappingURL=enterpriseapp-get.js.map

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

@@ -61,7 +61,7 @@ _EntraEnterpriseAppListCommand_instances = new WeakSet(), _EntraEnterpriseAppLis
     });
 }, _EntraEnterpriseAppListCommand_initOptions = function _EntraEnterpriseAppListCommand_initOptions() {
     this.options.unshift({
-        option: '--displayName [displayName]'
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--tag [tag]'
     });

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

@@ -65,7 +65,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;
@@ -111,7 +111,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             role: typeof args.options.role !== 'undefined',
             properties: typeof args.options.properties !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
@@ -121,7 +121,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
-        option: "-n, --groupDisplayName [groupDisplayName]"
+        option: "-n, --groupName [groupName]"
     }, {
         option: "-r, --role [role]",
         autocomplete: ["Owner", "Member"]
@@ -132,7 +132,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     });
 }, _EntraGroupUserListCommand_initOptionSets = function _EntraGroupUserListCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['groupId', 'groupDisplayName']
+        options: ['groupId', 'groupName']
     });
 }, _EntraGroupUserListCommand_initValidators = function _EntraGroupUserListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/m365group/m365group-conversation-post-list.js

@@ -51,7 +51,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         if (args.options.groupId) {
             return formatting.encodeQueryParameter(args.options.groupId);
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.groupName);
         return group.id;
     }
 }
@@ -59,14 +59,14 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined'
+            groupName: typeof args.options.groupName !== 'undefined'
         });
     });
 }, _EntraM365GroupConversationPostListCommand_initOptions = function _EntraM365GroupConversationPostListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-t, --threadId <threadId>'
     });
@@ -78,7 +78,7 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
         return true;
     });
 }, _EntraM365GroupConversationPostListCommand_initOptionSets = function _EntraM365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] });
 };
 export default new EntraM365GroupConversationPostListCommand();
 //# sourceMappingURL=m365group-conversation-post-list.js.map

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

@@ -32,7 +32,7 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_RECYCLEBINITEM_LIST, commands.M365GROUP_RECYCLEBINITEM_LIST);
         try {
             const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-            const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
+            const displayNameFilter = args.options.groupName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupName).replace(/'/g, `''`)}')` : '';
             const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
             const topCount = '&$top=100';
             const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
@@ -47,13 +47,13 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
 _EntraM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemListCommand_initTelemetry = function _EntraM365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
 }, _EntraM365GroupRecycleBinItemListCommand_initOptions = function _EntraM365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-m, --groupMailNickname [groupMailNickname]'
     });

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

@@ -31,9 +31,6 @@ class EntraM365GroupUserListCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
-            if (args.options.role === 'Guest') {
-                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);
             if (!isUnifiedGroup) {
@@ -42,9 +39,9 @@ class EntraM365GroupUserListCommand extends GraphCommand {
             let users = [];
             if (!args.options.role || args.options.role === 'Owner') {
                 const owners = await this.getUsers(args.options, 'Owners', groupId, logger);
-                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'], userType: 'Owner' }));
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'] }));
             }
-            if (!args.options.role || args.options.role === 'Member' || args.options.role === 'Guest') {
+            if (!args.options.role || args.options.role === 'Member') {
                 const members = await this.getUsers(args.options, 'Members', groupId, logger);
                 members.forEach((member) => {
                     const user = users.find((u) => u.id === member.id);
@@ -57,7 +54,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
                 });
             }
             if (args.options.role) {
-                users = users.filter(i => i.userType === args.options.role);
+                users = users.filter(i => i.roles.indexOf(args.options.role) > -1);
             }
             await logger.log(users);
         }
@@ -128,7 +125,7 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
         option: "-n, --groupDisplayName [groupDisplayName]"
     }, {
         option: "-r, --role [type]",
-        autocomplete: ["Owner", "Member", "Guest"]
+        autocomplete: ["Owner", "Member"]
     }, {
         option: "-p, --properties [properties]"
     }, {
@@ -144,8 +141,8 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {
-            if (['Owner', 'Member', 'Guest'].indexOf(args.options.role) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values Owner|Member|Guest`;
+            if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
             }
         }
         return true;

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/outlook/commands/message/message-get.js

@@ -30,20 +30,20 @@ class OutlookMessageGetCommand extends GraphCommand {
             }
             let requestUrl = '';
             if (isAppOnlyAccessToken) {
-                if (!args.options.userId && !args.options.userPrincipalName) {
-                    throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                if (!args.options.userId && !args.options.userName) {
+                    throw `The option 'userId' or 'userName' is required when retrieving an email using app only credentials`;
                 }
-                if (args.options.userId && args.options.userPrincipalName) {
-                    throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                if (args.options.userId && args.options.userName) {
+                    throw `Both options 'userId' and 'userName' cannot be set when retrieving an email using app only credentials`;
                 }
-                requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userName}`;
             }
             else {
-                if (args.options.userId && args.options.userPrincipalName) {
-                    throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                if (args.options.userId && args.options.userName) {
+                    throw `Both options 'userId' and 'userName' cannot be set when retrieving an email using delegated credentials`;
                 }
-                if (args.options.userId || args.options.userPrincipalName) {
-                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                if (args.options.userId || args.options.userName) {
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userName}`;
                 }
                 else {
                     requestUrl += 'me';
@@ -69,7 +69,7 @@ _OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_i
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
-            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
@@ -78,7 +78,7 @@ _OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_i
     }, {
         option: '--userId [userId]'
     }, {
-        option: '--userPrincipalName [userPrincipalName]'
+        option: '--userName [userName]'
     });
 };
 export default new OutlookMessageGetCommand();

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -46,7 +46,7 @@ export const workflow = {
                     with: {
                         "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
                         "SKIP_FEATURE_DEPLOYMENT": false,
-                        "OVERWRITE": false
+                        "OVERWRITE": true
                     }
                 }
             ]