combine core nightly ui version

MorganaToken · Mar 9, 2023 · 04ed32e · 04ed32e
1 parent 695dbeb
commit 04ed32e
Show file tree

Hide file tree

Showing 25 changed files with 163 additions and 80 deletions.
diff --git a/docs/building.md b/docs/building.md
@@ -25,8 +25,8 @@ See [KEYCLOAK-17812](https://issues.redhat.com/browse/KEYCLOAK-17812) for more d
 ---    
 First clone the Keycloak repository:
 
-    git clone https://github.com/MorganaToken/morgana-core.git
-    cd morgana-core
+    git clone https://github.com/keycloak/keycloak.git
+    cd keycloak
 
 To build Keycloak run:
 
@@ -36,9 +36,13 @@ This will build all modules and run the testsuite.
 
 To build the ZIP distribution run:
 
-    mvn clean install -Dmaven.test.skip
+    mvn clean install -Pdistribution
 
-Once completed you will find dist archives in `quarkus/dist/target/`.
+Once completed you will find distribution archives in `distribution`.
+
+To build only the server run:
+
+    mvn -Pdistribution -pl distribution/server-dist -am -Dmaven.test.skip clean install
 
 ---
 **NOTE**
@@ -51,13 +55,19 @@ Classes from `org.keycloak.testsuite.*` packages aren't suitable to be used in p
 
 Please, take a look at this [documentation](../quarkus/README.md).
 
-## Starting Morgana
+## Starting Keycloak
+
+To start Keycloak during development first build as specified above, then run:
+
+    mvn -f testsuite/utils/pom.xml exec:java -Pkeycloak-server 
+
+When running testsuite, by default an account with username `admin` and password `admin` will be created within the master realm at start.
 
 To start Keycloak from the server distribution first build the distribution it as specified above, then run:
 
-    tar xfz quarkus/dist/target/keycloak-<VERSION>.tar.gz
+    tar xfz distribution/server-dist/target/keycloak-<VERSION>.tar.gz
     cd keycloak-<VERSION>
-    bin/kc.sh start-dev
+    bin/standalone.sh
 
 To stop the server press `Ctrl + C`.
 

diff --git a/examples/themes/src/main/resources/theme/logo-example/welcome/index.ftl b/examples/themes/src/main/resources/theme/logo-example/welcome/index.ftl
@@ -18,7 +18,7 @@
 
 <html>
 <head>
-    <title>Welcome to Keycloak</title>
+    <title>Welcome to Morgana</title>
     <link rel="shortcut icon" href="welcome-content/favicon.ico" type="image/x-icon">
     <link rel="StyleSheet" href="welcome-content/keycloak.css" type="text/css">
 </head>
@@ -29,9 +29,9 @@
         <div class="logo">
                 <img src="welcome-content/red-hat-logo.png" alt="Red Hat" border="0" />
         </div>
-        <h1>Welcome to Keycloak</h1>
+        <h1>Welcome to Morgana</h1>
 
-        <h3>Your Keycloak is running.</h3>
+        <h3>Your Morgana is running.</h3>
 
         <p><a href="http://www.keycloak.org/docs">Documentation</a> | <a href="admin/">Administration Console</a> </p>
 

diff --git a/js/apps/account-ui/public/locales/en/translation.json b/js/apps/account-ui/public/locales/en/translation.json
@@ -157,5 +157,5 @@
   "user": "User",
   "username": "Username",
   "usernamePlaceholder": "Username or email",
-  "welcomeMessage": "Welcome to Keycloak Account Management."
+  "welcomeMessage": "Welcome to Morgana Account Management."
 }
