orderiom-api-package 0.4.86 → 0.4.88

package/index.d.ts

@@ -8,7 +8,6 @@ export const formatDate: (date: Date) => string;
 export const formatTime: (date: Date) => string;
 
 export interface AuthState<SignedIn extends boolean> {
-	publicToken: string | null,
 	privateToken: string | null,
 	expires_at: string | null,
 	user: {

package/package.json

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

package/src/common.js

@@ -115,31 +115,91 @@ export function formatTime(date){
 export function isTokenExpired(token) {
 	const base64Url = token.split(".")[1];
 	const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
-	const jsonPayload = decodeURIComponent(
-		atob(base64)
-			.split("")
-			.map(function (c) {
-				return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
-			})
-			.join("")
-	);
-
-	const { exp } = JSON.parse(jsonPayload);
-	return Date.now() >= exp * 1000;
+
+	try{
+		const jsonPayload = decodeURIComponent(
+			atob(base64)
+				.split("")
+				.map(function (c) {
+					return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+				})
+				.join("")
+		);
+
+		const { exp } = JSON.parse(jsonPayload);
+		return Date.now() >= exp * 1000;
+	} catch (err){
+		return true;
+	}
+}
+
+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 = () => {
+	isFetchingToken = true;
+	return 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;
+		});
 }
 
 axios.defaults.baseURL = process.env.VUE_APP_BASE_API_URL || window.dynamicData.VUE_APP_BASE_API_URL;
 axios.interceptors.request.use(config => {
-	const token = localStorage.getItem("privateToken") || localStorage.getItem("publicToken");
-	if (token) config.headers["Authorization"] = `Bearer ${token}`;
+	// 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;
 
-	return config;
+	// 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) => {
+		// 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();
+	})
 }, error => {
 	return Promise.reject(error);
 });
@@ -177,6 +237,7 @@ axios.interceptors.response.use(
 
 		if (
 			error.response &&
+			error.response.status === 422 &&
 			error.response.data &&
 			error.response.data.message &&
 			error.response.data.message.body === "unauthenticated"

package/src/modules/auth.js

@@ -1,7 +1,6 @@
-import {commonErrorCallback, $http, isTokenExpired, restaurantIdEnv } from '../common';
+import {commonErrorCallback, $http, restaurantIdEnv } from '../common';
 
 const state = {
-    publicToken: null,
     privateToken: null,
     expires_at: null,
     user: {},
@@ -12,9 +11,6 @@ const state = {
     userAddress: []
 };
 const mutations = {
-    setPublicToken(state, token) {
-        state.publicToken = token
-    },
     authUser(state, userData) {
         state.privateToken = userData.privateToken;
         state.expires_at = userData.expires_at;
@@ -52,23 +48,8 @@ const mutations = {
     }
 };
 const actions = {
-    auth({ commit }) {
-		const publicToken = localStorage.getItem('publicToken');
-		if(publicToken && !isTokenExpired(publicToken)) return;
-
-        return $http
-            .post("api/oauth/token", {
-                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 => {
-                commit('setPublicToken', res.data.data.access_token)
-                window.localStorage.setItem("publicToken", res.data.data.access_token);
-            })
-            .catch(
-                commonErrorCallback()
-            );
+    auth({ }) {
+		console.warn('auth/auth action is deprecated. No need to call');
     },
     login({ commit, dispatch }, authData) {
         var data = { ...authData };
@@ -317,7 +298,8 @@ const actions = {
             });
             return {
                 ...res,
-                msg: result.data.message.body
+				type: res.data.message.type,
+                msg: res.data.message.body
             }
         }).catch(
             commonErrorCallback()