@outlawdesigns/loe-rest-client 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outlawdesigns/loe-rest-client",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/core.js

@@ -12,24 +12,22 @@ export function createApiClient(baseURL, requestedScope){
   const oauthScope = requestedScope;
   const oauthResource = baseURL;
   const oauthRefreshBuffer = 300;
-  let oauthTokenExpiryTime;
   const axiosInstance = axios.create({baseURL:baseURL});
   authClient.onTokenUpdate((token)=>{
-    let tmpDate = new Date();
-    let secondsToAdd = token.expires_in;
-    tmpDate.setSeconds(tmpDate.getSeconds() + secondsToAdd);
-    oauthTokenExpiryTime = tmpDate.getSeconds();
     axiosInstance.defaults.headers.common['Authorization'] = `Bearer ${token.access_token}`;
   });
   axiosInstance.interceptors.request.use(async (config)=>{
     const token = authClient.getAccessToken();
     if(!token) throw new Error(`Authenticate before making API calls.`);
+    const user = await authClient.verifyAccessToken(token,[oauthResource]);
     const refreshToken = authClient.getRefreshToken();
-    if(refreshToken && oauthTokenExpiryTime){
-      const now = Math.floor(Date.now() / 1000);
-      const timeDiffSeconds = oauthTokenExpiryTime - now;
-      if(timeDiffSeconds <= oauthRefreshBuffer || now >= oauthTokenExpiryTime){
+    const now = Math.floor(Date.now() / 1000);
+    const timeDiffSeconds = user.exp - now;
+    if(timeDiffSeconds <= oauthRefreshBuffer){
+      if(refreshToken){
         await authClient.refreshToken(oauthScope,[oauthResource]);
+      }else{
+        await authClient.clientCredentialFlow(oauthScope,[oauthResource]);
       }
     }
     return config;

package/src/singleton.js

@@ -2,14 +2,14 @@ import { createApiClient } from './core.js';
 
 let instance = null;
 
-function init(baseURL){
+function init(baseURL, oauthScope){
   if(instance){
     if(instance.axios.defaults.baseURL !== baseURL){
       throw new Error(`API client already initialized with ${instance.axios.defaults.baseURL}`);
     }
     return instance;
   }
-  instance = createApiClient(baseURL);
+  instance = createApiClient(baseURL, oauthScope);
   return instance;
 }