Merge branch 'main' into admin-ui-issues-1863

.github/workflows/docker_build_image.yml

@@ -124,18 +124,18 @@ jobs:
           fi
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
           echo "build=${BUILD}" >> $GITHUB_OUTPUT
-          # wait for all images in DEFAULT_ALL to be built before building the all-in-one image as it depends on all other images
           if [[ "flex-all-in-one" =~ "${{ matrix.docker-images }}" ]]; then
-            if [[ ${{ github.event_name != 'pull_request' }} ]]; then
-              TEMP_IMG="admin-ui"
-              for i in $TEMP_IMG; do
-                TEMP_TOKEN=$(curl https://ghcr.io/token\?scope\="repository:gluufederation/flex/$i:pull" | jq -r '.token')
-                while [[ $(curl -s -H "Authorization: Bearer ${TEMP_TOKEN}" https://ghcr.io/v2/gluufederation/flex/$i/tags/list | jq -r '.tags' | grep "$VERSION" | tr -d '[:space:]"') != "$VERSION" ]]; do
-                  echo "Waiting for $i to be built"
-                  sleep 30
-                done
-              done
-            fi
+            echo "Waiting for all images to be built before building the all-in-one image"
+            while true; do
+              echo "Attempting to pull the Docker image"
+              if docker pull ghcr.io/$REPOSITORY/admin-ui:$VERSION; then
+                echo "Docker image pulled successfully"
+                break
+              else
+                echo "Failed to pull Docker image, retrying in 20 seconds"
+                sleep 20
+              fi
+            done
           fi
 
       # UPDATE BUILD DATES INSIDE THE DOCKERFILE BEFORE BUILDING THE DEV IMAGES TRIGGERED BY JENKINS

.github/workflows/test_docker_linux_installer.yml

@@ -18,7 +18,7 @@ jobs:
       max-parallel: 6
       matrix:
         # add '"pgsql" when supported
-        persistence-backends: ["MYSQL", "PGSQL", "LDAP"]
+        persistence-backends: ["MYSQL", "PGSQL"]
         python-version: ["3.7"]
       fail-fast: false
     steps:
@@ -38,20 +38,20 @@ jobs:
         ip=$(ifconfig eth0 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
         sudo chmod u+x automation/startflexmonolithdemo.sh
         sudo bash ./automation/startflexmonolithdemo.sh demoexample.gluu.org ${{ matrix.persistence-backends }} $ip ${{ github.sha }} ${{ secrets.LICENSE_SSA }}
-        
+
         echo "echo setup.properties"
         docker exec docker-flex-monolith-flex-1 cat setup.properties
         echo "echo setup.properties.last"
         docker exec docker-flex-monolith-flex-1 cat /opt/jans/jans-setup/setup.properties.last
-        
+
         export JANS_URL=https://demoexample.gluu.org
         export JANS_CLIENT_ID=9876baac-de39-4c23-8a78-674b59df8c09
         export JANS_CLIENT_SECRET=1t5Fin3#security
         export JANS_INSECURE_CLIENT=true
         export TF_ACC=1
         git clone https://github.com/JanssenProject/jans.git
         cd jans/terraform-provider-jans
-        
+
         go install github.com/jstemmer/go-junit-report/v2@latest
         go test -v 2>&1 ./... | go-junit-report > ${{ matrix.persistence-backends }}report.xml
         ls
@@ -61,4 +61,4 @@ jobs:
       if: success() || failure()        # run this step even if previous step failed
       with:
         name: go-test-results
-        path: ./jans/terraform-provider-jans/${{ matrix.persistence-backends }}report.xml
+        path: ./jans/terraform-provider-jans/${{ matrix.persistence-backends }}report.xml

admin-ui/app/locales/en/translation.json

@@ -102,7 +102,7 @@
     "principal_type": "Principal Type",
     "webhook_name": "Webhook Name",
     "sessionTimeoutInMins": "Admin UI Session Timeout (In Minutes)",
-    "gluuFlexVersion":"Gluu Flex Version",
+    "gluuFlexVersion": "Gluu Flex Version",
     "adminui_default_acr": "Admin UI authentication method (ACR)",
     "download_summary": "Download Summary",
     "metadata_location": "Metadata Location",
@@ -120,6 +120,12 @@
     "released_attributes": "Released Attributes",
     "jans_assertion_consumer_service_get_url": "Jans Assertion Consumer Service GET URL",
     "jans_assertion_consumer_service_post_url": "Jans Assertion Consumer Service POST URL",
+    "jans_id": "Jans ID",
+    "jans_state": "Jans State",
+    "jans_sess_state":"Jans Session State",
+    "jans_user_dn": "Jans User DN",
+    "permission_granted_map": "Permission Granted Map",
+    "jans_sess_attr": "Jans Session Attributes",
     "metadata_file": "Metadata File",
     "metadata_url": "Metadata URL",
     "webhook_url": "URL",
@@ -218,7 +224,7 @@
     "client_credentials_access_token": "Client Credentials Access Token",
     "client_expiration_date": "Client Expiration Date",
     "client_id": "Client Id",
-    "client_id_used": "Client Id Used",
+    "client_id_used": "Client Id",
     "client_name": "Client name",
     "client_secret": "Client secret",
     "computation_pool_size": "Computation Pool Size",
@@ -286,6 +292,7 @@
     "json_web_keys": "JSON Web Keys",
     "jwks": "Client JWKS",
     "jwks_uri": "Client JWKS URI",
+    "allow_keystore_edit": "Edit Keystore",
     "key_store": "Keystore",
     "key_store_password": "Keystore Password",
     "key_store_alias": "Keystore Alias",
@@ -458,6 +465,7 @@
     "licenseKey": "License Key",
     "isLicenseActive": "Is License Active",
     "validityPeriod": "License Valid Upto",
+    "isLicenseExpired": "Is License Expired",
     "companyName": "Company Name",
     "customerEmail": "Customer Email",
     "customerName": "Customer Name",
@@ -474,6 +482,8 @@
     "email": "Email",
     "userName": "User Name",
     "nickName": "Nick Name",
+    "modality": "Modality",
+    "dateAdded": "Date Added",
     "givenName": "Given Name",
     "resources": "Resources",
     "resourceId": "Resource id",
@@ -540,7 +550,13 @@
     "updates_at_last_run": "Updates at the last run",
     "problems_at_last_run": "Problems at the last run",
     "mapping": "Mapping",
-    "source": "Source"
+    "source": "Source",
+    "createdBy": "Created By",
+    "deviceName": "Device Name",
+    "OSName": "OS Name",
+    "OSVersion": "OS Version",
+    "platform": "Platform",
+    "authType": "Auth Type"
   },
   "languages": {
     "french": "French",
@@ -566,7 +582,7 @@
     "default_acr": "Default ACR",
     "acrs": "ACRs",
     "aliases": "Aliases",
-    "builtIn":"Built-In",
+    "builtIn": "Built-In",
     "api": {
       "roles": "Access roles",
       "permissions": "Permissions",
@@ -631,6 +647,7 @@
     "add_asset": "Add Jans Asset",
     "asset_document_error": "Document is mandatory.",
     "add_configuration": "Add Configuration",
+    "credentials": "Credentials",
     "view_configuration": "View Configuration",
     "view_trust_relationshi_details": "View Trust Relationship Details",
     "add_trust_relationship": "Add Trust Relationship",
@@ -696,6 +713,8 @@
     "resource_not_found_message": "The requested resource doesn't exist on this server. Please contact the site administrator or the support team.",
     "resource_not_found_title": "Resource not found",
     "view_client_details": "View client details",
+    "view_2FA_details": "View 2FA details",
+    "2FA_details": "2FA details",
     "view_script_details": "View custom script details",
     "add_new_user": "Add User",
     "error_in_saving": "Error in saving.",
@@ -866,7 +885,11 @@
     "change_backend_bind_password": "Change Backend Bind Password",
     "add_agama_project": "Add Agama project",
     "add_alias": "Add New Mapping",
-    "edit_alias": "Edit Mapping"
+    "edit_alias": "Edit Mapping",
+    "export_csv": "Export CSV",
+    "filters": "Filters",
+    "expiration_date" : "Expiration Date",
+    "authentication_date": "Authentication Date"
   },
   "links": {
     "support": "https://support.gluu.org/"
@@ -1433,7 +1456,7 @@
     },
     "settings": {
       "pageSize": "The default size for all list page.",
-      "gluuCurrentVersion":"Gluu Server current version",
+      "gluuCurrentVersion": "Gluu Server current version",
       "darkMode": "Whether to enable or disable adrk mode.",
       "configApiUrl": "The URL of the config api currently in used.",
       "sessionTimeoutInMins": "Determines the duration of inactivity allowed before the current session expires.",
@@ -1449,6 +1472,7 @@
       "customerName": "The customer name of the registered license.",
       "companyName": "The company name of the registered license.",
       "validityPeriod": "The license will expire on following date.",
+      "isLicenseExpired": "Is license expired?",
       "maxActivations": "The maximum allowed activations of this license on different machines.",
       "isLicenseActive": "Is license active?"
     },
@@ -1526,7 +1550,23 @@
       "INUM": "INUM",
       "middleName": "Middle Name",
       "sn": "Last Name",
-      "userConfirmPassword": "Confirm Password"
+      "userConfirmPassword": "Confirm Password",
+      "deviceName": "Device Name",
+      "OSName": "OS Name",
+      "OSVersion": "OS Version",
+      "platform": "Platform",
+      "createdBy": "Created By",
+      "type": "Type",
+      "domain": "Domain"
+    },
+    "sessions":{
+      "expirationDate" : "Expiration Date",
+      "jansId": "Jans Id",
+      "jansState": "Jans State",
+      "jansSessState": "Jans Session State",
+      "jansUsrDN": "Jans User DN",
+      "permissionGrantedMap": "Permission Granted Map",
+      "jansSessAttr": "Jans Session Attribute"
     },
     "saml": {
       "name": "The alphanumeric ID string that is used to identify the Trust Relationship",

admin-ui/app/locales/fr/translation.json

@@ -43,7 +43,7 @@
     "acrs": "ACRs",
     "aliases": "Aliases",
     "trust_relationships": "Relations de confiance",
-    "builtIn" : "Intégré",
+    "builtIn": "Intégré",
     "api": {
       "roles": "Rôles d'accès",
       "permissions": "Autorisations",
@@ -168,6 +168,12 @@
     "ssl_trust_store_password": "Mot de passe du magasin de confiance SSL",
     "jans_assertion_consumer_service_get_url": "URL GET du service consommateur d'assertions Jans",
     "jans_assertion_consumer_service_post_url": "URL POST du service consommateur d'assertions Jans",
+    "jans_id": "ID Jans",
+    "jans_state": "État Jans",
+    "jans_sess_state":"État de la session Jans",
+    "jans_user_dn": "DN de l'utilisateur Jans",
+    "permission_granted_map": "Carte des autorisations accordées",
+    "jans_sess_attr": "Attributs de la session Jans",
     "ssl_key_store_password": "Mot de passe du magasin de clés SSL",
     "customAttributes": "attributs personnalisés",
     "enable_kc": "Activer le lien Jannssen Keycloak",
@@ -345,7 +351,7 @@
     "client_credentials_access_token": "Jeton d'accès aux informations d'identification du client",
     "client_expiration_date": "Date d'expiration du client",
     "client_id": "Identité du client",
-    "client_id_used": "Identifiant client utilisé",
+    "client_id_used": "Identifiant client",
     "client_name": "Nom du client",
     "client_secret": "Secret du client",
     "computation_pool_size": "Taille du pool de calcul",
@@ -481,6 +487,7 @@
     "show_in_configuration_endpoint": "Afficher dans le point de terminaison de configuration",
     "s_id": "ID de session",
     "session_expired": "Session expirée",
+    "allow_keystore_edit": "Modifier le magasin de clés",
     "smtp_server_port": "Port du serveur SMTP",
     "smtp_test_status": "État du test SMTP",
     "smtp_user_name": "Nom d'utilisateur SMTP",
@@ -520,6 +527,7 @@
     "licenseKey": "Clé de licence",
     "isLicenseActive": "La licence est-elle active",
     "validityPeriod": "Licence valide jusqu'à",
+    "isLicenseExpired": "La licence est-elle expirée",
     "companyName": "Nom de la compagnie",
     "customerEmail": "Email client",
     "customerName": "Nom du client",
@@ -529,6 +537,8 @@
     "email": "E-mail",
     "userName": "Nom d'utilisateur",
     "nickName": "Surnom",
+    "modality": "Modalité",
+    "dateAdded": "date ajoutée",
     "resources": "Ressources",
     "resourceId": "Identifiant de la ressource",
     "iconUrl": "URL de l'icône",
@@ -566,13 +576,20 @@
     "updates_at_last_run": "Mises à jour lors de la dernière exécution",
     "problems_at_last_run": "Problèmes lors de la dernière course",
     "mapping": "Mapeamento",
-    "source": "Fonte"
+    "source": "Fonte",
+    "createdBy": "Créé par",
+    "deviceName": "Nom de l'appareil",
+    "OSName": "Nom du système d'exploitation",
+    "OSVersion": "Version du système d'exploitation",
+    "platform": "Plateforme",
+    "authType": "Type d'authentification"
   },
   "messages": {
     "add_permission": "Ajouter une autorisation",
     "add_asset": "Add Jans Asset",
     "asset_document_error": "Document is mandatory.",
     "add_configuration": "Ajouter une configuration",
+    "credentials": "Credentials",
     "view_configuration": "Afficher la configuration",
     "new_role": "Nouveau rôle",
     "view_trust_relationshi_details": "Voir les détails de la relation de confiance",
@@ -635,6 +652,8 @@
     "resource_not_found_message": "La ressource demandée n'existe pas sur ce serveur. Veuillez contacter l'administrateur du site ou l'équipe d'assistance.",
     "resource_not_found_title": "Ressource introuvable",
     "view_client_details": "Afficher les détails du client",
+    "view_2FA_details": "Afficher les détails de la 2FA",
+    "2FA_details": "les détails de la 2FA",
     "view_script_details": "Afficher les détails du script personnalisé",
     "add_new_user": "Ajouter un utilisateur",
     "no_scope_in_client": "Aucune donnée d'étendue pour ce client",
@@ -765,7 +784,8 @@
     "ssa_management": "SSA Gestion",
     "jans_ink": "Jans Link",
     "change_backend_bind_password": "Modifier le mot de passe de liaison du backend",
-    "add_agama_project": "Ajouter un projet Agama"
+    "add_agama_project": "Ajouter un projet Agama",
+    "export_csv":"Exporter CSV"
   },
   "links": {
     "support": "https://support.gluu.org/"
@@ -1465,6 +1485,22 @@
     "INUM": "INUM",
     "middleName": "Deuxième nom",
     "sn": "Nom de famille",
-    "userConfirmPassword": "Confirmez le mot de passe"
+    "userConfirmPassword": "Confirmez le mot de passe",
+    "deviceName": "Nom de l'appareil",
+    "OSName": "Nom du système d'exploitation",
+    "OSVersion": "Version du système d'exploitation",
+    "platform": "Plateforme",
+    "createdBy": "Créé par",
+    "type": "Type",
+    "domain": "Domaine"
+  },
+  "sessions":{
+    "expirationDate" : "Date d'expiration",
+    "jansId": "ID Jans",
+    "jansState": "État Jans",
+    "jansSessState": "État de la session Jans",
+    "jansUsrDN": "DN de l'utilisateur Jans",
+    "permissionGrantedMap": "Carte des autorisations accordées",
+    "jansSessAttr": "Attribut de la session Jans"
   }
 }