mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-25 19:48:50 +03:00
68af12cfad
closes https://linear.app/tryghost/issue/ENG-1617/ closes https://linear.app/tryghost/issue/ENG-1619/ - updated cookie authenticator's `authenticate` method to accept an `{identification, pasword, token}` object - if `token` is provided, hit our `PUT /session/verify/` endpoint passing through the token instead of hitting the `POST /session/` endpoint - added `signin/verify` route - displays a 2fa code input field, including required attributes for macOS auto-fill from email/messages to work - uses `session.authenticate({token})` when submitted - updated signin routine to detect token-required state - detects a `403` response with a `2FA_TOKEN_REQUIRED` code property when authenticating - if detected transitions to the `signin/verify` route
58 lines
1.8 KiB
JavaScript
58 lines
1.8 KiB
JavaScript
import Authenticator from 'ember-simple-auth/authenticators/base';
|
|
import RSVP from 'rsvp';
|
|
import {computed} from '@ember/object';
|
|
import {inject as service} from '@ember/service';
|
|
|
|
export default Authenticator.extend({
|
|
ajax: service(),
|
|
ghostPaths: service(),
|
|
|
|
sessionEndpoint: computed('ghostPaths.apiRoot', function () {
|
|
return `${this.ghostPaths.apiRoot}/session`;
|
|
}),
|
|
|
|
sessionVerifyEndpoint: computed('ghostPaths.apiRoot', function () {
|
|
return `${this.ghostPaths.apiRoot}/session/verify`;
|
|
}),
|
|
|
|
restore: function () {
|
|
return RSVP.resolve();
|
|
},
|
|
|
|
authenticate({identification, password, token}) {
|
|
if (token) {
|
|
const data = {token};
|
|
const options = {
|
|
data,
|
|
contentType: 'application/json;charset=utf-8',
|
|
// ember-ajax will try and parse the response as JSON if not explicitly set
|
|
dataType: 'text'
|
|
};
|
|
|
|
return this.ajax.put(this.sessionVerifyEndpoint, options);
|
|
}
|
|
|
|
const data = {username: identification, password};
|
|
const options = {
|
|
data,
|
|
contentType: 'application/json;charset=utf-8',
|
|
// ember-ajax will try and parse the response as JSON if not explicitly set
|
|
dataType: 'text'
|
|
};
|
|
|
|
return this.ajax.post(this.sessionEndpoint, options);
|
|
},
|
|
|
|
invalidate() {
|
|
// if we're invalidating because of a 401 we can end up in an infinite
|
|
// loop if we then try to perform a DELETE /session/ request
|
|
// TODO: find a more elegant way to handle this
|
|
if (this.ajax.skipSessionDeletion) {
|
|
this.ajax.skipSessionDeletion = false;
|
|
return RSVP.resolve();
|
|
}
|
|
|
|
return this.ajax.del(this.sessionEndpoint);
|
|
}
|
|
});
|