mirror of
https://github.com/mjrode/WhatToWatch.git
synced 2026-05-12 23:48:20 -05:00
Add current user in cookie
This commit is contained in:
@@ -3,6 +3,7 @@ const localConfig = {
|
||||
port: 8080,
|
||||
googleClientID: process.env.GOOGLE_CLIENT_ID,
|
||||
googleClientSecret: process.env.GOOGLE_CLIENT_SECRET,
|
||||
cookieKey: process.env.COOKIE_KEY,
|
||||
};
|
||||
|
||||
export default localConfig;
|
||||
|
||||
@@ -3,6 +3,7 @@ const prodConfig = {
|
||||
googleClientSecret: process.env.GOOGLE_CLIENT_SECRET,
|
||||
cookieKey: process.env.COOKIE_KEY,
|
||||
port: process.env.PORT,
|
||||
cookieKey: process.env.COOKIE_KEY,
|
||||
};
|
||||
|
||||
export default prodConfig;
|
||||
|
||||
Generated
+77
-166
File diff suppressed because it is too large
Load Diff
+3
-2
@@ -35,17 +35,18 @@
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"axios": "^0.18.0",
|
||||
"bcrypt-nodejs": "0.0.3",
|
||||
"bluebird": "^3.5.3",
|
||||
"babel-cli": "^6.26.0",
|
||||
"babel-core": "^6.26.3",
|
||||
"babel-plugin-istanbul": "^5.1.0",
|
||||
"babel-preset-node8": "^1.2.0",
|
||||
"bcrypt-nodejs": "0.0.3",
|
||||
"bluebird": "^3.5.3",
|
||||
"body-parser": "^1.18.3",
|
||||
"btoa": "^1.2.1",
|
||||
"build-url": "^1.3.2",
|
||||
"child-process-promise": "^2.2.1",
|
||||
"concurrently": "^4.1.0",
|
||||
"cookie-session": "^1.3.3",
|
||||
"cors": "^2.8.5",
|
||||
"cross-env": "^5.2.0",
|
||||
"custom-env": "^1.0.0",
|
||||
|
||||
@@ -17,11 +17,11 @@ router.get('/google/callback', passport.authenticate('google'), (req, res) => {
|
||||
res.redirect('/');
|
||||
});
|
||||
|
||||
router.get('/api/current_user', (req, res) => {
|
||||
router.get('/current_user', (req, res) => {
|
||||
res.send(req.user);
|
||||
});
|
||||
|
||||
router.get('/api/logout', (req, res) => {
|
||||
router.get('/logout', (req, res) => {
|
||||
req.logout();
|
||||
res.redirect('/');
|
||||
});
|
||||
|
||||
@@ -2,7 +2,9 @@ import express from 'express';
|
||||
import {json, urlencoded} from 'body-parser';
|
||||
// eslint-disable-next-line import/named
|
||||
import passport from 'passport';
|
||||
import cookieSession from 'cookie-session';
|
||||
import {sequelize} from './db/models';
|
||||
import keys from '../config';
|
||||
import plex from './routes/plex.route';
|
||||
import tdaw from './routes/tdaw.route';
|
||||
import auth from './routes/auth.route';
|
||||
@@ -21,6 +23,13 @@ export default () => {
|
||||
server.use(json());
|
||||
server.use(urlencoded({extended: true}));
|
||||
|
||||
server.use(
|
||||
cookieSession({
|
||||
maxAge: 30 * 24 * 60 * 60 * 1000,
|
||||
keys: [keys.server.cookieKey],
|
||||
}),
|
||||
);
|
||||
|
||||
server.use(passport.initialize());
|
||||
server.use(passport.session());
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
const passport = require('passport');
|
||||
const GoogleStrategy = require('passport-google-oauth20').Strategy;
|
||||
const keys = require('../../../config');
|
||||
import keys from '../../../config';
|
||||
|
||||
import models from '../../db/models';
|
||||
|
||||
@@ -9,7 +9,7 @@ passport.serializeUser((user, done) => {
|
||||
});
|
||||
|
||||
passport.deserializeUser((id, done) => {
|
||||
models.User.find(id).then(user => {
|
||||
models.User.findByPk(id).then(user => {
|
||||
done(null, user);
|
||||
});
|
||||
});
|
||||
@@ -17,8 +17,8 @@ passport.deserializeUser((id, done) => {
|
||||
passport.use(
|
||||
new GoogleStrategy(
|
||||
{
|
||||
clientID: keys.default.server.googleClientID,
|
||||
clientSecret: keys.default.server.googleClientSecret,
|
||||
clientID: keys.server.googleClientID,
|
||||
clientSecret: keys.server.googleClientSecret,
|
||||
callbackURL: '/auth/google/callback',
|
||||
proxy: true,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user