Merge branch 'main' into feat-gateway-support

Author: moabu

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

@@ -821,6 +821,7 @@
     "edit_script": "Edit Script",
     "edit_authn": "Edit AuthN",
     "edit_acr": "Edit ACR",
+    "built_in_acr_cannot_be_edited": "Built-in ACR cannot be edited due to missing identifier (inum)",
     "ldap_connection_error": "LDAP Connection Failed!",
     "ldap_connection_success": "LDAP Connection successful!",
     "not_deletable_client": "This Client can't be detele",

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

@@ -823,6 +823,7 @@
     "edit_script": "Editar Script",
     "edit_authn": "Editar AuthN",
     "edit_acr": "Editar ACR",
+    "built_in_acr_cannot_be_edited": "El ACR integrado no se puede editar debido a la falta del identificador (inum)",
     "ldap_connection_error": "¡Fallo en la conexión LDAP!",
     "ldap_connection_success": "¡Conexión LDAP exitosa!",
     "not_deletable_client": "Este Cliente no se puede eliminar",

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

@@ -813,6 +813,7 @@
     "add_ssa": "Ajouter SSA",
     "copied": "Copié",
     "edit_acr": "Modifier ACR",
+    "built_in_acr_cannot_be_edited": "L'ACR intégré ne peut pas être modifié en raison de l'absence d'identifiant (inum)",
     "no_data_found": "Aucune donnée trouvée",
     "no_data_to_export": "Aucune donnée disponible à exporter",
     "no_sessions_found": "Aucune session trouvée",

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

@@ -808,6 +808,7 @@
     "add_ssa": "Adicionar SSA",
     "copied": "Copiado",
     "edit_acr": "Editar ACR",
+    "built_in_acr_cannot_be_edited": "O ACR integrado não pode ser editado devido à ausência do identificador (inum)",
     "no_data_found": "Nenhum dado encontrado",
     "no_data_to_export": "Nenhum dado disponível para exportar",
     "no_sessions_found": "Nenhuma sessão encontrada",

admin-ui/app/routes/Apps/Gluu/GluuInputRow.tsx

@@ -50,14 +50,14 @@ function GluuInputRow({
           name={name}
           value={value}
           onChange={(event) => {
-            if (handleChange) {
+            if (formik) {
               formik.handleChange(event)
+            }
+            if (handleChange) {
               handleChange(event)
-            } else {
-              formik.handleChange(event)
             }
           }}
-          onBlur={formik.handleBlur}
+          onBlur={formik?.handleBlur}
           onFocus={onFocus}
           onKeyDown={(evt) => evt.key === 'e' && type === 'number' && evt.preventDefault()}
           disabled={disabled}

admin-ui/plugins/admin/components/Settings/SettingsPage.tsx

@@ -55,6 +55,7 @@ import { UPDATE } from '@/audit/UserActionType'
 import { ADMIN_UI_SETTINGS } from 'Plugins/admin/redux/audit/Resources'
 import { getErrorMessage } from 'Plugins/schema/utils/errorHandler'
 import type { RootState } from '@/redux/sagas/types/audit'
+import customColors from '@/customColors'
 
 const PAGING_SIZE_OPTIONS = [1, 5, 10, 20] as const
 const DEFAULT_PAGING_SIZE = PAGING_SIZE_OPTIONS[2]
@@ -76,10 +77,8 @@ const SettingsPage: React.FC = () => {
 
   const { hasCedarReadPermission, hasCedarWritePermission, authorizeHelper } = useCedarling()
 
-  const authState = useSelector((state: RootState) => ({
-    userinfo: state.authReducer?.userinfo,
-    clientId: state.authReducer?.config?.clientId,
-  }))
+  const userinfo = useSelector((state: RootState) => state.authReducer?.userinfo)
+  const clientId = useSelector((state: RootState) => state.authReducer?.config?.clientId)
 
   const {
     data: config,
@@ -189,11 +188,11 @@ const SettingsPage: React.FC = () => {
         dispatch(getOAuth2ConfigResponse({ config: updatedConfig }))
 
         await logAudit({
-          userinfo: authState.userinfo ?? undefined,
+          userinfo: userinfo ?? undefined,
           action: UPDATE,
           resource: ADMIN_UI_SETTINGS,
           message: 'Application settings updated',
-          client_id: authState.clientId,
+          client_id: clientId,
           payload: {
             sessionTimeoutInMins: values.sessionTimeoutInMins,
             acrValues: values.acrValues,
@@ -260,6 +259,26 @@ const SettingsPage: React.FC = () => {
     additionalParametersError && (formik.submitCount > 0 || formik.touched?.additionalParameters),
   )
 
+  const additionalParametersErrorText = useMemo((): string | null => {
+    const err = additionalParametersError
+    if (!err) return null
+    if (typeof err === 'string') return err
+    if (Array.isArray(err)) {
+      for (const item of err) {
+        if (!item) continue
+        if (typeof item === 'string') return item
+        if (typeof item === 'object') {
+          const maybeKey = (item as { key?: unknown }).key
+          const maybeValue = (item as { value?: unknown }).value
+          if (typeof maybeKey === 'string') return maybeKey
+          if (typeof maybeValue === 'string') return maybeValue
+        }
+      }
+      return null
+    }
+    return null
+  }, [additionalParametersError])
+
   const renderErrorAlert = () => {
     if (!hasQueryError) return null
 
@@ -494,7 +513,9 @@ const SettingsPage: React.FC = () => {
                     </Col>
                   </FormGroup>
                   {showAdditionalParametersError && (
-                    <div style={{ color: '#dc3545' }}>{additionalParametersError}</div>
+                    <div style={{ color: customColors.accentRed }}>
+                      {additionalParametersErrorText || t('messages.field_required')}
+                    </div>
                   )}
                 </AccordionBody>
               </Accordion>