Skip to content

Fix: connectionResolver receives incorrect field value when switching between Login and Sign-up tabs #2697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ankita10119 merged 2 commits into from
Dec 3, 2025
Merged

Fix: connectionResolver receives incorrect field value when switching between Login and Sign-up tabs #2697

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2e0a0d
Fix: connectionResolver tests username in wrong tab-2631
ankita10119 Dec 1, 2025
98e756a
Fix: exact matching for signup screen
ankita10119 Dec 2, 2025
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
10 changes: 8 additions & 2 deletions src/ui/box/container.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { CloseButton } from './button';
import * as l from '../../core/index';
import * as c from '../../field/index';
import { swap, updateEntity } from '../../store/index';
import { databaseUsernameValue } from '../../connection/database/index';

const badgeSvg = (
<svg focusable="false" width="58px" height="21px" viewBox="0 0 462 168">
Expand Down Expand Up @@ -69,15 +70,20 @@ export default class Container extends React.Component {
this.state = { isOpen: false };
}
checkConnectionResolver(done) {
const { contentProps } = this.props;
const { contentProps, screenName } = this.props;
const lock = contentProps.model;
const connectionResolver = l.connectionResolver(lock);
if (!connectionResolver) {
return done();
}
const { connections, id } = lock.get('client').toJS();
const context = { connections, id };
const userInputValue = c.getFieldValue(lock, 'username') || c.getFieldValue(lock, 'email');

// On signUp screen, use emailFirst option to prioritize email over username
// On login screen, use default behavior (username first)
const isSignUpScreen = screenName && screenName.includes('signUp');
const userInputValue = databaseUsernameValue(lock, isSignUpScreen ? { emailFirst: true } : {});

connectionResolver(userInputValue, context, resolvedConnection => {
swap(updateEntity, 'lock', l.id(lock), m => l.setResolvedConnection(m, resolvedConnection));
done();
Expand Down