From e598bf95fa06188ba1e44ceb249f34880f9d50a2 Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Tue, 13 Nov 2018 12:01:22 +0100
Subject: [PATCH] Edit the environment file in order to use kong-dev and
 kong-rec host

---
 src/environments/environment.dev.ts | 18 +++++++++---------
 src/environments/environment.rec.ts | 18 +++++++++---------
 src/environments/environment.ts     |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 063e3322..56092726 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -4,15 +4,15 @@ import { AppRoutes } from '../app/routes';
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
-const servicesProxyUrl = 'https://data-intothesky.alpha.grandlyon.com';
-const kongBaseUrl = 'https://kong.alpha.grandlyon.com';
+// const servicesProxyUrl = 'https://data-intothesky.alpha.grandlyon.com';
+const kongBaseUrl = 'https://kong-dev.alpha.grandlyon.com';
 
 export const environment = {
   production: true,
-  oidcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/oidc',
-  glcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/glc',
-  tokenEndpoint: kongBaseUrl + '/authentication/dev/token',
-  logoutEndpoint: kongBaseUrl + '/authentication/dev/logout',
+  oidcLoginEndpoint: kongBaseUrl + '/authentication/login/oidc',
+  glcLoginEndpoint: kongBaseUrl + '/authentication/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/token',
+  logoutEndpoint: kongBaseUrl + '/authentication/logout',
 
   // ElasticSearch
   elasticsearchUrl: {
@@ -22,7 +22,7 @@ export const environment = {
   enableEsFrontCache: false,
 
   matomo: {
-    url: 'https://matomo-intothesky.alpha.grandlyon.com',
+    url: kongBaseUrl + '/analytics',
   },
 
   backendUrls: {
@@ -31,7 +31,7 @@ export const environment = {
   },
 
   emailService: {
-    url: 'https://kong.alpha.grandlyon.com/email',
+    url: kongBaseUrl + '/email',
   },
 
   // Path to the built app in a particular language
@@ -41,7 +41,7 @@ export const environment = {
   },
 
   // Wordpress
-  wordpressUrl: servicesProxyUrl + '/wordpress/wp-json/wp/v2/',
+  wordpressUrl: kongBaseUrl + '/cms/wp-json/wp/v2/',
   wordpressStaticPages: {},
   wordpressContent: {
     categoryIdUniqueContent: 5,
diff --git a/src/environments/environment.rec.ts b/src/environments/environment.rec.ts
index a00aea3b..b00e7fee 100644
--- a/src/environments/environment.rec.ts
+++ b/src/environments/environment.rec.ts
@@ -4,15 +4,15 @@ import { AppRoutes } from '../app/routes';
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
-const servicesProxyUrl = 'https://data-intothesky.alpha.grandlyon.com';
-const kongBaseUrl = 'https://kong.alpha.grandlyon.com';
+// const servicesProxyUrl = 'https://data-intothesky.alpha.grandlyon.com';
+const kongBaseUrl = 'https://kong-rec.alpha.grandlyon.com';
 
 export const environment = {
   production: true,
-  oidcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/oidc',
-  glcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/glc',
-  tokenEndpoint: kongBaseUrl + '/authentication/rec/token',
-  logoutEndpoint: kongBaseUrl + '/authentication/rec/logout',
+  oidcLoginEndpoint: kongBaseUrl + '/authentication/login/oidc',
+  glcLoginEndpoint: kongBaseUrl + '/authentication/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/token',
+  logoutEndpoint: kongBaseUrl + '/authentication/logout',
 
   // ElasticSearch
   elasticsearchUrl: {
@@ -22,7 +22,7 @@ export const environment = {
   enableEsFrontCache: false,
 
   matomo: {
-    url: 'https://matomo-intothesky.alpha.grandlyon.com',
+    url: kongBaseUrl + '/analytics',
   },
 
   backendUrls: {
@@ -31,7 +31,7 @@ export const environment = {
   },
 
   emailService: {
-    url: 'https://kong.alpha.grandlyon.com/email',
+    url: kongBaseUrl + '/email',
   },
 
   // Path to the built app in a particular language
@@ -41,7 +41,7 @@ export const environment = {
   },
 
   // Wordpress
-  wordpressUrl: servicesProxyUrl + '/wordpress/wp-json/wp/v2/',
+  wordpressUrl: kongBaseUrl + '/cms/wp-json/wp/v2/',
   wordpressStaticPages: {},
   wordpressContent: {
     categoryIdUniqueContent: 5,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b30fd859..286a6d8b 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -5,7 +5,7 @@ import { AppRoutes } from '../app/routes';
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 const servicesProxyUrl = 'https://data-intothesky.alpha.grandlyon.com';
-const kongBaseUrl = 'https://kong.alpha.grandlyon.com';
+const kongBaseUrl = 'https://kong-dev.alpha.grandlyon.com';
 
 export const environment = {
   production: false,
-- 
GitLab