diff --git a/operator/src/main/kubernetes/minikube.yml b/operator/src/main/kubernetes/minikube.yml
diff --git a/operator/src/main/kubernetes/minikube.yml b/operator/src/main/kubernetes/minikube.yml
@@ -0,0 +1,71 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: keycloak-operator-role
+rules:
+  - apiGroups:
+      - apps
+      # Extensions enabled for backward compatibility:
+      # https://github.com/fabric8io/kubernetes-client/issues/3996
+      - extensions
+    resources:
+      - statefulsets
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - delete
+      - patch
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - delete
+      - patch
+      - update
+  - apiGroups:
+      - batch
+    resources:
+      - jobs
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - delete
+      - patch
+      - update
+  - apiGroups:
+      - networking.k8s.io
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - delete
+      - patch
+      - update
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/name: keycloak-operator
+  name: keycloak-operator-role-binding
+roleRef:
+  kind: Role
+  apiGroup: rbac.authorization.k8s.io
+  name: keycloak-operator-role
+subjects:
+  - kind: ServiceAccount
+    name: keycloak-operator
diff --git a/...src/main/java/org/keycloak/quarkus/runtime/services/resources/QuarkusWelcomeResource.java b/...src/main/java/org/keycloak/quarkus/runtime/services/resources/QuarkusWelcomeResource.java
@@ -181,7 +181,7 @@ private Response createWelcomePage(String successMessage, String errorMessage) {
                 String localAdminUrl = getLocalAdminUrl();
 
                 map.put("localAdminUrl", localAdminUrl);
-                map.put("adminUserCreationMessage", "or set the environment variables KEYCLOAK_ADMIN and KEYCLOAK_ADMIN_PASSWORD before starting the server");
+                map.put("adminUserCreationMessage", "or set the environment variables MORGANA_ADMIN and MORGANA_ADMIN_PASSWORD before starting the server");
 
                 if (isLocal) {
                     String stateChecker = setCsrfCookie();

diff --git a/testsuite/model/src/test/resources/kerberos b/testsuite/model/src/test/resources/kerberos
diff --git a/testsuite/model/src/test/resources/keystore b/testsuite/model/src/test/resources/keystore
diff --git a/testsuite/model/src/test/resources/ldap b/testsuite/model/src/test/resources/ldap
diff --git a/themes/src/main/resources-community/theme/base/account/messages/messages_zh_CN.properties b/themes/src/main/resources-community/theme/base/account/messages/messages_zh_CN.properties
@@ -11,7 +11,7 @@ federatedIdentitiesHtmlTitle=链接的身份
 accountLogHtmlTitle=账户日志
 changePasswordHtmlTitle=更改密码
 sessionsHtmlTitle=会话
-accountManagementTitle=Keycloak账户管理
+accountManagementTitle=Morgana 账户管理
 authenticatorTitle=认证者
 applicationsHtmlTitle=应用
 

diff --git a/themes/src/main/resources/theme/base/account/messages/messages_en.properties b/themes/src/main/resources/theme/base/account/messages/messages_en.properties
@@ -21,12 +21,12 @@ accountLogHtmlTitle=Account Log
 changePasswordHtmlTitle=Change Password
 deviceActivityHtmlTitle=Device Activity
 sessionsHtmlTitle=Sessions
-accountManagementTitle=Keycloak Account Management
+accountManagementTitle=Morgana Account Management
 authenticatorTitle=Authenticator
 applicationsHtmlTitle=Applications
 linkedAccountsHtmlTitle=Linked accounts
 
-accountManagementWelcomeMessage=Welcome to Keycloak Account Management
+accountManagementWelcomeMessage=Welcome to Morgana Account Management
 personalInfoIntroMessage=Manage your basic information
 accountSecurityTitle=Account Security
 accountSecurityIntroMessage=Control your password and account access

diff --git a/themes/src/main/resources/theme/keycloak.v2/account/index.ftl b/themes/src/main/resources/theme/keycloak.v2/account/index.ftl
@@ -143,7 +143,7 @@
 
                 loadjs("/Main.js");
             }).catch(() => {
-                alert('failed to initialize keycloak');
+                alert('failed to initialize morgana');
             });
         </script>
 

diff --git a/themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties b/themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties
@@ -22,7 +22,7 @@ selectLocale=Select a locale
 doSignIn=Sign in
 
 backToAdminConsole=Back to admin console
-accountManagementWelcomeMessage=Welcome to Keycloak account management
+accountManagementWelcomeMessage=Welcome to Morgana account management
 
 # Personal info page
 personalInfoHtmlTitle=Personal info

diff --git a/themes/src/main/resources/theme/keycloak.v2/account/resources/public/favicon.ico b/themes/src/main/resources/theme/keycloak.v2/account/resources/public/favicon.ico
diff --git a/themes/src/main/resources/theme/keycloak.v2/account/resources/public/logo.svg b/themes/src/main/resources/theme/keycloak.v2/account/resources/public/logo.svg
diff --git a/themes/src/main/resources/theme/keycloak/account/resources/img/keycloak-logo.png b/themes/src/main/resources/theme/keycloak/account/resources/img/keycloak-logo.png
diff --git a/themes/src/main/resources/theme/keycloak/account/resources/img/logo.png b/themes/src/main/resources/theme/keycloak/account/resources/img/logo.png
diff --git a/themes/src/main/resources/theme/keycloak/common/resources/img/favicon.ico b/themes/src/main/resources/theme/keycloak/common/resources/img/favicon.ico
diff --git a/themes/src/main/resources/theme/keycloak/login/resources/css/login.css b/themes/src/main/resources/theme/keycloak/login/resources/css/login.css
@@ -6,8 +6,6 @@
 }
 
 .login-pf body {
-    background: url("../img/keycloak-bg.png") no-repeat center center fixed;
-    background-size: cover;
     height: 100%;
 }
 
@@ -23,6 +21,12 @@ p.instruction {
     margin: 5px 0;
 }
 
