Merge pull request #211 from tellform/fixed_user_signup_error_ui
Fix user signup errors [wip]
This commit is contained in:
commit
dfdefaa305
|
@ -25,7 +25,9 @@ exports.getErrorMessage = function(err) {
|
||||||
|
|
||||||
if(!err) {
|
if(!err) {
|
||||||
return '';
|
return '';
|
||||||
} else if (err.code) {
|
} else if(typeof err === 'string'){
|
||||||
|
message = err;
|
||||||
|
} else if (err.code) {
|
||||||
switch (err.code) {
|
switch (err.code) {
|
||||||
case 11000:
|
case 11000:
|
||||||
case 11001:
|
case 11001:
|
||||||
|
|
|
@ -19,6 +19,7 @@ var config_nev = function () {
|
||||||
nev.configure({
|
nev.configure({
|
||||||
persistentUserModel: User,
|
persistentUserModel: User,
|
||||||
tempUserCollection: config.tempUserCollection,
|
tempUserCollection: config.tempUserCollection,
|
||||||
|
emailAndUsernameUnique: true,
|
||||||
expirationTime: 86400, // 24 hours
|
expirationTime: 86400, // 24 hours
|
||||||
|
|
||||||
verificationURL: config.baseUrl+'/#!/verify/${URL}',
|
verificationURL: config.baseUrl+'/#!/verify/${URL}',
|
||||||
|
@ -103,10 +104,10 @@ exports.signup = function(req, res) {
|
||||||
|
|
||||||
// Add missing user fields
|
// Add missing user fields
|
||||||
user.provider = 'local';
|
user.provider = 'local';
|
||||||
|
|
||||||
// Then save the temporary user
|
// Then save the temporary user
|
||||||
nev.createTempUser(user, function (err, existingPersistentUser, newTempUser) {
|
nev.createTempUser(user, function (err, existingPersistentUser, newTempUser) {
|
||||||
if (err) {
|
debugger;
|
||||||
|
if (err) {
|
||||||
return res.status(400).send({
|
return res.status(400).send({
|
||||||
message: errorHandler.getErrorMessage(err)
|
message: errorHandler.getErrorMessage(err)
|
||||||
});
|
});
|
||||||
|
@ -125,6 +126,7 @@ exports.signup = function(req, res) {
|
||||||
return res.status(200).send('An email has been sent to you. Please check it to verify your account.');
|
return res.status(200).send('An email has been sent to you. Please check it to verify your account.');
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
console.log(err);
|
||||||
return res.status(400).send({message: 'Error: User already exists!'});
|
return res.status(400).send({message: 'Error: User already exists!'});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<div class="col-xs-offset-3 col-xs-6 col-sm-offset-4 col-sm-4">
|
<div class="col-xs-offset-3 col-xs-6 col-sm-offset-4 col-sm-4">
|
||||||
<form name="userForm" data-ng-submit="signup()" class="signin form-horizontal" autocomplete="off">
|
<form name="userForm" data-ng-submit="signup()" class="signin form-horizontal" autocomplete="off">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<div data-ng-show="error" id="signup_errors" class="text-center text-danger">
|
<div data-ng-show="error" id="signup_errors" class="text-center">
|
||||||
{{'SIGNUP_ERROR_TEXT' | translate}}: <br>
|
{{'SIGNUP_ERROR_TEXT' | translate}}: <br>
|
||||||
<strong data-ng-bind="error"></strong>
|
<strong data-ng-bind="error"></strong>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue