QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-609 Restore usage of sessionId cookie/auth-key (used by a test on table-based auth)

Browse Source
This commit is contained in:
darin.kelkhoff
2023-08-09 09:55:59 -05:00
parent 8479ef4b90
commit dbaad85ec7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java
View File

@ -475,22 +475,23 @@ public class QJavalinImplementation
{ {
Map<String, String> authenticationContext = new HashMap<>(); Map<String, String> authenticationContext = new HashMap<>();
// todo delete String sessionIdCookieValue = context.cookie(SESSION_ID_COOKIE_NAME); String sessionIdCookieValue = context.cookie(SESSION_ID_COOKIE_NAME);
String sessionUuidCookieValue = context.cookie(Auth0AuthenticationModule.SESSION_UUID_KEY); String sessionUuidCookieValue = context.cookie(Auth0AuthenticationModule.SESSION_UUID_KEY);
String authorizationHeaderValue = context.header("Authorization"); String authorizationHeaderValue = context.header("Authorization");
String apiKeyHeaderValue = context.header("x-api-key"); String apiKeyHeaderValue = context.header("x-api-key");
/* todo - change to sessionUUID.
if(StringUtils.hasContent(sessionIdCookieValue)) if(StringUtils.hasContent(sessionIdCookieValue))
{ {
//////////////////////////////////////// ///////////////////////////////////////////////////////
// first, look for a sessionId cookie // // sessionId - maybe used by table-based auth module //
//////////////////////////////////////// ///////////////////////////////////////////////////////
authenticationContext.put(SESSION_ID_COOKIE_NAME, sessionIdCookieValue); authenticationContext.put(SESSION_ID_COOKIE_NAME, sessionIdCookieValue);
} }
else*/ else if(StringUtils.hasContent(sessionUuidCookieValue))
if(StringUtils.hasContent(sessionUuidCookieValue))
{ {
///////////////////////////////////////////////////////////////////////////
// session UUID - known to be used by auth0 module (in aug. 2023 update) //
///////////////////////////////////////////////////////////////////////////
authenticationContext.put(Auth0AuthenticationModule.SESSION_UUID_KEY, sessionUuidCookieValue); authenticationContext.put(Auth0AuthenticationModule.SESSION_UUID_KEY, sessionUuidCookieValue);
} }
else if(apiKeyHeaderValue != null) else if(apiKeyHeaderValue != null)