From e6d743e05b5e28dfc143b4d810bce11951b96fa7 Mon Sep 17 00:00:00 2001 From: Michael Willis Date: Tue, 21 Aug 2018 15:25:53 +0100 Subject: [PATCH] Use Oauth2 server URL if specified --- backend/config.js | 8 ++++++-- backend/index.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/config.js b/backend/config.js index 5440d8bad..f88f8f35d 100644 --- a/backend/config.js +++ b/backend/config.js @@ -14,11 +14,15 @@ module.exports = { expiryMinutes: process.env.WEB_SESSION_TIMEOUT_IN_MINUTES || 20 }, apis: { - elite2: { - url: process.env.API_ENDPOINT_URL || 'http://localhost:8080/', + oauth2: { + url: process.env.OAUTH2_ENDPOINT_URL || process.env.API_ENDPOINT_URL || 'http://localhost:8080/', timeoutSeconds: process.env.API_ENDPOINT_TIMEOUT_SECONDS || 10, clientId: process.env.API_CLIENT_ID || 'elite2apiclient', clientSecret: process.env.API_CLIENT_SECRET || 'clientsecret' + }, + elite2: { + url: process.env.API_ENDPOINT_URL || 'http://localhost:8080/', + timeoutSeconds: process.env.API_ENDPOINT_TIMEOUT_SECONDS || 10, } } }; diff --git a/backend/index.js b/backend/index.js index cfbe8788a..f882998f0 100644 --- a/backend/index.js +++ b/backend/index.js @@ -103,7 +103,7 @@ const controller = controllerFactory( updateAttendanceFactory(elite2Api) ); -const oauthApi = oauthApiFactory({ ...config.apis.elite2 }); +const oauthApi = oauthApiFactory({ ...config.apis.oauth2 }); const tokenRefresher = tokenRefresherFactory(oauthApi.refresh, config.app.tokenRefreshThresholdSeconds); const hmppsCookieOperations = cookieOperationsFactory(