@common_ch/common 1.0.21 → 1.0.23

package/build/events/portal/user-updated-event.d.ts

@@ -0,0 +1,14 @@
+import { Subjects } from "../subjects";
+export interface UserUpdatedInPortalEvent {
+    subject: Subjects.UserUpdatedInPortal;
+    data: {
+        id: string;
+        version: number;
+        name: string;
+        family: string;
+        email: string;
+        username: string;
+        password: string;
+        mobile: string;
+    };
+}

package/build/events/portal/user-updated-event.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/events/subjects.d.ts

@@ -1,5 +1,6 @@
 export declare enum Subjects {
     UserCreated = "user:created",
+    UserUpdatedInPortal = "user:updated-in-portal",
     AdminCreated = "admin:created",
     AiCreated = "ai:created",
     AiChangeStatus = "ai:changeStatus"

package/build/events/subjects.js

@@ -4,6 +4,7 @@ exports.Subjects = void 0;
 var Subjects;
 (function (Subjects) {
     Subjects["UserCreated"] = "user:created";
+    Subjects["UserUpdatedInPortal"] = "user:updated-in-portal";
     Subjects["AdminCreated"] = "admin:created";
     Subjects["AiCreated"] = "ai:created";
     Subjects["AiChangeStatus"] = "ai:changeStatus";

package/build/index.d.ts

@@ -18,3 +18,4 @@ export * from './events/user/user-created-event';
 export * from './events/admin/admin-created-event';
 export * from './events/portal/ai-created-event';
 export * from './events/portal/ai-changeStatus-event';
+export * from './events/portal/user-updated-event';

package/build/index.js

@@ -34,3 +34,4 @@ __exportStar(require("./events/user/user-created-event"), exports);
 __exportStar(require("./events/admin/admin-created-event"), exports);
 __exportStar(require("./events/portal/ai-created-event"), exports);
 __exportStar(require("./events/portal/ai-changeStatus-event"), exports);
+__exportStar(require("./events/portal/user-updated-event"), exports);

package/build/middlewares/current-admin.js

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentAdmin = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const currentAdmin = (req, res, next) => {
-    var _a;
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwtAdmin)) {
+    const authHeader = req.headers['authorization'];
+    if (!authHeader || !authHeader.startsWith('Bearer')) {
         return next();
     }
     try {
-        const payload = jsonwebtoken_1.default.verify(req.session.jwtAdmin, process.env.JWT_KEY_ADMIN);
+        const token = authHeader.split(' ')[1];
+        const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY);
         req.currentAdmin = payload;
     }
     catch (err) { }

package/build/middlewares/current-user.js

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentUser = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const currentUser = (req, res, next) => {
-    var _a;
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+    const authHeader = req.headers['authorization'];
+    if (!authHeader || !authHeader.startsWith('Bearer')) {
         return next();
     }
     try {
-        const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
+        const token = authHeader.split(' ')[1];
+        const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY);
         req.currentUser = payload;
     }
     catch (err) { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@common_ch/common",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [