forked from kaverti/website
remove express-session
This commit is contained in:
parent
203c54161c
commit
50fb35ea17
|
@ -32,13 +32,7 @@ import VueMatomo from 'vue-matomo'
|
|||
import { VueSpinners } from '@saeris/vue-spinners'
|
||||
import moment from 'moment'
|
||||
import VueSkipTo from '@vue-a11y/skip-to'
|
||||
import { ValidationProvider, extend } from 'vee-validate';
|
||||
import { required } from 'vee-validate/dist/rules';
|
||||
|
||||
extend('required', {
|
||||
...required,
|
||||
message: 'This field is required'
|
||||
});
|
||||
import {
|
||||
faBars, faPlus, faGrin, faLink, faCode,
|
||||
faTimes, faUnlockAlt, faReply, faHome, faTh,
|
||||
|
@ -402,7 +396,6 @@ Vue.filter('pluralize', function(number, value) {
|
|||
let Root = new Vue({
|
||||
store,
|
||||
router,
|
||||
ValidationProvider,
|
||||
render: h => h(App)
|
||||
}).$mount('#app');
|
||||
|
||||
|
|
|
@ -5,18 +5,13 @@ module.exports = {
|
|||
let io = require('socket.io')(server)
|
||||
function setIoSockets (socket) {
|
||||
let users = app.get('io-users')
|
||||
|
||||
if(socket.handshake.session.loggedIn) {
|
||||
users[socket.handshake.session.username] = socket.id
|
||||
app.set('io-users', users)
|
||||
}
|
||||
}
|
||||
|
||||
app.set('io-users', {})
|
||||
|
||||
io.use((socket, next) => {
|
||||
session(socket.handshake, {}, next)
|
||||
})
|
||||
//io.use((socket, next) => {
|
||||
// session(socket.handshake, {}, next)
|
||||
//})
|
||||
|
||||
io.on('connection', socket => {
|
||||
setIoSockets(socket)
|
||||
|
|
14
server.js
14
server.js
|
@ -67,15 +67,6 @@ const specs = swaggerJsdoc(options);
|
|||
const csrf = require('csurf')
|
||||
const csrfProtection = csrf({ cookie: true })
|
||||
|
||||
let session = expressSession({
|
||||
secret: config.sessionSecret,
|
||||
resave: true,
|
||||
saveUninitialized: true,
|
||||
store: new SequelizeStore({ db: sequelize }),
|
||||
name: 'kaveAuth',
|
||||
secure: true,
|
||||
domain: '*.kaverti.com, kaverti.com',
|
||||
})
|
||||
if(process.env.NODE_ENV === 'production') {
|
||||
app.set('trust proxy', 1);
|
||||
}
|
||||
|
@ -84,10 +75,7 @@ app.use(helmet())
|
|||
app.use(compression())
|
||||
app.use(bodyParser.json({ limit: '5mb' }))
|
||||
app.use(bodyParser.urlencoded({ extended: true }))
|
||||
app.use(session);
|
||||
app.use(expAutoSan.all);
|
||||
app.use(passport.initialize());
|
||||
app.use(passport.session());
|
||||
|
||||
if(process.env.NODE_ENV !== 'test' && process.env.NODE_ENV !== 'production') {
|
||||
app.use(require('morgan')('dev'))
|
||||
|
@ -135,7 +123,7 @@ function main () {
|
|||
app.emit('appStarted')
|
||||
})
|
||||
|
||||
sockets.init(app, server, session)
|
||||
sockets.init(app, server)
|
||||
}
|
||||
if(process.env.NODE_ENV === 'test') {
|
||||
sequelize.sync({ force: true }).then(main)
|
||||
|
|
Loading…
Reference in New Issue