diff --git a/README.md b/README.md index 49583e7f..7b1c1732 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ CA_ROOT=fullchain.pem (optional) ## ENV variables required for MODE: `server` DB_CONNECT=mongodb+srv://:@/?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` diff --git a/api/public/swagger.yaml b/api/public/swagger.yaml index 2fdd04eb..9d97d3be 100644 --- a/api/public/swagger.yaml +++ b/api/public/swagger.yaml @@ -641,9 +641,9 @@ paths: - bearerAuth: [] parameters: [] - /SASjsApi/authConfig/synchronizeWithLDAP: + /SASjsApi/authConfig/synchroniseWithLDAP: post: - operationId: SynchronizeWithLDAP + operationId: SynchroniseWithLDAP responses: '200': description: Ok @@ -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: diff --git a/api/src/controllers/authConfig.ts b/api/src/controllers/authConfig.ts index 2d2f4bb2..cf13fd6c 100644 --- a/api/src/controllers/authConfig.ts +++ b/api/src/controllers/authConfig.ts @@ -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({}) diff --git a/api/src/routes/api/authConfig.ts b/api/src/routes/api/authConfig.ts index 583f5778..fe7f677d 100644 --- a/api/src/routes/api/authConfig.ts +++ b/api/src/routes/api/authConfig.ts @@ -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()) diff --git a/web/src/containers/Settings/authConfig.tsx b/web/src/containers/Settings/authConfig.tsx index 262dad83..676448d6 100644 --- a/web/src/containers/Settings/authConfig.tsx +++ b/web/src/containers/Settings/authConfig.tsx @@ -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( @@ -137,9 +137,9 @@ const AuthConfig = () => {