diff --git a/src/config_token_store/adapter/env/index.js b/src/config_token_store/adapter/env/index.js index 43953e7..0f85507 100644 --- a/src/config_token_store/adapter/env/index.js +++ b/src/config_token_store/adapter/env/index.js @@ -27,7 +27,7 @@ class EnvConfigTokenStoreAdapter extends BaseConfigTokenStoreAdapter { let token; token = data[id]; - return JSON.stringify(token); + return typeof token !== "string" ? JSON.stringify(token) : token; } catch (e) { throw e; } diff --git a/src/config_token_store/adapter/file/index.js b/src/config_token_store/adapter/file/index.js index e166811..e7846d1 100644 --- a/src/config_token_store/adapter/file/index.js +++ b/src/config_token_store/adapter/file/index.js @@ -28,7 +28,7 @@ class FileConfigTokenStoreAdapter extends BaseConfigTokenStoreAdapter { let token; token = data[id]; - return JSON.stringify(token); + return typeof token !== "string" ? JSON.stringify(token) : token; } catch (e) { throw e; } diff --git a/src/header/index.js b/src/header/index.js index f8412dd..5d8bf4b 100644 --- a/src/header/index.js +++ b/src/header/index.js @@ -137,7 +137,7 @@ class HeaderInjector { if (value === undefined) { value = ""; } - logger.debug("injecting header: %s with value: %s", headerName, value); + logger.info("injecting header: %s with value: %s", headerName, value); res.setHeader(headerName, value); } } diff --git a/src/utils.js b/src/utils.js index ab62e1b..f53aa8a 100644 --- a/src/utils.js +++ b/src/utils.js @@ -126,11 +126,11 @@ function generate_csrf_id() { function toBoolean(input) { //return !!(dataStr?.toLowerCase?.() === 'true' || dataStr === true || Number.parseInt(dataStr, 10) === 0); //return !!(dataStr?.toLowerCase?.() === 'true' || dataStr === true); - + if (typeof input == "undefined" || input === null) { return false; } - + if (typeof input == "boolean") { return input; } @@ -158,7 +158,7 @@ function toBoolean(input) { function is_jwt(jwtString) { const re = new RegExp( - /^[A-Za-z0-9-_=]+\.[A-Za-z0-9-_=]+\.?[A-Za-z0-9-_.+/=]*$/ + /^[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?$/ ); return re.test(jwtString); }