fix: add updateTokenIfNeeded (#275)

onecx · Jun 12, 2024 · 03e8d1b · 03e8d1b
1 parent 5a531a2
commit 03e8d1b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/libs/angular-auth/src/lib/auth-service-wrapper.ts b/libs/angular-auth/src/lib/auth-service-wrapper.ts
@@ -39,6 +39,9 @@ export class AuthServiceWrapper {
   getHeaderValues(): Record<string, string> {
     return this.authService?.getHeaderValues() ?? {}
   }
+  updateTokenIfNeeded(): Promise<boolean> {
+    return this.authService?.updateTokenIfNeeded() ?? Promise.reject()
+  }
 
   async initializeAuthService(): Promise<void> {
     const serviceTypeConfig = this.configService.getProperty(CONFIG_KEY.AUTH_SERVICE) ?? 'keycloak'

diff --git a/libs/angular-auth/src/lib/auth.service.ts b/libs/angular-auth/src/lib/auth.service.ts
@@ -4,6 +4,8 @@ export interface AuthService {
   getHeaderValues(): Record<string, string>
 
   logout(): void
+
+  updateTokenIfNeeded(): Promise<boolean>
 }
 
 export enum Injectables {

diff --git a/libs/angular-auth/src/lib/auth_services/keycloak-auth.service.ts b/libs/angular-auth/src/lib/auth_services/keycloak-auth.service.ts
@@ -143,6 +143,14 @@ export class KeycloakAuthService implements AuthService {
     this.keycloakService.logout()
   }
 
+  async updateTokenIfNeeded(): Promise<boolean> {
+    if (!(await this.keycloakService.isLoggedIn())) {
+      return this.keycloakService.login().then(() => false)
+    } else {
+      return this.keycloakService.updateToken()
+    }
+  }
+
   getAuthProviderName(): string {
     return 'keycloak-auth'
   }

diff --git a/libs/angular-auth/src/lib/token.interceptor.ts b/libs/angular-auth/src/lib/token.interceptor.ts
@@ -1,6 +1,6 @@
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { Observable } from 'rxjs'
+import { Observable, from, mergeMap } from 'rxjs'
 import { AuthServiceWrapper } from './auth-service-wrapper'
 
 const WHITELIST = ['assets']
@@ -14,14 +14,19 @@ export class TokenInterceptor implements HttpInterceptor {
     if (skip) {
       return next.handle(request)
     }
-    const headerValues = this.authService.getHeaderValues()
-    let headers = request.headers
-    for (const header in headerValues) {
-      headers = headers.set(header, headerValues[header])
-    }
-    const authenticatedReq: HttpRequest<unknown> = request.clone({
-      headers: headers,
-    })
-    return next.handle(authenticatedReq)
+
+    return from(this.authService.updateTokenIfNeeded()).pipe(
+      mergeMap(() => {
+        const headerValues = this.authService.getHeaderValues()
+        let headers = request.headers
+        for (const header in headerValues) {
+          headers = headers.set(header, headerValues[header])
+        }
+        const authenticatedReq: HttpRequest<unknown> = request.clone({
+          headers: headers,
+        })
+        return next.handle(authenticatedReq)
+      })
+    )
   }
 }