fix(security): base URL of oauth2 URI was hardcoded as localhost, thu…

…s it was not possible to use proxy/custom domain. Switched to using redirect URI templating fixing the problem.
Roche · Mar 5, 2022 · 490da0c · 490da0c
1 parent 5d41393
commit 490da0c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...rc/main/kotlin/com/roche/ambassador/security/configuration/ClientRegistrationRegistrar.kt b/...rc/main/kotlin/com/roche/ambassador/security/configuration/ClientRegistrationRegistrar.kt
@@ -29,15 +29,19 @@ internal class ClientRegistrationRegistrar(private val projectSourcesProperties:
         if (clientRegistrations.isEmpty()) {
             throw IllegalStateException("No valid client registration")
         }
-        log.info("Registered OAuth2 clients: {}", clientRegistrations.joinToString { it.clientName })
+        log.info("Registered OAuth2 clients: {}", clientRegistrations.joinToString { it.asHumanReadable() })
         return InMemoryReactiveClientRegistrationRepository(clientRegistrations)
     }
 
+    private fun ClientRegistration.asHumanReadable(): String {
+        return "$clientName (redirect-uri=${redirectUri},scopes=(${scopes.joinToString(", ")}))"
+    }
+
     private fun completeRegistration(partialRegistration: ClientRegistration): ClientRegistration {
         return ClientRegistration.withClientRegistration(partialRegistration)
             .clientSecret(projectSourcesProperties.clientSecret)
             .clientId(projectSourcesProperties.clientId)
-            .redirectUri("http://localhost:8080/login/oauth2/code/gitlab")
+            .redirectUri("{baseUrl}/login/oauth2/code/${partialRegistration.registrationId}")
             .authorizationGrantType(partialRegistration.authorizationGrantType ?: DEFAULT_AUTHORIZATION_GRANT_TYPE)
             .build()
     }