(refactor) use static method to get new token

unkn0wn-root · Mar 19, 2024 · 47b3d56 · 47b3d56
1 parent 5478901
commit 47b3d56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/entrypoint.ts b/src/entrypoint.ts
@@ -3,7 +3,6 @@ import os from 'os'
 import express from 'express'
 import { AHCServer } from './server'
 import { HejtoProvider } from './lib/hejto/services/hejto-provider'
-import config from './lib/hejto/config'
 
 (async () => {
 	const entrypoint = await AHCServer({ app: express() })
@@ -18,8 +17,7 @@ import config from './lib/hejto/config'
 	}
 
     // get token from hejto auth
-    const { hejtoAuthData, hejtoAuthUrl } = config
-    const token = await HejtoProvider.getToken(hejtoAuthUrl, hejtoAuthData)
+    const token = await HejtoProvider.newToken()
     // set token to env
     process.env.HEJTO_API_KEY = token.access_token
 

diff --git a/src/lib/hejto/services/hejto-provider.ts b/src/lib/hejto/services/hejto-provider.ts
@@ -52,7 +52,7 @@ export class HejtoProvider extends IHejtoProvider {
 		} catch (e) {
             // 401 or 403 means token is probably expired, so get new token and set env to new token
             if ([401, 403].includes(e.response?.status)) {
-                const token = await this.refreshToken()
+                const token = await HejtoProvider.newToken()
                 process.env.HEJTO_API_KEY = token.access_token
             }
 			const responseMsg = e.response?.data ?? e.response?.message
@@ -68,6 +68,11 @@ export class HejtoProvider extends IHejtoProvider {
 		}
 	}
 
+    static newToken() {
+        const { hejtoAuthData, hejtoAuthUrl } = config
+        return HejtoProvider.getToken(hejtoAuthUrl, hejtoAuthData)
+    }
+
     static async getToken(
         authUrl: string,
         tokenRequest: HejtoTokenConfig,
@@ -96,12 +101,7 @@ export class HejtoProvider extends IHejtoProvider {
         return HejtoProvider.token
     }
 
-	private format(url: string): string {
+    private format(url: string): string {
 		return concatUrls(this.BASE_URL, url)
 	}
-
-    private refreshToken() {
-        const { hejtoAuthData, hejtoAuthUrl } = config
-        return HejtoProvider.getToken(hejtoAuthUrl, hejtoAuthData)
-    }
 }