You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/11/28 12:44:08 UTC

[incubator-dlab] branch v2.2-RC1 updated: [DLAB-1297]: fixed initial login issue

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch v2.2-RC1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/v2.2-RC1 by this push:
     new a56035e  [DLAB-1297]: fixed initial login issue
     new b337dac  Merge branch 'v2.2-RC1' of github.com:apache/incubator-dlab into v2.2-RC1
a56035e is described below

commit a56035e5170c32bed1ab811d3a6ddc343eb6cc63
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Nov 28 14:38:50 2019 +0200

    [DLAB-1297]: fixed initial login issue
---
 .../resources/webapp/src/app/core/interceptors/error.interceptor.ts   | 2 +-
 .../webapp/src/app/core/services/applicationSecurity.service.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts b/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
index e1b8039..4ae3899 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
@@ -90,7 +90,7 @@ import { HTTP_STATUS_CODES } from '../util';
   }
 
   private handleBadRequest(error, request: HttpRequest<any>, next: HttpHandler) {
-    if (!error.url.split('?')[0].endsWith('maven')) this.routingService.redirectToLoginPage();
+    if (error.url.indexOf('refresh') > -1) this.routingService.redirectToLoginPage();
     return next.handle(request);
   }
 }
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 a55c667..1bcd4f8 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
@@ -71,8 +71,8 @@ export class ApplicationSecurityService {
   }
 
   public refreshToken() {
-    const refreshTocken = `/${this.storage.getRefreshToken()}`;
-    return this.serviceFacade.buildRefreshToken(refreshTocken)
+    const refreshToken = `/${this.storage.getRefreshToken()}`;
+    return this.serviceFacade.buildRefreshToken(refreshToken)
       .pipe(
         tap((tokens) => this.storage.storeTokens(tokens)));
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org