TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-26 12:21:36 +03:00
Code Issues Projects Releases Wiki 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')
},
data: self.getProperties('blogTitle', 'name', 'email', 'password')
}).then(function (resp) {
self.toggleProperty('submitting');
if (resp && resp.userData) {
self.store.pushPayload({ users: [resp.userData]});
self.store.find('user', resp.userData.id).then(function (user) {
}).then(function () {
self.get('session').authenticate('ember-simple-auth-authenticator:oauth2-password-grant', {
identification: self.get('email'),
password: self.get('password')
}).then(function () {
self.store.find('user', 'me').then(function (user) {
self.send('signedIn', user);
self.notifications.clear();
self.transitionToRoute('posts');
self.transitionToRoute(Ember.SimpleAuth.routeAfterAuthentication);
});
} else {
self.transitionToRoute('setup');
}
});
}, function (resp) {
self.toggleProperty('submitting');
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')
},
data: self.getProperties('name', 'email', 'password')
}).then(function (resp) {
self.toggleProperty('submitting');
if (resp && resp.userData) {
self.store.pushPayload({ users: [resp.userData]});
self.store.find('user', resp.userData.id).then(function (user) {
}).then(function () {
self.get('session').authenticate('ember-simple-auth-authenticator:oauth2-password-grant', {
identification: self.get('email'),
password: self.get('password')
}).then(function () {
self.store.find('user', 'me').then(function (user) {
self.send('signedIn', user);
self.transitionToRoute('posts');
self.notifications.clear();
self.transitionToRoute(Ember.SimpleAuth.routeAfterAuthentication);
});
} else {
self.transitionToRoute('signin');
}
});
}, function (resp) {
self.toggleProperty('submitting');
self.notifications.showAPIError(resp);