Skip to content

Commit e37031f

Browse files
authored
Merge pull request #7 from venkat-clone/main
Done!
2 parents dce75ae + 64cc21a commit e37031f

5 files changed

Lines changed: 23 additions & 16 deletions

File tree

app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ app.use((err,req,res,next)=>{
4040

4141
const server = app.listen(PORT,()=>{
4242
const port = server.address().port;
43+
console.log(`server running on ${server.address().address}`)
4344
console.log(`Server running on port ${port}`)
4445
})

helpers/Validation_Schema.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const authSchema = joi.object({
44
Uname:joi.string().min(3).required(),
55
email:joi.string().email().lowercase().required(),
66
password:joi.string().min(4).required(),
7+
UserId:joi.string().required(),
78
})
89

910

helpers/jwt_helper.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ try {
2626
module.exports ={
2727
verifyAccessToken:(req,res,next)=>{
2828

29-
// console.log("UID",res)
30-
3129
if(!req.headers['authorization']) return next(createError.Unauthorized('Unauthorized Request'))
3230
const authheader = req.headers['authorization']
3331
const bearearToken = authheader.split(' ')
34-
const token = bearearToken[1]
32+
const token = bearearToken[1] || authheader
3533
console.log(token)
3634
admin.auth()
3735
.verifyIdToken(token)

models/User.model.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const ProfileSchma = new mongoose.Schema({
2525
type:Number,
2626
default:0
2727
},
28-
Uid:{
28+
UserId:{
2929
type:String,
3030
required:true,
3131
unique:true,

routes/auth.route.js

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const createError = require('http-errors')
44
const User = require('../models/User.model')
55
const {Post,UserPost} = require('../models/Post.model')
66
const {authSchema} = require('../helpers/Validation_Schema')
7-
const {signAccessToken,signRefreshToken,verifyRefreshToken, verifyAccessToken} = require('../helpers/jwt_helper')
7+
const { verifyAccessToken} = require('../helpers/jwt_helper')
88
const request = require('request');
99
router.post('/register',async(req,res,next)=>{
1010
try {
@@ -96,11 +96,11 @@ router.post('/createdairy',verifyAccessToken,async(req,res,next)=>{
9696

9797
router.get('/user/dairyscount',verifyAccessToken,async(req,res,next)=>{
9898
try{
99-
const Uid = req.aud
100-
const user = await User.find({Uid})
101-
console.log(user.DiryCount)
102-
const count = user.DiryCount
103-
res.send({count})
99+
const UserId = req.aud
100+
const user = await User.findOne({UserId:UserId})
101+
console.log("DairyCount",user)
102+
103+
res.send({count:user.DiryCount || 0})
104104

105105
}catch(error){
106106
console.log(error)
@@ -109,16 +109,24 @@ router.get('/user/dairyscount',verifyAccessToken,async(req,res,next)=>{
109109

110110
router.post('/makefake',verifyAccessToken,async(req,res,next)=>{
111111
try {
112-
const {content,year,day} = req.body
112+
var {content,year} = req.body
113+
var day =0
113114
const UserId = req.aud
114115
console.log(req.body)
115-
if(!content || !year || !day ) throw createError.BadRequest
116-
for (let i = 0; i < 3650; i++) {
117-
console.log(i)
118-
const Newpost = Post({UserId,content,year,day})
116+
if(!content || !year ) throw createError.BadRequest
117+
for (let i = 0; i < 1095; i++) {
118+
if(i%365==0)
119+
{ year++;
120+
day =0;
121+
}
122+
123+
console.log(i);
124+
const st = content+year+":"+day;
125+
const Newpost = await Post({UserId,content,year,day})
119126
// const Newpost = Post({UserId,postcontent})
120127
const s = await Newpost.save()
121128
await User.updateOne({UserId},{$push:{Dirays:{postId:s._id.valueOf()}},$inc: { DiryCount: 1 } })
129+
day++;
122130
}
123131
const Newpost = Post({UserId,content,year,day})
124132
// const Newpost = Post({UserId,postcontent})
@@ -326,7 +334,6 @@ router.post('/create/user',verifyAccessToken, async(req,res,next)=>{
326334
const validUser = await authSchema.validateAsync(req.body);
327335
const doseExist = await User.findOne({email:validUser.email});
328336
if(doseExist) throw createError.Conflict(`${validUser.email} already Exist`);
329-
validUser.Uid = req.aud;
330337
const user_ = await User(validUser).save();
331338
res.send({user_});
332339
}catch(e){

0 commit comments

Comments
 (0)