@armi-wave/common 1.23.43 → 1.23.45

package/build/middlewares/current-user.js

@@ -4,14 +4,26 @@ exports.currentUser = void 0;
 const jsonwebtoken_1 = require("jsonwebtoken");
 const currentUser = (req, res, next) => {
     var _a;
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+    // Try to get JWT from session cookie first (for mobile)
+    let jwt = (_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt;
+    // If not in session, try Authorization header (for web)
+    if (!jwt) {
+        const authHeader = req.headers.authorization;
+        if (authHeader && authHeader.startsWith('Bearer ')) {
+            jwt = authHeader.substring(7); // Remove 'Bearer ' prefix
+        }
+    }
+    // If no JWT found in either place, continue without auth
+    if (!jwt) {
         return next();
     }
     try {
-        const payload = (0, jsonwebtoken_1.verify)(req.session.jwt, process.env.JWT_KEY);
+        const payload = (0, jsonwebtoken_1.verify)(jwt, process.env.JWT_KEY);
         req.currentUser = payload;
     }
-    catch (error) { }
+    catch (error) {
+        // Invalid token, continue without auth
+    }
     next();
 };
 exports.currentUser = currentUser;

package/build/models/TextPostReply.d.ts

@@ -2,7 +2,7 @@ import mongoose, { Document } from 'mongoose';
 import { Mention } from './Mention';
 interface TextPostReply extends Document {
     textPostCommentId: mongoose.Types.ObjectId;
-    postId: mongoose.Types.ObjectId;
+    textPostId: mongoose.Types.ObjectId;
     userId: mongoose.Types.ObjectId;
     username: string;
     profilePicUrl: string;

package/build/models/TextPostReply.js

@@ -41,7 +41,7 @@ const textPostReplySchema = new mongoose_1.default.Schema({
         index: true,
         required: true,
     },
-    postId: {
+    textPostId: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: 'TextPost',
         index: true,

package/build/models/VideoPostReply.d.ts

@@ -2,7 +2,7 @@ import mongoose, { Document } from 'mongoose';
 import { Mention } from './Mention';
 interface VideoPostReply extends Document {
     videoPostCommentId: mongoose.Types.ObjectId;
-    postId: mongoose.Types.ObjectId;
+    videoPostId: mongoose.Types.ObjectId;
     userId: mongoose.Types.ObjectId;
     username: string;
     profilePicUrl: string;

package/build/models/VideoPostReply.js

@@ -41,7 +41,7 @@ const videoPostReplySchema = new mongoose_1.default.Schema({
         index: true,
         required: true,
     },
-    postId: {
+    videoPostId: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: 'VideoPost',
         index: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armi-wave/common",
-  "version": "1.23.43",
+  "version": "1.23.45",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",