Merge pull request #8 from rwth-acis/20.0.1

Update to Keycloak 20.0.1
rwth-acis · Nov 22, 2022 · 09dc711 · 09dc711
2 parents efbc3c7 + 4a3bcf9
commit 09dc711
Show file tree

Hide file tree

Showing 26 changed files with 4,951 additions and 3,413 deletions.
diff --git a/account-console/account-console.iml b/account-console/account-console.iml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/src/main/resources/theme/learning-layers-account/account/src/web_modules" />
       <excludeFolder url="file://$MODULE_DIR$/src/main/resources/theme/keycloak" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/account-console/pom.xml b/account-console/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>tech4comp</groupId>
         <artifactId>keycloak-extensions</artifactId>
-        <version>18.0.0</version>
+        <version>20.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>account-console</artifactId>
-    <version>18.0.0</version>
+    <version>20.0.1</version>
     <packaging>jar</packaging>
     <name>account-console</name>
     <description>changes of the account console</description>

diff --git a/account-console/src/main/resources/theme/learning-layers-account/account/index.ftl b/account-console/src/main/resources/theme/learning-layers-account/account/index.ftl
@@ -46,7 +46,10 @@
                 isEventsEnabled : ${isEventsEnabled?c},
                 isMyResourcesEnabled : ${(realm.userManagedAccessAllowed && isAuthorizationEnabled)?c},
                 isTotpConfigured : ${isTotpConfigured?c},
-                deleteAccountAllowed : ${deleteAccountAllowed?c}
+                deleteAccountAllowed : ${deleteAccountAllowed?c},
+                updateEmailFeatureEnabled: ${updateEmailFeatureEnabled?c},
+                updateEmailActionEnabled: ${updateEmailActionEnabled?c},
+                isViewGroupsEnabled : ${isViewGroupsEnabled?c}
             }
 
             var availableLocales = [];
@@ -105,18 +108,19 @@
         <script>
             var content = <#include "resources/content.json"/>
         </script>
+        
+        <link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/react-core/dist/styles/base.css"/>
+        <link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/react-core/dist/styles/app.css"/>
+        <link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/patternfly/patternfly-addons.css"/>
+        <link href="${resourceUrl}/public/layout.css" rel="stylesheet"/>
 
         <#if properties.styles?has_content>
             <#list properties.styles?split(' ') as style>
             <link href="${resourceUrl}/${style}" rel="stylesheet"/>
             </#list>
         </#if>
 
-        
-        <link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/react-core/dist/styles/base.css"/>
-        <link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/react-core/dist/styles/app.css"/>
-        <link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/patternfly/patternfly-addons.css"/>
-        <link href="${resourceUrl}/public/layout.css" rel="stylesheet"/>
+
     </head>
 
     <body>
@@ -188,7 +192,7 @@
                   <span class="pf-c-button__icon pf-m-start">
                       <i class="pf-icon pf-icon-arrow" aria-hidden="true"></i>
                   </span>
-                  ${msg("backToAdminConsole")}
+                  ${msg("backTo",referrerName)}
               </a>
             </div>
             </#if>
@@ -207,7 +211,7 @@
                     <ul id="landingMobileDropdown" aria-labelledby="landingMobileKebabButton" class="pf-c-dropdown__menu pf-m-align-right" role="menu" style="display:none">
                         <#if referrer?has_content && referrer_uri?has_content>
                         <li role="none">
-                            <a id="landingMobileReferrerLink" href="${referrer_uri}" role="menuitem" tabindex="0" aria-disabled="false" class="pf-c-dropdown__menu-item">${msg("backToAdminConsole")}</a>
+                            <a id="landingMobileReferrerLink" href="${referrer_uri}" role="menuitem" tabindex="0" aria-disabled="false" class="pf-c-dropdown__menu-item">${msg("backTo",referrerName)}</a>
                         </li>
                         </#if>
 

