Skip to content

Commit 80d15c6

Browse files
committed
fix: populate the heath status from Config-api #287
1 parent c4867c3 commit 80d15c6

File tree

4 files changed

+5
-25
lines changed

4 files changed

+5
-25
lines changed

app/redux/api/base.js

-17
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,3 @@ export const getClient = (JansConfigApi, r_token, r_issuer) => {
3737
jansauth.accessToken = r_token
3838
return defaultClient
3939
}
40-
export const getJansUIClient = (JansConfigApi, r_token, r_issuer) => {
41-
const defaultClient = JansConfigApi.ApiClient.instance
42-
defaultClient.timeout = 50000
43-
const jansauth = defaultClient.authentications['oauth2']
44-
defaultClient.basePath =
45-
process.env.JANS_API_BASE_URL
46-
const headers = {
47-
'Access-Control-Allow-Headers':
48-
'Origin, X-Requested-With, Content-Type, Accept',
49-
'Content-Type': 'application/json',
50-
'Access-Control-Allow-Credentials': true,
51-
issuer: r_issuer,
52-
}
53-
defaultClient.defaultHeaders = headers
54-
jansauth.accessToken = r_token
55-
return defaultClient
56-
}

plugins/auth-server/components/Health/HealthPage.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ import {
1616
import { connect } from 'react-redux'
1717
import { getHealthStatus } from '../../redux/actions/HealthAction'
1818

19-
function HealthPage({ serverStatus, dbStatus, permissions, loading, dispatch }) {
19+
function HealthPage({ serverStatus, dbStatus, dispatch }) {
2020
const { t } = useTranslation()
2121
const userAction = {}
2222
const options = {}
2323

24-
console.log('Health Status', status)
25-
2624
useEffect(() => {
2725
buildPayload(userAction, 'GET Health Status', options)
2826
dispatch(getHealthStatus(userAction))

plugins/auth-server/redux/api/HealthApi.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ export default class HealthApi {
33
this.api = api
44
}
55

6-
// Get maximum actives users
7-
getHealthStatus = (opts) => {
8-
opts['format'] = 'json'
6+
// Get Health Status
7+
getHealthStatus = () => {
98
return new Promise((resolve, reject) => {
109
this.api.getConfigHealthReady( (error, data) => {
1110
if (error) {

plugins/auth-server/redux/sagas/HealthSaga.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import { getAPIAccessToken } from '../../../../app/redux/actions/AuthActions'
88
import { postUserAction} from '../../../../app/redux/api/backend-api'
99
import { GET_HEALTH } from '../actions/types'
1010
import HealthApi from '../api/HealthApi'
11-
import { getJansUIClient } from '../../../../app/redux/api/base'
11+
import { getClient } from '../../../../app/redux/api/base'
1212
import { initAudit } from '../../../../app/redux/sagas/SagaUtils'
1313
const JansConfigApi = require('jans_config_api')
1414

1515
function* newFunction() {
1616
const token = yield select((state) => state.authReducer.token.access_token)
1717
const issuer = yield select((state) => state.authReducer.issuer)
1818
const api = new JansConfigApi.AuthServerHealthCheckApi(
19-
getJansUIClient(JansConfigApi, token, issuer),
19+
getClient(JansConfigApi, token, issuer),
2020
)
2121
return new HealthApi(api)
2222
}

0 commit comments

Comments
 (0)