Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Merge pull request #6244 from acburdine/issue-6226

Browse source 
Fix authentication error if setup/two is re-submitted
This commit is contained in:
Kevin Ansfield 2015-12-21 11:14:39 +00:00
commit c28f4853b8
2 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/client/app/controllers/setup/two.js
View file

@ -35,7 +35,7 @@ export default Controller.extend(ValidationEngine, {
return new RSVP.Promise((resolve, reject) => {
image.formData = {};
image.submit()
.success(function (response) {
.success((response) => {
user.image = response;
ajax({
url: this.get('ghostPaths.url').api('users', user.id.toString()),
@ -68,6 +68,22 @@ export default Controller.extend(ValidationEngine, {
}
},
afterAuthentication(result) {
if (this.get('image')) {
this.sendImage(result.users[0])
.then(() => {
this.toggleProperty('submitting');
this.transitionToRoute('setup.three');
}).catch((resp) => {
this.toggleProperty('submitting');
this.get('notifications').showAPIError(resp, {key: 'setup.blog-details'});
});
} else {
this.toggleProperty('submitting');
this.transitionToRoute('setup.three');
}
},
actions: {
preValidate(model) {
// Only triggers validation if a value has been entered, preventing empty errors on focusOut
@ -77,9 +93,8 @@ export default Controller.extend(ValidationEngine, {
},
setup() {
let setupProperties = ['blogTitle', 'name', 'email', 'password', 'image'];
let setupProperties = ['blogTitle', 'name', 'email', 'password'];
let data = this.getProperties(setupProperties);
let notifications = this.get('notifications');
let config = this.get('config');
let method = this.get('blogCreated') ? 'PUT' : 'POST';
@ -101,23 +116,17 @@ export default Controller.extend(ValidationEngine, {
}
}).then((result) => {
config.set('blogTitle', data.blogTitle);
// don't try to login again if we are already logged in
if (this.get('session.isAuthenticated')) {
return this.afterAuthentication(result);
}
// Don't call the success handler, otherwise we will be redirected to admin
this.get('application').set('skipAuthSuccessHandler', true);
this.get('session').authenticate('authenticator:oauth2', this.get('email'), this.get('password')).then(() => {
this.set('blogCreated', true);
if (data.image) {
this.sendImage(result.users[0])
.then(() => {
this.toggleProperty('submitting');
this.transitionToRoute('setup.three');
}).catch((resp) => {
this.toggleProperty('submitting');
notifications.showAPIError(resp, {key: 'setup.blog-details'});
});
} else {
this.toggleProperty('submitting');
this.transitionToRoute('setup.three');
}
return this.afterAuthentication(result);
}).catch((error) => {
this._handleAuthenticationError(error);
});

2
core/server/routes/api.js
View file

@ -95,7 +95,7 @@ apiRoutes = function apiRoutes(middleware) {
router.post('/authentication/invitation', api.http(api.authentication.acceptInvitation));
router.get('/authentication/invitation', api.http(api.authentication.isInvitation));
router.post('/authentication/setup', api.http(api.authentication.setup));
router.put('/authentication/setup', api.http(api.authentication.updateSetup));
router.put('/authentication/setup', authenticatePrivate, api.http(api.authentication.updateSetup));
router.get('/authentication/setup', api.http(api.authentication.isSetup));
router.post('/authentication/token',
middleware.spamPrevention.signin,