This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new d3f3596 [DLAB-758]: added logout with keyclock redirect
d3f3596 is described below
commit d3f3596ece58d720c531daed5dde68ab596bcfc6
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Sep 23 14:53:52 2019 +0300
[DLAB-758]: added logout with keyclock redirect
---
.../resources/webapp/src/app/core/services/appRouting.service.ts | 4 ++++
.../webapp/src/app/core/services/applicationSecurity.service.ts | 3 +--
.../webapp/src/app/core/services/applicationServiceFacade.service.ts | 4 ++--
.../main/resources/webapp/src/app/shared/navbar/navbar.component.ts | 5 +++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts
index 1225440..1a80759 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/appRouting.service.ts
@@ -44,4 +44,8 @@ export class AppRoutingService {
redirectToAzure(): void {
window.location.href = `${window.location.origin}/api/user/azure/init`;
}
+
+ redirectToUrl(url: string): void {
+ window.location.href = url;
+ }
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
index 40e5ac1..a0f7997 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
@@ -86,8 +86,7 @@ export class ApplicationSecurityService {
this.storage.destroyToken();
this.storage.setBillingQuoteUsed('');
this._loggedInStatus.next(false);
-
- return response.status === HTTP_STATUS_CODES.OK;
+ return response;
}, this));
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index 761d923..5fe851e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -85,7 +85,7 @@ export class ApplicationServiceFacade {
}
public buildLogoutRequest(): Observable<any> {
- return this.buildRequest(RequestMethod.Post,
+ return this.buildRequest(RequestMethod.Get,
this.requestRegistry.Item(ApplicationServiceFacade.LOGOUT),
'',
{ observe: 'response' });
@@ -581,7 +581,7 @@ export class ApplicationServiceFacade {
// Security
this.requestRegistry.Add(ApplicationServiceFacade.LOGIN, '/api/user/login');
- this.requestRegistry.Add(ApplicationServiceFacade.LOGOUT, '/api/user/logout');
+ this.requestRegistry.Add(ApplicationServiceFacade.LOGOUT, '/api/oauth/logout');
this.requestRegistry.Add(ApplicationServiceFacade.AUTHORIZE, '/api/oauth/authorize');
this.requestRegistry.Add(ApplicationServiceFacade.ACTIVE_LIST, '/api/environment/user');
this.requestRegistry.Add(ApplicationServiceFacade.FULL_ACTIVE_LIST, '/api/environment/all');
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index 44ebc0f..9719dee 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -89,8 +89,9 @@ export class NavbarComponent implements OnInit, OnDestroy {
logout_btnClick(): void {
this.healthStatusService.resetStatusValue();
this.applicationSecurityService.logout().subscribe(
- () => {
- this.appRoutingService.redirectToLoginPage();
+ (response: any) => {
+ const redirect_parameter = response.headers.get('Location');
+ redirect_parameter ? this.appRoutingService.redirectToUrl(redirect_parameter) : this.appRoutingService.redirectToLoginPage();
this.subscriptions.unsubscribe();
},
error => console.error(error));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org