diff --git a/.../src/main/resources/theme/learning-layers-account/account/messages/messages_en.properties b/.../src/main/resources/theme/learning-layers-account/account/messages/messages_en.properties
@@ -165,7 +165,7 @@ two-factor=Two-factor authentication
 passwordless=Passwordless
 unknown=Unknown
 password-display-name=Password
-password-help-text=Log in by entering your password.
+password-help-text=Sign in by entering your password.
 password=My password
 otp-display-name=authenticator application
 otp-help-text=Enter a verification code from authenticator application.
@@ -184,6 +184,7 @@ invalidRequestMessage=Invalid request
 
 # Applications page
 applicationsPageTitle=Applications
+applicationsPageSubTitle=Manage your application permissions
 internalApp=Internal
 thirdPartyApp=Third-party
 offlineAccess=Offline access
@@ -203,10 +204,11 @@ termsOfService=Terms of service
 policy=Privacy policy
 applicationType=Application type
 status=Status
+logo=Logo
 
 #Delete account page
 doDelete=Delete
-deleteAccountSummary=Deleting your account will erase all your data and log you out immediately.
+deleteAccountSummary=Deleting your account will erase all your data and sign you out immediately.
 deleteAccount=Delete account
 deleteAccountWarning=This is irreversible. All your data will be permanently destroyed, and irretrievable.
 
@@ -229,3 +231,13 @@ error-user-attribute-required=Please specify ''{0}''.
 error-invalid-date=''{0}'' is invalid date.
 error-username-invalid-character=''{0}'' contains invalid character.
 error-person-name-invalid-character='{0}' contains invalid character.
+
+updateEmail=Update email
+
+#groups
+groupLabel=Groups
+groupDescriptionLabel=View groups that you are associated with
+path=Path
+directMembership=Direct membership
+noGroups=No groups
+noGroupsText=You are not joined in any group
diff --git a/...t-console/src/main/resources/theme/learning-layers-account/account/resources/content.json b/...t-console/src/main/resources/theme/learning-layers-account/account/resources/content.json
@@ -3,35 +3,35 @@
     "id": "personal-info",
     "path": "personal-info",
     "icon": "pf-icon-user",
-    "label": "personalInfoHtmlTitle",
+    "label": "personalInfoSidebarTitle",
     "descriptionLabel": "personalInfoIntroMessage",
     "modulePath": "/content/account-page/AccountPage.js",
     "componentName": "AccountPage"
   },
   {
     "id": "security",
     "icon": "pf-icon-security",
-    "label": "accountSecurityTitle",
+    "label": "accountSecuritySidebarTitle",
     "descriptionLabel": "accountSecurityIntroMessage",
     "content": [
       {
         "id": "signingin",
         "path": "security/signingin",
-        "label": "signingIn",
+        "label": "signingInSidebarTitle",
         "modulePath": "/content/signingin-page/SigningInPage.js",
         "componentName": "SigningInPage"
       },
       {
         "id": "device-activity",
         "path": "security/device-activity",
-        "label": "device-activity",
+        "label": "deviceActivitySidebarTitle",
         "modulePath": "/content/device-activity-page/DeviceActivityPage.js",
         "componentName": "DeviceActivityPage"
       },
       {
         "id": "linked-accounts",
         "path": "security/linked-accounts",
-        "label": "linkedAccountsHtmlTitle",
+        "label": "linkedAccountsSidebarTitle",
         "modulePath": "/content/linked-accounts-page/LinkedAccountsPage.js",
         "componentName": "LinkedAccountsPage",
         "hidden": "!features.isLinkedAccountsEnabled"
@@ -47,6 +47,16 @@
     "modulePath": "/content/applications-page/ApplicationsPage.js",
     "componentName": "ApplicationsPage"
   },
+  {
+    "id": "groups",
+    "path": "groups",
+    "icon": "pf-icon-server-group",
+    "label": "groupLabel",
+    "descriptionLabel": "groupDescriptionLabel",
+    "modulePath": "/content/group-page/GroupsPage.js",
+    "componentName": "GroupsPage",
+    "hidden": "!features.isViewGroupsEnabled"
+  },
   {
     "id": "resources",
     "icon": "pf-icon-repository",
@@ -80,4 +90,4 @@
       }
     ]
   }
