diff --git a/out/auth-proxy.js b/out/auth-proxy.js index 20b53c8..4045013 100644 --- a/out/auth-proxy.js +++ b/out/auth-proxy.js @@ -18,8 +18,7 @@ const router = (req, res, next) => { return undefined; } const token = req.header(_1.DefaultConfig.USERINFO_HEADER); - const url = _1.DefaultConfig.AUTH_PROXY_USERINFO_URL || - _1.DefaultConfig.AUTH_PROXY_URL && _1.urlJoin(_1.DefaultConfig.AUTH_PROXY_URL, "userinfo"); + const url = _1.DefaultConfig.AUTH_PROXY_USERINFO_URL; if (token === undefined || url === undefined) { return undefined; } @@ -34,8 +33,7 @@ const router = (req, res, next) => { })); req.getUserInfo = () => resolvable.resolve(); res.initLogout = function () { - const url = _1.DefaultConfig.AUTH_PROXY_INIT_LOGOUT_URL || - _1.DefaultConfig.AUTH_PROXY_URL && _1.urlJoin(_1.DefaultConfig.AUTH_PROXY_URL, "init-logout"); + const url = _1.DefaultConfig.AUTH_PROXY_INIT_LOGOUT_URL; if (url === undefined) { return false; } diff --git a/out/config.d.ts b/out/config.d.ts index e3b7bef..3eba16d 100644 --- a/out/config.d.ts +++ b/out/config.d.ts @@ -3,6 +3,8 @@ export declare const DefaultConfig: { EXTERNAL_BASE_URL: string; isProduction: boolean; requireEnv: typeof requireEnv; + AUTH_PROXY_USERINFO_URL: string | undefined; + AUTH_PROXY_INIT_LOGOUT_URL: string | undefined; NODE_ENV: string; PORT: number; HOSTNAME: string; @@ -11,7 +13,5 @@ export declare const DefaultConfig: { SESSION_SECRET: string | undefined; USERINFO_HEADER: string | undefined; AUTH_PROXY_URL: string | undefined; - AUTH_PROXY_USERINFO_URL: string | undefined; - AUTH_PROXY_INIT_LOGOUT_URL: string | undefined; }; export {}; diff --git a/out/config.js b/out/config.js index dcced38..bb1b1df 100644 --- a/out/config.js +++ b/out/config.js @@ -33,4 +33,6 @@ function requireEnv(name, onlyInProduction = false) { } exports.DefaultConfig = Object.assign(Object.assign({}, envs), { EXTERNAL_BASE_URL: envs.EXTERNAL_BASE_URL || _1.urlJoin(`http://${envs.HOSTNAME}${envs.PORT !== 80 ? `:${envs.PORT}` : ""}`, envs.BASE_PATH), isProduction, - requireEnv }); + requireEnv, AUTH_PROXY_USERINFO_URL: envs.AUTH_PROXY_USERINFO_URL || + envs.AUTH_PROXY_URL && _1.urlJoin(envs.AUTH_PROXY_URL, "userinfo"), AUTH_PROXY_INIT_LOGOUT_URL: envs.AUTH_PROXY_INIT_LOGOUT_URL || + envs.AUTH_PROXY_URL && _1.urlJoin(envs.AUTH_PROXY_URL, "init-logout") }); diff --git a/out/helpers/userinfo.d.ts b/out/helpers/userinfo.d.ts index eb054cb..82573bd 100644 --- a/out/helpers/userinfo.d.ts +++ b/out/helpers/userinfo.d.ts @@ -1,10 +1,31 @@ -export declare type UserInfo = { - email: string; - email_verified: boolean; - family_name: string; - given_name: string; - groups: string[]; - name: string; - preferred_username: string; +export interface UserInfo { sub: string; -}; + name?: string; + given_name?: string; + family_name?: string; + middle_name?: string; + nickname?: string; + preferred_username?: string; + profile?: string; + picture?: string; + website?: string; + email?: string; + email_verified?: boolean; + gender?: string; + birthdate?: string; + zoneinfo?: string; + locale?: string; + phone_number?: string; + updated_at?: number; + address?: { + formatted?: string; + street_address?: string; + locality?: string; + region?: string; + postal_code?: string; + country?: string; + [key: string]: unknown; + }; + groups?: string[]; + [key: string]: unknown; +} diff --git a/src/helpers/userinfo.ts b/src/helpers/userinfo.ts index 25c44da..69cc23e 100644 --- a/src/helpers/userinfo.ts +++ b/src/helpers/userinfo.ts @@ -27,6 +27,6 @@ export interface UserInfo { [key: string]: unknown; }; - + groups?: string[]; [key: string]: unknown; }