diff --git a/src/server/admin/routes.js b/src/server/admin/routes.js index 11ebaf7..0e87cc3 100644 --- a/src/server/admin/routes.js +++ b/src/server/admin/routes.js @@ -18,6 +18,7 @@ module.exports = ( app, settings ) => { pwdmanager.checkpassword( request.body.mail, request.body.pwd ).then( data => { if ( data ) { if ( settings.twoFA ) { + // TODO: Support both methods of 2fa response.send( '2fa' ); } else { request.session.loggedInAdmin = true; diff --git a/src/server/app.js b/src/server/app.js index e148679..7d66a8b 100644 --- a/src/server/app.js +++ b/src/server/app.js @@ -15,14 +15,15 @@ const bodyParser = require( 'body-parser' ); const cookieParser = require( 'cookie-parser' ); const http = require( 'http' ); const fs = require( 'fs' ); -// const sql = require( './backend/db/mysqldb.js' ); -// const sqld = new sql(); +const sql = require( './backend/db/mysqldb.js' ); +const sqld = new sql(); // const env = process.env.PROD || false; const settings = JSON.parse( fs.readFileSync( path.join( __dirname + '/config.json' ) ) ); // initialise express with middlewares +// TODO: Generate random token app.use( expressSession( { secret: 'gaoevgoawefgo083tq2rfvöfaf0p8', resave: true, diff --git a/src/webapp/src/main.js b/src/webapp/src/main.js index cd3132d..e2f57c0 100644 --- a/src/webapp/src/main.js +++ b/src/webapp/src/main.js @@ -19,10 +19,10 @@ app.use( createPinia() ); let userStore = useUserStore(); -let prod = false; +let prod = true; if ( prod ) { - fetch( '/api/getAuth' ).then( res => { + fetch( 'http://localhost:8081/api/getAuth' ).then( res => { res.json().then( data => { userStore.setUserAuth( data.user ); userStore.setAdminAuth( data.admin ); diff --git a/src/webapp/src/views/admin/TwoFA.vue b/src/webapp/src/views/admin/TwoFA.vue new file mode 100644 index 0000000..18ad2f7 --- /dev/null +++ b/src/webapp/src/views/admin/TwoFA.vue @@ -0,0 +1,6 @@ + \ No newline at end of file