-]
+]
diff --git a/account-console/src/main/resources/theme/learning-layers-account/account/src/.eslintrc.js b/account-console/src/main/resources/theme/learning-layers-account/account/src/.eslintrc.js
@@ -1,32 +1,21 @@
+/** @type {import('eslint').Linter.Config } */
 module.exports = {
-  parser: '@typescript-eslint/parser',
-  env: {
-    browser: true,
-    es6: true,
-  },
-  extends: ['plugin:@typescript-eslint/recommended', 'react-app'],
-  globals: {
-    Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly',
-  },
-  parserOptions: {
-    ecmaFeatures: {
-      jsx: true,
-      impliedStrict: true
-    },
-    ecmaVersion: 2019,
-    sourceType: 'module',
-  },
-  plugins: [
-    'react',
+  extends: [
+    'react-app',
+    'plugin:jsx-a11y/recommended',
+    'plugin:react/recommended',
+    'plugin:@typescript-eslint/recommended',
   ],
-  rules: {
-      "no-useless-constructor":  "off",
-      "@typescript-eslint/indent": "off",
-      "@typescript-eslint/no-empty-interface": "off",
-      "@typescript-eslint/no-non-null-assertion": "off",
-      "@typescript-eslint/no-parameter-properties": "off",
-      "@typescript-eslint/explicit-member-accessibility": "off",
-      "no-restricted-properties": "off"
+  settings: {
+    react: {
+      version: '16',
+    }
   },
+  rules: {
+    '@typescript-eslint/ban-types': 'warn',
+    '@typescript-eslint/no-empty-interface': 'warn',
+    '@typescript-eslint/no-extra-semi': 'warn',
+    'prefer-const': 'warn',
+    'react/prop-types': 'warn',
+  }
 };
diff --git a/account-console/src/main/resources/theme/learning-layers-account/account/src/app/App.tsx b/account-console/src/main/resources/theme/learning-layers-account/account/src/app/App.tsx
@@ -33,7 +33,8 @@ import { KeycloakContext } from './keycloak-service/KeycloakContext';
 
 declare function toggleReact(): void;
 declare function isWelcomePage(): boolean;
-declare function loggedInUserName(): string;
+
+
 
 declare const brandImg: string;
 declare const brandUrl: string;
@@ -57,9 +58,7 @@ export class App extends React.Component<AppProps> {
             this.context!.login();
         }
 
-        const username = (
-            <span style={{marginLeft: '10px'}} id="loggedInUser">{loggedInUserName()}</span>
-        );
+
 
         const Header = (
             <PageHeader

diff --git a/...nsole/src/main/resources/theme/learning-layers-account/account/src/app/PageHeaderTool.tsx b/...nsole/src/main/resources/theme/learning-layers-account/account/src/app/PageHeaderTool.tsx
@@ -5,11 +5,14 @@ import {ReferrerLink} from './widgets/ReferrerLink';
 import {LogoutButton} from './widgets/Logout';
 
 declare const referrerName: string;
+declare function loggedInUserName(): string;
 
 export class PageHeaderTool extends React.Component {
     private hasReferrer: boolean = typeof referrerName !== 'undefined';
 
     public render(): React.ReactNode {
+        const username = loggedInUserName();
+
         return (
             <PageHeaderTools>
                 {this.hasReferrer &&
@@ -21,6 +24,8 @@ export class PageHeaderTool extends React.Component {
                 <div className="pf-c-page__header-tools-group">
                     <LogoutButton/>
                 </div>
+
+                <span style={{marginLeft: '10px'}} id="loggedInUser">{username}</span>
             </PageHeaderTools>
         );
     }