@duvdu-v1/duvdu 1.1.147 → 1.1.149

package/build/middlewares/auth.middleware.js

@@ -52,26 +52,36 @@ const isauthenticated = (req, res, next) => __awaiter(void 0, void 0, void 0, fu
                 en: `Forbidden: User is blocked ${req.loggedUser.isBlocked.reason}`,
                 ar: ` ممنوع: المستخدم محظور ${req.loggedUser.isBlocked.reason}`,
             }, req.lang));
+        next();
     }
     catch (error) {
-        // return res.status(423).json({ message: 'access token expired' });
-        const user = yield User_model_1.Users.findOne({ token: req.session.refresh });
-        if (!user)
-            return res.status(423).json({ message: 'refresh token expired' });
-        const role = yield Role_model_1.Roles.findById(user.role);
-        if (!role)
-            return res.status(423).json({ message: 'invalid role' });
-        const accessToken = (0, exports.generateAccessToken)({
-            id: user.id,
-            isVerified: user.isVerified,
-            isBlocked: user.isBlocked,
-            role: { key: role.key, permissions: role.permissions },
-        });
-        req.session.access = accessToken;
-        req.session.refresh = user.token;
-        next();
+        try {
+            const payload = (0, jsonwebtoken_1.verify)(req.session.refresh, process.env.JWT_KEY);
+            const user = yield User_model_1.Users.findById(payload.id);
+            if (!user)
+                return res.status(423).json({ message: 'token expired' });
+            if (user.isBlocked.value)
+                return next(new unauthorized_error_1.UnauthorizedError({
+                    en: `Forbidden: User is blocked ${req.loggedUser.isBlocked.reason}`,
+                    ar: ` ممنوع: المستخدم محظور ${req.loggedUser.isBlocked.reason}`,
+                }, req.lang));
+            const role = yield Role_model_1.Roles.findById(user.role);
+            if (!role)
+                return res.status(423).json({ message: 'invalid role' });
+            const accessToken = (0, exports.generateAccessToken)({
+                id: user.id,
+                isVerified: user.isVerified,
+                isBlocked: user.isBlocked,
+                role: { key: role.key, permissions: role.permissions },
+            });
+            req.session.access = accessToken;
+            req.loggedUser = (0, jsonwebtoken_1.verify)(accessToken, process.env.JWT_KEY);
+            next();
+        }
+        catch (error) {
+            return res.status(423).json({ message: 'token expired' });
+        }
     }
-    next();
 });
 exports.isauthenticated = isauthenticated;
 const generateAccessToken = (payload) => jsonwebtoken_1.default.sign(payload, process.env.JWT_KEY, {

package/build/models/User.model.js

@@ -25,7 +25,7 @@ const userSchema = new mongoose_1.Schema({
     password: String,
     verificationCode: { code: String, expireAt: Date, reason: { type: String, default: null } },
     isVerified: { type: Boolean, default: false },
-    token: String,
+    refreshTokens: [{ token: { type: String, default: null }, fingerprint: { type: String, default: null }, clientType: { type: String, default: null } }],
     profileImage: { type: String, default: 'defaults/profile.jpg' },
     coverImage: { type: String, default: null },
     location: { lat: { type: Number, default: null }, lng: { type: Number, default: null } },

package/build/types/User.d.ts

@@ -53,7 +53,11 @@ export interface Iuser {
         reason?: VerificationReason;
     };
     isVerified: boolean;
-    token?: string;
+    refreshTokens?: {
+        fingerprint: string;
+        clientType: string;
+        token: string;
+    }[];
     profileImage?: string;
     coverImage?: string;
     location?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duvdu-v1/duvdu",
-  "version": "1.1.147",
+  "version": "1.1.149",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [