@pnp/cli-microsoft365 7.5.0-beta.494c631 → 7.5.0-beta.c0c1edf

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -35,7 +35,7 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         const removeUser = async () => {
             try {
-                const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+                const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
                 }

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

@@ -10,7 +10,7 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
@@ -33,7 +33,7 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }

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

@@ -5,12 +5,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraUserGetCommand_instances, _EntraUserGetCommand_initTelemetry, _EntraUserGetCommand_initOptions, _EntraUserGetCommand_initValidators, _EntraUserGetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import aadCommands from '../../aadCommands.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
 class EntraUserGetCommand extends GraphCommand {
     get name() {
         return commands.USER_GET;
@@ -30,50 +30,50 @@ class EntraUserGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserGetCommand_instances, "m", _EntraUserGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const properties = args.options.properties ?
-            `&$select=${args.options.properties.split(',').map(p => formatting.encodeQueryParameter(p.trim())).join(',')}` :
-            '';
-        let requestUrl = `${this.resource}/v1.0/users`;
-        if (args.options.id) {
-            requestUrl += `?$filter=id eq '${formatting.encodeQueryParameter(args.options.id)}'${properties}`;
-        }
-        else if (args.options.userName) {
-            requestUrl += `?$filter=userPrincipalName eq '${formatting.encodeQueryParameter(args.options.userName)}'${properties}`;
-        }
-        else if (args.options.email) {
-            requestUrl += `?$filter=mail eq '${formatting.encodeQueryParameter(args.options.email)}'${properties}`;
-        }
-        if (args.options.withManager) {
-            requestUrl += '&$expand=manager($select=displayName,userPrincipalName,id,mail)';
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
         try {
-            const res = await request.get(requestOptions);
-            const identifier = args.options.id ? `id ${args.options.id}`
-                : args.options.userName ? `user name ${args.options.userName}`
-                    : `email ${args.options.email}`;
-            if (res.value.length === 0) {
-                throw `The specified user with ${identifier} does not exist`;
+            let userIdOrPrincipalName = args.options.id;
+            if (args.options.userName) {
+                // single user can be retrieved also by user principal name
+                userIdOrPrincipalName = formatting.encodeQueryParameter(args.options.userName);
             }
-            if (res.value.length > 1) {
-                const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-                const result = await cli.handleMultipleResultsFound(`Multiple users with ${identifier} found.`, resultAsKeyValuePair);
-                await logger.log(result);
-            }
-            else {
-                await logger.log(res.value[0]);
+            else if (args.options.email) {
+                userIdOrPrincipalName = await entraUser.getUserIdByEmail(args.options.email);
             }
+            const requestUrl = this.getRequestUrl(userIdOrPrincipalName, args.options);
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const user = await request.get(requestOptions);
+            await logger.log(user);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getRequestUrl(userIdOrPrincipalName, options) {
+        const queryParameters = [];
+        if (options.properties) {
+            const allProperties = options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+        }
+        if (options.withManager) {
+            queryParameters.push('$expand=manager($select=displayName,userPrincipalName,id,mail)');
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        // user principal name can start with $ but it violates the OData URL convention, so it must be enclosed in parenthesis and single quotes
+        return userIdOrPrincipalName.startsWith('%24')
+            ? `${this.resource}/v1.0/users('${userIdOrPrincipalName}')${queryString}`
+            : `${this.resource}/v1.0/users/${userIdOrPrincipalName}${queryString}`;
+    }
 }
 _EntraUserGetCommand_instances = new WeakSet(), _EntraUserGetCommand_initTelemetry = function _EntraUserGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -0,0 +1,224 @@
+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 _EntraUserRegistrationDetailsListCommand_instances, _EntraUserRegistrationDetailsListCommand_initTelemetry, _EntraUserRegistrationDetailsListCommand_initOptions, _EntraUserRegistrationDetailsListCommand_initValidators;
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import aadCommands from '../../aadCommands.js';
+import { odata } from '../../../../utils/odata.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
+const authenticationMethods = ['push', 'oath', 'voiceMobile', 'voiceAlternateMobile', 'voiceOffice', 'sms', 'none'];
+const methodsRegistered = ['mobilePhone', 'email', 'fido2', 'microsoftAuthenticatorPush', 'softwareOneTimePasscode'];
+class EntraUserRegistrationDetailsListCommand extends GraphCommand {
+    get name() {
+        return commands.USER_REGISTRATIONDETAILS_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of the authentication methods registered for users';
+    }
+    alias() {
+        return [aadCommands.USER_REGISTRATIONDETAILS_LIST];
+    }
+    defaultProperties() {
+        return ['userPrincipalName', 'methodsRegistered', 'lastUpdatedDateTime'];
+    }
+    constructor() {
+        super();
+        _EntraUserRegistrationDetailsListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraUserRegistrationDetailsListCommand_instances, "m", _EntraUserRegistrationDetailsListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraUserRegistrationDetailsListCommand_instances, "m", _EntraUserRegistrationDetailsListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraUserRegistrationDetailsListCommand_instances, "m", _EntraUserRegistrationDetailsListCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            let userUpns = [];
+            if (args.options.userIds) {
+                const ids = args.options.userIds.split(',').map(m => m.trim());
+                userUpns = await Promise.all(ids.map(id => entraUser.getUpnByUserId(id)));
+            }
+            const requestUrl = this.getRequestUrl(args.options, userUpns);
+            const result = await odata.getAllItems(requestUrl);
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getRequestUrl(options, userUpns) {
+        const queryParameters = [];
+        if (options.properties) {
+            queryParameters.push(`$select=${options.properties}`);
+        }
+        const filters = [];
+        if (options.isAdmin !== undefined) {
+            filters.push(`isAdmin eq ${options.isAdmin}`);
+        }
+        if (options.isMfaCapable !== undefined) {
+            filters.push(`isMfaCapable eq ${options.isMfaCapable}`);
+        }
+        if (options.isMfaRegistered !== undefined) {
+            filters.push(`isMfaRegistered eq ${options.isMfaRegistered}`);
+        }
+        if (options.isPasswordlessCapable !== undefined) {
+            filters.push(`isPasswordlessCapable eq ${options.isPasswordlessCapable}`);
+        }
+        if (options.isSelfServicePasswordResetCapable !== undefined) {
+            filters.push(`isSelfServicePasswordResetCapable eq ${options.isSelfServicePasswordResetCapable}`);
+        }
+        if (options.isSelfServicePasswordResetEnabled !== undefined) {
+            filters.push(`isSelfServicePasswordResetEnabled eq ${options.isSelfServicePasswordResetEnabled}`);
+        }
+        if (options.isSelfServicePasswordResetRegistered !== undefined) {
+            filters.push(`isSelfServicePasswordResetRegistered eq ${options.isSelfServicePasswordResetRegistered}`);
+        }
+        if (options.isSystemPreferredAuthenticationMethodEnabled !== undefined) {
+            filters.push(`isSystemPreferredAuthenticationMethodEnabled eq ${options.isSystemPreferredAuthenticationMethodEnabled}`);
+        }
+        const methodsRegistered = options.methodsRegistered?.split(',').map(method => `methodsRegistered/any(m:m eq '${method.trim()}')`);
+        const methodsRegisteredFilter = methodsRegistered?.join(' or ');
+        if (methodsRegisteredFilter) {
+            filters.push(`(${methodsRegisteredFilter})`);
+        }
+        const systemPreferredAuthenticationMethods = options.systemPreferredAuthenticationMethods?.split(',').map(method => `systemPreferredAuthenticationMethods/any(m:m eq '${method.trim()}')`);
+        const systemPreferredAuthenticationMethodsFilter = systemPreferredAuthenticationMethods?.join(' or ');
+        if (systemPreferredAuthenticationMethodsFilter) {
+            filters.push(`(${systemPreferredAuthenticationMethodsFilter})`);
+        }
+        const userUPNs = [];
+        if (userUpns.length > 0) {
+            userUpns.forEach(upn => {
+                userUPNs.push(`userPrincipalName eq '${formatting.encodeQueryParameter(upn)}'`);
+            });
+        }
+        if (options.userPrincipalNames) {
+            const upns = options.userPrincipalNames.split(',').map(m => m.trim());
+            upns.forEach(upn => {
+                userUPNs.push(`userPrincipalName eq '${formatting.encodeQueryParameter(upn)}'`);
+            });
+        }
+        if (userUPNs.length > 0) {
+            filters.push(`(${userUPNs.join(' or ')})`);
+        }
+        const userPreferredMethodForSecondaryAuthentication = options.userPreferredMethodForSecondaryAuthentication?.split(',').map(method => `userPreferredMethodForSecondaryAuthentication eq '${method.trim()}'`);
+        const userPreferredMethodForSecondaryAuthenticationFilter = userPreferredMethodForSecondaryAuthentication?.join(' or ');
+        if (userPreferredMethodForSecondaryAuthenticationFilter) {
+            filters.push(`(${userPreferredMethodForSecondaryAuthenticationFilter})`);
+        }
+        if (options.userType) {
+            filters.push(`userType eq '${options.userType}'`);
+        }
+        if (filters.length > 0) {
+            queryParameters.push(`$filter=${filters.join(' and ')}`);
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        return `${this.resource}/v1.0/reports/authenticationMethods/userRegistrationDetails${queryString}`;
+    }
+}
+_EntraUserRegistrationDetailsListCommand_instances = new WeakSet(), _EntraUserRegistrationDetailsListCommand_initTelemetry = function _EntraUserRegistrationDetailsListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            isAdmin: !!args.options.isAdmin,
+            userType: typeof args.options.userType !== 'undefined',
+            userPreferredMethodForSecondaryAuthentication: typeof args.options.userPreferredMethodForSecondaryAuthentication !== 'undefined',
+            systemPreferredAuthenticationMethods: typeof args.options.systemPreferredAuthenticationMethods !== 'undefined',
+            isSelfServicePasswordResetRegistered: !!args.options.isSelfServicePasswordResetRegistered,
+            isSelfServicePasswordResetEnabled: !!args.options.isSelfServicePasswordResetEnabled,
+            isSelfServicePasswordResetCapable: !!args.options.isSelfServicePasswordResetCapable,
+            isMfaRegistered: !!args.options.isMfaRegistered,
+            isMfaCapable: !!args.options.isMfaCapable,
+            isPasswordlessCapable: !!args.options.isPasswordlessCapable,
+            isSystemPreferredAuthenticationMethodEnabled: !!args.options.isSystemPreferredAuthenticationMethodEnabled,
+            methodsRegistered: typeof args.options.methodsRegistered !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
+            userPrincipalNames: typeof args.options.userPrincipalNames !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
+        });
+    });
+}, _EntraUserRegistrationDetailsListCommand_initOptions = function _EntraUserRegistrationDetailsListCommand_initOptions() {
+    this.options.unshift({
+        option: '--isAdmin [isAdmin]'
+    }, {
+        option: '--userType [userType]',
+        autocomplete: ['member', 'guest']
+    }, {
+        option: '--userPreferredMethodForSecondaryAuthentication [userPreferredMethodForSecondaryAuthentication ]',
+        autocomplete: authenticationMethods
+    }, {
+        option: '--systemPreferredAuthenticationMethods [systemPreferredAuthenticationMethods ]',
+        autocomplete: authenticationMethods
+    }, {
+        option: '--isSelfServicePasswordResetRegistered [isSelfServicePasswordResetRegistered]'
+    }, {
+        option: '--isSelfServicePasswordResetEnabled [isSelfServicePasswordResetEnabled]'
+    }, {
+        option: '--isSelfServicePasswordResetCapable [isSelfServicePasswordResetCapable]'
+    }, {
+        option: '--isMfaRegistered [isMfaRegistered]'
+    }, {
+        option: '--isMfaCapable [isMfaCapable]'
+    }, {
+        option: '--isPasswordlessCapable [isPasswordlessCapable]'
+    }, {
+        option: '--isSystemPreferredAuthenticationMethodEnabled [isSystemPreferredAuthenticationMethodEnabled]'
+    }, {
+        option: '--methodsRegistered [methodsRegistered]',
+        autocomplete: methodsRegistered
+    }, {
+        option: '--userIds [userIds]'
+    }, {
+        option: '--userPrincipalNames [userPrincipalNames]'
+    }, {
+        option: '-p, --properties [properties]'
+    });
+}, _EntraUserRegistrationDetailsListCommand_initValidators = function _EntraUserRegistrationDetailsListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userType) {
+            if (['member', 'guest'].every(type => type !== args.options.userType)) {
+                return `'${args.options.userType}' is not a valid userType value. Allowed values member, guest`;
+            }
+        }
+        if (args.options.userPreferredMethodForSecondaryAuthentication) {
+            const methods = args.options.userPreferredMethodForSecondaryAuthentication.split(',').map(m => m.trim());
+            const invalidMethods = methods.filter(m => !authenticationMethods.includes(m));
+            if (invalidMethods.length > 0) {
+                return `'${args.options.userPreferredMethodForSecondaryAuthentication}' is not a valid userPreferredMethodForSecondaryAuthentication value. Invalid values: ${invalidMethods.join(',')}. Allowed values ${authenticationMethods.join(', ')}`;
+            }
+        }
+        if (args.options.systemPreferredAuthenticationMethods) {
+            const methods = args.options.systemPreferredAuthenticationMethods.split(',').map(m => m.trim());
+            const invalidMethods = methods.filter(m => !authenticationMethods.includes(m));
+            if (invalidMethods.length > 0) {
+                return `'${args.options.systemPreferredAuthenticationMethods}' is not a valid systemPreferredAuthenticationMethods value. Invalid values: ${invalidMethods.join(',')}. Allowed values ${authenticationMethods.join(', ')}`;
+            }
+        }
+        if (args.options.methodsRegistered) {
+            const methods = args.options.methodsRegistered.split(',').map(m => m.trim());
+            const invalidMethods = methods.filter(m => !methodsRegistered.includes(m));
+            if (invalidMethods.length > 0) {
+                return `'${args.options.methodsRegistered}' is not a valid methodsRegistered value. Invalid values: ${invalidMethods.join(',')}. Allowed values ${methodsRegistered.join(', ')}`;
+            }
+        }
+        if (args.options.userIds) {
+            const ids = args.options.userIds.split(',').map(i => i.trim());
+            if (!validation.isValidGuidArray(ids)) {
+                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
+                return `'${invalidGuid}' is not a valid GUID for option 'userIds'.`;
+            }
+        }
+        if (args.options.userPrincipalNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.userPrincipalNames.split(',').map(u => u.trim()));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'userPrincipalNames'.`;
+            }
+        }
+        return true;
+    });
+};
+export default new EntraUserRegistrationDetailsListCommand();
+//# sourceMappingURL=user-registrationdetails-list.js.map

package/dist/m365/entra/commands.js

@@ -7,6 +7,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
     ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
+    ADMINISTRATIVEUNIT_MEMBER_REMOVE: `${prefix} administrativeunit member remove`,
     ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
@@ -14,15 +15,30 @@ export default {
     APP_REMOVE: `${prefix} app remove`,
     APP_SET: `${prefix} app set`,
     APP_PERMISSION_ADD: `${prefix} app permission add`,
+    APP_PERMISSION_LIST: `${prefix} app permission list`,
     APP_ROLE_ADD: `${prefix} app role add`,
     APP_ROLE_LIST: `${prefix} app role list`,
     APP_ROLE_REMOVE: `${prefix} app role remove`,
+    APPREGISTRATION_ADD: `${prefix} appregistration add`,
+    APPREGISTRATION_GET: `${prefix} appregistration get`,
+    APPREGISTRATION_LIST: `${prefix} appregistration list`,
+    APPREGISTRATION_REMOVE: `${prefix} appregistration remove`,
+    APPREGISTRATION_SET: `${prefix} appregistration set`,
+    APPREGISTRATION_PERMISSION_ADD: `${prefix} appregistration permission add`,
+    APPREGISTRATION_ROLE_ADD: `${prefix} appregistration role add`,
+    APPREGISTRATION_ROLE_LIST: `${prefix} appregistration role list`,
+    APPREGISTRATION_ROLE_REMOVE: `${prefix} appregistration role remove`,
     APPROLEASSIGNMENT_ADD: `${prefix} approleassignment add`,
     APPROLEASSIGNMENT_LIST: `${prefix} approleassignment list`,
     APPROLEASSIGNMENT_REMOVE: `${prefix} approleassignment remove`,
+    ENTERPRISEAPP_ADD: `${prefix} enterpriseapp add`,
+    ENTERPRISEAPP_GET: `${prefix} enterpriseapp get`,
+    ENTERPRISEAPP_LIST: `${prefix} enterpriseapp list`,
+    GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
+    GROUP_USER_ADD: `${prefix} group user add`,
     GROUP_USER_LIST: `${prefix} group user list`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
@@ -78,6 +94,7 @@ export default {
     USER_RECYCLEBINITEM_CLEAR: `${prefix} user recyclebinitem clear`,
     USER_RECYCLEBINITEM_LIST: `${prefix} user recyclebinitem list`,
     USER_RECYCLEBINITEM_REMOVE: `${prefix} user recyclebinitem remove`,
+    USER_REGISTRATIONDETAILS_LIST: `${prefix} user registrationdetails list`,
     USER_REMOVE: `${prefix} user remove`,
     USER_RECYCLEBINITEM_RESTORE: `${prefix} user recyclebinitem restore`,
     USER_SET: `${prefix} user set`,

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

@@ -228,7 +228,8 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
         const requestOptions = {
             url: `${this.resource}/v1.0/external/connections/${args.options.id}/schema`,
             headers: {
-                accept: 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none',
+                prefer: 'include-unknown-enum-members'
             },
             responseType: 'json'
         };

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

@@ -0,0 +1,151 @@
+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 _FileCopyCommand_instances, _FileCopyCommand_initTelemetry, _FileCopyCommand_initOptions, _FileCopyCommand_initValidators;
+import request from '../../../request.js';
+import { urlUtil } from '../../../utils/urlUtil.js';
+import { spo } from '../../../utils/spo.js';
+import { validation } from '../../../utils/validation.js';
+import GraphCommand from '../../base/GraphCommand.js';
+import commands from '../commands.js';
+class FileCopyCommand extends GraphCommand {
+    get name() {
+        return commands.COPY;
+    }
+    get description() {
+        return 'Copies a file to another location using the Microsoft Graph';
+    }
+    constructor() {
+        super();
+        _FileCopyCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
+        __classPrivateFieldGet(this, _FileCopyCommand_instances, "m", _FileCopyCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FileCopyCommand_instances, "m", _FileCopyCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FileCopyCommand_instances, "m", _FileCopyCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const { webUrl, sourceUrl, targetUrl, newName, verbose } = args.options;
+            const sourcePath = this.getAbsoluteUrl(webUrl, sourceUrl);
+            const destinationPath = this.getAbsoluteUrl(webUrl, targetUrl);
+            if (this.verbose) {
+                logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
+            }
+            const copyUrl = await this.getCopyUrl(args.options, sourcePath, logger);
+            const { targetDriveId, targetItemId } = await this.getTargetDriveAndItemId(webUrl, targetUrl, logger, verbose);
+            const requestOptions = {
+                url: copyUrl,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                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}`;
+            }
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getCopyUrl(options, sourcePath, logger) {
+        const { webUrl, sourceUrl, verbose, nameConflictBehavior } = options;
+        const folderUrl = new URL(sourcePath);
+        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const drive = await this.getDocumentLibrary(siteId, folderUrl, sourceUrl, logger);
+        const itemId = await this.getStartingFolderId(drive, folderUrl, logger);
+        const queryParameters = nameConflictBehavior && nameConflictBehavior !== 'fail'
+            ? `@microsoft.graph.conflictBehavior=${nameConflictBehavior}`
+            : '';
+        const copyUrl = `${this.resource}/v1.0/sites/${siteId}/drives/${drive.id}/items/${itemId}/copy${queryParameters ? `?${queryParameters}` : ''}`;
+        return copyUrl;
+    }
+    async getTargetDriveAndItemId(webUrl, targetUrl, logger, verbose) {
+        const targetSiteUrl = urlUtil.getTargetSiteAbsoluteUrl(webUrl, targetUrl);
+        const targetSiteId = await spo.getSiteId(targetSiteUrl, logger, verbose);
+        const targetFolderUrl = new URL(this.getAbsoluteUrl(targetSiteUrl, targetUrl));
+        const targetDrive = await this.getDocumentLibrary(targetSiteId, targetFolderUrl, targetUrl, logger);
+        const targetDriveId = targetDrive.id;
+        const targetItemId = await this.getStartingFolderId(targetDrive, targetFolderUrl, logger);
+        return { targetDriveId, targetItemId };
+    }
+    async getDocumentLibrary(siteId, folderUrl, folderUrlFromUser, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting document library...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const drives = await request.get(requestOptions);
+        const lowerCaseFolderUrl = folderUrl.href.toLowerCase();
+        const drive = drives.value
+            .sort((a, b) => b.webUrl.localeCompare(a.webUrl))
+            .find((d) => {
+            const driveUrl = d.webUrl.toLowerCase();
+            // ensure that the drive url is a prefix of the folder url
+            return lowerCaseFolderUrl.startsWith(driveUrl) &&
+                (driveUrl.length === lowerCaseFolderUrl.length ||
+                    lowerCaseFolderUrl[driveUrl.length] === '/');
+        });
+        if (!drive) {
+            throw `Document library '${folderUrlFromUser}' not found`;
+        }
+        return drive;
+    }
+    async getStartingFolderId(documentLibrary, folderUrl, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting starting folder id...`);
+        }
+        const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(`${documentLibrary.webUrl}`, 'i'), '').replace(/\/+$/, '');
+        const requestOptions = {
+            url: `${this.resource}/v1.0/drives/${documentLibrary.id}/root${documentLibraryRelativeFolderUrl ? `:${documentLibraryRelativeFolderUrl}` : ''}?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const folder = await request.get(requestOptions);
+        return folder?.id;
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
+}
+_FileCopyCommand_instances = new WeakSet(), _FileCopyCommand_initTelemetry = function _FileCopyCommand_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'
+        });
+    });
+}, _FileCopyCommand_initOptions = function _FileCopyCommand_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 });
+}, _FileCopyCommand_initValidators = function _FileCopyCommand_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 FileCopyCommand();
+//# sourceMappingURL=file-copy.js.map

