test2

depromeet · Mar 12, 2024 · d63b611 · d63b611
1 parent 4be3ded
commit d63b611
Showing 1 changed file with 44 additions and 31 deletions.
diff --git a/.../src/main/kotlin/io/raemian/api/support/HttpCookieOAuth2AuthorizationRequestRepository.kt b/.../src/main/kotlin/io/raemian/api/support/HttpCookieOAuth2AuthorizationRequestRepository.kt
@@ -16,38 +16,42 @@ class HttpCookieOAuth2AuthorizationRequestRepository() : AuthorizationRequestRep
     private val AUTHORIZATION_REQUEST_COOKIE_NAME = "oauth2_auth_request"
     private val EXPIRE_SECONDS: Int = Duration.ofSeconds(180).toMillis().toInt()
     private val logger: Logger = LoggerFactory.getLogger(javaClass)
+    private val providerStorage= HashMap<String, OAuth2AuthorizationRequest>()
 
     override fun loadAuthorizationRequest(request: HttpServletRequest): OAuth2AuthorizationRequest? {
         val state = this.getStateParameter(request) ?: return null
-
         val authorizationRequest: OAuth2AuthorizationRequest? =
             CookieUtils.getCookie(request, AUTHORIZATION_REQUEST_COOKIE_NAME)
                 .map { cookie: Cookie ->
                     CookieUtils.deserialize(cookie, OAuth2AuthorizationRequest::class.java)
                 }.orElse(null)
 
-        if(authorizationRequest != null) {
-            logger.info("============LOAD OAuth2AuthorizationRequest============")
-            logger.info("cookie: {}", request.cookies.toString())
-            logger.info("authorizationUri: {}", authorizationRequest.authorizationRequestUri)
-            logger.info("responseType: {}", authorizationRequest.responseType)
-            logger.info("clientId: {}", authorizationRequest.clientId)
-            logger.info("redirectUri: {}", authorizationRequest.redirectUri)
-            logger.info("scopes: {}", authorizationRequest.scopes.toString())
-            logger.info("state: {}", authorizationRequest.state)
-            logger.info("additionalParameters: {}", authorizationRequest.additionalParameters.toString())
-            logger.info("authorizationRequestUri: {}", authorizationRequest.authorizationRequestUri)
-            logger.info("attributes: {}", authorizationRequest.attributes)
-            logger.info("=======================================================")
-        } else {
-            logger.info("============FAIL TO LOAD OAuth2AuthorizationRequest============")
-            logger.info("cookie: {}", request.cookies.toString())
-        }
+
+        try {
+            if(authorizationRequest != null) {
+                    logger.info("============LOAD OAuth2AuthorizationRequest============")
+                    logger.info("cookie: {}", request.cookies.toString())
+                    logger.info("authorizationUri: {}", authorizationRequest.authorizationRequestUri)
+                    logger.info("responseType: {}", authorizationRequest.responseType)
+                    logger.info("clientId: {}", authorizationRequest.clientId)
+                    logger.info("redirectUri: {}", authorizationRequest.redirectUri)
+                    logger.info("scopes: {}", authorizationRequest.scopes.toString())
+                    logger.info("state: {}", authorizationRequest.state)
+                    logger.info("additionalParameters: {}", authorizationRequest.additionalParameters.toString())
+                    logger.info("authorizationRequestUri: {}", authorizationRequest.authorizationRequestUri)
+                    logger.info("attributes: {}", authorizationRequest.attributes)
+                    logger.info("=======================================================")
+
+            } else {
+                logger.info("============FAIL TO LOAD OAuth2AuthorizationRequest============")
+                logger.info("cookie: {}", request.cookies.toString() )
+            }
+        } catch (e: Exception) { }
 
         return if (authorizationRequest != null && state == authorizationRequest.state) {
             authorizationRequest
         } else {
-            null
+            return providerStorage.get(splitProviderFromUri(request))
         }
     }
     override fun saveAuthorizationRequest(
@@ -60,18 +64,25 @@ class HttpCookieOAuth2AuthorizationRequestRepository() : AuthorizationRequestRep
             return
         }
 
-        logger.info("============SAVE OAuth2AuthorizationRequest============")
-        logger.info("cookie: {}", request.cookies.toString())
-        logger.info("authorizationUri: {}", authorizationRequest.authorizationRequestUri)
-        logger.info("responseType: {}", authorizationRequest.responseType)
-        logger.info("clientId: {}", authorizationRequest.clientId)
-        logger.info("redirectUri: {}", authorizationRequest.redirectUri)
-        logger.info("scopes: {}", authorizationRequest.scopes.toString())
-        logger.info("state: {}", authorizationRequest.state)
-        logger.info("additionalParameters: {}", authorizationRequest.additionalParameters.toString())
-        logger.info("authorizationRequestUri: {}", authorizationRequest.authorizationRequestUri)
-        logger.info("attributes: {}", authorizationRequest.attributes)
-        logger.info("=======================================================")
+        if (!providerStorage.contains(splitProviderFromUri(request)) ) {
+            providerStorage.put(splitProviderFromUri(request), authorizationRequest)
+        }
+
+
+        try {
+            logger.info("============SAVE OAuth2AuthorizationRequest============")
+            logger.info("cookie: {}", request.cookies.toString())
+            logger.info("authorizationUri: {}", authorizationRequest.authorizationRequestUri)
+            logger.info("responseType: {}", authorizationRequest.responseType)
+            logger.info("clientId: {}", authorizationRequest.clientId)
+            logger.info("redirectUri: {}", authorizationRequest.redirectUri)
+            logger.info("scopes: {}", authorizationRequest.scopes.toString())
+            logger.info("state: {}", authorizationRequest.state)
+            logger.info("additionalParameters: {}", authorizationRequest.additionalParameters.toString())
+            logger.info("authorizationRequestUri: {}", authorizationRequest.authorizationRequestUri)
+            logger.info("attributes: {}", authorizationRequest.attributes)
+            logger.info("=======================================================")
+        } catch (e: Exception) { }
 
 
 
@@ -100,4 +111,6 @@ class HttpCookieOAuth2AuthorizationRequestRepository() : AuthorizationRequestRep
     }
 
     private fun getStateParameter(request: HttpServletRequest): String? = request.getParameter("state")
+
+    private fun splitProviderFromUri(request: HttpServletRequest): String = request.requestURI.split("/").last()
 }