@hahnpro/hpc-api 3.7.0 → 3.7.1

package/dist/http.service.d.ts

@@ -30,7 +30,7 @@ export declare class HttpClient {
     addEventSource(url: string, listener: (event: MessageEvent) => void, errorListener?: (event: MessageEvent) => void): Promise<any>;
     destroyEventSource(id: string): void;
     destroyAllEventSources(): void;
-    getAccessToken: () => Promise<string>;
+    getAccessToken: (forceRefresh?: boolean) => Promise<string>;
     private validateIssuer;
     private discoverIssuer;
     private requestAccessToken;

package/dist/http.service.js

@@ -9,7 +9,6 @@ const jose_1 = require("jose");
 const Queue_1 = require("./Queue");
 const token_set_1 = require("./token-set");
 const querystring_1 = require("querystring");
-const TOKEN_EXPIRATION_BUFFER = 30;
 class HttpClient {
     constructor(baseURL, authBaseURL, realm, clientId, clientSecret) {
         this.baseURL = baseURL;
@@ -34,11 +33,11 @@ class HttpClient {
                     .catch(reject);
             }));
         };
-        this.getAccessToken = async () => {
-            if (!this.tokenSet || this.tokenSet.expired() || this.tokenSet.expiresAt < Date.now() / 1000 + TOKEN_EXPIRATION_BUFFER) {
+        this.getAccessToken = async (forceRefresh = false) => {
+            if (forceRefresh || !this.tokenSet || this.tokenSet.isExpired()) {
                 return this.requestAccessToken();
             }
-            return this.tokenSet.access_token;
+            return this.tokenSet.accessToken;
         };
         this.axiosInstance = axios_1.default.create({ baseURL, timeout: 60000 });
         this.authAxiosInstance = axios_1.default.create({ baseURL: authBaseURL || baseURL, timeout: 10000 });

package/dist/token-set.d.ts

@@ -1,8 +1,9 @@
 export declare class TokenSet {
-    expiresAt: number;
-    access_token: string;
+    private readonly _accessToken;
+    private readonly _expiresAt;
     constructor(access_token: string, expires_in: number);
-    set expires_in(value: number);
-    get expires_in(): number;
-    expired(): boolean;
+    get accessToken(): string;
+    get expiresAt(): number;
+    get expiresIn(): number;
+    isExpired(): boolean;
 }

package/dist/token-set.js

@@ -1,19 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenSet = void 0;
+const TOKEN_EXPIRATION_BUFFER = 20;
 class TokenSet {
     constructor(access_token, expires_in) {
-        this.expires_in = expires_in;
-        this.access_token = access_token;
+        this._accessToken = access_token;
+        this._expiresAt = Math.floor(Date.now() / 1000) + Number(expires_in);
     }
-    set expires_in(value) {
-        this.expiresAt = Date.now() + Number(value);
+    get accessToken() {
+        return this._accessToken;
     }
-    get expires_in() {
-        return Math.max(this.expiresAt - Date.now(), 0);
+    get expiresAt() {
+        return this._expiresAt;
     }
-    expired() {
-        return this.expires_in === 0;
+    get expiresIn() {
+        return Math.max(this.expiresAt - Math.ceil(Date.now() / 1000), 0);
+    }
+    isExpired() {
+        return this.expiresIn <= TOKEN_EXPIRATION_BUFFER;
     }
 }
 exports.TokenSet = TokenSet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/hpc-api",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Module for easy access to the HahnPRO API",
   "license": "MIT",
   "author": {
@@ -24,10 +24,10 @@
     "access": "public"
   },
   "dependencies": {
-    "axios": "~1.3.3",
+    "axios": "~1.3.4",
     "eventsource": "^2.0.2",
     "form-data": "^4.0.0",
-    "jose": "^4.12.0",
+    "jose": "^4.13.1",
     "jwt-decode": "^3.1.2",
     "p-queue": "^6.6.2",
     "ts-mixer": "^6.0.3",