From a49cc0155b42914c990b6116b498efd2ca8d7487 Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Mon, 5 Nov 2018 17:21:51 +0100
Subject: [PATCH] Add token endpoint url in env file

---
 src/app/core/services/auth.service.ts | 5 ++---
 src/environments/environment.dev.ts   | 1 +
 src/environments/environment.rec.ts   | 1 +
 src/environments/environment.ts       | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index d5f34ecb..30ed859e 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -30,7 +30,7 @@ export class AuthService {
   }
 
   exchangeCode(code: string, state: string): Observable<boolean> {
-    const url = `${env.kongUrl}/authentication/token?code=${code}&state=${state}`;
+    const url = `${env.tokenEndpoint}?code=${code}&state=${state}`;
     return this._http.get<ILoginResponse>(url).pipe(
       map(
         (res) => {
@@ -81,8 +81,7 @@ export class AuthService {
     } catch (error) {
     }
 
-    let url = `${env.kongUrl}/authentication/logout?`;
-    url += `id_token=${idToken}&identity_provider=${identityProvider}`;
+    const url = `${env.logoutEndpoint}?id_token=${idToken}&identity_provider=${identityProvider}`;
 
     window.location.href = url;
   }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 773028e6..a50d2160 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -12,6 +12,7 @@ export const environment = {
   kongUrl: kongBaseUrl,
   oidcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/oidc',
   glcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/dev/token',
   logoutEndpoint: kongBaseUrl + '/authentication/dev/logout',
 
   // ElasticSearch
diff --git a/src/environments/environment.rec.ts b/src/environments/environment.rec.ts
index d6a82f0d..83e827b9 100644
--- a/src/environments/environment.rec.ts
+++ b/src/environments/environment.rec.ts
@@ -12,6 +12,7 @@ export const environment = {
   kongUrl: kongBaseUrl,
   oidcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/oidc',
   glcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/rec/token',
   logoutEndpoint: kongBaseUrl + '/authentication/rec/logout',
 
   // ElasticSearch
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b860dc1b..80ba10ee 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -12,6 +12,7 @@ export const environment = {
   kongUrl: kongBaseUrl,
   oidcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/oidc',
   glcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/dev/token',
   logoutEndpoint: kongBaseUrl + '/authentication/dev/logout',
 
   // ElasticSearch
-- 
GitLab