From 387f89088baf171383cecedbd5dd34d87990acf1 Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Thu, 3 Sep 2020 12:14:35 +0300
Subject: [PATCH 1/8] Disable editing username on registration form

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 dockerfiles/keycloak/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dockerfiles/keycloak/Dockerfile b/dockerfiles/keycloak/Dockerfile
index fd24eb09761..a70fec4ed6c 100644
--- a/dockerfiles/keycloak/Dockerfile
+++ b/dockerfiles/keycloak/Dockerfile
@@ -8,6 +8,7 @@
 
 FROM jboss/keycloak:6.0.1
 ADD che /opt/jboss/keycloak/themes/che
+ADD che-username-edit-disabled /opt/jboss/keycloak/themes/che-username-edit-disabled
 ADD . /scripts/
 ADD cli /scripts/cli
 RUN ln -s /opt/jboss/tools/docker-entrypoint.sh && \

From a567d967bc58b74f73f96c26f60c20bba594db4a Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Thu, 3 Sep 2020 12:14:45 +0300
Subject: [PATCH 2/8] Disable editing username on registration form

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 .../login/login-update-profile.ftl            | 56 +++++++++++++++++++
 .../login/theme.properties                    |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
 create mode 100644 dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties

diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl b/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
new file mode 100644
index 00000000000..5b41c461316
--- /dev/null
+++ b/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
@@ -0,0 +1,56 @@
+<#import "template.ftl" as layout>
+<@layout.registrationLayout; section>
+    <#if section = "header">
+        ${msg("loginProfileTitle")}
+    <#elseif section = "form">
+        <form id="kc-update-profile-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
+            <#if user.editUsernameAllowed>
+                <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('username',properties.kcFormGroupErrorClass!)}">
+                    <div class="${properties.kcLabelWrapperClass!}">
+                        <label for="username" class="${properties.kcLabelClass!}">${msg("username")}</label>
+                    </div>
+                    <div class="${properties.kcInputWrapperClass!}">
+                        <input type="text" id="username" name="username" value="${(user.username!'')}" class="${properties.kcInputClass!}" readonly />
+                    </div>
+                </div>
+            </#if>
+            <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('email',properties.kcFormGroupErrorClass!)}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="email" class="${properties.kcLabelClass!}">${msg("email")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <input type="text" id="email" name="email" value="${(user.email!'')}" class="${properties.kcInputClass!}" />
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('firstName',properties.kcFormGroupErrorClass!)}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="firstName" class="${properties.kcLabelClass!}">${msg("firstName")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <input type="text" id="firstName" name="firstName" value="${(user.firstName!'')}" class="${properties.kcInputClass!}" />
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('lastName',properties.kcFormGroupErrorClass!)}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="lastName" class="${properties.kcLabelClass!}">${msg("lastName")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <input type="text" id="lastName" name="lastName" value="${(user.lastName!'')}" class="${properties.kcInputClass!}" />
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!}">
+                <div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
+                    <div class="${properties.kcFormOptionsWrapperClass!}">
+                    </div>
+                </div>
+
+                <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
+                    <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}" />
+                </div>
+            </div>
+        </form>
+    </#if>
+</@layout.registrationLayout>
diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties b/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
new file mode 100644
index 00000000000..8f83cc023d1
--- /dev/null
+++ b/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
@@ -0,0 +1 @@
+parent=base

From df4489acf75a8981bc3f494f71eeecc860617b1e Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Thu, 3 Sep 2020 12:14:59 +0300
Subject: [PATCH 3/8] Disable editing username on registration form

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 .../keycloak/che-username-edit-disabled/login/theme.properties  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties b/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
index 8f83cc023d1..902f5816916 100644
--- a/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
+++ b/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
@@ -1 +1 @@
-parent=base
+parent=che

From cccf7b12c0ad32e73c23f55d952dcc7eb971fa97 Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Thu, 3 Sep 2020 16:11:53 +0300
Subject: [PATCH 4/8] Making the username editable withe the validation to make
 it k8s DNS compatible

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 .../che-username-edit-disabled/login/login-update-profile.ftl   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl b/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
index 5b41c461316..4164c89dee0 100644
--- a/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
+++ b/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
@@ -10,7 +10,7 @@
                         <label for="username" class="${properties.kcLabelClass!}">${msg("username")}</label>
                     </div>
                     <div class="${properties.kcInputWrapperClass!}">
-                        <input type="text" id="username" name="username" value="${(user.username!'')}" class="${properties.kcInputClass!}" readonly />
+                        <input type="text" id="username" name="username" value="${(user.username!'')}" class="${properties.kcInputClass!}" pattern="[a-z]([-a-z0-9]{0,61}[a-z0-9])?" title="An alphanumeric (a-z, and 0-9) string, with a maximum length of 63 characters, with the '-' character allowed anywhere except the first or last character." />
                     </div>
                 </div>
             </#if>

