Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Handle and i18n M_THREEPID_IN_USE during registration #6986

Merged
merged 2 commits into from
Oct 19, 2021
Merged

Handle and i18n M_THREEPID_IN_USE during registration #6986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67defb2
Handle and i18n M_THREEPID_IN_USE during registration
t3chguy Oct 19, 2021
6d9b856
i18n
t3chguy Oct 19, 2021
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
13 changes: 8 additions & 5 deletions src/components/structures/auth/Registration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export default class Registration extends React.Component<IProps, IState> {

private onUIAuthFinished = async (success: boolean, response: any) => {
if (!success) {
let msg = response.message || response.toString();
let errorText = response.message || response.toString();
// can we give a better error message?
if (response.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
const errorTop = messageForResourceLimitError(
Expand All @@ -291,7 +291,7 @@ export default class Registration extends React.Component<IProps, IState> {
'': _td("Please <a>contact your service administrator</a> to continue using this service."),
},
);
msg = <div>
errorText = <div>
<p>{ errorTop }</p>
<p>{ errorDetail }</p>
</div>;
Expand All @@ -301,15 +301,18 @@ export default class Registration extends React.Component<IProps, IState> {
msisdnAvailable = msisdnAvailable || flow.stages.includes('m.login.msisdn');
}
if (!msisdnAvailable) {
msg = _t('This server does not support authentication with a phone number.');
errorText = _t('This server does not support authentication with a phone number.');
}
} else if (response.errcode === "M_USER_IN_USE") {
msg = _t("That username already exists, please try another.");
errorText = _t("That username already exists, please try another.");
} else if (response.errcode === "M_THREEPID_IN_USE") {
errorText = _t("That e-mail address is already in use.");
}

this.setState({
busy: false,
doingUIAuth: false,
errorText: msg,
errorText,
});
return;
}
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3055,6 +3055,7 @@
"Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
"This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
"That username already exists, please try another.": "That username already exists, please try another.",
"That e-mail address is already in use.": "That e-mail address is already in use.",
"Continue with %(ssoButtons)s": "Continue with %(ssoButtons)s",
"%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Or %(usernamePassword)s",
"Already have an account? <a>Sign in here</a>": "Already have an account? <a>Sign in here</a>",
Expand Down