TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-29 15:12:58 +03:00
Code Issues Projects Releases Wiki Activity

Add user and client authentication events

Browse Source 
no issue

- slowly rolling out events across the app
This commit is contained in:
Hannah Wolfe 2016-04-03 19:40:23 -07:00
parent 098974917f
commit 1f8a4fe97d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/server/middleware/auth.js
View File

@ -1,5 +1,6 @@
var passport = require('passport'),
errors = require('../errors'),
events = require('../events'),
labs = require('../utils/labs'),
i18n = require('../i18n'),
@ -47,7 +48,7 @@ auth = {
if (!req.body.client_id || !req.body.client_secret) {
errors.logError(
i18n.t('errors.middleware.auth.clientAuthenticaionFailed'),
i18n.t('errors.middleware.auth.clientAuthenticationFailed'),
i18n.t('errors.middleware.auth.clientCredentialsNotProvided'),
i18n.t('errors.middleware.auth.forInformationRead', {url: 'http://api.ghost.org/docs/client-authentication'})
);
@ -66,7 +67,7 @@ auth = {
if (!client || client.type !== 'ua') {
errors.logError(
i18n.t('errors.middleware.auth.clientAuthenticaionFailed'),
i18n.t('errors.middleware.auth.clientAuthenticationFailed'),
i18n.t('errors.middleware.auth.clientCredentialsNotValid'),
i18n.t('errors.middleware.auth.forInformationRead', {url: 'http://api.ghost.org/docs/client-authentication'})
);
@ -75,6 +76,7 @@ auth = {
req.client = client;
events.emit('client.authenticated', client);
return next(null, client);
}
)(req, res, next);
@ -91,6 +93,8 @@ auth = {
if (user) {
req.authInfo = info;
req.user = user;
events.emit('user.authenticated', user);
return next(null, user, info);
} else if (isBearerAutorizationHeader(req)) {
return errors.handleAPIError(new errors.UnauthorizedError(i18n.t('errors.middleware.auth.accessDenied')), req, res, next);

2
core/server/translations/en.json
View File

@ -63,7 +63,7 @@
},
"middleware": {
"auth": {
"clientAuthenticaionFailed": "Client Authentication Failed",
"clientAuthenticationFailed": "Client Authentication Failed",
"clientCredentialsNotProvided": "Client credentials were not provided",
"clientCredentialsNotValid": "Client credentials were not valid",
"forInformationRead": "For information on how to fix this, please read {url}.",