chore: replace deprecated methods in 8.0.0 (#6644)

* feat: deprecate getUserRoles

* feat: remove deprecated method setUserPassword and setUserProfileMethod

* fix: comments

* fix: encrypt currentPassword

* fix: change serverVersion to compare in getUserRoles

Author: OtavioStasiak

app/definitions/IUser.ts

@@ -149,7 +149,11 @@ export interface IUser extends IRocketChatRecord, ILoggedUser {
 	ldap?: boolean;
 	muted?: boolean;
 }
-
+export interface IRoleUser {
+	_id: string;
+	username: string;
+	roles: string[];
+}
 export interface IRegisterUser extends IUser {
 	username: string;
 	name: string;

app/definitions/rest/v1/roles.ts

@@ -1,6 +1,6 @@
 import { IRole } from '../../IRole';
 import { RocketChatRecordDeleted } from '../../IRocketChatRecord';
-import { IUser } from '../../IUser';
+import { IRoleUser, IUser } from '../../IUser';
 
 type RoleCreateProps = Pick<IRole, 'name'> & Partial<Pick<IRole, 'description' | 'scope' | 'mandatory2fa'>>;
 
@@ -73,4 +73,11 @@ export type RolesEndpoints = {
 			role: IRole;
 		};
 	};
+
+	'roles.getUsersInPublicRoles': {
+		GET: () => {
+			users: IRoleUser[];
+			success: boolean;
+		};
+	};
 };

app/lib/services/restApi.ts

@@ -5,6 +5,7 @@ import {
 	INotificationPreferences,
 	IPreviewItem,
 	IProfileParams,
+	IRoleUser,
 	IRoom,
 	IRoomNotifications,
 	IServerRoom,
@@ -1069,15 +1070,6 @@ export const videoConferenceStart = (roomId: string) => sdk.post('video-conferen
 
 export const videoConferenceCancel = (callId: string) => sdk.post('video-conference.cancel', { callId });
 
-export const saveUserProfileMethod = (
-	params: IProfileParams,
-	customFields = {},
-	twoFactorOptions: {
-		twoFactorCode: string;
-		twoFactorMethod: string;
-	} | null
-) => sdk.current.methodCall('saveUserProfile', params, customFields, twoFactorOptions);
-
 export const deleteOwnAccount = (password: string, confirmRelinquish = false): any =>
 	// RC 0.67.0
 	sdk.post('users.deleteOwnAccount', { password, confirmRelinquish });
@@ -1087,9 +1079,19 @@ export const postMessage = (roomId: string, text: string) => sdk.post('chat.post
 export const notifyUser = (type: string, params: Record<string, any>): Promise<boolean> =>
 	sdk.methodCall('stream-notify-user', type, params);
 
-export const getUsersRoles = (): Promise<boolean> => sdk.methodCall('getUserRoles');
+export const getUsersRoles = async (): Promise<boolean | IRoleUser[]> => {
+	const serverVersion = reduxStore.getState().server.version;
+	if (compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '7.10.0')) {
+		// RC 7.10.0
+		const response = await sdk.get('roles.getUsersInPublicRoles');
+		if (response.success) {
+			return response.users;
+		}
+		return false;
+	}
+	// https://github.com/RocketChat/Rocket.Chat/blob/7787147da2be90f5f4d137ba477e708083dcf814/apps/meteor/app/lib/server/methods/getUserRoles.ts#L20
+	return sdk.methodCall('getUserRoles');
+};
 
 export const getSupportedVersionsCloud = (uniqueId?: string, domain?: string) =>
 	fetch(`https://releases.rocket.chat/v2/server/supportedVersions?uniqueId=${uniqueId}&domain=${domain}&source=mobile`);
-
-export const setUserPassword = (password: string) => sdk.methodCall('setUserPassword', password);

app/views/ChangePasswordView/index.tsx

@@ -7,6 +7,7 @@ import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useDispatch } from 'react-redux';
 import { sha256 } from 'js-sha256';
 
+import { IProfileParams } from '../../definitions/IProfile';
 import { twoFactor } from '../../lib/services/twoFactor';
 import { ProfileStackParamList } from '../../stacks/types';
 import { ControlledFormTextInput } from '../../containers/TextInput';
@@ -104,11 +105,11 @@ const ChangePasswordView = ({ navigation }: IChangePasswordViewProps) => {
 	};
 
 	const changePassword = async () => {
-		const { newPassword } = inputValues;
+		const { newPassword, currentPassword } = inputValues;
 
 		try {
 			setValue('saving', true);
-			await Services.setUserPassword(newPassword);
+			await Services.saveUserProfile({ newPassword, currentPassword: sha256(currentPassword) } as IProfileParams);
 			dispatch(setUser({ requirePasswordChange: false }));
 			navigation.goBack();
 		} catch (error: any) {
@@ -131,10 +132,8 @@ const ChangePasswordView = ({ navigation }: IChangePasswordViewProps) => {
 			const { username, emails } = user;
 			if (fromProfileView) {
 				const params = { currentPassword: sha256(currentPassword), newPassword, username, email: emails?.[0].address || '' };
-				const twoFactorOptions = currentPassword
-					? { twoFactorCode: params?.currentPassword, twoFactorMethod: TwoFactorMethods.PASSWORD }
-					: null;
-				const result = await Services.saveUserProfileMethod(params, {}, twoFactorCode || twoFactorOptions);
+
+				const result = await Services.saveUserProfile(params);
 
 				if (result) {
 					logEvent(events.PROFILE_SAVE_CHANGES);

app/views/ProfileView/index.tsx

@@ -194,11 +194,7 @@ const ProfileView = ({ navigation }: IProfileViewProps): React.ReactElement => {
 		}
 
 		try {
-			const twoFactorOptions = params.currentPassword
-				? { twoFactorCode: params.currentPassword, twoFactorMethod: TwoFactorMethods.PASSWORD }
-				: null;
-
-			const result = await Services.saveUserProfileMethod(params, customFields, twoFactorCode || twoFactorOptions);
+			const result = await Services.saveUserProfile(params, customFields);
 
 			if (result) {
 				logEvent(events.PROFILE_SAVE_CHANGES);