Skip to content

Commit 106d383

Browse files
jv18creatorjv18creator
committed
fix(admin-ui): saml UI changes #1596
Signed-off-by: Jeet Viramgama <[email protected]>
1 parent de06fe4 commit 106d383

File tree

4 files changed

+25
-307
lines changed

4 files changed

+25
-307
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@
510510
"scim": "SCIM",
511511
"saml": "SAML",
512512
"trust_relationships": "Trust Relationships",
513-
"service_providers": "Service Providers",
514-
"identity_providers": "Identity Providers",
513+
"service_providers": "Website SSO",
514+
"identity_providers": "Identity Brokering",
515515
"adminui": "Admin",
516516
"config-api": "Config-API",
517517
"authn": "Authn",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"lock": "Verrouillage",
4242
"cache": "Cacher",
4343
"clients": "Clientes",
44-
"service_providers": "Fournisseurs de services",
45-
"identity_providers": "Fournisseurs d'identité",
44+
"service_providers": "SSO de site web",
45+
"identity_providers": "Courtage d'identité",
4646
"configuration": "Configuration",
4747
"couchbase": "Base de canapé",
4848
"dashboard": "Tableau de bord",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"config-api": "Config-API",
3333
"saml": "SAML",
3434
"trust_relationships": "Relacionamentos de confiança",
35-
"service_providers": "Provedores de Serviço",
36-
"identity_providers": "Provedores de Identidade",
35+
"service_providers": "SSO para sites",
36+
"identity_providers": "Intermediação de Identidade",
3737
"api": {
3838
"roles": "Papéis de acesso",
3939
"permissions": "Permissões",

‎admin-ui/plugins/saml/components/SamlConfigurationForm.js

+19-301
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { useFormik } from 'formik'
22
import React, { useState } from 'react'
33
import { Row, Col, Form, FormGroup, CustomInput } from 'Components'
4-
import GluuInputRow from 'Routes/Apps/Gluu/GluuInputRow'
54
import { useDispatch, useSelector } from 'react-redux'
65
import GluuCommitDialog from 'Routes/Apps/Gluu/GluuCommitDialog'
76
import GluuCommitFooter from 'Routes/Apps/Gluu/GluuCommitFooter'
8-
import GluuTypeAhead from 'Routes/Apps/Gluu/GluuTypeAhead'
97
import { SAML_CONFIG_WRITE, hasPermission } from 'Utils/PermChecker'
108
import GluuLabel from 'Routes/Apps/Gluu/GluuLabel'
119
import GluuToogleRow from 'Routes/Apps/Gluu/GluuToogleRow'
@@ -47,64 +45,6 @@ const SamlConfigurationForm = () => {
4745
return (
4846
<Form onSubmit={formik.handleSubmit} className='mt-4'>
4947
<FormGroup row>
50-
<Col sm={10}>
51-
<GluuInputRow
52-
label='fields.sp_metadata_file_pattern'
53-
name='spMetadataFilePattern'
54-
value={formik.values.spMetadataFilePattern || ''}
55-
formik={formik}
56-
lsize={4}
57-
rsize={8}
58-
showError={
59-
formik.errors.spMetadataFilePattern &&
60-
formik.touched.spMetadataFilePattern
61-
}
62-
errorMessage={formik.errors.spMetadataFilePattern}
63-
/>
64-
</Col>
65-
<Col sm={10}>
66-
<GluuInputRow
67-
label='fields.sp_metadata_file'
68-
name='spMetadataFile'
69-
value={formik.values.spMetadataFile || ''}
70-
formik={formik}
71-
lsize={4}
72-
rsize={8}
73-
showError={
74-
formik.errors.spMetadataFile && formik.touched.spMetadataFile
75-
}
76-
errorMessage={formik.errors.spMetadataFile}
77-
/>
78-
</Col>
79-
<Col sm={10}>
80-
<GluuInputRow
81-
label='fields.saml_trust_relationship_dn'
82-
name='samlTrustRelationshipDn'
83-
value={formik.values.samlTrustRelationshipDn || ''}
84-
formik={formik}
85-
lsize={4}
86-
rsize={8}
87-
showError={
88-
formik.errors.samlTrustRelationshipDn &&
89-
formik.touched.samlTrustRelationshipDn
90-
}
91-
errorMessage={formik.errors.samlTrustRelationshipDn}
92-
/>
93-
</Col>
94-
<Col sm={10}>
95-
<GluuInputRow
96-
label='fields.trustedIdpDn'
97-
name='trustedIdpDn'
98-
value={formik.values.trustedIdpDn || ''}
99-
formik={formik}
100-
lsize={4}
101-
rsize={8}
102-
showError={
103-
formik.errors.trustedIdpDn && formik.touched.trustedIdpDn
104-
}
105-
errorMessage={formik.errors.trustedIdpDn}
106-
/>
107-
</Col>
10848
<Col sm={10}>
10949
<GluuToogleRow
11050
name={'enabled'}
@@ -118,6 +58,25 @@ const SamlConfigurationForm = () => {
11858
value={formik.values.enabled}
11959
/>
12060
</Col>
61+
<Col sm={10}>
62+
<FormGroup row>
63+
<GluuLabel label={'fields.selected_idp'} size={4} />
64+
<Col sm={8}>
65+
<CustomInput
66+
type='select'
67+
id='selectedIdp'
68+
name='selectedIdp'
69+
defaultValue={formik.values.selectedIdp}
70+
onChange={(e) => {
71+
formik.setFieldValue('selectedIdp', e.target.value)
72+
}}
73+
>
74+
<option value=''>{t('Choose')}...</option>
75+
<option value='keycloak'>Keycloak</option>
76+
</CustomInput>
77+
</Col>
78+
</FormGroup>
79+
</Col>
12180
<Col sm={10}>
12281
<GluuToogleRow
12382
name={'ignoreValidation'}
@@ -131,247 +90,6 @@ const SamlConfigurationForm = () => {
13190
value={formik.values.ignoreValidation}
13291
/>
13392
</Col>
134-
<Col sm={10}>
135-
<FormGroup row>
136-
<GluuLabel label={'fields.selected_idp'} size={4} />
137-
<Col sm={8}>
138-
<CustomInput
139-
type='select'
140-
id='selectedIdp'
141-
name='selectedIdp'
142-
defaultValue={formik.values.selectedIdp}
143-
onChange={(e) => {
144-
formik.setFieldValue('selectedIdp', e.target.value)
145-
}}
146-
>
147-
<option value=''>{t('Choose')}...</option>
148-
<option value='keycloak'>Keycloak</option>
149-
</CustomInput>
150-
</Col>
151-
</FormGroup>
152-
</Col>
153-
<Col sm={10}>
154-
<GluuInputRow
155-
label='fields.realm_dn'
156-
name='realmDn'
157-
value={formik.values.realmDn || ''}
158-
formik={formik}
159-
lsize={4}
160-
rsize={8}
161-
showError={formik.errors.realmDn && formik.touched.realmDn}
162-
errorMessage={formik.errors.realmDn}
163-
/>
164-
</Col>
165-
<Col sm={10}>
166-
<GluuInputRow
167-
label='fields.server_url'
168-
name='serverUrl'
169-
value={formik.values.serverUrl || ''}
170-
formik={formik}
171-
lsize={4}
172-
rsize={8}
173-
showError={formik.errors.serverUrl && formik.touched.serverUrl}
174-
errorMessage={formik.errors.serverUrl}
175-
/>
176-
</Col>
177-
<Col sm={10}>
178-
<GluuInputRow
179-
label='fields.realm'
180-
name='realm'
181-
value={formik.values.realm || ''}
182-
formik={formik}
183-
lsize={4}
184-
rsize={8}
185-
showError={formik.errors.realm && formik.touched.realm}
186-
errorMessage={formik.errors.realm}
187-
/>
188-
</Col>
189-
<Col sm={10}>
190-
<GluuTypeAhead
191-
name='idpMetadataMandatoryAttributes'
192-
label='fields.idpMetadataMandatoryAttributes'
193-
options={[]}
194-
required={false}
195-
value={formik.values.idpMetadataMandatoryAttributes || []}
196-
/>
197-
</Col>
198-
<Col sm={10}>
199-
<GluuInputRow
200-
label='fields.clientId'
201-
name='clientId'
202-
value={formik.values.clientId || ''}
203-
formik={formik}
204-
lsize={4}
205-
rsize={8}
206-
showError={formik.errors.clientId && formik.touched.clientId}
207-
errorMessage={formik.errors.clientId}
208-
/>
209-
</Col>
210-
<Col sm={10}>
211-
<GluuInputRow
212-
label='fields.application_name'
213-
name='applicationName'
214-
value={formik.values.applicationName || ''}
215-
formik={formik}
216-
lsize={4}
217-
rsize={8}
218-
showError={
219-
formik.errors.applicationName && formik.touched.applicationName
220-
}
221-
errorMessage={formik.errors.applicationName}
222-
/>
223-
</Col>
224-
<Col sm={10}>
225-
<GluuInputRow
226-
label='fields.grant_type'
227-
name='grantType'
228-
value={formik.values.grantType || ''}
229-
formik={formik}
230-
lsize={4}
231-
rsize={8}
232-
showError={formik.errors.grantType && formik.touched.grantType}
233-
errorMessage={formik.errors.grantType}
234-
/>
235-
</Col>
236-
<Col sm={10}>
237-
<GluuInputRow
238-
label='fields.username'
239-
name='username'
240-
value={formik.values.username || ''}
241-
formik={formik}
242-
lsize={4}
243-
rsize={8}
244-
showError={formik.errors.username && formik.touched.username}
245-
errorMessage={formik.errors.username}
246-
/>
247-
</Col>
248-
<Col sm={10}>
249-
<GluuInputRow
250-
label='fields.password'
251-
name='password'
252-
value={formik.values.password || ''}
253-
formik={formik}
254-
lsize={4}
255-
rsize={8}
256-
showError={formik.errors.password && formik.touched.password}
257-
errorMessage={formik.errors.password}
258-
/>
259-
</Col>
260-
<Col sm={10}>
261-
<GluuInputRow
262-
label='fields.idp_root_dir'
263-
name='idpRootDir'
264-
value={formik.values.idpRootDir || ''}
265-
formik={formik}
266-
lsize={4}
267-
rsize={8}
268-
showError={formik.errors.idpRootDir && formik.touched.idpRootDir}
269-
errorMessage={formik.errors.idpRootDir}
270-
/>
271-
</Col>
272-
<Col sm={10}>
273-
<GluuInputRow
274-
label='fields.idp_metadata_root_dir'
275-
name='idpMetadataRootDir'
276-
value={formik.values.idpMetadataRootDir || ''}
277-
formik={formik}
278-
lsize={4}
279-
rsize={8}
280-
showError={
281-
formik.errors.idpMetadataRootDir &&
282-
formik.touched.idpMetadataRootDir
283-
}
284-
errorMessage={formik.errors.idpMetadataRootDir}
285-
/>
286-
</Col>
287-
<Col sm={10}>
288-
<GluuInputRow
289-
label='fields.idp_metadata_temp_dir'
290-
name='idpMetadataTempDir'
291-
value={formik.values.idpMetadataTempDir || ''}
292-
formik={formik}
293-
lsize={4}
294-
rsize={8}
295-
showError={
296-
formik.errors.idpMetadataTempDir &&
297-
formik.touched.idpMetadataTempDir
298-
}
299-
errorMessage={formik.errors.idpMetadataTempDir}
300-
/>
301-
</Col>
302-
<Col sm={10}>
303-
<GluuInputRow
304-
label='fields.idp_metadata_file_pattern'
305-
name='idpMetadataFilePattern'
306-
value={formik.values.idpMetadataFilePattern || ''}
307-
formik={formik}
308-
lsize={4}
309-
rsize={8}
310-
showError={
311-
formik.errors.idpMetadataFilePattern &&
312-
formik.touched.idpMetadataFilePattern
313-
}
314-
errorMessage={formik.errors.idpMetadataFilePattern}
315-
/>
316-
</Col>
317-
<Col sm={10}>
318-
<GluuInputRow
319-
label='fields.idp_metadata_file'
320-
name='idpMetadataFile'
321-
value={formik.values.idpMetadataFile || ''}
322-
formik={formik}
323-
lsize={4}
324-
rsize={8}
325-
showError={
326-
formik.errors.idpMetadataFile && formik.touched.idpMetadataFile
327-
}
328-
errorMessage={formik.errors.idpMetadataFile}
329-
/>
330-
</Col>
331-
<Col sm={10}>
332-
<GluuInputRow
333-
label='fields.sp_metadata_url'
334-
name='spMetadataUrl'
335-
value={formik.values.spMetadataUrl || ''}
336-
formik={formik}
337-
lsize={4}
338-
rsize={8}
339-
showError={
340-
formik.errors.spMetadataUrl && formik.touched.spMetadataUrl
341-
}
342-
errorMessage={formik.errors.spMetadataUrl}
343-
/>
344-
</Col>
345-
<Col sm={10}>
346-
<GluuInputRow
347-
label='fields.sp_metadata_root_dir'
348-
name='spMetadataRootDir'
349-
value={formik.values.spMetadataRootDir || ''}
350-
formik={formik}
351-
lsize={4}
352-
rsize={8}
353-
showError={
354-
formik.errors.spMetadataRootDir &&
355-
formik.touched.spMetadataRootDir
356-
}
357-
errorMessage={formik.errors.spMetadataRootDir}
358-
/>
359-
</Col>
360-
<Col sm={10}>
361-
<GluuInputRow
362-
label='fields.sp_metadata_temp_dir'
363-
name='spMetadataTempDir'
364-
value={formik.values.spMetadataTempDir || ''}
365-
formik={formik}
366-
lsize={4}
367-
rsize={8}
368-
showError={
369-
formik.errors.spMetadataTempDir &&
370-
formik.touched.spMetadataTempDir
371-
}
372-
errorMessage={formik.errors.spMetadataTempDir}
373-
/>
374-
</Col>
37593
</FormGroup>
37694
{hasPermission(permissions, SAML_CONFIG_WRITE) && <Row>
37795
<Col>

0 commit comments

Comments
 (0)