Skip to content

Commit

Permalink
Merge pull request #57 from fdhhhdjd/release-#55
Browse files Browse the repository at this point in the history 
Release #55
  • Loading branch information
@fdhhhdjd
fdhhhdjd committed Oct 8, 2022
2 parents 455477b + 73e546b commit dc23efb
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 20 deletions.
1 change: 1 addition & 0 deletions backend/src/v1/middlewares/VerifyAcceptToken.middleware.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion backend/src/v1/user_api/controllers/order.controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
6 changes: 3 additions & 3 deletions backend/src/v1/user_api/controllers/payment.controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand All @@ -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,
});
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions backend/src/v1/user_api/controllers/product.controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
});
Expand Down
6 changes: 3 additions & 3 deletions backend/src/v1/user_api/controllers/review.controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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({
Expand All @@ -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({
Expand Down
10 changes: 5 additions & 5 deletions backend/src/v1/user_api/controllers/user.controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand All @@ -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({
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions backend/src/v1/user_api/controllers/voucher.controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions backend/src/v1/user_api/services/user.service/getalluser.service.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion backend/src/v1/user_api/services/user.service/user.service.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion backend/src/v1/utils/storage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Binary file modified dump.rdb
View file
Binary file not shown.

2 comments on commit dc23efb

@vercel
Copy link

@vercel vercel bot commented on dc23efb Oct 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

full-stack-shop-shoes – ./

full-stack-shop-shoes.vercel.app
shopshoes.cf
full-stack-shop-shoes-git-main-fdhhhdjd.vercel.app
full-stack-shop-shoes-fdhhhdjd.vercel.app

@vercel
Copy link

@vercel vercel bot commented on dc23efb Oct 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

serversendemailshopshoes – ./server_send_email

serversendemailshopshoes-fdhhhdjd.vercel.app
full-stack-shop-shoes-bootstrap.vercel.app
serversendemailshopshoes-git-main-fdhhhdjd.vercel.app

Please sign in to comment.