keycloak-memoizeit

Merge pull request #322 from stianst/master KEYCLOAK-411

4/7/2014 9:39:53 AM

Details

diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
index 297111a..39cf52f 100755
--- a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
+++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
@@ -73,6 +73,13 @@ public class KeycloakDeploymentBuilder {
         deployment.setLogoutUrl(KeycloakUriBuilder.fromUri(logoutUrl));
         deployment.setAccountUrl(accountUrl);
 
+        if (adapterConfig.isCors()) {
+            deployment.setCors(true);
+            deployment.setCorsMaxAge(adapterConfig.getCorsMaxAge());
+            deployment.setCorsAllowedHeaders(adapterConfig.getCorsAllowedHeaders());
+            deployment.setCorsAllowedMethods(adapterConfig.getCorsAllowedMethods());
+        }
+
         return deployment;
     }