dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-30 02:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

shouldAuthorizeApi refactor

Browse Source
This commit is contained in:
Jan Prochazka
2024-07-26 14:07:06 +02:00
parent 8864c3489d
commit 6a942a5058
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/api/src/controllers/auth.js
View File

@@ -10,10 +10,6 @@ const { create } = require('lodash');
const logger = getLogger('auth'); const logger = getLogger('auth');
function shouldAuthorizeApi() {
return createAuthProvider().shouldAuthorizeApi();
}
function unauthorizedResponse(req, res, text) { function unauthorizedResponse(req, res, text) {
// if (req.path == getExpressPath('/config/get-settings')) { // if (req.path == getExpressPath('/config/get-settings')) {
// return res.json({}); // return res.json({});
@@ -27,7 +23,7 @@ function unauthorizedResponse(req, res, text) {
function authMiddleware(req, res, next) { function authMiddleware(req, res, next) {
const SKIP_AUTH_PATHS = ['/config/get', '/auth/oauth-token', '/auth/login', '/stream']; const SKIP_AUTH_PATHS = ['/config/get', '/auth/oauth-token', '/auth/login', '/stream'];
if (!shouldAuthorizeApi()) { if (!createAuthProvider().shouldAuthorizeApi()) {
return next(); return next();
} }
let skipAuth = !!SKIP_AUTH_PATHS.find(x => req.path == getExpressPath(x)); let skipAuth = !!SKIP_AUTH_PATHS.find(x => req.path == getExpressPath(x));
@@ -68,5 +64,4 @@ module.exports = {
}, },
authMiddleware, authMiddleware,
shouldAuthorizeApi,
}; };

4
packages/api/src/main.js
View File

@@ -85,9 +85,7 @@ function start() {
}); });
} }
if (auth.shouldAuthorizeApi()) { app.use(auth.authMiddleware);
app.use(auth.authMiddleware);
}
app.get(getExpressPath('/stream'), async function (req, res) { app.get(getExpressPath('/stream'), async function (req, res) {
const strmid = req.query.strmid; const strmid = req.query.strmid;