diff --git a/src/server/admin/pwdmanager.js b/src/server/admin/pwdmanager.js index e794491..fcb6b8a 100644 --- a/src/server/admin/pwdmanager.js +++ b/src/server/admin/pwdmanager.js @@ -18,10 +18,16 @@ const bcrypt = require( 'bcrypt' ); const db = require( '../backend/db/db.js' ); -module.exports.checkpassword = function checkpassword ( username, password ) { +module.exports.checkpassword = ( username, password ) => { return new Promise( resolve => { db.getDataSimple( 'admin', 'email', username ).then( data => { resolve( bcrypt.compareSync( password, data ) ); } ); } ); +}; + +module.exports.hashPassword = ( password ) => { + return new Promise( resolve => { + resolve( bcrypt.hashSync( password, 10 ) ); + } ); }; \ No newline at end of file diff --git a/src/server/backend/credentials/pwdmanager.js b/src/server/backend/credentials/pwdmanager.js index ea40f9c..4487798 100644 --- a/src/server/backend/credentials/pwdmanager.js +++ b/src/server/backend/credentials/pwdmanager.js @@ -24,4 +24,10 @@ module.exports.checkpassword = function checkpassword ( email, password ) { } ); } ); } ); +}; + +module.exports.hashPassword = ( password ) => { + return new Promise( resolve => { + resolve( bcrypt.hashSync( password, 10 ) ); + } ); }; \ No newline at end of file diff --git a/src/webapp/src/App.vue b/src/webapp/src/App.vue index b61f23b..c6f446a 100644 --- a/src/webapp/src/App.vue +++ b/src/webapp/src/App.vue @@ -186,8 +186,6 @@ export default { document.documentElement.classList.add( 'light' ); this.theme = '☽'; } - // localStorage.setItem( 'url', 'http://localhost:8081' ); - localStorage.setItem( 'url', '' ); } } diff --git a/src/webapp/src/main.js b/src/webapp/src/main.js index e750cd3..6303a82 100644 --- a/src/webapp/src/main.js +++ b/src/webapp/src/main.js @@ -19,21 +19,24 @@ app.use( createPinia() ); let userStore = useUserStore(); -let prod = true; +let prod = false; if ( prod ) { fetch( '/api/getAuth' ).then( res => { - // fetch( 'http://localhost:8081/api/getAuth' ).then( res => { + // fetch( 'http://localhost:8081/api/getAuth' ).then( res => { res.json().then( data => { userStore.setUserAuth( data.user ); userStore.setAdminAuth( data.admin ); - + app.use( router ); app.mount( '#app' ); } ); } ); + localStorage.setItem( 'url', '' ); } else { - // userStore.setUserAuth( true ); + localStorage.setItem( 'url', 'http://localhost:8081' ); + userStore.setUserAuth( true ); + userStore.setAdminAuth( true ); app.use( router ); app.mount( '#app' ); }