Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6911e50

Browse files
code refactor
1 parent bbf1383 commit 6911e50

File tree

4 files changed

+56
-4
lines changed

4 files changed

+56
-4
lines changed

‎server/controllers/usersController.js‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const Token = require('../models/token')
55
const crypto = require('crypto')
66
const passport = require('passport')
77
const nodemailer = require('nodemailer')
8+
// const fetch = require('node-fetch')
89

910
const getUserParams = (body) => {
1011
return {
@@ -95,9 +96,27 @@ module.exports = {
9596
}
9697
})
9798
},
99+
98100
userFeed: (req, res) => {
99101
console.log(req.session)
100-
res.render('feed')
102+
// const url = 'https://hacker-news.firebaseio.com/v0/topstories.json?print=pretty'
103+
104+
// const getData = async url => {
105+
// try {
106+
// const response = await fetch(url)
107+
// const json = await response.json()
108+
// console.log(json)
109+
// } catch (error) {
110+
// console.log(error)
111+
// }
112+
113+
// }
114+
115+
// getData(url)
116+
// fetch(').then((response) => {
117+
// console.log(response.json())
118+
// }).catch(err => console.log(err))
119+
return res.render('feed')
101120
},
102121
redirectView: (req, res, next) => {
103122
const redirectPath = res.locals.redirect
@@ -112,7 +131,7 @@ module.exports = {
112131
.trim()
113132
req.check('email', 'Email is invalid').isEmail()
114133
// Check for validation errors
115-
const errors = req.vuserFealidationErrors()
134+
const errors = req.userValidationErrors()
116135
if (errors) return res.status(400).send(errors)
117136

118137
User.findOne({ email: req.body.email }, function (err, user) {

‎server/main.js‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const User = require('./models/user')
2121
// const Token = require('./models/token')
2222
const googleOauth = require('./controllers/googleOauth')
2323
const githubOauth = require('./controllers/githubOauth')
24+
const cors = require('cors')
2425
// const GoogleStrategy = require('passport-google-oauth2').Strategy
2526
// auth = require("./controllers/googleOauth")
2627
mongoose.Promise = global.Promise
@@ -40,6 +41,13 @@ db.once('open', () => {
4041
app.set('port', process.env.PORT || 3000)
4142
app.set('view engine', 'ejs')
4243

44+
router.use(cors({
45+
origin: 'http://localhost:3002'
46+
}))
47+
// router.use((req, res, next) => {
48+
// res.header('Access-Control-Allow-Origin', '*')
49+
// next()
50+
// })
4351
router.use(express.static(path.join(__dirname, 'public')))
4452
router.use(layouts)
4553
router.use(expressValidator())
@@ -53,8 +61,11 @@ router.use(cookieParser('secret_passcode'))
5361
router.use(
5462
expressSession({
5563
secret: 'secret_passcode',
64+
// name: 'priyank',
5665
cookie: {
57-
maxAge: 4000000
66+
maxAge: 4000000,
67+
sameSite: false,
68+
httpOnly: false
5869
},
5970
resave: false,
6071
saveUninitialized: false
@@ -118,6 +129,7 @@ router.get(
118129
(req, res) => {
119130
req.session.loggedIn = true
120131
res.redirect('/feed')
132+
// res.status(200).send(req.session)
121133
}
122134
)
123135

@@ -133,13 +145,13 @@ router.get(
133145
// Successful authentication, redirect home.
134146
req.session.loggedIn = true
135147
res.redirect('/feed')
148+
// res.status(200).send(req.session)
136149
}
137150
)
138151

139152
router.use(errorController.logErrors)
140153
router.use(errorController.respondNoResourceFound)
141154
router.use(errorController.respondInternalError)
142-
143155
app.use('/', router)
144156

145157
app.listen(app.get('port'), () => {

‎server/package-lock.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"dependencies": {
2727
"connect-flash": "^0.1.1",
2828
"cookie-parser": "^1.4.5",
29+
"cors": "^2.8.5",
2930
"crypto": "^1.0.1",
3031
"ejs": "^3.1.3",
3132
"express": "^4.17.1",
@@ -36,6 +37,7 @@
3637
"mongodb": "^3.5.9",
3738
"mongoose": "^5.9.24",
3839
"mongoose-type-email": "^1.0.12",
40+
"node-fetch": "^2.6.0",
3941
"nodemailer": "^6.4.10",
4042
"nodemon": "^2.0.4",
4143
"passport": "^0.4.1",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /