From 47dd481386a3c0884f9237c1717e73d796e2109e Mon Sep 17 00:00:00 2001 From: tai Date: Sat, 8 Oct 2022 14:35:00 +0700 Subject: [PATCH] fig bug profile null --- .../middlewares/VerifyAcceptToken.middleware.js | 1 + .../user_api/controllers/order.controllers.js | 2 +- .../user_api/controllers/payment.controllers.js | 6 +++--- .../user_api/controllers/product.controllers.js | 8 ++++---- .../user_api/controllers/review.controllers.js | 6 +++--- .../v1/user_api/controllers/user.controllers.js | 10 +++++----- .../user_api/controllers/voucher.controllers.js | 4 ++-- .../services/user.service/getalluser.service.js | 1 + .../services/user.service/user.service.js | 2 +- backend/src/v1/utils/storage.js | 2 +- dump.rdb | Bin 664 -> 483 bytes 11 files changed, 22 insertions(+), 20 deletions(-) diff --git a/backend/src/v1/middlewares/VerifyAcceptToken.middleware.js b/backend/src/v1/middlewares/VerifyAcceptToken.middleware.js index 5419508..da09e1c 100644 --- a/backend/src/v1/middlewares/VerifyAcceptToken.middleware.js +++ b/backend/src/v1/middlewares/VerifyAcceptToken.middleware.js @@ -4,6 +4,7 @@ const VerifyAcceptToken = async (req, res, next) => { const token = req.headers.authorization.split(" ")[1]; let now = new Date(); const decoded = HELPER.VerifyAccToken(token); + // console.log(decoded); if (decoded.exp < now.getTime() / 1000) { return res.status(401).json({ status: 401, diff --git a/backend/src/v1/user_api/controllers/order.controllers.js b/backend/src/v1/user_api/controllers/order.controllers.js index 58a2900..222aa23 100644 --- a/backend/src/v1/user_api/controllers/order.controllers.js +++ b/backend/src/v1/user_api/controllers/order.controllers.js @@ -7,7 +7,7 @@ const { const paymentCtrl = { historyOrders: async (req, res) => { try { - let user_id = req.user.id; + let user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleHistoryOrder({ user_id, }); diff --git a/backend/src/v1/user_api/controllers/payment.controllers.js b/backend/src/v1/user_api/controllers/payment.controllers.js index 877fb00..fd5e5e7 100644 --- a/backend/src/v1/user_api/controllers/payment.controllers.js +++ b/backend/src/v1/user_api/controllers/payment.controllers.js @@ -7,7 +7,7 @@ const { const paymentCtrl = { totalPayment: async (req, res) => { try { - let user_id = req.user.id; + let user_id = req.user.id || req.user.user_id; const { status, success, element } = await handlePaymentTotal({ user_id, }); @@ -27,7 +27,7 @@ const paymentCtrl = { }, countInStock: async (req, res) => { try { - let user_id = req.user.id; + let user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleCheckInStock({ user_id, }); @@ -47,7 +47,7 @@ const paymentCtrl = { }, paymentPaypal: async (req, res) => { try { - let user_id = req.user.id; + let user_id = req.user.id || req.user.user_id; const { paymentID, address } = req.body; const { status, success, element } = await handlePaymentPaypal({ user_id, diff --git a/backend/src/v1/user_api/controllers/product.controllers.js b/backend/src/v1/user_api/controllers/product.controllers.js index 26cc141..c50b454 100644 --- a/backend/src/v1/user_api/controllers/product.controllers.js +++ b/backend/src/v1/user_api/controllers/product.controllers.js @@ -52,7 +52,7 @@ const productCtrl = { addToCartProduct: async (req, res) => { try { const { product_id, quantity } = req.body; - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleAddToCart({ user_id, product_id, @@ -76,7 +76,7 @@ const productCtrl = { quantityCartProduct: async (req, res) => { try { const { product_id, quantity } = req.body; - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleInAndDecrementCart({ user_id, product_id, @@ -100,7 +100,7 @@ const productCtrl = { delCartProduct: async (req, res) => { try { const { product_id } = req.body; - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleDelCart({ user_id, product_id, @@ -121,7 +121,7 @@ const productCtrl = { }, getAddToCart: async (req, res) => { try { - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleGetAddToCart({ user_id, }); diff --git a/backend/src/v1/user_api/controllers/review.controllers.js b/backend/src/v1/user_api/controllers/review.controllers.js index 317d693..1c0a4dc 100644 --- a/backend/src/v1/user_api/controllers/review.controllers.js +++ b/backend/src/v1/user_api/controllers/review.controllers.js @@ -10,7 +10,7 @@ const reviewCtrl = { try { const { rating, comment } = req.body; let review_id = req.params.id; - let user_id = req.user.id; + let user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleCreateReview({ rating, @@ -35,7 +35,7 @@ const reviewCtrl = { editReviewProduct: async (req, res) => { try { const { comment } = req.body; - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const product_id = req.params.productId; const review_id = req.params.commentId; const { status, success, element } = await handleEditReview({ @@ -60,7 +60,7 @@ const reviewCtrl = { }, deleteReviewProduct: async (req, res) => { try { - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const product_id = req.params.productId; const review_id = req.params.commentId; const { status, success, element } = await handleDeleteReview({ diff --git a/backend/src/v1/user_api/controllers/user.controllers.js b/backend/src/v1/user_api/controllers/user.controllers.js index 337851a..a470a58 100644 --- a/backend/src/v1/user_api/controllers/user.controllers.js +++ b/backend/src/v1/user_api/controllers/user.controllers.js @@ -179,7 +179,7 @@ const userCtrl = { //* New AcceptToken createNewAccessTokens: async (req, res) => { try { - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const { status, success, element } = await CreateNewAcceptToken({ user_id, }); @@ -200,7 +200,7 @@ const userCtrl = { //* Logout LogoutUser: async (req, res) => { try { - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const token = req.token; const session = req.session; const { status, success, element } = await LogoutRemoveAllUser({ @@ -229,7 +229,7 @@ const userCtrl = { //* Profile User ProfileUser: async (req, res) => { try { - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const session = req.session; const { status, success, element } = await HandleProfile({ user_id, @@ -253,7 +253,7 @@ const userCtrl = { UpdateProfile: async (req, res) => { try { const { name, image, phone_number, sex, date_of_birth } = req.body; - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const { status, success, element } = await HandleUploadProfile({ name, image, @@ -330,7 +330,7 @@ const userCtrl = { ChangePassword: async (req, res) => { try { const { password, oldPassword, confirmPassword } = req.body; - const user_id = req.user.id; + const user_id = req.user.id || req.user.user_id; const { status, success, element } = await HandleChangePassword({ password, oldPassword, diff --git a/backend/src/v1/user_api/controllers/voucher.controllers.js b/backend/src/v1/user_api/controllers/voucher.controllers.js index 6a38c95..a35bdfe 100644 --- a/backend/src/v1/user_api/controllers/voucher.controllers.js +++ b/backend/src/v1/user_api/controllers/voucher.controllers.js @@ -7,7 +7,7 @@ const { const voucherCtrl = { addVoucher: async (req, res) => { try { - let user_id = req.user.id; + let user_id = req.user.id || req.user.user_id; const { title } = req.body; const { status, success, element } = await handleVoucher({ user_id, @@ -29,7 +29,7 @@ const voucherCtrl = { }, delVoucher: async (req, res) => { try { - let user_id = req.user.id; + let user_id = req.user.id || req.user.user_id; const { status, success, element } = await handleDelVoucher(user_id); return res.status(status).json({ status, diff --git a/backend/src/v1/user_api/services/user.service/getalluser.service.js b/backend/src/v1/user_api/services/user.service/getalluser.service.js index 2ce6cf5..80c0f55 100644 --- a/backend/src/v1/user_api/services/user.service/getalluser.service.js +++ b/backend/src/v1/user_api/services/user.service/getalluser.service.js @@ -3,6 +3,7 @@ const HELPER = require("../../../utils/helper"); const CONTAINS = require("../../../configs/constants"); const { set, get, del } = require("../../../utils/limited_redis"); const getProfileId = async (userId) => { + console.log(userId); const user_redis = await get(`userId:${userId}`); if (user_redis) { return JSON.parse(user_redis); diff --git a/backend/src/v1/user_api/services/user.service/user.service.js b/backend/src/v1/user_api/services/user.service/user.service.js index d70eeb3..0a869bc 100644 --- a/backend/src/v1/user_api/services/user.service/user.service.js +++ b/backend/src/v1/user_api/services/user.service/user.service.js @@ -392,7 +392,7 @@ module.exports = { }; } if (session?.users?.id) { - const { user } = await getProfileId(session); + const user = await getProfileId(session); return { status: 200, success: true, diff --git a/backend/src/v1/utils/storage.js b/backend/src/v1/utils/storage.js index 9da51ab..81dc767 100644 --- a/backend/src/v1/utils/storage.js +++ b/backend/src/v1/utils/storage.js @@ -180,7 +180,7 @@ module.exports = { }, //*Handle RefetchToken async GenerateRefreshToken(user) { - const refresh = await get(user.id); + const refresh = await get(user.id.toString()); if (refresh) { return refresh; } diff --git a/dump.rdb b/dump.rdb index ed0167befcaa2fbc0ea685dd2f66a534e0e6c6ea..68596679008c0044b9b60ad60b09814cdc9ec1c7 100644 GIT binary patch delta 366 zcmWlRy-vbV7=~+v!Pz@Fi5uYQ572f(O3_LHp%8?{l=ie7C~fH2G}5|#IQOe7(CC84c0UeGzETK6cBNuxrS|0ajYmsPKZe~EL5z2T+rP)*lhNh zclG$={_9ptnyV(;l9qUMJy|MKH)&0Wbh{>V&7Ka;P9bierwa+U8gW{8{i2j`?v>)f mZV;ka;QF0-HJ9}0a=>2nsUw;x7a%!$m-&5seH&%Jjh89q zBw$~fCW<9WWdhQ^8EgIIKUf5k1M_Ari5A?VD?V~-URJ%JbTz*C3#)8tf3gs<2DdG% zsvQCZhm&U9krU6!mtN!-V}^(Ij&IFyMzVAnJ{i?EIKI3;zWI>}AwAL%QiV*CSV*Mm zQkq)&@1BMH?crc(<<{=Na<*yj(~`Te`M-vKhv-Od02