Merge pull request #335 from appukuttan-shailesh/ebrains_theme

EBRAINS theme + Other improvements & Fixes

Author: appukuttan-shailesh

apps/curation-dashboard/package.json

@@ -10,7 +10,7 @@
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^12.8.1",
     "axios": "^0.21.1",
-    "keycloak-js": "^8.0.1",
+    "keycloak-js": "^12.0.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-scripts": "4.0.3"

apps/curation-dashboard/src/auth.js

@@ -6,24 +6,34 @@ import Keycloak from 'keycloak-js';
 const keycloak = Keycloak({
     url: 'https://iam.ebrains.eu/auth',
     realm: 'hbp',
-    clientId: 'model-catalog'
+    clientId: 'model-catalog',
+    'public-client': true,
+    'confidential-port': 0,
 });
 const YOUR_APP_SCOPES = 'team email profile';   // full list at https://iam.ebrains.eu/auth/realms/hbp/.well-known/openid-configuration
 
 
 export default function initAuth(main) {
     console.log('DOM content is loaded, initialising Keycloak client...');
-    keycloak
-        .init({ flow: 'implicit', promiseType: 'native' })
+    console.log(window.location.hostname);
+    if (window.location.hostname === "localhost" || window.location.hostname === "127.0.0.1") {
+        // for local development
+        keycloak
+        .init({ flow: 'implicit', promiseType: 'native' }) 
         .then(() => checkAuth(main))
         .catch(console.log);
+    } else {
+        // for deployment
+        keycloak
+        .init({ flow: 'standard', pkceMethod: 'S256' }) 
+        .then(() => checkAuth(main))
+        .catch(console.log);
+    }
 }
 
-
 function checkPermissions(keycloak) {
     return keycloak.loadUserInfo()
         .then((userInfo) => {
-
             if (userInfo.roles.team.includes("collab-model-validation-editor") || userInfo.roles.team.includes("collab-model-validation-administrator")) {
                 keycloak.authorized = true;
             } else {
@@ -32,7 +42,6 @@ function checkPermissions(keycloak) {
         })
 }
 
-
 function checkAuth(main) {
     console.log('Keycloak client is initialised, verifying authentication...');
 

apps/validation_framework_v2/package-lock.json

@@ -14,7 +14,7 @@
         "eslint-plugin-react-hooks": "^4.2.0",
         "filesize": "^6.1.0",
         "humanparser": "^1.11.0",
-        "keycloak-js": "^8.0.1",
+        "keycloak-js": "^12.0.2",
         "lodash": "^4.17.20",
         "material-ui-chip-input": "^2.0.0-beta.2",
         "moment": "^2.29.1",