package/dist/m365/file/commands.js

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

package/dist/m365/flow/commands/owner/owner-ensure.js

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowOwnerEnsureCommand_instances, _a, _FlowOwnerEnsureCommand_initTelemetry, _FlowOwnerEnsureCommand_initOptions, _FlowOwnerEnsureCommand_initOptionSets, _FlowOwnerEnsureCommand_initValidators;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
@@ -36,13 +36,13 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
                 id = args.options.userId;
             }
             else if (args.options.userName) {
-                id = await aadUser.getUserIdByUpn(args.options.userName);
+                id = await entraUser.getUserIdByUpn(args.options.userName);
             }
             else if (args.options.groupId) {
                 id = args.options.groupId;
             }
             else {
-                id = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                id = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
             }
             let type;
             if (args.options.userId || args.options.userName) {

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

@@ -6,8 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowOwnerRemoveCommand_instances, _FlowOwnerRemoveCommand_initTelemetry, _FlowOwnerRemoveCommand_initOptions, _FlowOwnerRemoveCommand_initValidators, _FlowOwnerRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
@@ -38,13 +38,13 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
                     idToRemove = args.options.userId;
                 }
                 else if (args.options.userName) {
-                    idToRemove = await aadUser.getUserIdByUpn(args.options.userName);
+                    idToRemove = await entraUser.getUserIdByUpn(args.options.userName);
                 }
                 else if (args.options.groupId) {
                     idToRemove = args.options.groupId;
                 }
                 else {
-                    idToRemove = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                    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`,