Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,7 @@
"User_not_found_or": "User not found or incorrect password",
"User_sent_an_attachment": "{{user}} sent an attachment",
"Username": "Username",
"Username_invalid": "Use only letters, numbers, dots, hyphens and underscores",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Make the error text match the configurable validator.

Username_invalid now backs a server-defined regex, but this copy hardcodes the fallback character set. On workspaces with a custom UTF8_User_Names_Validation, users will get the wrong guidance for a rejection that came from a different pattern.

Suggested copy
-  "Username_invalid": "Use only letters, numbers, dots, hyphens and underscores",
+  "Username_invalid": "Username format is invalid for this workspace",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"Username_invalid": "Use only letters, numbers, dots, hyphens and underscores",
"Username_invalid": "Username format is invalid for this workspace",
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@app/i18n/locales/en.json` at line 1005, The Username_invalid localization
string is hardcoded to a specific allowed character set, but it should reflect
the configurable username validator instead. Update the localized copy in the
en.json locale entry so the message is generic and matches whichever regex is
enforced by the server, and keep the change scoped to the Username_invalid key
used for username validation feedback.

"Username_is_already_in_use": "Username is already in use.",
"Username_not_available": "Username not available",
"Username_or_email": "Username or email",
Expand Down
57 changes: 57 additions & 0 deletions app/lib/notifications/deduplicator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import UserPreferences from '../methods/userPreferences';

const NOTIFICATION_DEDUPLICATOR_KEY = 'processedNotificationIds';
const MAX_STORED_IDS = 100;

export const isNotificationProcessed = (id?: string | null): boolean => {
if (!id) {
return false;
}
try {
const storedJson = UserPreferences.getString(NOTIFICATION_DEDUPLICATOR_KEY);
if (!storedJson) {
return false;
}
const processedIds = JSON.parse(storedJson);
if (Array.isArray(processedIds)) {
return processedIds.includes(id);
}
UserPreferences.removeItem(NOTIFICATION_DEDUPLICATOR_KEY);
return false;
} catch (e) {
console.warn('[NotificationDeduplicator] Error reading processed notification IDs:', e);
UserPreferences.removeItem(NOTIFICATION_DEDUPLICATOR_KEY);
return false;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
};

export const markNotificationAsProcessed = (id?: string | null): void => {
if (!id) {
return;
}
try {
const storedJson = UserPreferences.getString(NOTIFICATION_DEDUPLICATOR_KEY);
let processedIds: string[] = [];
if (storedJson) {
const parsed = JSON.parse(storedJson);
if (Array.isArray(parsed)) {
processedIds = parsed;
} else {
UserPreferences.removeItem(NOTIFICATION_DEDUPLICATOR_KEY);
}
}

// Avoid duplicates in the array
if (!processedIds.includes(id)) {
processedIds.push(id);
// Limit size to MAX_STORED_IDS
if (processedIds.length > MAX_STORED_IDS) {
processedIds = processedIds.slice(processedIds.length - MAX_STORED_IDS);
}
UserPreferences.setString(NOTIFICATION_DEDUPLICATOR_KEY, JSON.stringify(processedIds));
}
} catch (e) {
console.warn('[NotificationDeduplicator] Error writing processed notification IDs:', e);
UserPreferences.removeItem(NOTIFICATION_DEDUPLICATOR_KEY);
}
};
25 changes: 25 additions & 0 deletions app/lib/notifications/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { deepLinkingClickCallPush, deepLinkingOpen } from '../../actions/deepLin
import { type INotification, SubscriptionType } from '../../definitions';
import { store } from '../store/auxStore';
import { deviceToken, pushNotificationConfigure, removeAllNotifications, setNotificationsBadgeCount } from './push';
import { isNotificationProcessed, markNotificationAsProcessed } from './deduplicator';

interface IEjson {
rid: string;
Expand All @@ -24,6 +25,18 @@ export const onNotification = (push: INotification): void => {
if (push?.payload?.ejson) {
try {
const notification = EJSON.parse(push.payload.ejson);
const notificationId = push.identifier;
const callId = notification?.callId;

if (isNotificationProcessed(notificationId) || (callId && isNotificationProcessed(callId))) {
return;
}

markNotificationAsProcessed(notificationId);
if (callId) {
markNotificationAsProcessed(callId);
}

store.dispatch(
deepLinkingClickCallPush({ ...notification, event: identifier === 'ACCEPT_ACTION' ? 'accept' : 'decline' })
);
Expand All @@ -40,6 +53,18 @@ export const onNotification = (push: INotification): void => {

// Handle video conf notification tap (default action) - treat as accept
if (notification?.notificationType === 'videoconf') {
const notificationId = push.identifier;
const callId = notification?.callId;

if (isNotificationProcessed(notificationId) || (callId && isNotificationProcessed(callId))) {
return;
}

markNotificationAsProcessed(notificationId);
if (callId) {
markNotificationAsProcessed(callId);
}

store.dispatch(deepLinkingClickCallPush({ ...notification, event: 'accept' }));
return;
}
Expand Down
43 changes: 31 additions & 12 deletions app/lib/notifications/push.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import * as Notifications from 'expo-notifications';
import * as Device from 'expo-device';
import { Platform } from 'react-native';
import EJSON from 'ejson';

import { type INotification } from '../../definitions';
import { isIOS } from '../methods/helpers';
import { store as reduxStore } from '../store/auxStore';
import { registerPushToken } from '../services/restApi';
import I18n from '../../i18n';
import NativePushNotificationModule from '../native/NativePushNotificationAndroid';
import { isNotificationProcessed } from './deduplicator';

export let deviceToken = '';

Expand Down Expand Up @@ -159,6 +161,33 @@ const registerForPushNotifications = async (): Promise<string | null> => {
}
};

/**
* Retrieve the last notification response, but return null if it was already processed.
*/
const getLastDeduplicatedResponse = (): INotification | null => {
try {
const lastResponse = Notifications.getLastNotificationResponse();
if (lastResponse) {
const transformed = transformNotificationResponse(lastResponse);
if (transformed.payload?.ejson) {
const ejsonData = EJSON.parse(transformed.payload.ejson);
if (ejsonData?.notificationType === 'videoconf') {
if (transformed.identifier && isNotificationProcessed(transformed.identifier)) {
return null;
}
if (ejsonData?.callId && isNotificationProcessed(ejsonData.callId)) {
return null;
}
}
}
return transformed;
}
} catch (e) {
console.log('Error getting deduplicated last notification response:', e);
}
return null;
};

export const pushNotificationConfigure = (onNotification: (notification: INotification) => void): Promise<any> => {
if (configured) {
return Promise.resolve({ configured: true });
Expand Down Expand Up @@ -261,12 +290,7 @@ export const pushNotificationConfigure = (onNotification: (notification: INotifi
}

// Fallback to expo-notifications (for iOS or if native module doesn't have data)
const lastResponse = Notifications.getLastNotificationResponse();
if (lastResponse) {
return transformNotificationResponse(lastResponse);
}

return null;
return getLastDeduplicatedResponse();
})
.catch(e => {
console.error('[push.ts] Error in promise chain:', e);
Expand All @@ -275,10 +299,5 @@ export const pushNotificationConfigure = (onNotification: (notification: INotifi
}

// Fallback to expo-notifications (for iOS or if native module doesn't have data)
const lastResponse = Notifications.getLastNotificationResponse();
if (lastResponse) {
return Promise.resolve(transformNotificationResponse(lastResponse));
}

return Promise.resolve(null);
return Promise.resolve(getLastDeduplicatedResponse());
};
28 changes: 28 additions & 0 deletions app/lib/notifications/videoConf/getInitialNotification.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { DeviceEventEmitter, Platform } from 'react-native';
import { deepLinkingClickCallPush } from '../../../actions/deepLinking';
import { store } from '../../store/auxStore';
import NativeVideoConfModule from '../../native/NativeVideoConfAndroid';
import { isNotificationProcessed, markNotificationAsProcessed } from '../deduplicator';

/**
* Sets up listener for video conference actions from native side.
Expand All @@ -16,6 +17,13 @@ export const setupVideoConfActionListener = (): (() => void) | undefined => {
try {
const data = JSON.parse(actionJson);
if (data?.notificationType === 'videoconf') {
const callId = data?.callId;
if (callId && isNotificationProcessed(callId)) {
return;
}
if (callId) {
markNotificationAsProcessed(callId);
}
store.dispatch(deepLinkingClickCallPush(data));
}
} catch (error) {
Expand All @@ -41,6 +49,13 @@ export const getInitialNotification = async (): Promise<boolean> => {
if (pendingAction) {
const data = JSON.parse(pendingAction);
if (data?.notificationType === 'videoconf') {
const callId = data?.callId;
if (callId && isNotificationProcessed(callId)) {
return false;
}
if (callId) {
markNotificationAsProcessed(callId);
}
store.dispatch(deepLinkingClickCallPush(data));
return true;
}
Expand All @@ -66,6 +81,19 @@ export const getInitialNotification = async (): Promise<boolean> => {
if (payload.ejson) {
const ejsonData = EJSON.parse(payload.ejson);
if (ejsonData?.notificationType === 'videoconf') {
const notificationId = notification.request.identifier;
const callId = ejsonData?.callId;

if (isNotificationProcessed(notificationId) || (callId && isNotificationProcessed(callId))) {
return false;
}

// Mark as processed
markNotificationAsProcessed(notificationId);
if (callId) {
markNotificationAsProcessed(callId);
}

// Accept/Decline actions or default tap (treat as accept)
let event = 'accept';
if (actionIdentifier === 'DECLINE_ACTION') {
Expand Down
25 changes: 24 additions & 1 deletion app/views/ProfileView/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { twoFactor } from '../../lib/services/twoFactor';
import handleSaveUserProfileError from '../../lib/methods/helpers/handleSaveUserProfileError';
import EventEmitter from '../../lib/methods/helpers/events';
import { setUser } from '../../actions/login';
import I18n from '../../i18n';

jest.mock('react-redux', () => ({
useDispatch: jest.fn()
Expand Down Expand Up @@ -69,7 +70,8 @@ const buildState = () => ({
Accounts_AllowUserAvatarChange: true,
Accounts_AllowUsernameChange: true,
Accounts_CustomFields: '',
Accounts_AllowDeleteOwnAccount: true
Accounts_AllowDeleteOwnAccount: true,
UTF8_User_Names_Validation: '[0-9a-zA-Z-_.]+'
}
});

Expand Down Expand Up @@ -110,6 +112,27 @@ describe('ProfileView submit', () => {
expect(handleSaveUserProfileError).not.toHaveBeenCalled();
});

it('does not save when the username contains invalid characters', async () => {
const { getByTestId, findByText } = renderProfile();

fireEvent.changeText(getByTestId('profile-view-username'), 'cygnus b');
fireEvent.press(getByTestId('profile-view-submit'));

await findByText(I18n.t('Username_invalid'));
expect(saveUserProfile).not.toHaveBeenCalled();
});

it('saves when the username is corrected to a valid value', async () => {
(saveUserProfile as jest.Mock).mockResolvedValue(true);

const { getByTestId } = renderProfile();

fireEvent.changeText(getByTestId('profile-view-username'), 'cygnus.b');
fireEvent.press(getByTestId('profile-view-submit'));

await waitFor(() => expect(saveUserProfile).toHaveBeenCalledWith({ username: 'cygnus.b' }, {}));
});

it('asks for the current password before changing the email', async () => {
const { getByTestId } = renderProfile();

Expand Down
32 changes: 26 additions & 6 deletions app/views/ProfileView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,25 @@ import ConfirmEmailChangeActionSheetContent from './components/ConfirmEmailChang
const MAX_BIO_LENGTH = 260;
const MAX_NICKNAME_LENGTH = 120;

// Mirror the server's username validation, which matches the value against the
// UTF8_User_Names_Validation setting anchored as a full match (`^pattern$`),
// falling back to the default pattern when the setting is empty or invalid.
// https://github.com/RocketChat/Rocket.Chat/blob/develop/apps/meteor/app/lib/server/functions/validateUsername.ts
const DEFAULT_USERNAME_VALIDATION = '[0-9a-zA-Z-_.]+';

const isValidUsername = (username: string, pattern: string): boolean => {
try {
return new RegExp(`^(${pattern || DEFAULT_USERNAME_VALIDATION})$`).test(username);
} catch {
// Fall back to the default pattern if the server provides an invalid regex.
return new RegExp(`^(${DEFAULT_USERNAME_VALIDATION})$`).test(username);
}
};

interface IProfileViewProps {
navigation: NativeStackNavigationProp<ProfileStackParamList, 'ProfileView'>;
}
const ProfileView = ({ navigation }: IProfileViewProps): ReactElement => {
const validationSchema = yup.object().shape({
name: yup.string().required(I18n.t('Name_required')),
email: yup.string().email(I18n.t('Email_must_be_a_valid_email')).required(I18n.t('Email_required')),
username: yup.string().required(I18n.t('Username_required'))
});

const { showActionSheet, hideActionSheet } = useActionSheet();
const { colors } = useTheme();
const dispatch = useDispatch();
Expand All @@ -67,6 +76,7 @@ const ProfileView = ({ navigation }: IProfileViewProps): ReactElement => {
Accounts_AllowUserAvatarChange,
Accounts_AllowUsernameChange,
Accounts_CustomFields,
UTF8_User_Names_Validation,
serverVersion,
user
} = useAppSelector(state => ({
Expand All @@ -77,9 +87,19 @@ const ProfileView = ({ navigation }: IProfileViewProps): ReactElement => {
Accounts_AllowUserAvatarChange: state.settings.Accounts_AllowUserAvatarChange as boolean,
Accounts_AllowUsernameChange: state.settings.Accounts_AllowUsernameChange as boolean,
Accounts_CustomFields: state.settings.Accounts_CustomFields as string,
UTF8_User_Names_Validation: state.settings.UTF8_User_Names_Validation as string,
serverVersion: state.server.version,
Accounts_AllowDeleteOwnAccount: state.settings.Accounts_AllowDeleteOwnAccount as boolean
}));

const validationSchema = yup.object().shape({
name: yup.string().required(I18n.t('Name_required')),
email: yup.string().email(I18n.t('Email_must_be_a_valid_email')).required(I18n.t('Email_required')),
username: yup
.string()
.required(I18n.t('Username_required'))
.test('valid-username', I18n.t('Username_invalid'), value => isValidUsername(value ?? '', UTF8_User_Names_Validation))
Comment on lines +95 to +101

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Only validate usernames that the user is actually changing.

Line 101 re-checks the current username against the latest server regex on every submit. If a workspace tightens UTF8_User_Names_Validation, any legacy username that no longer matches will block unrelated profile edits, and that becomes impossible to recover from when Accounts_AllowUsernameChange is false because the field is locked in the same component.

Suggested fix
 			username: yup
 				.string()
 				.required(I18n.t('Username_required'))
-				.test('valid-username', I18n.t('Username_invalid'), value => isValidUsername(value ?? '', UTF8_User_Names_Validation))
+				.test('valid-username', I18n.t('Username_invalid'), value => {
+					if ((value ?? '') === (user?.username ?? '')) {
+						return true;
+					}
+					return isValidUsername(value ?? '', UTF8_User_Names_Validation);
+				})
 	});
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const validationSchema = yup.object().shape({
name: yup.string().required(I18n.t('Name_required')),
email: yup.string().email(I18n.t('Email_must_be_a_valid_email')).required(I18n.t('Email_required')),
username: yup
.string()
.required(I18n.t('Username_required'))
.test('valid-username', I18n.t('Username_invalid'), value => isValidUsername(value ?? '', UTF8_User_Names_Validation))
username: yup
.string()
.required(I18n.t('Username_required'))
.test('valid-username', I18n.t('Username_invalid'), value => {
if ((value ?? '') === (user?.username ?? '')) {
return true;
}
return isValidUsername(value ?? '', UTF8_User_Names_Validation);
})
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@app/views/ProfileView/index.tsx` around lines 95 - 101, The username
validation in ProfileView’s validationSchema is applied on every submit, which
blocks saving unrelated profile changes when the existing username no longer
matches the latest UTF8_User_Names_Validation. Update the logic in ProfileView
so username is only validated when it is actually editable or changed (for
example, when Accounts_AllowUsernameChange allows edits and the field value
differs from the current account username), and keep the existing Yup test and
isValidUsername check scoped to that case.

});
const isMasterDetail = useMasterDetail();
const {
control,
Expand Down