Set version to 1.9.3.Final

Merge pull request #2764 from stianst/1.9.x
KEYCLOAK-2932 KEYCLOAK-2934
2016-04-28 15:14:56 +00:00 · 2016-04-28 13:50:40 +02:00 · 2016-04-28 13:11:10 +02:00 · 2016-04-28 13:06:41 +02:00 · 2016-04-28 13:01:57 +02:00 · 2016-04-28 13:01:45 +02:00
570 changed files with 18865 additions and 3461 deletions
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-as7-integration-pom</artifactId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Jetty Integration</name>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -25,6 +25,7 @@
        var kc = this;
        var adapter;
        var refreshQueue = [];
+        var storage;

        var loginIframe = {
            enable: true,
@@ -35,6 +36,8 @@
        kc.init = function (initOptions) {
            kc.authenticated = false;

+            storage = new PersistentStorage();
+
            if (window.Cordova) {
                adapter = loadAdapter('cordova');
            } else {
@@ -192,7 +195,7 @@
                redirectUri += (redirectUri.indexOf('?') == -1 ? '?' : '&') + 'prompt=' + options.prompt;
            }

-            localStorage.oauthState = JSON.stringify({ state: state, nonce: nonce, redirectUri: encodeURIComponent(redirectUri) });
+            storage.setItem('oauthState', JSON.stringify({ state: state, nonce: nonce, redirectUri: encodeURIComponent(redirectUri) }));

            var action = 'auth';
            if (options && options.action == 'register') {
@@ -689,10 +692,11 @@
        function parseCallback(url) {
            var oauth = new CallbackParser(url, kc.responseMode).parseUri();

-            var sessionState = localStorage.oauthState && JSON.parse(localStorage.oauthState);
+            var oauthState = storage.getItem('oauthState');
+            var sessionState = oauthState && JSON.parse(oauthState);

            if (sessionState && (oauth.code || oauth.error || oauth.access_token || oauth.id_token) && oauth.state && oauth.state == sessionState.state) {
-                delete localStorage.oauthState;
+                storage.removeItem('oauthState');

                oauth.redirectUri = sessionState.redirectUri;
                oauth.storedNonce = sessionState.nonce;
@@ -973,6 +977,82 @@
        }


+        var PersistentStorage = function() {
+            if (!(this instanceof PersistentStorage)) {
+                return new PersistentStorage();
+            }
+            var ps = this;
+            var useCookieStorage = function () {
+                if (typeof localStorage === "undefined") {
+                    return true;
+                }
+                try {
+                    var key = '@@keycloak-session-storage/test';
+                    localStorage.setItem(key, 'test');
+                    localStorage.removeItem(key);
+                    return false;
+                } catch (err) {
+                    // Probably in Safari "private mode" where localStorage
+                    // quota is 0, or quota exceeded. Switching to cookie
+                    // storage.
+                    return true;
+                }
+            }
+
+            ps.setItem = function(key, value) {
+                if (useCookieStorage()) {
+                    setCookie(key, value, cookieExpiration(5));
+                } else {
+                    localStorage.setItem(key, value);
+                }
+            }
+
+            ps.getItem = function(key) {
+                if (useCookieStorage()) {
+                    return getCookie(key);
+                }
+                return localStorage.getItem(key);
+            }
+
+            ps.removeItem = function(key) {
+                if (typeof localStorage !== "undefined") {
+                    try {
+                        // Always try to delete from localStorage.
+                        localStorage.removeItem(key);
+                    } catch (err) { }
+                }
+                // Always remove the cookie.
+                setCookie(key, '', cookieExpiration(-100));
+            }
+
+            var cookieExpiration = function (minutes) {
+                var exp = new Date();
+                exp.setTime(exp.getTime() + (minutes*60*1000));
+                return exp;
+            }
+
+            var getCookie = function (key) {
+                var name = key + '=';
+                var ca = document.cookie.split(';');
+                for (var i = 0; i < ca.length; i++) {
+                    var c = ca[i];
+                    while (c.charAt(0) == ' ') {
+                        c = c.substring(1);
+                    }
+                    if (c.indexOf(name) == 0) {
+                        return c.substring(name.length, c.length);
+                    }
+                }
+                return '';
+            }
+
+            var setCookie = function (key, value, expirationDate) {
+                var cookie = key + '=' + value + '; '
+                    + 'expires=' + expirationDate.toUTCString() + '; ';
+                document.cookie = cookie;
+            }
+        }
+
        var CallbackParser = function(uriToParse, responseMode) {
            if (!(this instanceof CallbackParser)) {
                return new CallbackParser(uriToParse, responseMode);
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OIDC Client Adapter Modules</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>keycloak-parent</artifactId>
    <groupId>org.keycloak</groupId>
-    <version>1.9.2.Final</version>
+    <version>1.9.3.Final</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Tomcat Integration</name>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak WildFly Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Keycloak Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-saml-eap-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML EAP Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-saml-eap-integration-pom</artifactId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -79,11 +79,11 @@ public class WebBrowserSsoAuthenticationHandler extends AbstractSamlAuthenticati
        builder.issuer(issuerURL);
        BaseSAML2BindingBuilder binding = new BaseSAML2BindingBuilder().relayState(relayState);
        if (deployment.getIDP().getSingleLogoutService().signResponse()) {
+            if (deployment.getSignatureCanonicalizationMethod() != null)
+                binding.canonicalizationMethod(deployment.getSignatureCanonicalizationMethod());
            binding.signatureAlgorithm(deployment.getSignatureAlgorithm())
                    .signWith(deployment.getSigningKeyPair())
                    .signDocument();
-            if (deployment.getSignatureCanonicalizationMethod() != null)
-                binding.canonicalizationMethod(deployment.getSignatureCanonicalizationMethod());
        }


@@ -110,6 +110,9 @@ public class WebBrowserSsoAuthenticationHandler extends AbstractSamlAuthenticati
                .destination(deployment.getIDP().getSingleLogoutService().getRequestBindingUrl());
        BaseSAML2BindingBuilder binding = new BaseSAML2BindingBuilder();
        if (deployment.getIDP().getSingleLogoutService().signRequest()) {
+            if (deployment.getSignatureCanonicalizationMethod() != null)
+                binding.canonicalizationMethod(deployment.getSignatureCanonicalizationMethod());
+            binding.signatureAlgorithm(deployment.getSignatureAlgorithm());
            binding.signWith(deployment.getSigningKeyPair())
                    .signDocument();
        }
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Jetty Integration</name>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Client Adapter Modules</name>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Tomcat Integration</name>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Wildfly Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Client Adapter SPI Modules</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,11 @@ package org.keycloak.common;
 * @version $Revision: 1 $
 */
 public interface ClientConnection {
+
    String getRemoteAddr();
    String getRemoteHost();
-    int getReportPort();
+    int getRemotePort();
+
+    String getLocalAddr();
+    int getLocalPort();
 }
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -264,13 +264,22 @@ public class RealmRepresentation {
        return scopeMappings;
    }

-    public ScopeMappingRepresentation scopeMapping(String username) {
+    public ScopeMappingRepresentation clientScopeMapping(String clientName) {
        ScopeMappingRepresentation mapping = new ScopeMappingRepresentation();
-        mapping.setClient(username);
+        mapping.setClient(clientName);
        if (scopeMappings == null) scopeMappings = new ArrayList<ScopeMappingRepresentation>();
        scopeMappings.add(mapping);
        return mapping;
    }
+
+    public ScopeMappingRepresentation clientTemplateScopeMapping(String clientTemplateName) {
+        ScopeMappingRepresentation mapping = new ScopeMappingRepresentation();
+        mapping.setClientTemplate(clientTemplateName);
+        if (scopeMappings == null) scopeMappings = new ArrayList<ScopeMappingRepresentation>();
+        scopeMappings.add(mapping);
+        return mapping;
+    }
+
    @Deprecated
    public Set<String> getRequiredCredentials() {
        return requiredCredentials;
@@ -27,6 +27,7 @@ import java.util.Set;
 public class ScopeMappingRepresentation {
    protected String self; // link
    protected String client;
+    protected String clientTemplate;
    protected Set<String> roles;

    public String getSelf() {
@@ -45,6 +46,14 @@ public class ScopeMappingRepresentation {
        this.client = client;
    }

+    public String getClientTemplate() {
+        return clientTemplate;
+    }
+
+    public void setClientTemplate(String clientTemplate) {
+        this.clientTemplate = clientTemplate;
+    }
+
    public Set<String> getRoles() {
        return roles;
    }
@@ -17,6 +17,7 @@

 package org.keycloak.representations.idm;

+import java.util.List;
 import java.util.Set;

 /**
@@ -25,7 +26,9 @@ import java.util.Set;
 public class UserFederationProviderFactoryRepresentation {

    private String id;
-    private Set<String> options;
+    private Set<String> options; // TODO:Remove as configurable providers are more flexible?
+    private String helpText; // Used for configurable providers
+    private List<ConfigPropertyRepresentation> properties; // Used for configurable providers

    public String getId() {
        return id;
@@ -43,6 +46,22 @@ public class UserFederationProviderFactoryRepresentation {
        this.options = options;
    }

+    public String getHelpText() {
+        return helpText;
+    }
+
+    public void setHelpText(String helpText) {
+        this.helpText = helpText;
+    }
+
+    public List<ConfigPropertyRepresentation> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(List<ConfigPropertyRepresentation> properties) {
+        this.properties = properties;
+    }
+
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2016 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.keycloak.representations.idm;
+
+/**
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class UserFederationSyncResultRepresentation {
+
+    private boolean ignored;
+
+    private int added;
+    private int updated;
+    private int removed;
+    private int failed;
+
+    private String status;
+
+    public boolean isIgnored() {
+        return ignored;
+    }
+
+    public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+    public int getAdded() {
+        return added;
+    }
+
+    public void setAdded(int added) {
+        this.added = added;
+    }
+
+    public int getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(int updated) {
+        this.updated = updated;
+    }
+
+    public int getRemoved() {
+        return removed;
+    }
+
+    public void setRemoved(int removed) {
+        this.removed = removed;
+    }
+
+    public int getFailed() {
+        return failed;
+    }
+
+    public void setFailed(int failed) {
+        this.failed = failed;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+}
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.9.2.Final</version>
+		<version>1.9.3.Final</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -25,7 +25,7 @@
    <parent>
        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Features</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI JAAS Realm Configuration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-distribution-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <name>Adapters Distribution Parent</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly 8 Adapter</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -25,7 +25,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly Adapter</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -25,7 +25,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-distribution-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <artifactId>keycloak-demo-dist</artifactId>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-distribution-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <artifactId>keycloak-docs-dist</artifactId>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-distribution-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <artifactId>keycloak-dist-downloads</artifactId>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-distribution-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <artifactId>keycloak-examples-dist</artifactId>
@@ -19,7 +19,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>feature-packs-parent</artifactId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-distribution-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
    </parent>

    <name>Feature Pack Builds</name>
@@ -19,7 +19,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>feature-packs-parent</artifactId>
-        <version>1.9.2.Final</version>
+        <version>1.9.3.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -18,11 +18,22 @@

 <!--  See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
 <config>
-   <subsystems name="default">
+   <subsystems name="load-balancer">
+      <!-- Each subsystem to be included relative to the src/main/resources directory -->
+      <subsystem>logging.xml</subsystem>
+      <subsystem>io.xml</subsystem>
+      <subsystem supplement="domain">jmx.xml</subsystem>
+      <subsystem>naming.xml</subsystem>
+      <subsystem>remoting.xml</subsystem>
+      <subsystem>request-controller.xml</subsystem>
+      <subsystem>security.xml</subsystem>
+      <subsystem>security-manager.xml</subsystem>
+   </subsystems>
+   <subsystems name="auth-server-standalone">
      <!-- Each subsystem to be included relative to the src/main/resources directory -->
      <subsystem>logging.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
-      <subsystem>keycloak-datasources.xml</subsystem>
+      <subsystem supplement="default">keycloak-datasources.xml</subsystem>
      <subsystem>ee.xml</subsystem>
      <subsystem>ejb3.xml</subsystem>
      <subsystem>io.xml</subsystem>
@@ -43,11 +54,12 @@
      <subsystem>undertow.xml</subsystem>
      <subsystem>keycloak-server.xml</subsystem>
   </subsystems>
-   <subsystems name="ha">
+
+   <subsystems name="auth-server-clustered">
      <!-- Each subsystem to be included relative to the src/main/resources directory -->
      <subsystem>logging.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
-      <subsystem>keycloak-datasources.xml</subsystem>
+      <subsystem supplement="domain">keycloak-datasources.xml</subsystem>
      <subsystem>ee.xml</subsystem>
      <subsystem supplement="ha">ejb3.xml</subsystem>
      <subsystem>io.xml</subsystem>
Author	SHA1	Message	Date
keycloak-bot	ea46bb0be3	Set version to 1.9.3.Final	2016-04-28 15:14:56 +00:00
Stian Thorgersen	7b988d267b	Merge pull request #2764 from stianst/1.9.x KEYCLOAK-2932 KEYCLOAK-2934	2016-04-28 13:50:40 +02:00
Stian Thorgersen	99372d2534	Merge pull request #2762 from mposolda/1.9.x KEYCLOAK-2903 Document proxy-address-forwarding with reverse proxy/lo…	2016-04-28 13:11:10 +02:00
Stian Thorgersen	508bddc70a	KEYCLOAK-2932 KEYCLOAK-2934	2016-04-28 13:06:41 +02:00
Stian Thorgersen	56d95b5414	Merge pull request #2760 from stianst/1.9.x KEYCLOAK-2933	2016-04-28 13:01:57 +02:00
mposolda	71b9420286	KEYCLOAK-2903 Document proxy-address-forwarding with reverse proxy/loadbalancer setup	2016-04-28 13:01:45 +02:00
Stian Thorgersen	024d64e0e0	KEYCLOAK-2933 RealmTest is failing on WildFly	2016-04-28 12:22:10 +02:00
Stian Thorgersen	e719f1af96	Merge pull request #2758 from vramik/KEYCLOAK-2928-1.9.x KEYCLOAK-2928 Enabled/edited CustomAuthFlowCookieTest	2016-04-28 11:17:56 +02:00
Vlasta Ramik	225aab1fed	Enabled/edited CustomAuthFlowCookieTest	2016-04-28 10:22:02 +02:00
Stian Thorgersen	fde9e6870f	Merge pull request #2757 from stianst/KEYCLOAK-2924-1.9 KEYCLOAK-2924: Fire AdminEvents on user group membership changes.	2016-04-28 10:18:09 +02:00
Thomas Darimont	90a9465caf	KEYCLOAK-2924: Fire AdminEvents on user group membership changes. We now fire AdminEvents if a user joins or leaves a group. This information can be used to deduce potential role changes in custom event listeners.	2016-04-28 08:38:17 +02:00
Stian Thorgersen	37a61d79a6	Merge pull request #2754 from ssilvert/1.9.x-migrate-actions KEYCLOAK-2905 Migrate actions package from old testsuite	2016-04-28 06:44:23 +02:00
Bill Burke	cb2fce74a6	Merge pull request #2756 from patriot1burke/1.9.x add bind addresses to domain template	2016-04-27 22:09:32 -04:00
Bill Burke	aaad122cff	add bind addresses to domain template	2016-04-27 22:03:13 -04:00
Stan Silvert	269a2e9ba9	KEYCLOAK-2905 Migrate actions package from old testsuite	2016-04-27 14:14:16 -04:00
Bill Burke	d5b86bedd6	Merge pull request #2751 from patriot1burke/1.9.x KEYCLOAK-2922 KEYCLOAK-2920	2016-04-27 11:37:15 -04:00
Bill Burke	790f0fe7f9	Merge pull request #2749 from stianst/1.9.x KEYCLOAK-2927 Rename add-user script to add-user-keycloak	2016-04-27 11:05:20 -04:00
Bill Burke	8417144677	Merge remote-tracking branch 'remote19/1.9.x' into b_1_9	2016-04-27 10:25:04 -04:00
Bill Burke	277f90e8b0	KEYCLOAK-2922 KEYCLOAK-2920	2016-04-27 10:23:23 -04:00
Stian Thorgersen	9306dc2015	KEYCLOAK-2927 Rename add-user script to add-user-keycloak	2016-04-27 16:17:41 +02:00
Stian Thorgersen	e979b96923	Merge pull request #2736 from mhajas/adapter-ssl-1.9.x KEYCLOAK-2915 Fix adapter ssl tests on EAP/EAP6	2016-04-27 13:50:01 +02:00
Stian Thorgersen	5a362df491	Merge pull request #2735 from vramik/KEYCLOAK-2889-1.9.x KEYCLOAK-2889 Fix adapter tests for Karaf/Fuse	2016-04-27 13:49:30 +02:00
Stian Thorgersen	1b611fef01	Merge pull request #2746 from stianst/KEYCLOAK-2871 KEYCLOAK-2871 Extend coverage on RealmAdminResource	2016-04-27 13:38:22 +02:00
Marek Posolda	2f7d415cba	Merge pull request #2742 from mposolda/1.9.x-loadbalancer KEYCLOAK-2903 Fix WelcomeResource to not allow requests forwarded fro…	2016-04-27 11:10:48 +02:00
Stian Thorgersen	5e992f6db9	KEYCLOAK-2871 Extend coverage on RealmAdminResource	2016-04-27 10:28:02 +02:00
Marek Posolda	844da0193a	Merge pull request #2744 from mposolda/1.9.x KEYCLOAK-2898 Fix GroupMappersTest on wildfly. Clearing AssertEvents …	2016-04-26 18:01:28 +02:00
mposolda	d42b44ee13	KEYCLOAK-2898 Fix GroupMappersTest on wildfly. Clearing AssertEvents events queue before test instead of after	2016-04-26 16:08:10 +02:00
mposolda	c3616ecb4d	KEYCLOAK-2903 Fix WelcomeResource to not allow requests forwarded from proxy/loadbalancer	2016-04-26 12:01:42 +02:00
mhajas	3a7787b1d7	Fix adapter ssl tests on EAP/EAP6	2016-04-26 09:08:35 +02:00
Stian Thorgersen	47103a040f	Merge pull request #2727 from abstractj/RHSSO-106-1.9.x RHSSO-106: Migration of ResourceOwnerPasswordCredentialsGrantTest	2016-04-25 19:46:15 +02:00
Bruno Oliveira	568140de4a	RHSSO-106: Migration of ResourceOwnerPasswordCredentialsGrantTest	2016-04-25 10:15:50 -03:00
Vlasta Ramik	6d2ade5f77	Fix adapter tests for Karaf/Fuse	2016-04-25 15:10:08 +02:00
Marek Posolda	40427a2200	Merge pull request #2733 from mposolda/1.9.x KEYCLOAK-2900	2016-04-25 15:00:12 +02:00
Stian Thorgersen	bb34cfb7d6	Merge pull request #2731 from abstractj/RHSSO-130-1.9.x RHSSO-130: AccessTokenTest migration	2016-04-25 13:43:05 +02:00
Stian Thorgersen	3fd840515b	Merge pull request #2712 from ssilvert/1.9.x-migrate-LoginTest Migrate LoginTest	2016-04-25 13:40:56 +02:00
mposolda	604a757665	KEYCLOAK-2900	2016-04-25 11:18:56 +02:00
Marek Posolda	107a3f4f11	Merge pull request #2729 from mstruk/KEYCLOAK-2899-b KEYCLOAK-2899 Tests fail with -Pauth-server-wildfly due to missing logging dependecy	2016-04-22 21:37:54 +02:00
Bruno Oliveira	f6fe53a44c	RHSSO-130: AccessTokenTest migration	2016-04-22 16:32:50 -03:00
Marko Strukelj	7281c2d8ae	KEYCLOAK-2899 Tests fail with -Pauth-server-wildfly due to missing logging dependecy	2016-04-22 19:50:40 +02:00
Marek Posolda	bb8bc7f976	Merge pull request #2723 from mstruk/KEYCLOAK-2893-b KEYCLOAK-2893 Fix TokenIntrospectionTest	2016-04-22 15:16:13 +02:00
Marek Posolda	b4ae814567	Merge pull request #2719 from abstractj/RHSSO-108-client-auth-signed-1.9.x Rhsso 108 client auth signed 1.9.x	2016-04-22 15:07:07 +02:00
Marek Posolda	b482396af9	Merge pull request #2720 from mposolda/1.9.x EYCLOAK	2016-04-22 15:00:49 +02:00
Marko Strukelj	9d9bf3c39b	KEYCLOAK-2893 Fix TokenIntrospectionTest	2016-04-22 14:20:53 +02:00
mposolda	01fece902c	KEYCLOAK-2878 Added UserFederationLdapConnectionTest	2016-04-22 13:46:58 +02:00
mposolda	663a145bd7	KEYCLOAK-2878 UserFederation mapper testing	2016-04-22 13:46:58 +02:00
Marek Posolda	2417e49f9c	Merge pull request #2717 from mstruk/KEYCLOAK-2893-b KEYCLOAK-2893 Fix TokenIntrospectionTest	2016-04-22 13:42:51 +02:00
Bruno Oliveira	b053ce70f9	Inclusion of try/finally suggested by Stian	2016-04-22 08:30:15 -03:00
Bruno Oliveira	a6f4588ef2	RHSSO-108: Migration of ClientAuthSignedJWTTest	2016-04-22 08:30:12 -03:00
Marko Strukelj	025df56796	KEYCLOAK-2893 Fix TokenIntrospectionTest	2016-04-22 11:19:54 +02:00
Marek Posolda	f75f14141c	Merge pull request #2714 from mposolda/1.9.x UserFederation admin testing	2016-04-22 00:43:32 +02:00
mposolda	f966d53f9e	Simplified calling of AuthenticationManagementResource.getExecutions()	2016-04-21 22:54:27 +02:00
mposolda	2c25fd3c08	KEYCLOAK-2878 Testing of UserFederation admin REST endpoints	2016-04-21 22:54:17 +02:00
Stan Silvert	e671d4429b	Migrate LoginTest	2016-04-21 09:43:19 -04:00
Stian Thorgersen	95cf7bdeea	Merge pull request #2708 from stianst/KEYCLOAK-2866-1.9 KEYCLOAK-2866 KEYCLOAK-2874 Test role mapping resource	2016-04-21 14:58:13 +02:00
Stian Thorgersen	7f96e0438e	KEYCLOAK-2866 KEYCLOAK-2874 Test role mapping resource	2016-04-21 14:22:25 +02:00
Stian Thorgersen	82006f812a	Merge pull request #2706 from stianst/KEYCLOAK-2868-1.9 KEYCLOAK-2868 Extend coverage of GroupResource tests	2016-04-21 13:38:16 +02:00
Stian Thorgersen	951fb095fc	Merge pull request #2703 from stianst/KEYCLOAK-2838-1.9 KEYCLOAK-2838: Add cookie storage fallback to keycloak.js	2016-04-21 13:37:48 +02:00
Stian Thorgersen	06c1f0a7e9	KEYCLOAK-2868 Extend coverage of GroupResource tests	2016-04-21 11:52:04 +02:00
Stian Thorgersen	4445989f85	Merge pull request #2702 from stianst/KEYCLOAK-2873-1.9 KEYCLOAK-2873 / KEYCLOAK-2875 Test RoleContainerResource	2016-04-21 11:47:46 +02:00
Maximilian Szengel	c1156bb053	KEYCLOAK-2838: Add cookie storage fallback to keycloak.js	2016-04-21 11:10:18 +02:00
Stian Thorgersen	fc1a7908d6	KEYCLOAK-2873 / KEYCLOAK-2875 Test RoleContainerResource	2016-04-21 10:59:45 +02:00
Stian Thorgersen	70d427acea	Merge pull request #2699 from stianst/KEYCLOAK-2864-1.9 KEYCLOAK-2864 Test InitialAccessTokenResource	2016-04-21 10:27:13 +02:00
Stian Thorgersen	d299ae9af5	KEYCLOAK-2864 Test InitialAccessTokenResource	2016-04-21 09:44:59 +02:00
Stian Thorgersen	f79d7a65fd	Merge pull request #2698 from stianst/KEYCLOAK-2872-1.9 KEYCLOAK-2872 Test RoleByIdResource	2016-04-21 09:31:45 +02:00
Stian Thorgersen	cff654b784	KEYCLOAK-2872 Test RoleByIdResource	2016-04-21 07:10:25 +02:00
Stian Thorgersen	bdbd765e7e	Merge pull request #2693 from abstractj/RHSSO-108-1.9.x RHSSO-108: Client signed token authentication	2016-04-21 06:19:20 +02:00
Stian Thorgersen	61bb2ee660	Merge pull request #2695 from stianst/1.9.x Ignore failing CustomAuthFlowCookieTest	2016-04-21 06:07:20 +02:00
Stian Thorgersen	2472eef714	Ignore failing CustomAuthFlowCookieTest	2016-04-21 06:06:14 +02:00
Bruno Oliveira	51c87609ae	RHSSO-108: Client signed token authentication	2016-04-20 20:47:09 -03:00
Stian Thorgersen	33c8ced3e9	Merge pull request #2691 from stianst/role-assertevents-1.9 Made AssertEvents work with @Rule	2016-04-20 21:44:42 +02:00
Stian Thorgersen	94f1e43be7	Merge pull request #2692 from stianst/KEYCLOAK-2835-1.9 [KEYCLOAK-2835] - Adding SOAP binding to the list of supported Single…	2016-04-20 20:16:26 +02:00
Pedro Igor	13e09d2341	[KEYCLOAK-2835] - Adding SOAP binding to the list of supported SingleSignOnService.	2016-04-20 20:15:30 +02:00
Stian Thorgersen	d3fc34752e	Made AssertEvents work with @Rule	2016-04-20 20:11:02 +02:00
Stian Thorgersen	f8ddecdf2f	Merge pull request #2689 from ssilvert/1.9.x Rename oauthClient to oauth in AbstractKeycloakTst	2016-04-20 19:41:00 +02:00
Stian Thorgersen	53a7025784	Merge pull request #2686 from mposolda/1.9.x KEYCLOAK-2842 Not possible to add new execution under registration flow	2016-04-20 19:40:41 +02:00
Stian Thorgersen	4f07522953	Merge pull request #2685 from mstruk/assert-events-refactor-b KEYCLOAK-2755 Refactor testsuite events provider	2016-04-20 19:37:01 +02:00
Stian Thorgersen	ad0c9adc03	Merge pull request #2682 from stianst/KEYCLOAK-2861 KEYCLOAK-2861 Test AttackDetectionResource	2016-04-20 19:36:08 +02:00
Stan Silvert	16390ee4b6	Rename oauthClient to oauth in AbstractKeycloakTst	2016-04-20 12:40:10 -04:00
mposolda	ec8eee02fe	KEYCLOAK-2842 Not possible to add new execution under registration flow	2016-04-20 18:36:35 +02:00
Marko Strukelj	db85f77b00	KEYCLOAK-2755 Refactor testsuite events provider	2016-04-20 16:46:42 +02:00
Stian Thorgersen	433fe5944c	KEYCLOAK-2861 Test AttackDetectionResource	2016-04-20 16:20:38 +02:00
Stian Thorgersen	fb476e5022	Merge pull request #2681 from stianst/KEYCLOAK-2850-1.9 Moved admin tests from endpoint package back to admin package	2016-04-20 15:35:52 +02:00
Stian Thorgersen	29113b9398	Moved admin tests from endpoint package back to admin package	2016-04-20 14:57:15 +02:00
Stian Thorgersen	fc0c8e898d	Merge pull request #2678 from stianst/KEYCLOAK-2850-1.9 KEYCLOAK-2850 Migrated ImpersonationTest and added builders	2016-04-20 14:48:07 +02:00
Marek Posolda	fca9122052	Merge pull request #2676 from mposolda/1.9.x Client template fixes	2016-04-20 14:13:51 +02:00
Stian Thorgersen	f1e5cbf8fc	KEYCLOAK-2850 Migrated ImpersonationTest and added builders	2016-04-20 13:52:32 +02:00
mposolda	2a6b25b840	KEYCLOAK-2846 export/import of clientTemplate scopes	2016-04-20 13:22:40 +02:00
mposolda	1c9f4cfb5c	KEYCLOAK-2844 Unexpected error when trying to remove clientTemplate in use	2016-04-20 13:20:48 +02:00
Stian Thorgersen	4c7c2a4cd3	Merge pull request #2674 from stianst/1.9.x KEYCLOAK-2850 Migrated ConcurrencyTest	2016-04-20 12:50:06 +02:00
Stian Thorgersen	110c142a53	Merge pull request #2672 from stianst/KEYCLOAK-2491-1.9 KEYCLOAK-2491 Fix permissions in admin console to match permissions i…	2016-04-20 12:49:31 +02:00
Stian Thorgersen	8c8f2019e9	KEYCLOAK-2850 Migrated ConcurrencyTest	2016-04-20 10:07:49 +02:00
Stian Thorgersen	e5557e0cde	KEYCLOAK-2491 Fix permissions in admin console to match permissions in admin endpoints	2016-04-20 09:57:31 +02:00
Marek Posolda	f4f7488d8a	Merge pull request #2669 from mposolda/1.9.x KEYCLOAK-2850 Migrate RealmTest from old testsuite to new	2016-04-20 09:33:50 +02:00
Stian Thorgersen	7ea27e7c28	Merge pull request #2668 from stianst/KEYCLOAK-2832-1.9 KEYCLOAK-2832	2016-04-20 09:10:51 +02:00
mposolda	b14b384777	Remove AbstractAdminTest.assertNames and related methods (as they are available in Assert class)	2016-04-20 08:04:40 +02:00
mposolda	7c284dc843	KEYCLOAK-2850 migrate RealmTest from old testsuite to new	2016-04-20 08:04:40 +02:00
Stian Thorgersen	320e81f11b	KEYCLOAK-2832 Authentication failure logs at ERROR level	2016-04-20 07:32:33 +02:00
Stian Thorgersen	350f45ef76	Merge pull request #2650 from mhajas/truststore.1.9.x KEYCLOAK-2841 Trustore support in adapter tests	2016-04-20 06:56:58 +02:00
Stian Thorgersen	20f7b444bb	Merge pull request #2665 from stianst/1.9.x Migrate pages from old testsuite, make OAuthClient injectable	2016-04-19 22:08:50 +02:00
Stian Thorgersen	3da4b3a6d3	Removed duplicated ClientInitialAccessTest	2016-04-19 20:34:47 +02:00
Stian Thorgersen	37a9f88983	Merge pull request #2663 from vmuzikar/1.9.x KEYCLOAK-2854 Fix Client Settings Console UI test	2016-04-19 20:32:06 +02:00
Stian Thorgersen	d4c82dbd72	Merge pull request #2660 from abstractj/apiutil-removal-1.9.x Removal of duplicated API Util	2016-04-19 20:31:10 +02:00
Stian Thorgersen	85e2b5eea0	Merge pull request #2647 from tkyjovsk/performance-tests-1.9.x Added module 'adapters/jboss/remote' with performance tests. 1.9.x	2016-04-19 20:30:23 +02:00
Stian Thorgersen	e6cf4afc29	Migrate pages from old testsuite, make OAuthClient injectable	2016-04-19 20:18:09 +02:00
Vaclav Muzikar	26ba12962c	KEYCLOAK-2854 Fix Client Settings Console UI test	2016-04-19 18:04:57 +02:00
Marek Posolda	e963344f87	Merge pull request #2657 from stianst/KEYCLOAK-2850-1.9 KEYCLOAK-2850 Migrate admin endpoint identity provider test	2016-04-19 16:24:49 +02:00
Bruno Oliveira	daf8658568	Removal of duplicated API Util	2016-04-19 10:22:26 -03:00
Marek Posolda	38394a6949	Merge pull request #2655 from mposolda/1.9.x KEYCLOAK-2849 Admin endpoint tests for client templates	2016-04-19 15:22:14 +02:00
mposolda	af34927930	KEYCLOAK-2849 Admin endpoint tests for client templates	2016-04-19 14:36:30 +02:00
Stian Thorgersen	fe4fbfca30	KEYCLOAK-2850 Migrate admin endpoint identity provider test	2016-04-19 14:27:53 +02:00
Stian Thorgersen	28de85f8f9	Merge pull request #2653 from stianst/KEYCLOAK-2828-1.9.x KEYCLOAK-2828	2016-04-19 13:44:12 +02:00
Stian Thorgersen	91817ea333	KEYCLOAK-2828 Refactor contribution and add tests	2016-04-19 13:09:35 +02:00
Thomas Raehalme	c285fc1cf7	KEYCLOAK-2828: LoginStatusIframeEndpoint now sets the P3P header. IE requires a P3P header to be present in <iframe /> response. Otherwise cookies are forbidden. The value of the header does not seem to matter.	2016-04-19 10:27:17 +02:00
Marek Posolda	45173f4063	Merge pull request #2648 from pdrozd/1.9.x KEYCLOAK-2839 - kerberos tests migration.	2016-04-18 20:05:33 +02:00
mhajas	c4271b30e9	Trustore support in adapter tests + fix tests	2016-04-18 16:12:58 +02:00
Tomas Kyjovsky	c7205fa43d	Updated version fo adapters/jboss/remote/pom.xml to 1.9.3-Final-SNAPSHOT.	2016-04-18 14:27:14 +02:00
Pavel Drozd	5ac65413f2	KEYCLOAK-2839 - kerberos tests migration.	2016-04-18 14:27:12 +02:00
Tomas Kyjovsky	848c234e06	Added module 'adapters/jboss/remote' with performance tests.	2016-04-18 14:25:13 +02:00
Stian Thorgersen	1b987ff2a5	Merge pull request #2636 from ssilvert/1.9.x-migrate-oauth-client-2 KEYCLOAK-2743: Port OAuthClient to new testsuite	2016-04-18 07:35:09 +02:00
Bill Burke	8c0c80f6af	Merge pull request #2645 from patriot1burke/1.9.x KEYCLOAK-2740	2016-04-15 17:29:46 -04:00
Bill Burke	8d3d80e603	KEYCLOAK-2740	2016-04-15 16:48:38 -04:00
Bill Burke	3df22af3f0	Merge pull request #2606 from vramik/KEYCLOAK-2757-1.9.x KEYCLOAK-2757 Add tests to cover custom auth flows	2016-04-15 16:27:56 -04:00
Bill Burke	199198ecb5	Merge pull request #2642 from patriot1burke/1.9.x KEYCLOAK-2584	2016-04-15 16:27:34 -04:00
Bill Burke	6180132486	KEYCLOAK-2584	2016-04-15 15:14:43 -04:00
Bill Burke	7731e74c38	KEYCLOAK-2584	2016-04-15 15:09:42 -04:00
Stan Silvert	15f75a36b5	Move test under 'endpoint' package.	2016-04-15 08:12:58 -04:00
Stan Silvert	37eddc23fd	Create TestRealmKeycloakTest as common base class for tests that need testrealm.json. Rename admin packaget to endpoint. Rename legacy package to match old testsuite. test suite.	2016-04-15 08:12:22 -04:00
Stan Silvert	7099dc3e51	KEYCLOAK-2743: Port OAuthClient to new testsuite	2016-04-15 08:11:54 -04:00
keycloak-bot	cf1c7a319a	Set version to 1.9.3.Final-SNAPSHOT	2016-04-14 14:07:48 +00:00
Vlasta Ramik	41ac0f3b04	Add tests to cover custom auth flows	2016-04-13 12:08:03 +02:00