fix: mismatch of new added fields name on oidc clients screen #352

GluuFederation · Aug 4, 2022 · 20a04ad · 20a04ad
1 parent 5765dbe
commit 20a04ad
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 22 deletions.
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js
@@ -152,12 +152,12 @@ function ClientAdvancedPanel({ client, scripts, formik, scopes }) {
         rsize={9}
       ></GluuTypeAheadForDn>
       <GluuToogleRow
-        name="defaultPromptLogin"
+        name="jansDefaultPromptLogin"
         lsize={3}
         rsize={9}
         formik={formik}
         label="fields.defaultPromptLogin"
-        value={client.defaultPromptLogin}
+        value={client.jansDefaultPromptLogin}
         doc_category={DOC_CATEGORY}
       />
       <GluuInputRow

diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientEncryptionSigningPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientEncryptionSigningPanel.js
@@ -47,6 +47,19 @@ function ClientEncryptionSigningPanel({ client, formik, oidcConfiguration }) {
     ? oidcConfiguration.userInfoEncryptionEncValuesSupported
     : []
 
+  // authorization
+  const jansAuthSignedRespAlg = !!oidcConfiguration.authorizationSigningAlgValuesSupported
+    ? oidcConfiguration.authorizationSigningAlgValuesSupported
+    : []
+
+  const jansAuthEncRespAlg = !!oidcConfiguration.authorizationEncryptionAlgValuesSupported
+    ? oidcConfiguration.authorizationEncryptionAlgValuesSupported
+    : []
+
+  const jansAuthEncRespEnc = !!oidcConfiguration.authorizationEncryptionEncValuesSupported
+    ? oidcConfiguration.authorizationEncryptionEncValuesSupported
+    : []
+
   const tokenEndpointAuthMethod = !!oidcConfiguration.tokenEndpointAuthMethodsSupported
     ? oidcConfiguration.tokenEndpointAuthMethodsSupported
     : []
@@ -166,11 +179,11 @@ function ClientEncryptionSigningPanel({ client, formik, oidcConfiguration }) {
           <GluuSelectRow
             label="fields.authorizationSignedResponseAlg"
             formik={formik}
-            value={client.authorizationSignedResponseAlg}
+            value={client.jansAuthSignedRespAlg}
             values={idTokenSignedResponseAlg}
             lsize={6}
             rsize={6}
-            name="authorizationSignedResponseAlg"
+            name="jansAuthSignedRespAlg"
             doc_category={DOC_CATEGORY}
           />
         </Col>
@@ -180,21 +193,21 @@ function ClientEncryptionSigningPanel({ client, formik, oidcConfiguration }) {
             formik={formik}
             lsize={6}
             rsize={6}
-            value={client.authorizationEncryptedResponseAlg}
+            value={client.jansAuthEncRespAlg}
             values={idTokenEncryptedResponseAlg}
-            name="authorizationEncryptedResponseAlg"
+            name="jansAuthEncRespAlg"
             doc_category={DOC_CATEGORY}
           />
         </Col>
         <Col sm={6}>
           <GluuSelectRow
             label="fields.authorizationEncryptedResponseEnc"
             formik={formik}
-            value={client.authorizationEncryptedResponseEnc}
+            value={client.jansAuthEncRespEnc}
             values={idTokenEncryptedResponseEnc}
             lsize={6}
             rsize={6}
-            name="authorizationEncryptedResponseEnc"
+            name="jansAuthEncRespEnc"
             doc_category={DOC_CATEGORY}
           />
         </Col>

diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientWizardForm.js b/admin-ui/plugins/auth-server/components/Clients/ClientWizardForm.js
@@ -181,17 +181,17 @@ function ClientWizardForm({
     requirePar: client.attributes.requirePar || false,
     updateTokenScriptDns: client.attributes.updateTokenScriptDns || [],
     ropcScripts: client.attributes.ropcScripts || [],
-    authorizationSignedResponseAlg:
-      client.attributes.authorizationSignedResponseAlg || '',
-    authorizationEncryptedResponseAlg:
-      client.attributes.authorizationEncryptedResponseAlg || '',
-    authorizationEncryptedResponseEnc:
-      client.attributes.authorizationEncryptedResponseEnc || '',
+    jansAuthSignedRespAlg:
+      client.attributes.jansAuthSignedRespAlg || '',
+    jansAuthEncRespAlg:
+      client.attributes.jansAuthEncRespAlg || '',
+    jansAuthEncRespEnc:
+      client.attributes.jansAuthEncRespEnc || '',
     postAuthnScripts: client.attributes.postAuthnScripts || [],
     rptClaimsScripts: client.attributes.rptClaimsScripts || [],
     additionalAudience: client.attributes.additionalAudience,
     backchannelLogoutUri: client.attributes.backchannelLogoutUri,
-    defaultPromptLogin: client.attributes.defaultPromptLogin || false,
+    jansDefaultPromptLogin: client.attributes.jansDefaultPromptLogin || false,
     authorizedAcrValues: client.attributes.authorizedAcrValues || [],
     customObjectClasses: client.customObjectClasses || [],
     requireAuthTime: client.requireAuthTime,
@@ -242,16 +242,16 @@ function ClientWizardForm({
             values[ATTRIBUTE].redirectUrisRegex = values.redirectUrisRegex
             values[ATTRIBUTE].parLifetime = values.parLifetime
             values[ATTRIBUTE].requirePar = values.requirePar
-            values[ATTRIBUTE].defaultPromptLogin = values.defaultPromptLogin
+            values[ATTRIBUTE].jansDefaultPromptLogin = values.jansDefaultPromptLogin
             values[ATTRIBUTE].authorizedAcrValues = values.authorizedAcrValues
             values[ATTRIBUTE].updateTokenScriptDns = values.updateTokenScriptDns
             values[ATTRIBUTE].ropcScripts = values.ropcScripts
-            values[ATTRIBUTE].authorizationSignedResponseAlg =
-              values.authorizationSignedResponseAlg
-            values[ATTRIBUTE].authorizationEncryptedResponseAlg =
-              values.authorizationEncryptedResponseAlg
-            values[ATTRIBUTE].authorizationEncryptedResponseEnc =
-              values.authorizationEncryptedResponseEnc
+            values[ATTRIBUTE].jansAuthSignedRespAlg =
+              values.jansAuthSignedRespAlg
+            values[ATTRIBUTE].jansAuthEncRespAlg =
+              values.jansAuthEncRespAlg
+            values[ATTRIBUTE].jansAuthEncRespEnc =
+              values.jansAuthEncRespEnc
             customOnSubmit(JSON.parse(JSON.stringify(values)))
           }}
         >