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/10/16 10:17:00 UTC

[incubator-dlab] 04/06: [DLAB-1157]: added refresh token request on unauthorize

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

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

commit 5f417d1d6304a5724b30ccc5fc2561b524d2012f
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Oct 15 12:32:47 2019 +0300

    [DLAB-1157]: added refresh token request on unauthorize
---
 .../webapp/src/app/core/interceptors/error.interceptor.ts    | 12 ++----------
 .../src/main/resources/webapp/src/app/login/login.model.ts   |  2 +-
 2 files changed, 3 insertions(+), 11 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 b166a96..7c22843 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
@@ -50,10 +50,8 @@ import { HTTP_STATUS_CODES } from '../util';
       if (error instanceof HttpErrorResponse) {
         switch ((<HttpErrorResponse>error).status) {
           case HTTP_STATUS_CODES.UNAUTHORIZED:
-            console.log('401');
             return this.handleUnauthorized(request, next);
           case HTTP_STATUS_CODES.BAD_REQUEST:
-            console.log('400');
             return this.handleBadRequest(request, next);
           default:
             return _throw(error);
@@ -82,14 +80,9 @@ import { HTTP_STATUS_CODES } from '../util';
 
     } else {
       return this.refreshTokenSubject.pipe(
-        filter(token => {
-          debugger;
-          return token != null
-        }),
+        filter(token => token != null),
         take(1),
-        switchMap(jwt => {
-          return next.handle(this.addToken(request, jwt));
-        }));
+        switchMap(jwt => next.handle(this.addToken(request, jwt))));
     }
   }
 
@@ -98,7 +91,6 @@ import { HTTP_STATUS_CODES } from '../util';
       switchMap((response: any) => {
         const redirect_parameter = response.headers.get('Location');
         redirect_parameter ? this.routingService.redirectToUrl(redirect_parameter) : this.routingService.redirectToLoginPage();
-        debugger;
         return next.handle(request);
       })
     );
diff --git a/services/self-service/src/main/resources/webapp/src/app/login/login.model.ts b/services/self-service/src/main/resources/webapp/src/app/login/login.model.ts
index 52e7b18..d06ed0d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/login/login.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/login/login.model.ts
@@ -18,7 +18,7 @@
  */
 
 export class LoginModel {
-  constructor(public username: string, public password: string) {}
+  constructor(public username: string, public password: string) { }
 
   toJsonString(): string {
     return JSON.stringify({


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