From f1fc62fa0e3a8b93a7021688887b0f7f2909eeaa Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Thu, 3 Sep 2020 16:12:40 +0300
Subject: [PATCH 5/8] Fixes

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 .../keycloak/che-username-edit-disabled/login/theme.properties   | 1 -
 .../login/login-update-profile.ftl                               | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
 rename dockerfiles/keycloak/{che-username-edit-disabled => che}/login/login-update-profile.ftl (100%)

diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties b/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
deleted file mode 100644
index 902f5816916..00000000000
--- a/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
+++ /dev/null
@@ -1 +0,0 @@
-parent=che
diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl b/dockerfiles/keycloak/che/login/login-update-profile.ftl
similarity index 100%
rename from dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
rename to dockerfiles/keycloak/che/login/login-update-profile.ftl

From 1119bda517492650121122257b746f2553ef8b1e Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Thu, 3 Sep 2020 16:13:40 +0300
Subject: [PATCH 6/8] Fixes

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 dockerfiles/keycloak/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dockerfiles/keycloak/Dockerfile b/dockerfiles/keycloak/Dockerfile
index a70fec4ed6c..fd24eb09761 100644
--- a/dockerfiles/keycloak/Dockerfile
+++ b/dockerfiles/keycloak/Dockerfile
@@ -8,7 +8,6 @@
 
 FROM jboss/keycloak:6.0.1
 ADD che /opt/jboss/keycloak/themes/che
-ADD che-username-edit-disabled /opt/jboss/keycloak/themes/che-username-edit-disabled
 ADD . /scripts/
 ADD cli /scripts/cli
 RUN ln -s /opt/jboss/tools/docker-entrypoint.sh && \

From 00219ab2e4b5b65e60bbb5828c72d85054f1e7e7 Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Fri, 4 Sep 2020 11:16:26 +0300
Subject: [PATCH 7/8] Add theme to put username field to readonly

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 dockerfiles/keycloak/Dockerfile               |  1 +
 .../login/login-update-profile.ftl            | 56 +++++++++++++++++++
 .../login/theme.properties                    |  1 +
 .../che/login/login-update-profile.ftl        |  2 +-
 .../che/login/messages/messages_en.properties |  2 +
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
 create mode 100644 dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties

diff --git a/dockerfiles/keycloak/Dockerfile b/dockerfiles/keycloak/Dockerfile
index fd24eb09761..a70fec4ed6c 100644
--- a/dockerfiles/keycloak/Dockerfile
+++ b/dockerfiles/keycloak/Dockerfile
@@ -8,6 +8,7 @@
 
 FROM jboss/keycloak:6.0.1
 ADD che /opt/jboss/keycloak/themes/che
+ADD che-username-edit-disabled /opt/jboss/keycloak/themes/che-username-edit-disabled
 ADD . /scripts/
 ADD cli /scripts/cli
 RUN ln -s /opt/jboss/tools/docker-entrypoint.sh && \
diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl b/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
new file mode 100644
index 00000000000..5b41c461316
--- /dev/null
+++ b/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
@@ -0,0 +1,56 @@
+<#import "template.ftl" as layout>
+<@layout.registrationLayout; section>
+    <#if section = "header">
+        ${msg("loginProfileTitle")}
+    <#elseif section = "form">
+        <form id="kc-update-profile-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
+            <#if user.editUsernameAllowed>
+                <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('username',properties.kcFormGroupErrorClass!)}">
+                    <div class="${properties.kcLabelWrapperClass!}">
+                        <label for="username" class="${properties.kcLabelClass!}">${msg("username")}</label>
+                    </div>
+                    <div class="${properties.kcInputWrapperClass!}">
+                        <input type="text" id="username" name="username" value="${(user.username!'')}" class="${properties.kcInputClass!}" readonly />
+                    </div>
+                </div>
+            </#if>
+            <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('email',properties.kcFormGroupErrorClass!)}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="email" class="${properties.kcLabelClass!}">${msg("email")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <input type="text" id="email" name="email" value="${(user.email!'')}" class="${properties.kcInputClass!}" />
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('firstName',properties.kcFormGroupErrorClass!)}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="firstName" class="${properties.kcLabelClass!}">${msg("firstName")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <input type="text" id="firstName" name="firstName" value="${(user.firstName!'')}" class="${properties.kcInputClass!}" />
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('lastName',properties.kcFormGroupErrorClass!)}">
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="lastName" class="${properties.kcLabelClass!}">${msg("lastName")}</label>
+                </div>
+                <div class="${properties.kcInputWrapperClass!}">
+                    <input type="text" id="lastName" name="lastName" value="${(user.lastName!'')}" class="${properties.kcInputClass!}" />
+                </div>
+            </div>
+
+            <div class="${properties.kcFormGroupClass!}">
+                <div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
+                    <div class="${properties.kcFormOptionsWrapperClass!}">
+                    </div>
+                </div>
+
+                <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
+                    <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}" />
+                </div>
+            </div>
+        </form>
+    </#if>
+</@layout.registrationLayout>
diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties b/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
new file mode 100644
index 00000000000..902f5816916
--- /dev/null
+++ b/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
@@ -0,0 +1 @@
+parent=che
diff --git a/dockerfiles/keycloak/che/login/login-update-profile.ftl b/dockerfiles/keycloak/che/login/login-update-profile.ftl
index 4164c89dee0..d2131a36349 100644
--- a/dockerfiles/keycloak/che/login/login-update-profile.ftl
+++ b/dockerfiles/keycloak/che/login/login-update-profile.ftl
@@ -10,7 +10,7 @@
                         <label for="username" class="${properties.kcLabelClass!}">${msg("username")}</label>
                     </div>
                     <div class="${properties.kcInputWrapperClass!}">
