orderiom-api-package 0.4.94 → 0.4.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.4.94",
+  "version": "0.4.95",
   "description": "This package will install all necessary API calls for every orderiom restaurant",
   "main": "index.js",
   "types": "index.d.ts",

package/src/common.js

@@ -149,13 +149,17 @@ const getAuthToken = async ($store, hadPrivateToken = false) => {
 
 		if(hadPrivateToken) {
 			$store.commit("auth/clearAuthData");
-			await $store.dispatch('unassignBasket');
+			await $store.dispatch('auth/unassignBasket');
 		}
 	} catch (error) {
 		return commonErrorCallback()(error)
 	} finally {
 		while (reqBuffer.length) {
-			reqBuffer.shift()(); // First in First out
+			let basketId = null;
+			if(hadPrivateToken){
+				basketId = calculateBasketIdParameter(false, restaurantIdEnv())
+			}
+			reqBuffer.shift()(basketId); // First in First out
 		}
 		isFetchingToken = false;
 	}
@@ -190,10 +194,19 @@ export const defineInterceptors = ({$store}) => {
 			localStorage.removeItem("publicToken");
 
 			// Push the request to waitlist and wait for new token to be fetched
-			reqBuffer.push(() => {
+			reqBuffer.push((basketId = null) => {
 				const newToken = localStorage.getItem("publicToken");
 				if(newToken){
 					config.headers["Authorization"] = `Bearer ${newToken}`
+
+					// basketId is available only when unassign-basket is called right before resolving the request from waitlist
+					if(basketId){
+						const key = config.method === 'get' ? 'params' : 'data';
+						const data = config[key] || {};
+						if(!data.basketId) data.basketId = basketId;
+						config[key] = data;
+					}
+
 					resolve(config);
 				} else {
 					config.headers["Authorization"] = undefined;