imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't break if the user misses out an email address

Browse source
This commit is contained in:
Matthew Hodgson 2015-11-11 00:05:14 +01:00
parent b669f587de
commit a4968ca967
1 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/controllers/templates/Register.js
View file

@ -177,6 +177,9 @@ module.exports = {
if (formVals.username == '') { if (formVals.username == '') {
badFields.username = this.FieldErrors.Missing; badFields.username = this.FieldErrors.Missing;
} }
if (formVals.email == '') {
badFields.email = this.FieldErrors.Missing;
}
if (Object.keys(badFields).length > 0) { if (Object.keys(badFields).length > 0) {
this.onBadFields(badFields); this.onBadFields(badFields);
return; return;
@ -228,12 +231,13 @@ module.exports = {
}); });
self.setStep('stage_m.login.email.identity'); self.setStep('stage_m.login.email.identity');
}, function(error) { }, function(error) {
console.error(error);
self.setStep('initial'); self.setStep('initial');
var newState = {busy: false}; var newState = {busy: false};
if (error.errcode == 'THREEPID_IN_USE') { if (error.errcode == 'THREEPID_IN_USE') {
self.onBadFields({email: self.FieldErrors.InUse}); self.onBadFields({email: self.FieldErrors.InUse});
} else { } else {
newState.errorText = 'Unable to contact the given Home Server'; newState.errorText = 'Unable to contact the given identity server';
} }
self.setState(newState); self.setState(newState);
}); });
@ -292,18 +296,27 @@ module.exports = {
var flow = self.chooseFlow(error.data.flows); var flow = self.chooseFlow(error.data.flows);
var flowStage = self.firstUncompletedStageIndex(flow); if (flow) {
var numDone = self.numCompletedStages(flow); var flowStage = self.firstUncompletedStageIndex(flow);
var numDone = self.numCompletedStages(flow);
self.setState({ self.setState({
busy: false, busy: false,
flows: flow, flows: flow,
currentStep: 1+numDone, currentStep: 1+numDone,
totalSteps: flow.stages.length+1, totalSteps: flow.stages.length+1,
flowStage: flowStage flowStage: flowStage
}); });
self.startStage(flow.stages[flowStage]); self.startStage(flow.stages[flowStage]);
}
else {
self.setState({
busy: false,
errorText: "Unable to register - missing email address?"
});
}
} else { } else {
console.log(error);
self.setStep("initial"); self.setStep("initial");
var newState = { var newState = {
busy: false, busy: false,