orderiom-api-package 0.4.92 → 0.4.93

package/index.d.ts

@@ -6,6 +6,7 @@ export const $http: Object;
 export const weekdays: string[];
 export const formatDate: (date: Date) => string;
 export const formatTime: (date: Date) => string;
+export const defineInterceptors: (params: Record<string, any>) => void;
 
 export interface AuthState<SignedIn extends boolean> {
 	privateToken: string | null,

package/index.js

@@ -2,7 +2,7 @@ import apiStore from './src';
 import enMsg from "./src/messages/en-api.json";
 import deMsg from "./src/messages/de-api.json";
 import frMsg from './src/messages/fr-api.json';
-import {$http as api, weekdays, formatDate, formatTime} from './src/common';
+import {$http as api, defineInterceptors as di, weekdays, formatDate, formatTime} from './src/common';
 
 function install(Vue, options = {}, config = {}) {
     if (!options.store) console.log('Please provide a store!!');
@@ -10,6 +10,7 @@ function install(Vue, options = {}, config = {}) {
 }
 
 export const $http = api;
+export const defineInterceptors = di;
 export default {
     install,
     enMsg,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.4.92",
+  "version": "0.4.93",
   "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,34 +137,7 @@ 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
 
-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) => {
+const getAuthToken = async ($store, hadPrivateToken = false) => {
 	isFetchingToken = true;
 	try {
 		const getTokenRes = await axios.post(getTokenAPI, {
@@ -174,7 +147,10 @@ const getAuthToken = async (hadPrivateToken = false) => {
 		})
 		window.localStorage.setItem("publicToken", getTokenRes.data.data.access_token);
 
-		if(hadPrivateToken) await unassignBasket();
+		if(hadPrivateToken) {
+			$store.commit("auth/clearAuthData");
+			await $store.dispatch('unassignBasket');
+		}
 	} catch (error) {
 		return commonErrorCallback()(error)
 	} finally {
@@ -186,95 +162,98 @@ const getAuthToken = async (hadPrivateToken = false) => {
 }
 
 axios.defaults.baseURL = process.env.VUE_APP_BASE_API_URL || window.dynamicData.VUE_APP_BASE_API_URL;
-axios.interceptors.request.use(config => {
-	// exception API that does not need any pre-process
-	if(config.url === getTokenAPI) return config;
-
-	// attach restaurant ID to all other requests
-	const key = config.method === 'get' ? 'params' : 'data';
-	const data = config[key] || {};
-	const idFromEnv = restaurantIdEnv();
-	if(idFromEnv && !data.restaurantId) data.restaurantId = idFromEnv;
-	config[key] = data;
-
-	// use the valid token if possible
-	let token = localStorage.getItem("privateToken") || localStorage.getItem("publicToken");
-	if(token && !isTokenExpired(token)){
-		config.headers["Authorization"] = `Bearer ${token}`
-		return config;
-	}
+export const defineInterceptors = ({$store}) => {
+	axios.interceptors.request.use(config => {
+		// exception API that does not need any pre-process
+		if(config.url === getTokenAPI) return config;
+
+		// attach restaurant ID to all other requests
+		const key = config.method === 'get' ? 'params' : 'data';
+		const data = config[key] || {};
+		const idFromEnv = restaurantIdEnv();
+		if(idFromEnv && !data.restaurantId) data.restaurantId = idFromEnv;
+		config[key] = data;
+
+		// use the valid token if possible
+		let token = localStorage.getItem("privateToken") || localStorage.getItem("publicToken");
+		if(token && !isTokenExpired(token)){
+			config.headers["Authorization"] = `Bearer ${token}`
+			return 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");
-		localStorage.removeItem("publicToken");
+		// 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");
+			localStorage.removeItem("publicToken");
+
+			// Push the request to waitlist and wait for new token to be fetched
+			reqBuffer.push(() => {
+				const newToken = localStorage.getItem("publicToken");
+				if(newToken){
+					config.headers["Authorization"] = `Bearer ${newToken}`
+					resolve(config);
+				} else {
+					config.headers["Authorization"] = undefined;
+					reject(`Not authorized! token required for ${config.url}.`);
+				}
+			});
+
+			// Start to fetch token if it is not already fetching
+			if(!isFetchingToken) getAuthToken($store, hadPrivateToken);
+		})
+	}, error => {
+		return Promise.reject(error);
+	});
 
-		// Push the request to waitlist and wait for new token to be fetched
-		reqBuffer.push(() => {
-			const newToken = localStorage.getItem("publicToken");
-			if(newToken){
-				config.headers["Authorization"] = `Bearer ${newToken}`
-				resolve(config);
-			} else {
-				config.headers["Authorization"] = undefined;
-				reject(`Not authorized! token required for ${config.url}.`);
+	axios.interceptors.response.use(
+		res => {
+			return {
+				type: 'success',
+				msg: '',
+				status: res.status,
+				data: res.data
+			}
+		},
+		error => {
+			if (
+				error.response &&
+				error.response.data &&
+				error.response.data.error &&
+				error.response.data.error.validation
+			) {
+				const validation = error.response.data.error.validation;
+
+				if (
+					(
+						Object.keys(validation).includes("basketId") &&
+						validation["basketId"][0] === "basket_does_not_exists"
+					) ||
+					(
+						Object.keys(validation).includes("restaurantId") &&
+						validation["restaurantId"][0] === "basket_does_not_exists"
+					)
+				) {
+					localStorage.removeItem("basket");
+				}
 			}
-		});
-
-		// Start to fetch token if it is not already fetching
-		if(!isFetchingToken) getAuthToken(hadPrivateToken);
-	})
-}, error => {
-	return Promise.reject(error);
-});
-axios.interceptors.response.use(
-	res => {
-		return {
-			type: 'success',
-			msg: '',
-			status: res.status,
-			data: res.data
-		}
-	},
-	error => {
-		if (
-			error.response &&
-			error.response.data &&
-			error.response.data.error &&
-			error.response.data.error.validation
-		) {
-			const validation = error.response.data.error.validation;
 
 			if (
-				(
-					Object.keys(validation).includes("basketId") &&
-					validation["basketId"][0] === "basket_does_not_exists"
-				) ||
-				(
-					Object.keys(validation).includes("restaurantId") &&
-					validation["restaurantId"][0] === "basket_does_not_exists"
-				)
+				error.response &&
+				error.response.status === 422 &&
+				error.response.data &&
+				error.response.data.message &&
+				error.response.data.message.body === "unauthenticated"
 			) {
-				localStorage.removeItem("basket");
+				localStorage.clear();
+				window.location.reload();
 			}
-		}
 
-		if (
-			error.response &&
-			error.response.status === 422 &&
-			error.response.data &&
-			error.response.data.message &&
-			error.response.data.message.body === "unauthenticated"
-		) {
-			localStorage.clear();
-			window.location.reload();
+			return Promise.reject(error);
 		}
-
-		return Promise.reject(error);
-	}
-);
+	);
+}
 
 export const $http = axios;

package/src/modules/auth.js

@@ -189,7 +189,30 @@ const actions = {
             );
     },
     unassignBasket(_, restaurantId) {
-		return unassignBasket(restaurantId);
+		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 =>
+				$http.post(`api/basket/unassigned-basket`, {
+					basketId
+				})
+			)
+		).catch(commonErrorCallback())
     },
     restaurantInfo({ commit }, restaurantId) {
         return $http