No require any ENV_VAR

This commit is contained in:
Sebastian Seedorf
2020-11-15 23:57:04 +01:00
parent 72b81cae5e
commit 6a21fc1169
15 changed files with 102 additions and 67 deletions

View File

@@ -1,21 +1,22 @@
import {Request, RequestHandler} from 'express';
import {Config, Logger} from '.';
import {DefaultConfig, Logger} from '.';
import {Resolvable} from './helpers/resolvable';
import fetch from 'node-fetch';
import {urlJoin} from './helpers/urlJoin';
const router: RequestHandler = (req: Request, res, next) => {
const resolvable = new Resolvable(async () => {
if (!Config.USERINFO_HEADER) {
if (!DefaultConfig.USERINFO_HEADER) {
return undefined;
}
const token = req.header(Config.USERINFO_HEADER);
const url = Config.AUTH_PROXY_USERINFO_URL || Config.AUTH_PROXY_URL && urlJoin(Config.AUTH_PROXY_URL, "userinfo");
const token = req.header(DefaultConfig.USERINFO_HEADER);
const url = DefaultConfig.AUTH_PROXY_USERINFO_URL ||
DefaultConfig.AUTH_PROXY_URL && urlJoin(DefaultConfig.AUTH_PROXY_URL, "userinfo");
if (token === undefined || url === undefined) {
return undefined;
}
try {
const res = await fetch(url, {headers: [[Config.USERINFO_HEADER, token]]});
const res = await fetch(url, {headers: [[DefaultConfig.USERINFO_HEADER, token]]});
return await res.json() as UserInfo;
} catch (e) {
Logger.warn(e);
@@ -25,7 +26,8 @@ const router: RequestHandler = (req: Request, res, next) => {
req.getUserInfo = () => resolvable.resolve();
res.initLogout = function() {
const url = Config.AUTH_PROXY_INIT_LOGOUT_URL || Config.AUTH_PROXY_URL && urlJoin(Config.AUTH_PROXY_URL, "init-logout");
const url = DefaultConfig.AUTH_PROXY_INIT_LOGOUT_URL ||
DefaultConfig.AUTH_PROXY_URL && urlJoin(DefaultConfig.AUTH_PROXY_URL, "init-logout");
if (url === undefined) {
return false;
}