From e221db34f6bb14dee35f912443c3b9ad7c4f188a Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Mon, 12 Nov 2018 17:15:30 +0100
Subject: [PATCH] Update elasticsearch route
---
src/app/core/services/auth.service.ts | 9 +++++++--
src/environments/environment.dev.ts | 2 +-
src/environments/environment.rec.ts | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index 4bf38b2d..10008f05 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -81,9 +81,14 @@ export class AuthService {
} catch (error) {
}
- const url = `${env.logoutEndpoint}?id_token=${idToken}&identity_provider=${identityProvider}`;
+ if (idToken !== null && identityProvider !== null) {
+ const url = `${env.logoutEndpoint}?id_token=${idToken}&identity_provider=${identityProvider}`;
+
+ window.location.href = url;
+ } else {
+ this.resetAuth();
+ }
- window.location.href = url;
}
resetAuth() {
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index eec33952..063e3322 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -16,7 +16,7 @@ export const environment = {
// ElasticSearch
elasticsearchUrl: {
- full: kongBaseUrl + '/elasticsearch-dev/test-all-in-one-index.full.v9.quadtree',
+ full: kongBaseUrl + '/elasticsearch/test-all-in-one-index.full.v9.quadtree',
},
enableEsFrontCache: false,
diff --git a/src/environments/environment.rec.ts b/src/environments/environment.rec.ts
index 45774368..a00aea3b 100644
--- a/src/environments/environment.rec.ts
+++ b/src/environments/environment.rec.ts
@@ -16,7 +16,7 @@ export const environment = {
// ElasticSearch
elasticsearchUrl: {
- full: kongBaseUrl + '/elasticsearch-rec/test-all-in-one-index.full.v9.quadtree',
+ full: kongBaseUrl + '/elasticsearch/test-all-in-one-index.full.v9.quadtree',
},
enableEsFrontCache: false,
--
GitLab