Skip to content

Commit

Permalink
Merge pull request #296 from sasjs/spellingz
Browse files Browse the repository at this point in the history
fix: spelling issues
  • Loading branch information
allanbowe authored Oct 3, 2022
2 parents d1c1a59 + 3bb0597 commit b66dc86
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ CA_ROOT=fullchain.pem (optional)
## ENV variables required for MODE: `server`
DB_CONNECT=mongodb+srv://<DB_USERNAME>:<DB_PASSWORD>@<CLUSTER>/<DB_NAME>?retryWrites=true&w=majority
# AUTH_PROVIDERS options: [ldap|internal] default: `internal`
# AUTH_PROVIDERS options: [ldap] default: ``
AUTH_PROVIDERS=
## ENV variables required for AUTH_MECHANISM: `ldap`
Expand Down
6 changes: 3 additions & 3 deletions api/public/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,9 @@ paths:
-
bearerAuth: []
parameters: []
/SASjsApi/authConfig/synchronizeWithLDAP:
/SASjsApi/authConfig/synchroniseWithLDAP:
post:
operationId: SynchronizeWithLDAP
operationId: SynchroniseWithLDAP
responses:
'200':
description: Ok
Expand All @@ -660,7 +660,7 @@ paths:
examples:
'Example 1':
value: {users: 5, groups: 3}
summary: 'Synchronizes LDAP users and groups with internal DB and returns the count of imported users and groups.'
summary: 'Synchronises LDAP users and groups with internal DB and returns the count of imported users and groups.'
tags:
- Auth_Config
security:
Expand Down
10 changes: 5 additions & 5 deletions api/src/controllers/authConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ export class AuthConfigController {
}

/**
* @summary Synchronizes LDAP users and groups with internal DB and returns the count of imported users and groups.
* @summary Synchronises LDAP users and groups with internal DB and returns the count of imported users and groups.
*
*/
@Example({
users: 5,
groups: 3
})
@Post('/synchronizeWithLDAP')
public async synchronizeWithLDAP() {
return synchronizeWithLDAP()
@Post('/synchroniseWithLDAP')
public async synchroniseWithLDAP() {
return synchroniseWithLDAP()
}
}

const synchronizeWithLDAP = async () => {
const synchroniseWithLDAP = async () => {
process.logger.info('Syncing LDAP with internal DB')

const permissions = await Permission.get({})
Expand Down
4 changes: 2 additions & 2 deletions api/src/routes/api/authConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ authConfigRouter.get('/', async (req, res) => {
}
})

authConfigRouter.post('/synchronizeWithLDAP', async (req, res) => {
authConfigRouter.post('/synchroniseWithLDAP', async (req, res) => {
const controller = new AuthConfigController()
try {
const response = await controller.synchronizeWithLDAP()
const response = await controller.synchroniseWithLDAP()
res.send(response)
} catch (err: any) {
res.status(500).send(err.toString())
Expand Down
8 changes: 4 additions & 4 deletions web/src/containers/Settings/authConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ const AuthConfig = () => {
.finally(() => setIsLoading(false))
}, [])

const synchronizeWithLDAP = () => {
const synchroniseWithLDAP = () => {
setIsLoading(true)
axios
.post(`/SASjsApi/authConfig/synchronizeWithLDAP`)
.post(`/SASjsApi/authConfig/synchroniseWithLDAP`)
.then((res: any) => {
const { userCount, groupCount } = res.data
toast.success(
Expand Down Expand Up @@ -137,9 +137,9 @@ const AuthConfig = () => {
<Button
type="submit"
variant="contained"
onClick={synchronizeWithLDAP}
onClick={synchroniseWithLDAP}
>
Synchronize
Synchronise
</Button>
</CardActions>
</Card>
Expand Down

0 comments on commit b66dc86

Please sign in to comment.