TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5702 from kevinansfield/zelda-signin-updates

Browse Source 
Fixes for sign-in error handling
This commit is contained in:
John O'Nolan 2015-08-24 08:00:13 +02:00
commit 6a7fa1a183
4 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ghost/admin/app/controllers/signin.js
View File

@ -27,6 +27,14 @@ export default Ember.Controller.extend(ValidationEngine, {
if (err.errors) {
self.set('flowErrors', err.errors[0].message.string);
if (err.errors[0].message.string.match(/no user with that email/)) {
self.get('model.errors').add('identification', '');
}
if (err.errors[0].message.string.match(/password is incorrect/)) {
self.get('model.errors').add('password', '');
}
}
// if authentication fails a rejected promise will be returned.
// it needs to be caught so it doesn't generate an exception in the console,
@ -41,7 +49,7 @@ export default Ember.Controller.extend(ValidationEngine, {
// browsers and password managers that don't send proper events on autofill
$('#login').find('input').trigger('change');
this.validate().then(function () {
this.validate({property: 'signin'}).then(function () {
self.get('notifications').closeNotifications();
self.toggleProperty('loggingIn');
self.send('authenticate');
@ -60,7 +68,7 @@ export default Ember.Controller.extend(ValidationEngine, {
self = this;
this.set('flowErrors', '');
this.validate({property: 'identification'}).then(function () {
this.validate({property: 'forgotPassword'}).then(function () {
self.toggleProperty('submitting');
ajax({
@ -77,7 +85,13 @@ export default Ember.Controller.extend(ValidationEngine, {
}).catch(function (resp) {
self.toggleProperty('submitting');
if (resp && resp.jqXHR && resp.jqXHR.responseJSON && resp.jqXHR.responseJSON.errors) {
self.set('flowErrors', resp.jqXHR.responseJSON.errors[0].message);
var message = resp.jqXHR.responseJSON.errors[0].message;
self.set('flowErrors', message);
if (message.match(/no user with that email/)) {
self.get('model.errors').add('identification', '');
}
} else {
notifications.showAPIError(resp, {defaultErrorText: 'There was a problem with the reset, please try again.'});
}

4
ghost/admin/app/styles/layouts/auth.css
View File

@ -26,6 +26,10 @@
position: relative;
}
.forgotten-wrap input {
padding-right: 7rem;
}
.forgotten-wrap .forgotten-link {
position: absolute;
top: 10px;

4
ghost/admin/app/templates/signin.hbs
View File

@ -4,13 +4,13 @@
<form id="login" class="gh-signin" method="post" novalidate="novalidate" {{action "validateAndAuthenticate" on="submit"}}>
{{#gh-form-group errors=model.errors property="identification"}}
<span class="input-icon icon-mail">
{{gh-trim-focus-input class="gh-input email" type="email" placeholder="Email Address" name="identification" autocapitalize="off" autocorrect="off" tabindex="1" value=model.identification focusOut=(action "validate" "identification")}}
{{gh-trim-focus-input class="gh-input email" type="email" placeholder="Email Address" name="identification" autocapitalize="off" autocorrect="off" tabindex="1" value=model.identification}}
</span>
{{gh-error-message errors=model.errors property="identification"}}
{{/gh-form-group}}
{{#gh-form-group errors=model.errors property="password"}}
<span class="input-icon icon-lock forgotten-wrap">
{{input class="gh-input password" type="password" placeholder="Password" name="password" tabindex="2" value=model.password focusOut=(action "validate" "password")}}
{{input class="gh-input password" type="password" placeholder="Password" name="password" tabindex="2" value=model.password}}
<button type="button" {{action "forgotten"}} class="forgotten-link btn btn-link" tabindex="4" disabled={{submitting}}>Forgot?</button>
</span>
{{gh-error-message errors=model.errors property="password"}}

36
ghost/admin/app/validators/signin.js
View File

@ -1,23 +1,41 @@
import BaseValidator from './base';
var SigninValidator = BaseValidator.create({
properties: ['identification', 'password'],
properties: ['identification', 'signin', 'forgotPassword'],
identification: function (model) {
var id = model.get('identification');
if (validator.empty(id)) {
model.get('errors').add('identification', 'Please enter an email');
this.invalidate();
} else if (!validator.isEmail(id)) {
if (!validator.empty(id) && !validator.isEmail(id)) {
model.get('errors').add('identification', 'Invalid email');
this.invalidate();
}
},
password: function (model) {
var password = model.get('password') || '';
if (!validator.isLength(password, 1)) {
model.get('errors').add('password', 'Please enter a password');
signin: function (model) {
var id = model.get('identification'),
password = model.get('password');
model.get('errors').clear();
if (validator.empty(id)) {
model.get('errors').add('identification', '');
this.invalidate();
}
if (validator.empty(password)) {
model.get('errors').add('password', '');
this.invalidate();
}
},
forgotPassword: function (model) {
var id = model.get('identification');
model.get('errors').clear();
if (validator.empty(id) || !validator.isEmail(id)) {
model.get('errors').add('identification', '');
this.invalidate();
}
}