+.pf-c-button.pf-m-primary {
+    color: var(--pf-c-button--m-primary--Color);
+    background-color: #0c0c0d;
+    height: 40px;
+}
+
 .pf-c-button.pf-m-control {
     border: solid var(--pf-global--BorderWidth--sm);
     border-color: rgba(230, 230, 230, 0.5);
@@ -64,18 +68,18 @@ a#kc-current-locale-link::after {
 }
 
 .login-pf a:hover {
-    color: #0099d3;
+    color: #ff9933;
 }
 
 #kc-logo {
     width: 100%;
 }
 
 div.kc-logo-text {
-    background-image: url(../img/keycloak-logo-text.png);
-    background-repeat: no-repeat;
-    height: 63px;
-    width: 300px;
+    /*background-image: url(../img/keycloak-logo-text.png);*/
+    /*background-repeat: no-repeat;*/
+    /*height: 60px;*/
+    /*width: 60px;*/
     margin: 0 auto;
 }
 
@@ -484,11 +488,10 @@ ul#kc-totp-supported-apps {
 
 .card-pf {
     margin: 0 auto;
-    box-shadow: var(--pf-global--BoxShadow--lg);
     padding: 0 20px;
     max-width: 500px;
     border-top: 4px solid;
-    border-color: var(--pf-global--primary-color--100);
+    border-color: #ff9933;
 }
 
 /*phone*/

diff --git a/...es/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo-text.png b/...es/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo-text.png
diff --git a/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png b/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png
diff --git a/themes/src/main/resources/theme/keycloak/welcome/index.ftl b/themes/src/main/resources/theme/keycloak/welcome/index.ftl
@@ -23,7 +23,7 @@
 
 <html>
 <head>
-    <title>Welcome to ${productName}</title>
+    <title>Welcome to Morgana</title>
 
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -45,24 +45,20 @@
 
 <body>
 <div class="container-fluid">
-  <div class="row">
-    <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-8 col-lg-offset-2">
-      <div class="welcome-header">
-        <img src="${resourcesPath}/logo.png" alt="${productName}" border="0" />
-        <h1>Welcome to <strong>${productName}</strong></h1>
-      </div>
+  <div class="row" style="margin-top: 12%">
+    <div class="col-sm-8 col-sm-offset-2 col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4">
       <div class="row">
         <#if adminConsoleEnabled>
-        <div class="col-xs-12 col-sm-4">
+        <div class="col-xs-12 col-sm-12">
           <div class="card-pf h-l">
+            <img src="${resourcesPath}/logo.png" alt="morgana-logo" />
+            <h1>Welcome to <strong>Morgana</strong></h1>
             <#if successMessage?has_content>
                 <p class="alert success">${successMessage}</p>
             <#elseif errorMessage?has_content>
                 <p class="alert error">${errorMessage}</p>
-                <h3><img src="welcome-content/user.png">Administration Console</h3>
             <#elseif bootstrap>
             <#if localUser>
-                <h3><img src="welcome-content/user.png">Administration Console</h3>
                 <p>Please create an initial admin user to get started.</p>
             <#else>
                 <p class="welcome-message">
@@ -96,37 +92,14 @@
             </#if>
 
             <div class="welcome-primary-link">
-              <h3><a href="${adminUrl}"><img src="welcome-content/user.png">Administration Console <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
+              <h3><a href="${adminUrl}">Administration Console <i class="fa fa-arrow-right link" aria-hidden="true"></i></a></h3>
               <div class="description">
-                Centrally manage all aspects of the ${productName} server
+                Centrally manage all aspects of the Morgana server
               </div>
             </div>
           </div>
         </div>
         </#if> <#-- adminConsoleEnabled -->
-        <div class="col-xs-12 col-sm-4">
-          <div class="card-pf h-l">
-            <h3><a href="${properties.documentationUrl}"><img class="doc-img" src="welcome-content/admin-console.png">Documentation <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
-            <div class="description">
-
-              User Guide, Admin REST API and Javadocs
-
-            </div>
-          </div>
-        </div>
-        <div class="col-xs-12 col-sm-4">
-        <#if properties.displayCommunityLinks = "true">
-          <div class="card-pf h-m">
-            <h3><a href="http://www.keycloak.org"><img src="welcome-content/keycloak-project.png">Keycloak Project <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
-          </div>
-          <div class="card-pf h-m">
-            <h3><a href="https://groups.google.com/forum/#!forum/keycloak-user"><img src="welcome-content/mail.png">Mailing List <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
-          </div>
-          <div class="card-pf h-m">
-            <h3><a href="https://github.com/keycloak/keycloak/issues"><img src="welcome-content/bug.png">Report an issue <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
-          </div>
-        </#if>
-        </div>
       </div>
     </div>
   </div>