@wrcb/cb-common 1.0.680 → 1.0.682

package/build/middlewares/currentUser.js

@@ -7,17 +7,31 @@ exports.currentUser = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const currentUser = (req, res, next) => {
     var _a;
-    // vamos apenas descobrir se o usuario esta logado. se estiver, vamos extrair o payload
-    // e setar no currentUser property
-    // se não tiver logado, outro middleware irá retornar um erro.
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+    let token;
+    // 1️⃣ Tenta pegar do header Authorization (mobile)
+    const authHeader = req.headers.authorization;
+    if (authHeader && authHeader.startsWith('Bearer ')) {
+        token = authHeader.substring(7); // remove "Bearer "
+    }
+    // 2️⃣ Se não achou no header, tenta pegar do cookie (web)
+    if (!token && ((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+        token = req.session.jwt;
+    }
+    // 3️⃣ Se não tem token em nenhum lugar, segue sem autenticar
+    if (!token) {
         return next();
     }
+    // 4️⃣ Valida o token
     try {
-        const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
+        // vamos apenas descobrir se o usuario esta logado. se estiver, vamos extrair o payload
+        // e setar no currentUser property
+        // se não tiver logado, outro middleware irá retornar um erro.
+        const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY);
         req.currentUser = payload;
     }
-    catch (error) { }
+    catch (error) {
+        // Token inválido — ignora e segue sem autenticar
+    }
     next();
 };
 exports.currentUser = currentUser;

package/build/types/userTags.d.ts

@@ -187,9 +187,8 @@ export declare enum UserTags {
     DietProducts = "DietProducts",
     Halal = "Halal",
     Kosher = "Kosher",
-    FastDelivery = "FastDelivery",
-    FreeDelivery = "FreeDelivery",
-    Open24Hours = "Open24Hours"
+    CookingGas = "CookingGas",
+    Other = "Other"
 }
 export declare const TOUR_TAGS: UserTags[];
 export declare const RESTAURANT_TAGS: UserTags[];

package/build/types/userTags.js

@@ -212,10 +212,9 @@ var UserTags;
     UserTags["DietProducts"] = "DietProducts";
     UserTags["Halal"] = "Halal";
     UserTags["Kosher"] = "Kosher";
-    // Compranomia - Serviços
-    UserTags["FastDelivery"] = "FastDelivery";
-    UserTags["FreeDelivery"] = "FreeDelivery";
-    UserTags["Open24Hours"] = "Open24Hours";
+    // Compranomia - Outros
+    UserTags["CookingGas"] = "CookingGas";
+    UserTags["Other"] = "Other";
 })(UserTags || (exports.UserTags = UserTags = {}));
 exports.TOUR_TAGS = [
     UserTags.CityTour,
@@ -552,10 +551,7 @@ exports.COMPRANOMIA_GROCERY_TAGS = [
     UserTags.DietProducts,
     UserTags.Halal,
     UserTags.Kosher,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery,
-    UserTags.Open24Hours
+    UserTags.Other
 ];
 exports.COMPRANOMIA_PHARMACY_TAGS = [
     // Medicamentos
@@ -573,10 +569,7 @@ exports.COMPRANOMIA_PHARMACY_TAGS = [
     UserTags.Diapers,
     // Características
     UserTags.OrganicProducts,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery,
-    UserTags.Open24Hours
+    UserTags.Other
 ];
 exports.COMPRANOMIA_BUTCHER_TAGS = [
     // Carnes
@@ -595,9 +588,7 @@ exports.COMPRANOMIA_BUTCHER_TAGS = [
     UserTags.LocalProducts,
     UserTags.Halal,
     UserTags.Kosher,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery
+    UserTags.Other
 ];
 exports.COMPRANOMIA_GREENGROCER_TAGS = [
     // Vegetais/Frutas
@@ -613,9 +604,7 @@ exports.COMPRANOMIA_GREENGROCER_TAGS = [
     // Características
     UserTags.OrganicProducts,
     UserTags.LocalProducts,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery
+    UserTags.Other
 ];
 exports.COMPRANOMIA_BAKERY_TAGS = [
     // Padaria
@@ -640,10 +629,7 @@ exports.COMPRANOMIA_BAKERY_TAGS = [
     UserTags.GlutenFree,
     UserTags.VeganProducts,
     UserTags.LocalProducts,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery,
-    UserTags.Open24Hours
+    UserTags.Other
 ];
 exports.COMPRANOMIA_PETSHOP_TAGS = [
     // Pet Food
@@ -660,9 +646,7 @@ exports.COMPRANOMIA_PETSHOP_TAGS = [
     // Características
     UserTags.OrganicProducts,
     UserTags.NaturalProducts,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery
+    UserTags.Other
 ];
 exports.COMPRANOMIA_CONVENIENCE_STORE_TAGS = [
     // Snacks/Lanches
@@ -677,13 +661,13 @@ exports.COMPRANOMIA_CONVENIENCE_STORE_TAGS = [
     UserTags.Juices,
     UserTags.SoftDrinks,
     UserTags.Water,
+    // gás
+    UserTags.CookingGas,
     // Congelados
     UserTags.FrozenFood,
     // Higiene básica
     UserTags.PersonalCare,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.Open24Hours
+    UserTags.Other
 ];
 exports.COMPRANOMIA_FISHMONGER_TAGS = [
     // Frutos do mar
@@ -694,9 +678,7 @@ exports.COMPRANOMIA_FISHMONGER_TAGS = [
     // Características
     UserTags.OrganicProducts,
     UserTags.LocalProducts,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery
+    UserTags.Other
 ];
 exports.COMPRANOMIA_AGRICULTURE_STORE_TAGS = [
     // Agropecuária
@@ -715,13 +697,6 @@ exports.COMPRANOMIA_AGRICULTURE_STORE_TAGS = [
     // Características
     UserTags.OrganicProducts,
     UserTags.LocalProducts,
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery
-];
-exports.COMPRANOMIA_SERVICES_TAGS = [
-    // Serviços
-    UserTags.FastDelivery,
-    UserTags.FreeDelivery,
-    UserTags.Open24Hours
+    UserTags.Other
 ];
+exports.COMPRANOMIA_SERVICES_TAGS = [UserTags.Other];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrcb/cb-common",
-  "version": "1.0.680",
+  "version": "1.0.682",
   "description": "Common resources between services",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",