orderiom-api-package 0.4.90 → 0.4.92

package/package.json

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

package/src/common.js

@@ -137,26 +137,52 @@ let isFetchingToken = false;
 const reqBuffer = []; // List of axios requests waiting for the fetch of public token (Each item is a function)
 const getTokenAPI = "api/oauth/token"; // API to get public token needs
 
-const getAuthToken = () => {
+export const unassignBasket = (restaurantId = null) => {
+	restaurantId = restaurantId || restaurantIdEnv();
+	let baskets = JSON.parse(localStorage.getItem("basket"));
+
+	if(!Array.isArray(baskets) || !baskets.length) return;
+
+	// Find all basketId where restaurantId does not exist, or find all basketId linked to a specific restaurantId if it exists.
+	const basketsIdToUnassign = baskets.filter(basket => (
+		basket.basketId &&
+		(
+			!Number(restaurantId) ||
+			(
+				Number(restaurantId) === Number(basket.restaurantId)
+			)
+		)
+	)).map(basket => basket.basketId)
+
+	// unassign all filtered baskets from logged-in user (so these baskets would not need a private token anymore)
+	return Promise.all(
+		basketsIdToUnassign.map(basketId =>
+			axios.post(`api/basket/unassigned-basket`, {
+				basketId
+			})
+		)
+	).catch(commonErrorCallback())
+}
+
+const getAuthToken = async (hadPrivateToken = false) => {
 	isFetchingToken = true;
-	return axios
-		.post(getTokenAPI, {
+	try {
+		const getTokenRes = await axios.post(getTokenAPI, {
 			grant_type: process.env.VUE_APP_GRANT_TYPE || window.dynamicData.VUE_APP_GRANT_TYPE,
 			client_id: process.env.VUE_APP_CLIENT_ID || window.dynamicData.VUE_APP_CLIENT_ID,
 			client_secret: process.env.VUE_APP_CLIENT_SECRET ||  window.dynamicData.VUE_APP_CLIENT_SECRET
 		})
-		.then(res => {
-			window.localStorage.setItem("publicToken", res.data.data.access_token);
-		})
-		.catch(
-			commonErrorCallback()
-		)
-		.finally(() => {
-			while (reqBuffer.length) {
-				reqBuffer.shift()(); // First in First out
-			}
-			isFetchingToken = false;
-		});
+		window.localStorage.setItem("publicToken", getTokenRes.data.data.access_token);
+
+		if(hadPrivateToken) await unassignBasket();
+	} catch (error) {
+		return commonErrorCallback()(error)
+	} finally {
+		while (reqBuffer.length) {
+			reqBuffer.shift()(); // First in First out
+		}
+		isFetchingToken = false;
+	}
 }
 
 axios.defaults.baseURL = process.env.VUE_APP_BASE_API_URL || window.dynamicData.VUE_APP_BASE_API_URL;
@@ -180,6 +206,7 @@ axios.interceptors.request.use(config => {
 
 	// if the token is expired or does not exist, wait for public token to be fetched
 	return new Promise((resolve, reject) => {
+		const hadPrivateToken = !!localStorage.getItem("privateToken");
 		// remove invalid or expired tokens
 		token = null;
 		localStorage.removeItem("privateToken");
@@ -198,7 +225,7 @@ axios.interceptors.request.use(config => {
 		});
 
 		// Start to fetch token if it is not already fetching
-		if(!isFetchingToken) getAuthToken();
+		if(!isFetchingToken) getAuthToken(hadPrivateToken);
 	})
 }, error => {
 	return Promise.reject(error);

package/src/modules/auth.js

@@ -1,4 +1,4 @@
-import {commonErrorCallback, $http, restaurantIdEnv } from '../common';
+import {commonErrorCallback, $http, restaurantIdEnv, unassignBasket } from '../common';
 
 const state = {
     privateToken: null,
@@ -178,6 +178,7 @@ const actions = {
         const foundBasket = basket.find(item => Number(item.restaurantId) === Number(restaurantId || restaurantIdEnv()))
         const basketId = foundBasket ? foundBasket.basketId : undefined;
 
+		// assign basket id to logged-in use (so basket actions need a private token now)
         basketId && $http
             .post(`api/basket/assign-basket`, { basketId, restaurantId })
             .then(() => {
@@ -187,27 +188,8 @@ const actions = {
                 commonErrorCallback()
             );
     },
-    unassignBasket({ }, restaurantId) {
-        const basket = JSON.parse(localStorage.getItem("basket"));
-        if(!basket || !Array.isArray(basket)) return;
-        let baskets = [];
-
-        if (restaurantId || restaurantIdEnv()) {
-            const foundBasket = basket.find(item => Number(item.restaurantId) === Number(restaurantId || restaurantIdEnv()))
-            const basketId = foundBasket ? foundBasket.basketId : undefined;
-
-            if(basketId) baskets.push(basketId);
-        } else {
-            baskets = basket.map(m => m.basketId)
-        }
-            for (let i = 0; i < baskets.length; i++) {
-                $http
-                    .post(`api/basket/unassigned-basket`, { basketId: baskets[i] })
-                    .then(res => res)
-                    .catch(
-                        commonErrorCallback()
-                    );
-            }
+    unassignBasket(_, restaurantId) {
+		return unassignBasket(restaurantId);
     },
     restaurantInfo({ commit }, restaurantId) {
         return $http