Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Transition to signin with error message on invalid token not 500 error screen

Browse source 
closes #3548
- Add error to hidenav, removes menubar from error screen.
- Wrap atob() in a try/catch
- Added regex to try and validate if params.token at least looks like base64
This commit is contained in:
shindakun 2014-08-06 08:08:02 -07:00
parent 0a9bde7702
commit 5d7630607b
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/admin/controllers/application.js
View file

@ -1,5 +1,5 @@
var ApplicationController = Ember.Controller.extend({ var ApplicationController = Ember.Controller.extend({
hideNav: Ember.computed.match('currentPath', /(signin|signup|setup|forgotten|reset)/), hideNav: Ember.computed.match('currentPath', /(error|signin|signup|setup|forgotten|reset)/),
topNotificationCount: 0, topNotificationCount: 0,

21
ghost/admin/routes/signup.js
View file

@ -10,10 +10,23 @@ var SignupRoute = Ember.Route.extend(styleBody, loadingIndicator, {
} }
}, },
setupController: function (controller, params) { setupController: function (controller, params) {
var tokenText = atob(params.token), var tokenText,
email = tokenText.split('|')[1]; email,
controller.token = params.token; re = /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/;
controller.email = email; if (re.test(params.token)) {
try {
tokenText = atob(params.token);
email = tokenText.split('|')[1];
controller.token = params.token;
controller.email = email;
} catch (e) {
this.transitionTo('signin');
this.notifications.showError('Invalid token.', {delayed: true});
}
} else {
this.transitionTo('signin');
this.notifications.showError('Invalid token.', {delayed: true});
}
} }
}); });