Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions config/constant.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
require("dotenv").config();

exports.port = process.env.PORT_NO
exports.secretKey = process.env.SECRET_KEY
exports.ACCESS_TOKEN_SECRET = process.env.ACCESS_TOKEN_SECRET
exports.REFRESH_TOKEN_SECRET = process.env.REFRESH_TOKEN_SECRET
exports.db_url = process.env.DB_URL
exports.JWT_EXPIRES_IN = process.env.JWT_EXPIRY
exports.ACCESS_TOKEN_EXPIRES = process.env.JWT_EXPIRY
exports.FPASS_EXPIRESIN = process.env.FPASS_EXPIRY
exports.API_KEY = process.env.APIKEY
exports.EMAIL_FROM = process.env.emailFrom
Expand Down
11 changes: 10 additions & 1 deletion controllers/userController.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
const cookieparser = require('cookie-parser');
const express = require("express");
const app = express();
app.use(cookieparser())
const userServices = require("../services/userservices")

exports.signup = async (req, res) => {
Expand All @@ -12,7 +16,12 @@ exports.signin = async (req, res) => {
if (!loggedin) {
return res.status(401).send({ success: false, msg: "Email or Password is wrong" });
} else {
res.status(200).send(loggedin);
// Assigning refresh token in http-only cookie
res.cookie('jwt', loggedin.refreshToken, { httpOnly: true,
sameSite: 'None', secure: true,
maxAge: 24 * 60 * 60 * 1000
});
res.status(200).send(loggedin.accessToken);
}
};

Expand Down
2 changes: 1 addition & 1 deletion migrations/20231125074458-create-address.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
user_id: {
type: Sequelize.INTEGER,
references:{
model:"User",
model:"Users",
key:"id",
as:"id"
}
Expand Down
14 changes: 12 additions & 2 deletions models/user.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';
const {Model} = require('sequelize');
const bcrypt = require('bcryptjs')
module.exports = (sequelize, DataTypes) => {
class User extends Model {
/**
Expand All @@ -8,8 +9,8 @@ module.exports = (sequelize, DataTypes) => {
* The `models/index` file will call this method automatically.
*/
static associate(models) {
User.hasMany(models.address,{
foreignKey:'user_id'
User.hasMany(models.address, {
foreignKey:"user_id"
});
User.hasOne(models.userToken);
}
Expand All @@ -25,5 +26,14 @@ module.exports = (sequelize, DataTypes) => {
sequelize,
modelName: 'User',
});
User.beforeCreate(async function(user){
try {
const salt = 10;
const hashedpassword = await bcrypt.hash(user.password, salt);
user.password = hashedpassword
} catch (error) {
console.log(error)
}
});
return User;
};
37 changes: 37 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"axios": "^1.6.2",
"bcryptjs": "^2.4.3",
"cheerio": "^1.0.0-rc.12",
"cookie-parser": "^1.4.6",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"jsonwebtoken": "^9.0.2",
Expand Down
29 changes: 13 additions & 16 deletions services/userservices.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const nodemailer = require("nodemailer")
const axios = require("axios");
const Cheerio =require("cheerio");


const transporter = nodemailer.createTransport({
host:'smtp.gmail.com',
port:587,
Expand All @@ -20,16 +19,9 @@ const transporter = nodemailer.createTransport({
}
});

const getdata = async (ids) => {
const getdata = async (id) => {
try {
return await User.findOne({
include: [
{
model:address
},
],
raw: true,
},{where:{id:ids}});
return await User.findOne({include: address},{where:{id:id}});
} catch (error) {
console.error("Error retrieving data:", error);
throw error;
Expand Down Expand Up @@ -62,7 +54,7 @@ const verifyemail = async (data) =>{
if(emailexist){
const token = jwt.sign(
{ email: emailexist.email, id: emailexist._id },
config.secretKey,
config.ACCESS_TOKEN_SECRET,
{expiresIn:config.FPASS_EXPIRESIN}
);

Expand Down Expand Up @@ -100,17 +92,22 @@ const userlogin = async(data) =>{
const pass = bcrypt.compare(userData.password , data.password)

if(pass && userData){
const token = jwt.sign(
const accessToken = jwt.sign(
{ email: userData.email, id: userData.id },
config.secretKey,
{expiresIn:config.JWT_EXPIRES_IN}
config.ACCESS_TOKEN_SECRET,
{expiresIn:config.ACCESS_TOKEN_EXPIRES}
);
const refreshToken = jwt.sign({
username: userData.email, id:userData.id,
}, config.REFRESH_TOKEN_SECRET,
{ expiresIn: '1d' });

await userToken.create({
user_id:userData.id,
token: token,
token: accessToken,
expiry: config.JWT_EXPIRES_IN
});
return token;
return {accessToken,refreshToken};
}else{
return false
}
Expand Down