orderiom-api-package 0.4.96 → 0.4.98

package/package.json

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

package/src/common.js

@@ -178,16 +178,22 @@ export const defineInterceptors = ({$store}) => {
 		if(idFromEnv && !data.restaurantId) data.restaurantId = idFromEnv;
 		config[key] = data;
 
+		const userId = $store.state.orderiomApiPackage.auth.user.id;
+
 		// use the valid token if possible
 		let token = localStorage.getItem("privateToken") || localStorage.getItem("publicToken");
-		if(token && !isTokenExpired(token)){
+		if(
+			token &&
+			!isTokenExpired(token) &&
+			(!userId || localStorage.getItem("privateToken")) // if userId exists then private token must exist too
+		){
 			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");
+			const hadPrivateToken = Boolean(localStorage.getItem("privateToken") || userId);
 			// remove invalid or expired tokens
 			token = null;
 			localStorage.removeItem("privateToken");