-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into DHIS2-10247/allow-list
- Loading branch information
Showing
16 changed files
with
611 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| Feature: Users should be able to add OAuth2 clients | ||
|
|
||
| Scenario: User adds OAuth2 client | ||
| Given the user visits the 'OAuth2 Clients' page | ||
| And the user clicks on the 'Add OAuth2 client' button | ||
| And the user enters the relevant details in the form that appears | ||
| Then a snackbar message should appear telling the user that the client was saved | ||
| And the page should show the new client in the table of clients | ||
|
|
||
| Scenario: No OAuth2 clients are present | ||
| Given the user visits the 'OAuth2 Clients' page | ||
| And there are no OAuth2 clients | ||
| Then the message 'There are currently no OAuth2 clients registered' should be shown | ||
|
|
||
| Scenario: Some OAuth2 clients are present | ||
| Given the user visits the 'OAuth2 Clients' page | ||
| And there are some OAuth2 clients | ||
| Then a table showing all clients should be present |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| import i18n from '@dhis2/d2-i18n' | ||
| import { Button, Modal, ModalTitle, ModalContent } from '@dhis2/ui' | ||
| import { getInstance as getD2 } from 'd2' | ||
| import FormBuilder from 'd2-ui/lib/forms/FormBuilder.component.js' | ||
| import { isUrlArray, isRequired } from 'd2-ui/lib/forms/Validators.js' | ||
| import PropTypes from 'prop-types' | ||
| import React from 'react' | ||
| import MultiToggle from '../form-fields/multi-toggle.js' | ||
| import TextField from '../form-fields/text-field.js' | ||
| import styles from './ClientForm.module.css' | ||
|
|
||
| const formFieldStyle = { | ||
| width: '100%', | ||
| } | ||
|
|
||
| const validateClientID = async (v) => { | ||
| const d2 = await getD2() | ||
| const list = await d2.models.oAuth2Clients.list({ | ||
| paging: false, | ||
| filter: [`cid:eq:${v}`], | ||
| }) | ||
| if (list.size > 0) { | ||
| throw i18n.t('This client ID is already taken') | ||
| } | ||
| } | ||
|
|
||
| const ClientForm = ({ clientModel, onUpdate, onSave, onCancel }) => { | ||
| const grantTypes = ((clientModel && clientModel.grantTypes) || []).reduce( | ||
| (curr, prev) => { | ||
| curr[prev] = true | ||
| return curr | ||
| }, | ||
| {} | ||
| ) | ||
|
|
||
| const fields = [ | ||
| { | ||
| name: 'name', | ||
| value: clientModel.name, | ||
| component: TextField, | ||
| props: { | ||
| floatingLabelText: i18n.t('Name'), | ||
| style: formFieldStyle, | ||
| changeEvent: 'onBlur', | ||
| }, | ||
| validators: [ | ||
| { | ||
| validator: isRequired, | ||
| message: i18n.t('Required'), | ||
| }, | ||
| ], | ||
| }, | ||
| { | ||
| name: 'cid', | ||
| value: clientModel.cid, | ||
| component: TextField, | ||
| props: { | ||
| floatingLabelText: i18n.t('Client ID'), | ||
| style: formFieldStyle, | ||
| changeEvent: 'onBlur', | ||
| }, | ||
| validators: [ | ||
| { | ||
| validator: isRequired, | ||
| message: i18n.t('Required'), | ||
| }, | ||
| { | ||
| validator: (v) => v.toString().trim().length > 0, | ||
| message: i18n.t('Required'), | ||
| }, | ||
| ], | ||
| asyncValidators: [validateClientID], | ||
| }, | ||
| { | ||
| name: 'secret', | ||
| value: clientModel && clientModel.secret, | ||
| component: TextField, | ||
| props: { | ||
| floatingLabelText: i18n.t('Client Secret'), | ||
| disabled: true, | ||
| style: formFieldStyle, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'grantTypes', | ||
| component: MultiToggle, | ||
| style: formFieldStyle, | ||
| props: { | ||
| label: i18n.t('Grant Types'), | ||
| items: [ | ||
| { | ||
| name: 'password', | ||
| text: i18n.t('Password'), | ||
| value: grantTypes.password, | ||
| }, | ||
| { | ||
| name: 'refresh_token', | ||
| text: i18n.t('Refresh token'), | ||
| value: grantTypes.refresh_token, | ||
| }, | ||
| { | ||
| name: 'authorization_code', | ||
| text: i18n.t('Authorization code'), | ||
| value: grantTypes.authorization_code, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| { | ||
| name: 'redirectUris', | ||
| value: (clientModel.redirectUris || []).join('\n'), | ||
| component: TextField, | ||
| props: { | ||
| hintText: i18n.t('One URL per line'), | ||
| floatingLabelText: i18n.t('Redirect URIs'), | ||
| multiLine: true, | ||
| style: formFieldStyle, | ||
| changeEvent: 'onBlur', | ||
| }, | ||
| validators: [ | ||
| { | ||
| validator: isUrlArray, | ||
| message: i18n.t('This field should contain a list of URLs'), | ||
| }, | ||
| ], | ||
| }, | ||
| ] | ||
|
|
||
| const headerText = | ||
| clientModel.id === undefined | ||
| ? i18n.t('Create new OAuth2 Client') | ||
| : i18n.t('Edit OAuth2 Client') | ||
| return ( | ||
| <Modal onClose={onCancel}> | ||
| <ModalTitle>{headerText}</ModalTitle> | ||
| <ModalContent> | ||
| <FormBuilder fields={fields} onUpdateField={onUpdate} /> | ||
| <div style={{ marginTop: '1rem' }}> | ||
| <Button primary onClick={onSave}> | ||
| {i18n.t('Save')} | ||
| </Button> | ||
| <Button | ||
| secondary | ||
| onClick={onCancel} | ||
| className={styles.cancelBtn} | ||
| > | ||
| {i18n.t('Cancel')} | ||
| </Button> | ||
| </div> | ||
| </ModalContent> | ||
| </Modal> | ||
| ) | ||
| } | ||
|
|
||
| ClientForm.propTypes = { | ||
| clientModel: PropTypes.object.isRequired, | ||
| onCancel: PropTypes.func.isRequired, | ||
| onSave: PropTypes.func.isRequired, | ||
| onUpdate: PropTypes.func.isRequired, | ||
| } | ||
|
|
||
| export default ClientForm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .cancelBtn { | ||
| float: right; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import i18n from '@dhis2/d2-i18n' | ||
| import { | ||
| CenteredContent, | ||
| Table, | ||
| TableBody, | ||
| TableCell, | ||
| TableCellHead, | ||
| TableHead, | ||
| TableRow, | ||
| TableRowHead, | ||
| Button, | ||
| } from '@dhis2/ui' | ||
| import PropTypes from 'prop-types' | ||
| import React from 'react' | ||
| import styles from './ClientsList.module.css' | ||
|
|
||
| const ClientsList = ({ clients, onClientEdit, onClientDelete }) => { | ||
| if (clients.length === 0) { | ||
| return ( | ||
| <CenteredContent> | ||
| <p> | ||
| {i18n.t('There are currently no OAuth2 clients registered')} | ||
| </p> | ||
| </CenteredContent> | ||
| ) | ||
| } | ||
|
|
||
| return ( | ||
| <Table> | ||
| <TableHead> | ||
| <TableRowHead> | ||
| <TableCellHead>{i18n.t('Name')}</TableCellHead> | ||
| <TableCellHead>{i18n.t('Password')}</TableCellHead> | ||
| <TableCellHead>{i18n.t('Refresh token')}</TableCellHead> | ||
| <TableCellHead> | ||
| {i18n.t('Authorization code')} | ||
| </TableCellHead> | ||
| <TableCellHead>{/* Buttons column */}</TableCellHead> | ||
| </TableRowHead> | ||
| </TableHead> | ||
| <TableBody> | ||
| {clients.map((client) => ( | ||
| <TableRow key={client.authorization_code}> | ||
| <TableCell>{client.name}</TableCell> | ||
| <TableCell>{client.password}</TableCell> | ||
| <TableCell>{client.refresh_token}</TableCell> | ||
| <TableCell>{client.authorization_code}</TableCell> | ||
| <TableCell> | ||
| <Button | ||
| small | ||
| primary | ||
| className={styles.editBtn} | ||
| onClick={() => onClientEdit(client)} | ||
| > | ||
| {i18n.t('Edit')} | ||
| </Button> | ||
| <Button | ||
| small | ||
| destructive | ||
| onClick={() => onClientDelete(client)} | ||
| > | ||
| {i18n.t('Delete')} | ||
| </Button> | ||
| </TableCell> | ||
| </TableRow> | ||
| ))} | ||
| </TableBody> | ||
| </Table> | ||
| ) | ||
| } | ||
|
|
||
| ClientsList.propTypes = { | ||
| clients: PropTypes.array.isRequired, | ||
| onClientDelete: PropTypes.func.isRequired, | ||
| onClientEdit: PropTypes.func.isRequired, | ||
| } | ||
|
|
||
| export default ClientsList |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .editBtn { | ||
| margin-right: var(--spacers-dp16); | ||
| } |
Oops, something went wrong.