Merge pull request #322 from stianst/master

KEYCLOAK-411 Set cors properties in KeycloakDeployment
keycloak · Apr 7, 2014 · 2916cce · 2916cce
2 parents 6081572 + bf95c2b
commit 2916cce
Showing 1 changed file with 7 additions and 0 deletions.
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
@@ -73,6 +73,13 @@ protected KeycloakDeployment internalBuild(AdapterConfig adapterConfig) {
         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;
     }