tqt
/
Ghost
mirror of https://github.com/TryGhost/Ghost.git
2
1
Fork 0
Code Issues 1 Releases Wiki Activity

Added empty lines and reduces line length in auth authorize 

no issue

- improves readability
This commit is contained in:
kirrg001 2019-01-18 17:33:36 +01:00
parent 3f758c6a0a
commit f82bb07534
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/server/services/auth/authorize.js
View File

@ -9,7 +9,9 @@ const authorize = {
if (req.user && req.user.id) {
return next();
} else {
return next(new common.errors.NoPermissionError({message: common.i18n.t('errors.middleware.auth.pleaseSignIn')}));
return next(new common.errors.NoPermissionError({
message: common.i18n.t('errors.middleware.auth.pleaseSignIn')
}));
}
},
@ -21,7 +23,9 @@ const authorize = {
if (req.user && req.user.id) {
return next();
} else {
return next(new common.errors.NoPermissionError({message: common.i18n.t('errors.middleware.auth.pleaseSignIn')}));
return next(new common.errors.NoPermissionError({
message: common.i18n.t('errors.middleware.auth.pleaseSignIn')
}));
}
}
},
@ -30,7 +34,9 @@ const authorize = {
requiresAuthorizedClient: function requiresAuthorizedClient(client) {
return function doAuthorizedClient(req, res, next) {
if (client && (!req.client || !req.client.name || req.client.name !== client)) {
return next(new common.errors.NoPermissionError({message: common.i18n.t('errors.permissions.noPermissionToAction')}));
return next(new common.errors.NoPermissionError({
message: common.i18n.t('errors.permissions.noPermissionToAction')
}));
}
return next();
@ -38,6 +44,7 @@ const authorize = {
},
authorizeAdminApi: [session.ensureUser],
authorizeContentApi(req, res, next) {
const hasApiKey = req.api_key && req.api_key.id;
const hasMember = req.member;
@ -47,16 +54,21 @@ const authorize = {
if (labs.isSet('members') && hasMember) {
return next();
}
return next(new common.errors.NoPermissionError({message: common.i18n.t('errors.middleware.auth.pleaseSignInOrAuthenticate')}));
return next(new common.errors.NoPermissionError({
message: common.i18n.t('errors.middleware.auth.pleaseSignInOrAuthenticate')
}));
},
requiresAuthorizedUserOrApiKey(req, res, next) {
const hasUser = req.user && req.user.id;
const hasApiKey = req.api_key && req.api_key.id;
if (hasUser || hasApiKey) {
return next();
} else {
return next(new common.errors.NoPermissionError({message: common.i18n.t('errors.middleware.auth.pleaseSignInOrAuthenticate')}));
return next(new common.errors.NoPermissionError({
message: common.i18n.t('errors.middleware.auth.pleaseSignInOrAuthenticate')
}));
}
}
};