sebse/node-pkg-express-utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved env resolution of AUTH_PROXY_URL

Browse Source
This commit is contained in:
Sebastian Seedorf
2020-11-17 15:07:01 +01:00
parent 1ba81209c9
commit ca8211bec4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/auth-proxy.ts
View File

@@ -1,5 +1,5 @@
import {Request, RequestHandler} from 'express'; import {Request, RequestHandler} from 'express';
import {DefaultConfig, Logger, Resolvable, urlJoin, UserInfo} from '.'; import {DefaultConfig, Logger, Resolvable, UserInfo} from '.';
import fetch from 'node-fetch'; import fetch from 'node-fetch';
const router: RequestHandler = (req: Request, res, next) => { const router: RequestHandler = (req: Request, res, next) => {
@@ -8,8 +8,7 @@ const router: RequestHandler = (req: Request, res, next) => {
return undefined; return undefined;
} }
const token = req.header(DefaultConfig.USERINFO_HEADER); const token = req.header(DefaultConfig.USERINFO_HEADER);
const url = DefaultConfig.AUTH_PROXY_USERINFO_URL || const url = DefaultConfig.AUTH_PROXY_USERINFO_URL;
DefaultConfig.AUTH_PROXY_URL && urlJoin(DefaultConfig.AUTH_PROXY_URL, "userinfo");
if (token === undefined || url === undefined) { if (token === undefined || url === undefined) {
return undefined; return undefined;
} }
@@ -24,8 +23,7 @@ const router: RequestHandler = (req: Request, res, next) => {
req.getUserInfo = () => resolvable.resolve(); req.getUserInfo = () => resolvable.resolve();
res.initLogout = function() { res.initLogout = function() {
const url = DefaultConfig.AUTH_PROXY_INIT_LOGOUT_URL || const url = DefaultConfig.AUTH_PROXY_INIT_LOGOUT_URL;
DefaultConfig.AUTH_PROXY_URL && urlJoin(DefaultConfig.AUTH_PROXY_URL, "init-logout");
if (url === undefined) { if (url === undefined) {
return false; return false;
} }

4
src/config.ts
View File

@@ -41,4 +41,8 @@ export const DefaultConfig = {
urlJoin(`http://${envs.HOSTNAME}${envs.PORT !== 80 ? `:${envs.PORT}` : ""}`, envs.BASE_PATH), urlJoin(`http://${envs.HOSTNAME}${envs.PORT !== 80 ? `:${envs.PORT}` : ""}`, envs.BASE_PATH),
isProduction, isProduction,
requireEnv, requireEnv,
AUTH_PROXY_USERINFO_URL: envs.AUTH_PROXY_USERINFO_URL ||
envs.AUTH_PROXY_URL && urlJoin(envs.AUTH_PROXY_URL, "userinfo"),
AUTH_PROXY_INIT_LOGOUT_URL: envs.AUTH_PROXY_INIT_LOGOUT_URL ||
envs.AUTH_PROXY_URL && urlJoin(envs.AUTH_PROXY_URL, "init-logout"),
}; };