chore(admin-ui): label for settings field #1575

Signed-off-by: Jeet Viramgama <[email protected]>

Author: jv18creator

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

@@ -83,7 +83,8 @@
     "introspection_encrypted_response_alg": "Introspection Encrypted Response Alg",
     "http_request_body": "Request Body",
     "webhook_name": "Webhook Name",
-    "sessionTimeoutInMins": "Session Timeout In Mins",
+    "sessionTimeoutInMins": "Admin UI Session Timeout (In Minutes)",
+    "adminui_default_acr": "Admin UI authentication method (ACR)",
     "download_summary": "Download Summary",
     "metadata_location": "Metadata Location",
     "released_attributes": "Released Attributes",
@@ -1259,7 +1260,8 @@
       "pageSize": "The default size for all list page.",
       "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."
+      "sessionTimeoutInMins": "Determines the duration of inactivity allowed before the current session expires.",
+      "adminui_default_acr": "This field controls the default authentication mechanism used in Admin UI."
     },
     "license": {
       "productName": "The license is registered under following product.",

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

@@ -132,7 +132,8 @@
     "ssl_key_store_file_path": "Chemin du fichier du magasin de clés SSL",
     "ssl_trust_store_password": "Mot de passe du magasin de confiance SSL",
     "ssl_key_store_password": "Mot de passe du magasin de clés SSL",
-    "sessionTimeoutInMins": "Durée de la session en minutes",
+    "sessionTimeoutInMins": "Délai d'expiration de la session de l'interface administrateur (en minutes)",
+    "adminui_default_acr": "Méthode d'authentification de l'interface administrateur (ACR)",
     "metadata_location": "Emplacement des métadonnées",
     "released_attributes": "Attributs publiés",
     "download_summary": "Télécharger le résumé",
@@ -812,7 +813,8 @@
       "pageSize": "La taille par défaut pour toutes les pages de liste.",
       "darkMode": "Indique si le mode sombre est activé ou désactivé.",
       "configApiUrl": "L'URL de l'API de configuration actuellement utilisée.",
-      "sessionTimeoutInMins": "Détermine la durée d'inactivité autorisée avant l'expiration de la session en cours."
+      "sessionTimeoutInMins": "Détermine la durée d'inactivité autorisée avant l'expiration de la session en cours.",
+      "adminui_default_acr": "Ce champ contrôle le mécanisme d'authentification par défaut utilisé dans l'interface administrateur."
     },
     "script": {
       "inum": "Identifiant unique identifiant le script",

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

@@ -130,7 +130,8 @@
     "introspection_encrypted_response_alg": "Algoritmo de criptografia da resposta de introspeção",
     "aui_feature_ids": "Recursos da interface do administrador",
     "download_summary": "Baixar Resumo",
-    "sessionTimeoutInMins": "Tempo Limite da Sessão em Minutos",
+    "sessionTimeoutInMins": "Tempo limite da sessão da interface de administração (em minutos)",
+    "adminui_default_acr": "Método de autenticação da interface de administração (ACR)",
     "introspection_encrypted_response_enc": "Algoritmo de criptografia da resposta de introspeção",
     "issuer": "Emissor",
     "metadata_location": "Localização dos Metadados",
@@ -906,7 +907,8 @@
       "pageSize": "O tamanho padrão para todas as páginas de lista.",
       "darkMode": "Se deve ativar ou desativar o modo escuro.",
       "configApiUrl": "A URL da API de configuração atualmente em uso.",
-      "sessionTimeoutInMins": "Determina a duração da inatividade permitida antes que a sessão atual expire."
+      "sessionTimeoutInMins": "Determina a duração da inatividade permitida antes que a sessão atual expire.",
+      "adminui_default_acr": "Este campo controla o mecanismo de autenticação padrão usado na interface de administração."
     },
     "script": {
       "inum": "ID único identificando o script",

admin-ui/app/redux/sagas/AuthSaga.js

@@ -54,6 +54,7 @@ function* putConfigWorker({ payload }) {
     console.log(`token`, token);
     const response = yield call(putServerConfiguration, { token, props: payload })
     if (response) {
+      yield put(getOAuth2ConfigResponse({ config: response }))
       yield put(updateToast(true, 'success'))
       return
     }

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

@@ -25,7 +25,6 @@ import * as Yup from 'yup'
 import { SIMPLE_PASSWORD_AUTH } from 'Plugins/auth-server/common/Constants'
 import { getScripts } from 'Redux/features/initSlice'
 import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
-import { getAcrsConfig } from 'Plugins/auth-server/redux/features/acrSlice'
 
 const levels = [1, 5, 10, 20]
 
@@ -35,7 +34,6 @@ function SettingsPage() {
   const loadingScripts = useSelector(
     (state) => state.initReducer.loadingScripts
   )
-  const loadingAcr = useSelector((state) => state.acrReducer.loading)
   const loadingConfig = useSelector((state) => state.authReducer?.loadingConfig)
   const theme = useContext(ThemeContext)
   const selectedTheme = theme.state.theme
@@ -45,13 +43,12 @@ function SettingsPage() {
   SetTitle(t('titles.application_settings'))
 
   useEffect(() => {
-    dispatch(getAcrsConfig())
     dispatch(getScripts({ action: {} }))
   }, [])
 
   return (
     <React.Fragment>
-      <GluuLoader blocking={loadingScripts || loadingConfig || loadingAcr}>
+      <GluuLoader blocking={loadingScripts || loadingConfig}>
         <Card style={applicationStyle.mainCard}>
           <CardBody>
             <FormGroup row>
@@ -115,7 +112,7 @@ function SettingsPage() {
               </Col>
             </FormGroup>
 
-            {!loadingScripts && !loadingAcr && <SettingsForm />}
+            {!loadingScripts && <SettingsForm />}
           </CardBody>
         </Card>
       </GluuLoader>
@@ -128,10 +125,10 @@ function SettingsForm() {
   const theme = useContext(ThemeContext)
   const selectedTheme = theme.state.theme
   const loadingConfig = useSelector((state) => state.authReducer?.loadingConfig)
+  const acrValues = useSelector((state) => state.authReducer?.config?.acrValues)
   const sessionTimeout =
     useSelector((state) => state.authReducer?.config?.sessionTimeoutInMins) || 5
   const scripts = useSelector((state) => state.initReducer.scripts)
-  const acrs = useSelector((state) => state.acrReducer.acrReponse)
   const dispatch = useDispatch()
 
   const authScripts = scripts
@@ -144,7 +141,7 @@ function SettingsForm() {
   const formik = useFormik({
     initialValues: {
       sessionTimeoutInMins: sessionTimeout,
-      acrValues: acrs?.defaultAcr || '',
+      acrValues: acrValues || '',
     },
     onSubmit: (values) => {
       dispatch(putConfigWorker(values))
@@ -178,9 +175,9 @@ function SettingsForm() {
       <FormGroup row>
         <GluuLabel
           size={4}
-          doc_category='json_properties'
-          doc_entry={'defaultAcr'}
-          label={t('fields.default_acr')}
+          doc_category='settings'
+          doc_entry={'adminui_default_acr'}
+          label={t('fields.adminui_default_acr')}
         />
         <Col sm={8}>
           <InputGroup>