@opencitylabs/formio-sdk 1.1.2 → 1.1.4

package/index.js

@@ -1,47 +1,61 @@
-"use strict";
-
-const axios = require("axios");
-const get = require("lodash.get");
-const { baseUrl } = require("./BaseUrl");
-const { jwtDecode } = require("jwt-decode");
+import axios from "axios";
+import get from "lodash.get";
+import { baseUrl } from "./BaseUrl.js";
+import { jwtDecode } from "jwt-decode";
 
 class FormIoHelper {
 
   constructor() {
     this.token = null;
+    this.tokenPromise = null;
     this.basePath = null;
     this.init()
   }
 
   init() {
     this.basePath = this.getBaseUrl();
-    this.token = this.getCurrentToken();
   }
 
   getCurrentLocale() {
     return document.documentElement.lang.toString();
   }
 
-    async getCurrentToken() {
+  async getCurrentToken() {
     if (this.token) {
       return this.token;
     }
 
-    const rawToken = sessionStorage.getItem("auth-token");
-    if (!rawToken) {
-        const response = await axios.get(this.basePath + '/api/session-auth')  
-        sessionStorage.setItem("auth-token",response?.data?.token);
-        return response?.data?.token;
+    if (this.tokenPromise) {
+      return this.tokenPromise;
     }
 
-    try {
-      const parsedToken = JSON.parse(rawToken);
-      if (typeof parsedToken === "string") {
-        return parsedToken;
+    this.tokenPromise = (async () => {
+      const rawToken = sessionStorage.getItem("auth-token");
+      if (!rawToken) {
+        const response = await axios.get(this.basePath + '/api/session-auth');
+        const fetchedToken = response?.data?.token || null;
+        if (fetchedToken) {
+          sessionStorage.setItem("auth-token", fetchedToken);
+        }
+        return fetchedToken;
       }
-      return parsedToken?.value || null;
-    } catch (error) {
-      return rawToken;
+
+      try {
+        const parsedToken = JSON.parse(rawToken);
+        if (typeof parsedToken === "string") {
+          return parsedToken;
+        }
+        return parsedToken?.value || null;
+      } catch (error) {
+        return rawToken;
+      }
+    })();
+
+    try {
+      this.token = await this.tokenPromise;
+      return this.token;
+    } finally {
+      this.tokenPromise = null;
     }
   }
 
@@ -59,11 +73,12 @@ class FormIoHelper {
   }
 
   async authenticatedCall(endPoint) {
-    if(this.token){
+    const token = await this.getCurrentToken();
+    if(token){
       const response = await axios.get(this.basePath + '/api/' + endPoint, {
         headers: {
           "Content-Type": "application/json",
-          "Authorization": "Bearer " + this.token
+          "Authorization": "Bearer " + token
         }
       })
       return response.data
@@ -71,11 +86,12 @@ class FormIoHelper {
   }
 
   async authenticatedPOSTCall(endPoint,params) {
-    if(this.token){
+    const token = await this.getCurrentToken();
+    if(token){
       const response = await axios.post(this.basePath + '/api/' + endPoint, JSON.stringify(params),{
         headers: {
           "Content-Type": "application/json",
-          "Authorization": "Bearer " + this.token
+          "Authorization": "Bearer " + token
         }
       })
       return response.data
@@ -549,7 +565,6 @@ function createFormioHelper(options = {}) {
   return new FormIoHelper(options);
 }
 
-module.exports = FormIoHelper;
-module.exports.FormIoHelper = FormIoHelper;
-module.exports.FormioHelper = FormIoHelper;
-module.exports.createFormioHelper = createFormioHelper;
+export { FormIoHelper, createFormioHelper };
+export { FormIoHelper as FormioHelper };
+export default FormIoHelper;

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@opencitylabs/formio-sdk",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Node/browser SDK helper for Form.io APIs",
+  "type": "module",
   "main": "index.js",
   "exports": {
     ".": "./index.js"
@@ -12,7 +13,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "node -e \"require('./index.js')\""
+    "test": "node --input-type=module -e \"import('./index.js')\""
   },
   "keywords": [
     "formio",
@@ -26,6 +27,6 @@
     "axios": "^1.13.6",
     "jwt-decode": "^4.0.0",
     "lodash.get": "^4.4.2",
-    "sweetalert2": "^11.26.22"
+    "sweetalert2": "^11.26.23"
   }
 }