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

Merge pull request #3140 from sebgie/issue#3125

Browse source 
Signin after Signup
This commit is contained in:
Hannah Wolfe 2014-06-30 16:04:51 +01:00
commit 1a2d747ef7
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/client/controllers/setup.js
View file

@ -27,18 +27,17 @@ var SetupController = Ember.ObjectController.extend(ValidationEngine, {
'X-CSRF-Token': self.get('csrf') 'X-CSRF-Token': self.get('csrf')
}, },
data: self.getProperties('blogTitle', 'name', 'email', 'password') data: self.getProperties('blogTitle', 'name', 'email', 'password')
}).then(function (resp) { }).then(function () {
self.toggleProperty('submitting'); self.get('session').authenticate('ember-simple-auth-authenticator:oauth2-password-grant', {
if (resp && resp.userData) { identification: self.get('email'),
self.store.pushPayload({ users: [resp.userData]}); password: self.get('password')
self.store.find('user', resp.userData.id).then(function (user) { }).then(function () {
self.store.find('user', 'me').then(function (user) {
self.send('signedIn', user); self.send('signedIn', user);
self.notifications.clear(); self.notifications.clear();
self.transitionToRoute('posts'); self.transitionToRoute(Ember.SimpleAuth.routeAfterAuthentication);
}); });
} else { });
self.transitionToRoute('setup');
}
}, function (resp) { }, function (resp) {
self.toggleProperty('submitting'); self.toggleProperty('submitting');
self.notifications.showAPIError(resp); self.notifications.showAPIError(resp);

18
core/client/controllers/signup.js
View file

@ -26,17 +26,17 @@ var SignupController = Ember.ObjectController.extend(ValidationEngine, {
'X-CSRF-Token': self.get('csrf') 'X-CSRF-Token': self.get('csrf')
}, },
data: self.getProperties('name', 'email', 'password') data: self.getProperties('name', 'email', 'password')
}).then(function (resp) { }).then(function () {
self.toggleProperty('submitting'); self.get('session').authenticate('ember-simple-auth-authenticator:oauth2-password-grant', {
if (resp && resp.userData) { identification: self.get('email'),
self.store.pushPayload({ users: [resp.userData]}); password: self.get('password')
self.store.find('user', resp.userData.id).then(function (user) { }).then(function () {
self.store.find('user', 'me').then(function (user) {
self.send('signedIn', user); self.send('signedIn', user);
self.transitionToRoute('posts'); self.notifications.clear();
self.transitionToRoute(Ember.SimpleAuth.routeAfterAuthentication);
}); });
} else { });
self.transitionToRoute('signin');
}
}, function (resp) { }, function (resp) {
self.toggleProperty('submitting'); self.toggleProperty('submitting');
self.notifications.showAPIError(resp); self.notifications.showAPIError(resp);