fix: improve refresh grant flow

Author: anonrig

src/service.ts

@@ -88,33 +88,32 @@ export class KeycloakService {
   }
 
   async refreshGrant(): Promise<TokenSet | undefined | null> {
-    if (this.tokenSet && !this.tokenSet.expired()) {
-      return this.tokenSet
-    }
-
     if (!this.tokenSet) {
-      this.logger.warn(`Missing token set on refreshGrant.`)
-      return null
+      await this.initialize()
     }
 
-    const { refresh_token } = this.tokenSet
+    if (!this.tokenSet?.expired()) {
+      return this.tokenSet
+    }
 
-    if (!refresh_token) {
+    if (!this.tokenSet.refresh_token) {
       this.logger.debug(`Refresh token is missing. Reauthenticating.`)
 
       this.tokenSet = await this.issuerClient?.grant({
         clientId: this.options.clientId,
         clientSecret: this.options.clientSecret,
         grant_type: 'client_credentials',
       })
-      if (this.tokenSet?.access_token) this.client.setAccessToken(this.tokenSet?.access_token)
+      if (this.tokenSet?.access_token) {
+        this.client.setAccessToken(this.tokenSet?.access_token)
+      }
 
       return this.tokenSet
     }
 
     this.logger.debug(`Refreshing grant token`)
 
-    this.tokenSet = await this.issuerClient?.refresh(refresh_token)
+    this.tokenSet = await this.issuerClient?.refresh(this.tokenSet.refresh_token)
 
     return this.tokenSet
   }