From a56e6d4798437ea0a8c5818d6e63efcb5e4b6e7e Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Fri, 1 Feb 2019 21:20:56 +0100
Subject: [PATCH] Update server.js

---
 server.js | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/server.js b/server.js
index 154ea2b..8f106be 100644
--- a/server.js
+++ b/server.js
@@ -7,13 +7,9 @@ var async = require('async');
 var path = require('path');
 var favicon = require('serve-favicon');
 var bodyParser = require('body-parser');
-var cookieParser = require('cookie-parser');
-var session = require('express-session');
-var SQLiteStore = require('connect-sqlite3')(session);
+// kann gelöscht werden -> var cookieParser = require('cookie-parser');
 var bcrypt = require('bcrypt');
 var passport = require('passport');
-// TODO: gegen SQLITE ersetzen
-var LocalStrategy = require('passport-local').Strategy;
 
 // Express-Einstellungen
 app.set('views', path.join(__dirname, 'views'));
@@ -24,33 +20,20 @@ app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({
   extended: false
 }));
-// TODO: secret pruefen und ggf. aus app_cfg laden
-app.use(cookieParser('secret'));
-app.use(session({
-  store: new SQLiteStore,
-  secret: 'secret',
-  resave: false,
-  saveUninitialized: true,
-  cookie: { maxAge: 60 * 60 * 1000 } // 1 hour
-}));
-
-app.use(passport.initialize());
-app.use(passport.session());
+// kann gelöscht werden -> app.use(cookieParser('secret'));
 
 // Scripte einbinden
 var app_cfg = require('./server/app_cfg.js');
 var sql_cfg = require('./server/sql_cfg')(bcrypt, app_cfg);
 var sql = require('./server/sql_qry')(sql_cfg)
 var waip_io = require('./server/waip_io')(io, sql, async, app_cfg);
-var udp = require('./server/udp')(app_cfg, waip_io);
-var auth = require('./server/auth')(app_cfg, sql_cfg, bcrypt, passport, LocalStrategy);
-var routes = require('./server/routing')(app, sql, app_cfg, passport);
-
-
+var udp = require('./server/udp')(app_cfg, waip_io, sql);
+var auth = require('./server/auth')(app, app_cfg, sql_cfg, bcrypt, passport);
+var routes = require('./server/routing')(app, sql, app_cfg, passport, auth);
 
 // Server starten
 server.listen(app_cfg.global.webport, function() {
-  console.log('Wachalarm-IP-Webserver auf Port ' + app_cfg.global.webport + ' gestartet');
+  sql.db_log('Anwendung' ,'Wachalarm-IP-Webserver auf Port ' + app_cfg.global.webport + ' gestartet');
 });
 
 // TODO: auf HTTPS mit TLS1.2 umstellen, inkl. WSS