-                        <input type="text" id="username" name="username" value="${(user.username!'')}" class="${properties.kcInputClass!}" pattern="[a-z]([-a-z0-9]{0,61}[a-z0-9])?" title="An alphanumeric (a-z, and 0-9) string, with a maximum length of 63 characters, with the '-' character allowed anywhere except the first or last character." />
+                        <input type="text" id="username" name="username" value="${(user.username!'')}" class="${properties.kcInputClass!}" pattern="[a-z]([-a-z0-9]{0,61}[a-z0-9])?" title="${msg("usernameTitle")}" />
                     </div>
                 </div>
             </#if>
diff --git a/dockerfiles/keycloak/che/login/messages/messages_en.properties b/dockerfiles/keycloak/che/login/messages/messages_en.properties
index 72d947c6097..736507af2ab 100644
--- a/dockerfiles/keycloak/che/login/messages/messages_en.properties
+++ b/dockerfiles/keycloak/che/login/messages/messages_en.properties
@@ -4,3 +4,5 @@ passwordLogin=Login with password
 oauthLogin=Login with OAuth
 formRegister=Create an account with a form
 passwordRecover=Forgot your password? <br/> Enter your email below.
+
+usernameTitle=Username has to comply with the DNS naming convention. An alphanumeric (a-z, and 0-9) string, with a maximum length of 63 characters, with the '-' character allowed anywhere except the first or last character.

From 0495dabc63f3dadde35482dce90fd0ec58b4a49b Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Tue, 8 Sep 2020 09:44:47 +0300
Subject: [PATCH 8/8] Change theme title to che-username-readonly

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 dockerfiles/keycloak/Dockerfile                                 | 2 +-
 .../login/login-update-profile.ftl                              | 0
 .../login/theme.properties                                      | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename dockerfiles/keycloak/{che-username-edit-disabled => che-username-readonly}/login/login-update-profile.ftl (100%)
 rename dockerfiles/keycloak/{che-username-edit-disabled => che-username-readonly}/login/theme.properties (100%)

diff --git a/dockerfiles/keycloak/Dockerfile b/dockerfiles/keycloak/Dockerfile
index a70fec4ed6c..23d576e434a 100644
--- a/dockerfiles/keycloak/Dockerfile
+++ b/dockerfiles/keycloak/Dockerfile
@@ -8,7 +8,7 @@
 
 FROM jboss/keycloak:6.0.1
 ADD che /opt/jboss/keycloak/themes/che
-ADD che-username-edit-disabled /opt/jboss/keycloak/themes/che-username-edit-disabled
+ADD che-username-readonly /opt/jboss/keycloak/themes/che-username-readonly
 ADD . /scripts/
 ADD cli /scripts/cli
 RUN ln -s /opt/jboss/tools/docker-entrypoint.sh && \
diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl b/dockerfiles/keycloak/che-username-readonly/login/login-update-profile.ftl
similarity index 100%
rename from dockerfiles/keycloak/che-username-edit-disabled/login/login-update-profile.ftl
rename to dockerfiles/keycloak/che-username-readonly/login/login-update-profile.ftl
diff --git a/dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties b/dockerfiles/keycloak/che-username-readonly/login/theme.properties
similarity index 100%
rename from dockerfiles/keycloak/che-username-edit-disabled/login/theme.properties
rename to dockerfiles/keycloak/che-username-readonly/login/theme.properties