keycloak-uncached
Changes
audit/api/pom.xml 2(+1 -1)
audit/email/pom.xml 2(+1 -1)
audit/jboss-logging/pom.xml 2(+1 -1)
audit/jpa/pom.xml 2(+1 -1)
audit/mongo/pom.xml 2(+1 -1)
audit/pom.xml 2(+1 -1)
connections/jpa/pom.xml 2(+1 -1)
connections/mongo/pom.xml 2(+1 -1)
connections/pom.xml 2(+1 -1)
core/pom.xml 2(+1 -1)
core-jaxrs/pom.xml 2(+1 -1)
dependencies/pom.xml 2(+1 -1)
dependencies/server-all/pom.xml 2(+1 -1)
dependencies/server-min/pom.xml 2(+1 -1)
distribution/appliance-dist/pom.xml 2(+1 -1)
distribution/as7-adapter-zip/pom.xml 2(+1 -1)
distribution/modules/pom.xml 2(+1 -1)
distribution/pom.xml 2(+1 -1)
distribution/src-dist/pom.xml 2(+1 -1)
distribution/war-dist/pom.xml 2(+1 -1)
distribution/war-zip/pom.xml 2(+1 -1)
docbook/pom.xml 2(+1 -1)
examples/cors/pom.xml 2(+1 -1)
examples/demo-template/pom.xml 2(+1 -1)
examples/js-console/pom.xml 2(+1 -1)
examples/pom.xml 2(+1 -1)
examples/providers/pom.xml 2(+1 -1)
export-import/pom.xml 2(+1 -1)
federation/ldap/pom.xml 2(+1 -1)
federation/pom.xml 2(+1 -1)
forms/account-api/pom.xml 2(+1 -1)
forms/account-freemarker/pom.xml 2(+1 -1)
forms/common-freemarker/pom.xml 2(+1 -1)
forms/common-themes/pom.xml 2(+1 -1)
forms/email-api/pom.xml 2(+1 -1)
forms/email-freemarker/pom.xml 2(+1 -1)
forms/login-api/pom.xml 2(+1 -1)
forms/login-freemarker/pom.xml 2(+1 -1)
forms/pom.xml 2(+1 -1)
integration/adapter-core/pom.xml 2(+1 -1)
integration/admin-client/pom.xml 2(+1 -1)
integration/as7-eap6/adapter/pom.xml 2(+1 -1)
integration/installed/pom.xml 2(+1 -1)
integration/js/pom.xml 2(+1 -1)
integration/pom.xml 2(+1 -1)
integration/tomcat7/adapter/pom.xml 2(+1 -1)
integration/undertow/pom.xml 2(+1 -1)
integration/wildfly-adapter/pom.xml 2(+1 -1)
model/api/pom.xml 2(+1 -1)
model/invalidation-cache/pom.xml 2(+1 -1)
model/jpa/pom.xml 2(+1 -1)
model/mongo/pom.xml 2(+1 -1)
model/pom.xml 2(+1 -1)
model/sessions-jpa/pom.xml 2(+1 -1)
model/sessions-mem/pom.xml 2(+1 -1)
model/sessions-mongo/pom.xml 2(+1 -1)
picketlink/pom.xml 2(+1 -1)
pom.xml 2(+1 -1)
project-integrations/pom.xml 2(+1 -1)
server/pom.xml 2(+1 -1)
services/pom.xml 2(+1 -1)
social/core/pom.xml 2(+1 -1)
social/facebook/pom.xml 2(+1 -1)
social/github/pom.xml 2(+1 -1)
social/google/pom.xml 2(+1 -1)
social/pom.xml 2(+1 -1)
social/twitter/pom.xml 2(+1 -1)
testsuite/integration/pom.xml 2(+1 -1)
testsuite/performance/pom.xml 2(+1 -1)
testsuite/performance-web/pom.xml 2(+1 -1)
testsuite/pom.xml 2(+1 -1)
testsuite/tools/pom.xml 2(+1 -1)
timer/api/pom.xml 2(+1 -1)
timer/basic/pom.xml 2(+1 -1)
timer/pom.xml 2(+1 -1)
Details
audit/api/pom.xml 2(+1 -1)
diff --git a/audit/api/pom.xml b/audit/api/pom.xml
index 8231ce8..dbed239 100755
--- a/audit/api/pom.xml
+++ b/audit/api/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-audit-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
audit/email/pom.xml 2(+1 -1)
diff --git a/audit/email/pom.xml b/audit/email/pom.xml
index b411647..03634e3 100755
--- a/audit/email/pom.xml
+++ b/audit/email/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-audit-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
audit/jboss-logging/pom.xml 2(+1 -1)
diff --git a/audit/jboss-logging/pom.xml b/audit/jboss-logging/pom.xml
index e8bf82d..b9ee72d 100755
--- a/audit/jboss-logging/pom.xml
+++ b/audit/jboss-logging/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-audit-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
audit/jpa/pom.xml 2(+1 -1)
diff --git a/audit/jpa/pom.xml b/audit/jpa/pom.xml
index 445c96e..0a3e813 100755
--- a/audit/jpa/pom.xml
+++ b/audit/jpa/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-audit-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
audit/mongo/pom.xml 2(+1 -1)
diff --git a/audit/mongo/pom.xml b/audit/mongo/pom.xml
index 7bfa61a..82cf3ed 100755
--- a/audit/mongo/pom.xml
+++ b/audit/mongo/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-audit-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
audit/pom.xml 2(+1 -1)
diff --git a/audit/pom.xml b/audit/pom.xml
index eb530a5..9a5411b 100755
--- a/audit/pom.xml
+++ b/audit/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
connections/jpa/pom.xml 2(+1 -1)
diff --git a/connections/jpa/pom.xml b/connections/jpa/pom.xml
index 3383883..092858f 100755
--- a/connections/jpa/pom.xml
+++ b/connections/jpa/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
connections/mongo/pom.xml 2(+1 -1)
diff --git a/connections/mongo/pom.xml b/connections/mongo/pom.xml
index 7112f9c..1a5a946 100755
--- a/connections/mongo/pom.xml
+++ b/connections/mongo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
connections/pom.xml 2(+1 -1)
diff --git a/connections/pom.xml b/connections/pom.xml
index 901732b..18bad63 100755
--- a/connections/pom.xml
+++ b/connections/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<name>Connections Parent</name>
<description/>
core/pom.xml 2(+1 -1)
diff --git a/core/pom.xml b/core/pom.xml
index b8b4274..11200a0 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
core-jaxrs/pom.xml 2(+1 -1)
diff --git a/core-jaxrs/pom.xml b/core-jaxrs/pom.xml
index 456f1b9..16244fc 100755
--- a/core-jaxrs/pom.xml
+++ b/core-jaxrs/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
dependencies/pom.xml 2(+1 -1)
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index c9b3c32..6e3b240 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
dependencies/server-all/pom.xml 2(+1 -1)
diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index a69e9d1..b678eda 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
dependencies/server-min/pom.xml 2(+1 -1)
diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index 78e7376..c5d514a 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
distribution/appliance-dist/pom.xml 2(+1 -1)
diff --git a/distribution/appliance-dist/pom.xml b/distribution/appliance-dist/pom.xml
index c6c0085..e31c87a 100755
--- a/distribution/appliance-dist/pom.xml
+++ b/distribution/appliance-dist/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
distribution/as7-adapter-zip/pom.xml 2(+1 -1)
diff --git a/distribution/as7-adapter-zip/pom.xml b/distribution/as7-adapter-zip/pom.xml
index c91c996..416b890 100755
--- a/distribution/as7-adapter-zip/pom.xml
+++ b/distribution/as7-adapter-zip/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/distribution/eap6-adapter-zip/pom.xml b/distribution/eap6-adapter-zip/pom.xml
index 5d2f0b9..aaa3598 100755
--- a/distribution/eap6-adapter-zip/pom.xml
+++ b/distribution/eap6-adapter-zip/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/distribution/examples-docs-zip/pom.xml b/distribution/examples-docs-zip/pom.xml
index 127a415..ef50efe 100755
--- a/distribution/examples-docs-zip/pom.xml
+++ b/distribution/examples-docs-zip/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
distribution/modules/pom.xml 2(+1 -1)
diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index 677534a..7ea974f 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -30,7 +30,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
distribution/pom.xml 2(+1 -1)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2cfde3a..843b00e 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Distribution</name>
distribution/src-dist/pom.xml 2(+1 -1)
diff --git a/distribution/src-dist/pom.xml b/distribution/src-dist/pom.xml
index 817fdea..46cc173 100755
--- a/distribution/src-dist/pom.xml
+++ b/distribution/src-dist/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/distribution/theme-template-zip/pom.xml b/distribution/theme-template-zip/pom.xml
index ed8abce..31f809d 100755
--- a/distribution/theme-template-zip/pom.xml
+++ b/distribution/theme-template-zip/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
distribution/war-dist/pom.xml 2(+1 -1)
diff --git a/distribution/war-dist/pom.xml b/distribution/war-dist/pom.xml
index b8bd0c1..79b7f7e 100755
--- a/distribution/war-dist/pom.xml
+++ b/distribution/war-dist/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
distribution/war-zip/pom.xml 2(+1 -1)
diff --git a/distribution/war-zip/pom.xml b/distribution/war-zip/pom.xml
index be566d1..da1054a 100755
--- a/distribution/war-zip/pom.xml
+++ b/distribution/war-zip/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/distribution/wildfly-adapter-zip/pom.xml b/distribution/wildfly-adapter-zip/pom.xml
index 809cbad..1bf9ee1 100755
--- a/distribution/wildfly-adapter-zip/pom.xml
+++ b/distribution/wildfly-adapter-zip/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
docbook/pom.xml 2(+1 -1)
diff --git a/docbook/pom.xml b/docbook/pom.xml
index ffba8f4..b920fd2 100755
--- a/docbook/pom.xml
+++ b/docbook/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-reference-guide-${translation}</artifactId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<packaging>jdocbook</packaging>
<name>Keycloak Reference Guide (${translation})</name>
<description/>
diff --git a/docbook/reference/en/en-US/master.xml b/docbook/reference/en/en-US/master.xml
index 077eb98..fec7caa 100755
--- a/docbook/reference/en/en-US/master.xml
+++ b/docbook/reference/en/en-US/master.xml
@@ -38,7 +38,7 @@
<bookinfo>
<title>Keycloak Reference Guide</title>
<subtitle>SSO for Web Apps and REST Services</subtitle>
- <releaseinfo>1.0-rc-1-SNAPSHOT</releaseinfo>
+ <releaseinfo>1.0-rc-1</releaseinfo>
</bookinfo>
<toc/>
diff --git a/docbook/reference/en/en-US/modules/export-import.xml b/docbook/reference/en/en-US/modules/export-import.xml
old mode 100644
new mode 100755
index 6f1cfc3..13da6cb
--- a/docbook/reference/en/en-US/modules/export-import.xml
+++ b/docbook/reference/en/en-US/modules/export-import.xml
@@ -50,6 +50,14 @@ bin/standalone.sh -Dkeycloak.migration.action=export
]]></programlisting>
</para>
<para>
+ Here's an example of importing:
+ <programlisting><![CDATA[
+bin/standalone.sh -Dkeycloak.migration.action=import
+-Dkeycloak.migration.provider=singleFile -Dkeycloak.migration.file=<FILE TO IMPORT>
+-Dkeycloak.migration.strategy=OVERWRITE_EXISTING
+]]></programlisting>
+ </para>
+ <para>
Other available options are:
<variablelist>
<varlistentry>
@@ -92,7 +100,7 @@ bin/standalone.sh -Dkeycloak.migration.action=export
is used during import. It can be used to specify how to proceed if realm with same name
already exists in the database where you are going to import data. Possible values are:
<itemizedlist>
- <listitem>IGNORE_EXISTING - Ignore exporting if realm of this name already exists</listitem>
+ <listitem>IGNORE_EXISTING - Ignore importing if realm of this name already exists</listitem>
<listitem>OVERWRITE_EXISTING - Remove existing realm and import it again with new data from JSON file.
If you want to fully migrate one environment to another and ensure that the new environment will contain same data
like the old one, you can specify this.
diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index 58f747b..e480238 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -8,11 +8,11 @@
<itemizedlist>
<listitem>
- keycloak-appliance-dist-all-1.0-rc-1-SNAPSHOT.zip
+ keycloak-appliance-dist-all-1.0-rc-1.zip
</listitem>
<listitem>
- keycloak-war-dist-all-1.0-rc-1-SNAPSHOT.zip
+ keycloak-war-dist-all-1.0-rc-1.zip
</listitem>
</itemizedlist>
@@ -31,7 +31,7 @@
<para>
<programlisting>
-keycloak-appliance-dist-all-1.0-rc-1-SNAPSHOT/
+keycloak-appliance-dist-all-1.0-rc-1/
keycloak/
bin/
standalone.sh
@@ -42,9 +42,9 @@ keycloak-appliance-dist-all-1.0-rc-1-SNAPSHOT/
keycloak-server.json
themes/
adapters/
- keycloak-as7-adapter-dist-1.0-rc-1-SNAPSHOT.zip
- keycloak-eap6-adapter-dist-1.0-rc-1-SNAPSHOT.zip
- keycloak-wildfly-adapter-dist-1.0-rc-1-SNAPSHOT.zip
+ keycloak-as7-adapter-dist-1.0-rc-1.zip
+ keycloak-eap6-adapter-dist-1.0-rc-1.zip
+ keycloak-wildfly-adapter-dist-1.0-rc-1.zip
examples/
docs/
</programlisting>
@@ -79,7 +79,7 @@ keycloak-appliance-dist-all-1.0-rc-1-SNAPSHOT/
</para>
<para>
<programlisting>
-keycloak-war-dist-all-1.0-rc-1-SNAPSHOT/
+keycloak-war-dist-all-1.0-rc-1/
deployments/
auth-server.war/
keycloak-ds.xml
@@ -87,9 +87,9 @@ keycloak-war-dist-all-1.0-rc-1-SNAPSHOT/
keycloak-server.json
themes/
adapters/
- keycloak-as7-adapter-dist-1.0-rc-1-SNAPSHOT.zip
- keycloak-eap6-adapter-dist-1.0-rc-1-SNAPSHOT.zip
- keycloak-wildfly-adapter-dist-1.0-rc-1-SNAPSHOT.zip
+ keycloak-as7-adapter-dist-1.0-rc-1.zip
+ keycloak-eap6-adapter-dist-1.0-rc-1.zip
+ keycloak-wildfly-adapter-dist-1.0-rc-1.zip
examples/
docs/
</programlisting>
@@ -101,7 +101,7 @@ keycloak-war-dist-all-1.0-rc-1-SNAPSHOT/
</para>
<para>
<programlisting>
- $ cd keycloak-war-dist-all-1.0-rc-1-SNAPSHOT
+ $ cd keycloak-war-dist-all-1.0-rc-1
$ cp -r deployments $JBOSS_HOME/standalone
$ cp -r configuration $JBOSS_HOME/standalone
</programlisting>
@@ -402,7 +402,7 @@ keycloak-war-dist-all-1.0-rc-1-SNAPSHOT/
</programlisting>
</section>
<section>
- <title>SSL/HTTPS Setup</title>
+ <title>SSL/HTTPS Requirement/Modes</title>
<warning>
<para>
Keycloak is not set up by default to handle SSL/HTTPS in either the
@@ -410,6 +410,47 @@ keycloak-war-dist-all-1.0-rc-1-SNAPSHOT/
itself or on a reverse proxy in front of the Keycloak server.
</para>
</warning>
+ <para>
+ Keycloak can run out of the box without SSL so long as you stick to private IP addresses like
+ localhost, 127.0.0.1, 10.0.x.x, 192.168.x.x, and 172..16.x.x. If you try to access Keycloak from a
+ non-IP adress you will get an error.
+ </para>
+ <para>
+ Keycloak has 3 SSL/HTTPS modes which you can set up in the admin console under the Settings->Login page
+ and the <literal>Require SSL</literal> select box. Each adapter config should mirror this server-side
+ setting. See adapter config section for more details.
+ <variablelist>
+ <varlistentry>
+ <term>external</term>
+ <listitem>
+ <para>
+ Keycloak can run out of the box without SSL so long as you stick to private IP addresses like
+ localhost, 127.0.0.1, 10.0.x.x, 192.168.x.x, and 172..16.x.x. If you try to access Keycloak from a
+ non-IP adress you will get an error.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>none</term>
+ <listitem>
+ <para>
+ Keycloak does not require SSL.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>all</term>
+ <listitem>
+ <para>
+ Keycloak requires SSL for all IP addresses.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </section>
+ <section>
+ <title>SSL/HTTPS Setup</title>
<para>
First enable SSL on Keycloak or on a reverse proxy in front of Keycloak. Then configure the Keycloak Server to enforce HTTPS connections.
diff --git a/docbook/reference/en/en-US/modules/themes.xml b/docbook/reference/en/en-US/modules/themes.xml
index 10ed629..489f0cf 100755
--- a/docbook/reference/en/en-US/modules/themes.xml
+++ b/docbook/reference/en/en-US/modules/themes.xml
@@ -154,7 +154,7 @@
</para>
<para>
Keycloaks default account management provider is built on the FreeMarker template engine (<literal>forms/account-freemarker</literal>).
- To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-account-freemarker-1.0-rc-1-SNAPSHOT.jar</literal>
+ To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-account-freemarker-1.0-rc-1.jar</literal>
or disable it with the system property <literal>org.keycloak.account.freemarker.FreeMarkerAccountProviderFactory</literal>.
</para>
</section>
@@ -167,7 +167,7 @@
</para>
<para>
Keycloaks default login forms provider is built on the FreeMarker template engine (<literal>forms/login-freemarker</literal>).
- To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-login-freemarker-1.0-rc-1-SNAPSHOT.jar</literal>
+ To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-login-freemarker-1.0-rc-1.jar</literal>
or disable it with the system property <literal>org.keycloak.login.freemarker.FreeMarkerLoginFormsProviderFactory</literal>.
</para>
</section>
diff --git a/examples/cors/angular-product-app/pom.xml b/examples/cors/angular-product-app/pom.xml
index ca88677..feae660 100755
--- a/examples/cors/angular-product-app/pom.xml
+++ b/examples/cors/angular-product-app/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/cors/database-service/pom.xml b/examples/cors/database-service/pom.xml
index 7e66233..9decfe9 100755
--- a/examples/cors/database-service/pom.xml
+++ b/examples/cors/database-service/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/cors/database-service/src/main/webapp/WEB-INF/keycloak.json b/examples/cors/database-service/src/main/webapp/WEB-INF/keycloak.json
index 0d29299..e93b148 100755
--- a/examples/cors/database-service/src/main/webapp/WEB-INF/keycloak.json
+++ b/examples/cors/database-service/src/main/webapp/WEB-INF/keycloak.json
@@ -1,5 +1,5 @@
{
- "realm" : "cors-realm",
+ "realm" : "cors",
"resource" : "cors-database-service",
"realm-public-key" : "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB",
"bearer-only" : true,
examples/cors/pom.xml 2(+1 -1)
diff --git a/examples/cors/pom.xml b/examples/cors/pom.xml
index 8160c5c..ac04d48 100755
--- a/examples/cors/pom.xml
+++ b/examples/cors/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Examples</name>
diff --git a/examples/demo-template/admin-access-app/pom.xml b/examples/demo-template/admin-access-app/pom.xml
index 7516146..fe3351d 100755
--- a/examples/demo-template/admin-access-app/pom.xml
+++ b/examples/demo-template/admin-access-app/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/angular-product-app/pom.xml b/examples/demo-template/angular-product-app/pom.xml
index 2a2435b..80b1520 100755
--- a/examples/demo-template/angular-product-app/pom.xml
+++ b/examples/demo-template/angular-product-app/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/customer-app/pom.xml b/examples/demo-template/customer-app/pom.xml
index 43fe60a..a767fb5 100755
--- a/examples/demo-template/customer-app/pom.xml
+++ b/examples/demo-template/customer-app/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/customer-app-cli/pom.xml b/examples/demo-template/customer-app-cli/pom.xml
index 57b35ab..7ebbcd8 100755
--- a/examples/demo-template/customer-app-cli/pom.xml
+++ b/examples/demo-template/customer-app-cli/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/customer-app-js/pom.xml b/examples/demo-template/customer-app-js/pom.xml
index b246d07..b9521a8 100755
--- a/examples/demo-template/customer-app-js/pom.xml
+++ b/examples/demo-template/customer-app-js/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/database-service/pom.xml b/examples/demo-template/database-service/pom.xml
index 6314933..e3db168 100755
--- a/examples/demo-template/database-service/pom.xml
+++ b/examples/demo-template/database-service/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/example-ear/pom.xml b/examples/demo-template/example-ear/pom.xml
old mode 100644
new mode 100755
index 6d5d1ed..1fd8ab6
--- a/examples/demo-template/example-ear/pom.xml
+++ b/examples/demo-template/example-ear/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/demo-template/pom.xml 2(+1 -1)
diff --git a/examples/demo-template/pom.xml b/examples/demo-template/pom.xml
index 5dbfa50..1eac2af 100755
--- a/examples/demo-template/pom.xml
+++ b/examples/demo-template/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Examples</name>
diff --git a/examples/demo-template/product-app/pom.xml b/examples/demo-template/product-app/pom.xml
index b7fa5f8..cc2353a 100755
--- a/examples/demo-template/product-app/pom.xml
+++ b/examples/demo-template/product-app/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/third-party/pom.xml b/examples/demo-template/third-party/pom.xml
index 7253b42..ecf8e3b 100755
--- a/examples/demo-template/third-party/pom.xml
+++ b/examples/demo-template/third-party/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml
index d57ebb1..8a8148b 100755
--- a/examples/demo-template/third-party-cdi/pom.xml
+++ b/examples/demo-template/third-party-cdi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/js-console/pom.xml 2(+1 -1)
diff --git a/examples/js-console/pom.xml b/examples/js-console/pom.xml
index c98c9f1..4fd4119 100755
--- a/examples/js-console/pom.xml
+++ b/examples/js-console/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/pom.xml 2(+1 -1)
diff --git a/examples/pom.xml b/examples/pom.xml
index 6c2c217..2e0b903 100755
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Examples</name>
diff --git a/examples/providers/audit-listener-sysout/pom.xml b/examples/providers/audit-listener-sysout/pom.xml
index b6428d7..4b1363e 100755
--- a/examples/providers/audit-listener-sysout/pom.xml
+++ b/examples/providers/audit-listener-sysout/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>examples-providers-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Audit Listener System.out Example</name>
diff --git a/examples/providers/audit-provider-mem/pom.xml b/examples/providers/audit-provider-mem/pom.xml
index a12030a..2f700bd 100755
--- a/examples/providers/audit-provider-mem/pom.xml
+++ b/examples/providers/audit-provider-mem/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>examples-providers-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Audit Provider In-Mem Example</name>
diff --git a/examples/providers/federation-provider/pom.xml b/examples/providers/federation-provider/pom.xml
index 8053c6a..4113bf5 100755
--- a/examples/providers/federation-provider/pom.xml
+++ b/examples/providers/federation-provider/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>examples-providers-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Properties Authentication Provider Example</name>
examples/providers/pom.xml 2(+1 -1)
diff --git a/examples/providers/pom.xml b/examples/providers/pom.xml
index 701f086..d4b4353 100755
--- a/examples/providers/pom.xml
+++ b/examples/providers/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>examples-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Provider Examples</name>
diff --git a/export-import/export-import-api/pom.xml b/export-import/export-import-api/pom.xml
index 7669b6f..e3f3bed 100755
--- a/export-import/export-import-api/pom.xml
+++ b/export-import/export-import-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-export-import-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/export-import/export-import-dir/pom.xml b/export-import/export-import-dir/pom.xml
index 55867ea..e89b201 100755
--- a/export-import/export-import-dir/pom.xml
+++ b/export-import/export-import-dir/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-export-import-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/export-import/export-import-single-file/pom.xml b/export-import/export-import-single-file/pom.xml
index b6e1eb3..ed0c989 100755
--- a/export-import/export-import-single-file/pom.xml
+++ b/export-import/export-import-single-file/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-export-import-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/export-import/export-import-zip/pom.xml b/export-import/export-import-zip/pom.xml
index 868bc3e..b1f8cc8 100755
--- a/export-import/export-import-zip/pom.xml
+++ b/export-import/export-import-zip/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-export-import-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
export-import/pom.xml 2(+1 -1)
diff --git a/export-import/pom.xml b/export-import/pom.xml
index 208d266..2631cea 100755
--- a/export-import/pom.xml
+++ b/export-import/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
federation/ldap/pom.xml 2(+1 -1)
diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml
index e0ea364..2b4b19b 100755
--- a/federation/ldap/pom.xml
+++ b/federation/ldap/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
federation/pom.xml 2(+1 -1)
diff --git a/federation/pom.xml b/federation/pom.xml
index c48bd61..dc1eca1 100755
--- a/federation/pom.xml
+++ b/federation/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/account-api/pom.xml 2(+1 -1)
diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml
index d77970b..9929300 100755
--- a/forms/account-api/pom.xml
+++ b/forms/account-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/account-freemarker/pom.xml 2(+1 -1)
diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml
index 9f25bbb..8030c71 100755
--- a/forms/account-freemarker/pom.xml
+++ b/forms/account-freemarker/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/common-freemarker/pom.xml 2(+1 -1)
diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml
index 65ba8b2..9abff9f 100755
--- a/forms/common-freemarker/pom.xml
+++ b/forms/common-freemarker/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/common-themes/pom.xml 2(+1 -1)
diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml
index f5b86b5..3c4fa29 100755
--- a/forms/common-themes/pom.xml
+++ b/forms/common-themes/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/forms/common-themes/src/main/resources/theme/account/base/account.ftl b/forms/common-themes/src/main/resources/theme/account/base/account.ftl
index 49ac9d7..f83a62e 100755
--- a/forms/common-themes/src/main/resources/theme/account/base/account.ftl
+++ b/forms/common-themes/src/main/resources/theme/account/base/account.ftl
@@ -57,8 +57,8 @@
<div id="kc-form-buttons" class="col-md-offset-2 col-md-10 submit">
<div class="">
<#if url.referrerURI??><a href="${url.referrerURI}">Back to application</a></#if>
- <button type="submit" class="btn btn-primary btn-lg">Save</button>
- <button type="submit" class="btn btn-default btn-lg">Cancel</button>
+ <button type="submit" class="btn btn-primary btn-lg" name="submitAction" value="Save">Save</button>
+ <button type="submit" class="btn btn-default btn-lg" name="submitAction" value="Cancel">Cancel</button>
</div>
</div>
</div>
diff --git a/forms/common-themes/src/main/resources/theme/account/base/password.ftl b/forms/common-themes/src/main/resources/theme/account/base/password.ftl
index 95ab5f7..e5d5531 100755
--- a/forms/common-themes/src/main/resources/theme/account/base/password.ftl
+++ b/forms/common-themes/src/main/resources/theme/account/base/password.ftl
@@ -44,8 +44,8 @@
<div class="form-group">
<div id="kc-form-buttons" class="col-md-offset-2 col-md-10 submit">
<div class="">
- <button type="submit" class="btn btn-primary btn-lg">Save</button>
- <button type="submit" class="btn btn-default btn-lg">Cancel</button>
+ <button type="submit" class="btn btn-primary btn-lg" name="submitAction" value="Save">Save</button>
+ <button type="submit" class="btn btn-default btn-lg" name="submitAction" value="Cancel">Cancel</button>
</div>
</div>
</div>
diff --git a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
index e5886ad..171a0b6 100755
--- a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
+++ b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl
@@ -50,8 +50,8 @@
<div class="form-group">
<div id="kc-form-buttons" class="col-md-offset-2 col-md-10 submit">
<div class="">
- <button type="submit" class="btn btn-primary btn-lg">Save</button>
- <button type="submit" class="btn btn-default btn-lg">Cancel</button>
+ <button type="submit" class="btn btn-primary btn-lg" name="submitAction" value="Save">Save</button>
+ <button type="submit" class="btn btn-default btn-lg" name="submitAction" value="Cancel">Cancel</button>
</div>
</div>
</div>
forms/email-api/pom.xml 2(+1 -1)
diff --git a/forms/email-api/pom.xml b/forms/email-api/pom.xml
index fff8a2b..522774a 100755
--- a/forms/email-api/pom.xml
+++ b/forms/email-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/email-freemarker/pom.xml 2(+1 -1)
diff --git a/forms/email-freemarker/pom.xml b/forms/email-freemarker/pom.xml
index 640f745..bd87578 100755
--- a/forms/email-freemarker/pom.xml
+++ b/forms/email-freemarker/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/login-api/pom.xml 2(+1 -1)
diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml
index c42a9a9..f16e8df 100755
--- a/forms/login-api/pom.xml
+++ b/forms/login-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/login-freemarker/pom.xml 2(+1 -1)
diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml
index 4857a1f..e9b1d68 100755
--- a/forms/login-freemarker/pom.xml
+++ b/forms/login-freemarker/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-forms-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
forms/pom.xml 2(+1 -1)
diff --git a/forms/pom.xml b/forms/pom.xml
index 534232f..8188a19 100755
--- a/forms/pom.xml
+++ b/forms/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/adapter-core/pom.xml 2(+1 -1)
diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml
index f2c7fa1..a16aa4f 100755
--- a/integration/adapter-core/pom.xml
+++ b/integration/adapter-core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/admin-client/pom.xml 2(+1 -1)
diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml
index cf56368..e843963 100755
--- a/integration/admin-client/pom.xml
+++ b/integration/admin-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/as7-eap6/adapter/pom.xml 2(+1 -1)
diff --git a/integration/as7-eap6/adapter/pom.xml b/integration/as7-eap6/adapter/pom.xml
index e318859..461c071 100755
--- a/integration/as7-eap6/adapter/pom.xml
+++ b/integration/as7-eap6/adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration/as7-eap-subsystem/pom.xml b/integration/as7-eap-subsystem/pom.xml
index 274e0f6..1b84656 100755
--- a/integration/as7-eap-subsystem/pom.xml
+++ b/integration/as7-eap-subsystem/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
integration/installed/pom.xml 2(+1 -1)
diff --git a/integration/installed/pom.xml b/integration/installed/pom.xml
index c92eb7e..e4b3e24 100755
--- a/integration/installed/pom.xml
+++ b/integration/installed/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration/jaxrs-oauth-client/pom.xml b/integration/jaxrs-oauth-client/pom.xml
index 5be23b6..f86cc49 100755
--- a/integration/jaxrs-oauth-client/pom.xml
+++ b/integration/jaxrs-oauth-client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration/jboss-adapter-core/pom.xml b/integration/jboss-adapter-core/pom.xml
index f9513b4..9192d0e 100755
--- a/integration/jboss-adapter-core/pom.xml
+++ b/integration/jboss-adapter-core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/js/pom.xml 2(+1 -1)
diff --git a/integration/js/pom.xml b/integration/js/pom.xml
index 9d53839..25adb85 100755
--- a/integration/js/pom.xml
+++ b/integration/js/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/pom.xml 2(+1 -1)
diff --git a/integration/pom.xml b/integration/pom.xml
index 2a29902..82c8497 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Keycloak Integration</name>
diff --git a/integration/servlet-oauth-client/pom.xml b/integration/servlet-oauth-client/pom.xml
index a74b047..acb5132 100755
--- a/integration/servlet-oauth-client/pom.xml
+++ b/integration/servlet-oauth-client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/tomcat7/adapter/pom.xml 2(+1 -1)
diff --git a/integration/tomcat7/adapter/pom.xml b/integration/tomcat7/adapter/pom.xml
index 3366804..af929f4 100755
--- a/integration/tomcat7/adapter/pom.xml
+++ b/integration/tomcat7/adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/undertow/pom.xml 2(+1 -1)
diff --git a/integration/undertow/pom.xml b/integration/undertow/pom.xml
index fd36269..2ef0c92 100755
--- a/integration/undertow/pom.xml
+++ b/integration/undertow/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/wildfly-adapter/pom.xml 2(+1 -1)
diff --git a/integration/wildfly-adapter/pom.xml b/integration/wildfly-adapter/pom.xml
index beb9430..eb0f5ed 100755
--- a/integration/wildfly-adapter/pom.xml
+++ b/integration/wildfly-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration/wildfly-subsystem/pom.xml b/integration/wildfly-subsystem/pom.xml
index 4c21ac6..93a9cf7 100755
--- a/integration/wildfly-subsystem/pom.xml
+++ b/integration/wildfly-subsystem/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
model/api/pom.xml 2(+1 -1)
diff --git a/model/api/pom.xml b/model/api/pom.xml
index 466742d..a8c1138 100755
--- a/model/api/pom.xml
+++ b/model/api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/model/invalidation-cache/model-adapters/pom.xml b/model/invalidation-cache/model-adapters/pom.xml
index 72fac81..f94f309 100755
--- a/model/invalidation-cache/model-adapters/pom.xml
+++ b/model/invalidation-cache/model-adapters/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
model/invalidation-cache/pom.xml 2(+1 -1)
diff --git a/model/invalidation-cache/pom.xml b/model/invalidation-cache/pom.xml
index 2c2e93e..d955faa 100755
--- a/model/invalidation-cache/pom.xml
+++ b/model/invalidation-cache/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Model Parent</name>
model/jpa/pom.xml 2(+1 -1)
diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
index 84d62bb..2c14f9d 100755
--- a/model/jpa/pom.xml
+++ b/model/jpa/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
model/mongo/pom.xml 2(+1 -1)
diff --git a/model/mongo/pom.xml b/model/mongo/pom.xml
index f5037f8..c03195d 100755
--- a/model/mongo/pom.xml
+++ b/model/mongo/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
model/pom.xml 2(+1 -1)
diff --git a/model/pom.xml b/model/pom.xml
index 47e2f7c..a78e3af 100755
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Model Parent</name>
model/sessions-jpa/pom.xml 2(+1 -1)
diff --git a/model/sessions-jpa/pom.xml b/model/sessions-jpa/pom.xml
index 4f95a9c..2f85c48 100755
--- a/model/sessions-jpa/pom.xml
+++ b/model/sessions-jpa/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
model/sessions-mem/pom.xml 2(+1 -1)
diff --git a/model/sessions-mem/pom.xml b/model/sessions-mem/pom.xml
index fdd104d..0fbe568 100755
--- a/model/sessions-mem/pom.xml
+++ b/model/sessions-mem/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
model/sessions-mongo/pom.xml 2(+1 -1)
diff --git a/model/sessions-mongo/pom.xml b/model/sessions-mongo/pom.xml
index 10d4b82..d80f65d 100755
--- a/model/sessions-mongo/pom.xml
+++ b/model/sessions-mongo/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/picketlink/keycloak-picketlink-api/pom.xml b/picketlink/keycloak-picketlink-api/pom.xml
index 5e0b24c..b291662 100755
--- a/picketlink/keycloak-picketlink-api/pom.xml
+++ b/picketlink/keycloak-picketlink-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-picketlink-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/picketlink/keycloak-picketlink-ldap/pom.xml b/picketlink/keycloak-picketlink-ldap/pom.xml
index 74b16a0..ed323f0 100755
--- a/picketlink/keycloak-picketlink-ldap/pom.xml
+++ b/picketlink/keycloak-picketlink-ldap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-picketlink-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
picketlink/pom.xml 2(+1 -1)
diff --git a/picketlink/pom.xml b/picketlink/pom.xml
index 76acb74..9addce5 100755
--- a/picketlink/pom.xml
+++ b/picketlink/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
pom.xml 2(+1 -1)
diff --git a/pom.xml b/pom.xml
index dc06160..81f3581 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</description>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<packaging>pom</packaging>
<properties>
diff --git a/project-integrations/aerogear-ups/app/pom.xml b/project-integrations/aerogear-ups/app/pom.xml
index 796a5f7..3cfcf72 100755
--- a/project-integrations/aerogear-ups/app/pom.xml
+++ b/project-integrations/aerogear-ups/app/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/project-integrations/aerogear-ups/auth-server/pom.xml b/project-integrations/aerogear-ups/auth-server/pom.xml
index 8837cd1..567ad90 100755
--- a/project-integrations/aerogear-ups/auth-server/pom.xml
+++ b/project-integrations/aerogear-ups/auth-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/project-integrations/aerogear-ups/pom.xml b/project-integrations/aerogear-ups/pom.xml
index 7653fe7..c0e23a0 100755
--- a/project-integrations/aerogear-ups/pom.xml
+++ b/project-integrations/aerogear-ups/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Aerogear UPS Parent</name>
project-integrations/pom.xml 2(+1 -1)
diff --git a/project-integrations/pom.xml b/project-integrations/pom.xml
index 41a8378..625e9e0 100755
--- a/project-integrations/pom.xml
+++ b/project-integrations/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Third-party Integration Parent</name>
server/pom.xml 2(+1 -1)
diff --git a/server/pom.xml b/server/pom.xml
index 55d6f98..96d8bbc 100755
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
services/pom.xml 2(+1 -1)
diff --git a/services/pom.xml b/services/pom.xml
index daab483..8ca4631 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/services/src/main/java/org/keycloak/services/resources/AccountService.java b/services/src/main/java/org/keycloak/services/resources/AccountService.java
index dca8ad1..3c4a1fa 100755
--- a/services/src/main/java/org/keycloak/services/resources/AccountService.java
+++ b/services/src/main/java/org/keycloak/services/resources/AccountService.java
@@ -192,10 +192,7 @@ public class AccountService {
return Flows.forms(session, realm, null, uriInfo).setError("No access").createErrorPage();
}
- String[] referrer = getReferrer();
- if (referrer != null) {
- account.setReferrer(referrer);
- }
+ setReferrerOnPage();
return account.createResponse(page);
} else {
@@ -203,6 +200,13 @@ public class AccountService {
}
}
+ protected void setReferrerOnPage() {
+ String[] referrer = getReferrer();
+ if (referrer != null) {
+ account.setReferrer(referrer);
+ }
+ }
+
/**
* CORS preflight
*
@@ -324,10 +328,17 @@ public class AccountService {
require(AccountRoles.MANAGE_ACCOUNT);
+ String action = formData.getFirst("submitAction");
+ if (action != null && action.equals("Cancel")) {
+ setReferrerOnPage();
+ return account.createResponse(AccountPages.ACCOUNT);
+ }
+
UserModel user = auth.getUser();
String error = Validation.validateUpdateProfileForm(formData);
if (error != null) {
+ setReferrerOnPage();
return account.setError(error).createResponse(AccountPages.ACCOUNT);
}
@@ -346,7 +357,7 @@ public class AccountService {
user.setEmailVerified(false);
audit.clone().event(EventType.UPDATE_EMAIL).detail(Details.PREVIOUS_EMAIL, oldEmail).detail(Details.UPDATED_EMAIL, email).success();
}
-
+ setReferrerOnPage();
return account.setSuccess("accountUpdated").createResponse(AccountPages.ACCOUNT);
}
@@ -364,6 +375,7 @@ public class AccountService {
audit.event(EventType.REMOVE_TOTP).client(auth.getClient()).user(auth.getUser()).success();
+ setReferrerOnPage();
return account.setSuccess("successTotpRemoved").createResponse(AccountPages.TOTP);
}
@@ -380,7 +392,14 @@ public class AccountService {
UserModel user = auth.getUser();
session.sessions().removeUserSessions(realm, user);
- return Response.seeOther(Urls.accountSessionsPage(uriInfo.getBaseUri(), realm.getName())).build();
+ UriBuilder builder = Urls.accountBase(uriInfo.getBaseUri()).path(AccountService.class, "sessionsPage");
+ String referrer = uriInfo.getQueryParameters().getFirst("referrer");
+ if (referrer != null) {
+ builder.queryParam("referrer", referrer);
+
+ }
+ URI location = builder.build(realm.getName());
+ return Response.seeOther(location).build();
}
/**
@@ -404,14 +423,22 @@ public class AccountService {
require(AccountRoles.MANAGE_ACCOUNT);
+ String action = formData.getFirst("submitAction");
+ if (action != null && action.equals("Cancel")) {
+ setReferrerOnPage();
+ return account.createResponse(AccountPages.TOTP);
+ }
+
UserModel user = auth.getUser();
String totp = formData.getFirst("totp");
String totpSecret = formData.getFirst("totpSecret");
if (Validation.isEmpty(totp)) {
+ setReferrerOnPage();
return account.setError(Messages.MISSING_TOTP).createResponse(AccountPages.TOTP);
} else if (!new TimeBasedOTP().validate(totp, totpSecret.getBytes())) {
+ setReferrerOnPage();
return account.setError(Messages.INVALID_TOTP).createResponse(AccountPages.TOTP);
}
@@ -424,6 +451,7 @@ public class AccountService {
audit.event(EventType.UPDATE_TOTP).client(auth.getClient()).user(auth.getUser()).success();
+ setReferrerOnPage();
return account.setSuccess("successTotp").createResponse(AccountPages.TOTP);
}
@@ -449,6 +477,12 @@ public class AccountService {
require(AccountRoles.MANAGE_ACCOUNT);
+ String action = formData.getFirst("submitAction");
+ if (action != null && action.equals("Cancel")) {
+ setReferrerOnPage();
+ return account.createResponse(AccountPages.PASSWORD);
+ }
+
UserModel user = auth.getUser();
String password = formData.getFirst("password");
@@ -456,16 +490,20 @@ public class AccountService {
String passwordConfirm = formData.getFirst("password-confirm");
if (Validation.isEmpty(passwordNew)) {
+ setReferrerOnPage();
return account.setError(Messages.MISSING_PASSWORD).createResponse(AccountPages.PASSWORD);
} else if (!passwordNew.equals(passwordConfirm)) {
+ setReferrerOnPage();
return account.setError(Messages.INVALID_PASSWORD_CONFIRM).createResponse(AccountPages.PASSWORD);
}
UserCredentialModel cred = UserCredentialModel.password(password);
if (Validation.isEmpty(password)) {
+ setReferrerOnPage();
return account.setError(Messages.MISSING_PASSWORD).createResponse(AccountPages.PASSWORD);
} else {
if (!session.users().validCredentials(realm, user, cred)) {
+ setReferrerOnPage();
return account.setError(Messages.INVALID_PASSWORD_EXISTING).createResponse(AccountPages.PASSWORD);
}
}
@@ -474,11 +512,13 @@ public class AccountService {
session.users().updateCredential(realm, user, UserCredentialModel.password(passwordNew));
} catch (Exception ape) {
logger.error("Failed to update password", ape);
+ setReferrerOnPage();
return account.setError(ape.getMessage()).createResponse(AccountPages.PASSWORD);
}
audit.event(EventType.UPDATE_PASSWORD).client(auth.getClient()).user(auth.getUser()).success();
+ setReferrerOnPage();
return account.setSuccess("accountPasswordUpdated").createResponse(AccountPages.PASSWORD);
}
@@ -494,19 +534,23 @@ public class AccountService {
UserModel user = auth.getUser();
if (Validation.isEmpty(providerId)) {
+ setReferrerOnPage();
return account.setError(Messages.MISSING_SOCIAL_PROVIDER).createResponse(AccountPages.SOCIAL);
}
AccountSocialAction accountSocialAction = AccountSocialAction.getAction(action);
if (accountSocialAction == null) {
+ setReferrerOnPage();
return account.setError(Messages.INVALID_SOCIAL_ACTION).createResponse(AccountPages.SOCIAL);
}
SocialProvider provider = SocialLoader.load(providerId);
if (provider == null) {
+ setReferrerOnPage();
return account.setError(Messages.SOCIAL_PROVIDER_NOT_FOUND).createResponse(AccountPages.SOCIAL);
}
if (!user.isEnabled()) {
+ setReferrerOnPage();
return account.setError(Messages.ACCOUNT_DISABLED).createResponse(AccountPages.SOCIAL);
}
@@ -522,6 +566,7 @@ public class AccountService {
.putClientAttribute(OAuth2Constants.REDIRECT_URI, redirectUri)
.redirectToSocialProvider();
} catch (SocialProviderException spe) {
+ setReferrerOnPage();
return account.setError(Messages.SOCIAL_REDIRECT_ERROR).createResponse(AccountPages.SOCIAL);
}
case REMOVE:
@@ -538,11 +583,14 @@ public class AccountService {
.detail(Details.USERNAME, link.getSocialUserId() + "@" + link.getSocialProvider())
.success();
+ setReferrerOnPage();
return account.setSuccess(Messages.SOCIAL_PROVIDER_REMOVED).createResponse(AccountPages.SOCIAL);
} else {
+ setReferrerOnPage();
return account.setError(Messages.SOCIAL_REMOVING_LAST_PROVIDER).createResponse(AccountPages.SOCIAL);
}
} else {
+ setReferrerOnPage();
return account.setError(Messages.SOCIAL_LINK_NOT_ACTIVE).createResponse(AccountPages.SOCIAL);
}
default:
social/core/pom.xml 2(+1 -1)
diff --git a/social/core/pom.xml b/social/core/pom.xml
index 098893b..046a0a0 100755
--- a/social/core/pom.xml
+++ b/social/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-social-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
social/facebook/pom.xml 2(+1 -1)
diff --git a/social/facebook/pom.xml b/social/facebook/pom.xml
index 39b076f..1070796 100755
--- a/social/facebook/pom.xml
+++ b/social/facebook/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-social-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
social/github/pom.xml 2(+1 -1)
diff --git a/social/github/pom.xml b/social/github/pom.xml
index ee61e83..ebce17f 100755
--- a/social/github/pom.xml
+++ b/social/github/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-social-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
social/google/pom.xml 2(+1 -1)
diff --git a/social/google/pom.xml b/social/google/pom.xml
index 60c3962..c02cdc1 100755
--- a/social/google/pom.xml
+++ b/social/google/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-social-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
social/pom.xml 2(+1 -1)
diff --git a/social/pom.xml b/social/pom.xml
index 439f4c7..85abb30 100755
--- a/social/pom.xml
+++ b/social/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
social/twitter/pom.xml 2(+1 -1)
diff --git a/social/twitter/pom.xml b/social/twitter/pom.xml
index 5b6def7..ccc29c2 100755
--- a/social/twitter/pom.xml
+++ b/social/twitter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-social-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/integration/pom.xml 2(+1 -1)
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 837e73e..69eb770 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
index 9ebdaff..5fbf669 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
@@ -395,7 +395,7 @@ public class AccountTest {
Collections.reverse(e);
Assert.assertTrue(logPage.isCurrent());
-
+ Thread.sleep(100); // seems to be some kind of race here.
final int expectedEvents = e.size();
Retry.execute(new Runnable() {
@Override
testsuite/performance/pom.xml 2(+1 -1)
diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml
index 7aaa5a3..8ea6ea9 100755
--- a/testsuite/performance/pom.xml
+++ b/testsuite/performance/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/performance-web/pom.xml 2(+1 -1)
diff --git a/testsuite/performance-web/pom.xml b/testsuite/performance-web/pom.xml
index 75fa280..eaa893c 100755
--- a/testsuite/performance-web/pom.xml
+++ b/testsuite/performance-web/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/pom.xml 2(+1 -1)
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 56e9762..980aef9 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/tools/pom.xml 2(+1 -1)
diff --git a/testsuite/tools/pom.xml b/testsuite/tools/pom.xml
index 42b430a..a00ce2d 100755
--- a/testsuite/tools/pom.xml
+++ b/testsuite/tools/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
timer/api/pom.xml 2(+1 -1)
diff --git a/timer/api/pom.xml b/timer/api/pom.xml
index 5fd044c..2d34bf3 100755
--- a/timer/api/pom.xml
+++ b/timer/api/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-timer-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
timer/basic/pom.xml 2(+1 -1)
diff --git a/timer/basic/pom.xml b/timer/basic/pom.xml
index 658e4c5..efd60f2 100755
--- a/timer/basic/pom.xml
+++ b/timer/basic/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-timer-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
timer/pom.xml 2(+1 -1)
diff --git a/timer/pom.xml b/timer/pom.xml
index 80306d6..c5473d2 100755
--- a/timer/pom.xml
+++ b/timer/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.0-rc-1-SNAPSHOT</version>
+ <version>1.0-rc-1</version>
<relativePath>../pom.xml</relativePath>
</parent>