diff --git a/express-server/public/javascripts/login.js b/express-server/public/javascripts/login.js
index b8338d65..a847db50 100644
--- a/express-server/public/javascripts/login.js
+++ b/express-server/public/javascripts/login.js
@@ -10,26 +10,16 @@ var config = {
firebase.initializeApp(config);
-function checkAuth() {
- firebase.auth().onAuthStateChanged(async function (user) {
+async function checkAuth() {
+ await firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
- try {
- firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idToken) {
- console.log("Vor Replace");
+ await firebase.auth().currentUser.getIdToken(true).then(function (idToken) {
+ console.log("Vor Replace");
- window.location.replace("/dash/" + idToken);
- }).catch(function (error) {
- console.error("Get id token client error: ", error)
- });
- } catch {
- console.error("checkAuth error: ");
- }
-
- // document.getElementById("loginbutton").style.display = "none";
- //
- } else {
- // document.getElementById("loginbutton").style.display = "block";
- console.log("Check Auth error", user)
+ window.location.replace("/dash/" + idToken);
+ }).catch(function (error) {
+ console.error("Get id token client error: ", error);
+ });
}
});
}
@@ -43,9 +33,17 @@ var vue = new Vue({
el: '#vue-app',
data: {
email: "",
- password: ""
+ password: "",
+ emailandpwd: false
},
methods: {
+ emailpasswdfilled() {
+ var filled = false;
+ if (email && password) {
+ filled = true;
+ }
+ emailandpwd = filled;
+ },
login() {
var provider = new firebase.auth.GoogleAuthProvider();
provider.addScope('profile');
diff --git a/express-server/public/javascripts/registerEmail.js b/express-server/public/javascripts/registerEmail.js
index de69b435..9dca31cd 100644
--- a/express-server/public/javascripts/registerEmail.js
+++ b/express-server/public/javascripts/registerEmail.js
@@ -15,38 +15,45 @@ var vue = new Vue({
data: {
name: "",
email: "",
- picurl: "",
password: ""
},
methods: {
- registerEmail() {
+ async registerEmail() {
+
+
+ console.log("Start register: ", this.name, this.email, this.password)
+
+ await firebase.auth().createUserWithEmailAndPassword(this.email, this.password)
+ .then(user => {
+ console.log("User created: ", user);
+
+ })
+ .catch(function (error) {
+ // Handle Errors here.
+ var errorCode = error.code;
+ var errorMessage = error.message;
+
+ console.error(error.code + '_' + error.message);
+ alert(error.code + '_' + error.message);
+ });
var user = firebase.auth().currentUser;
+ if (user != null) {
+ await user.updateProfile({
+ displayName: this.name,
+ photoURL: "http://techfrage.de/upfiles/13547334191038217.png"
+ }).then(function () {
+ console.log("update name and photo");
- firebase.auth().createUserWithEmailAndPassword(this.email, this.password).catch(function (error) {
- // Handle Errors here.
- var errorCode = error.code;
- var errorMessage = error.message;
-
- console.error(error)
- // ...
- });
-
- user.updateProfile({
- displayName: this.name,
- photoURL: this.picurl
- }).then(function () {
- // Update successful.
- }).catch(function (error) {
- console.error(error)
- });
-
- user.updateEmail(this.email).then(function () {
- // Update successful.
- }).catch(function (error) {
- console.error(error)
- });
-
- window.location.href = "/";
+ }).catch(function (error) {
+ console.error(error);
+ });
+ await user.updateEmail(this.email).then(function () {
+ console.log("Email");
+ }).catch(function (error) {
+ console.error(error);
+ });
+ window.location.href = "/";
+ }
}
},
})
\ No newline at end of file
diff --git a/express-server/routes/index.js b/express-server/routes/index.js
index d85c361f..6789bc76 100644
--- a/express-server/routes/index.js
+++ b/express-server/routes/index.js
@@ -11,24 +11,24 @@ var postgres = require("./../db-connect/db-connect");
var admin = require('firebase-admin');
var serviceAccount = require('../login/firebaseAdminKey.json');
var firebaseAdmin = admin.initializeApp({
- credential: admin.credential.cert(serviceAccount),
- databaseURL: 'https://test-667ca.firebaseio.com'
- });
+ credential: admin.credential.cert(serviceAccount),
+ databaseURL: 'https://test-667ca.firebaseio.com'
+});
- router.get('/user', function(req, res, next){
- res.status(200).render('user');
- });
+router.get('/user', function (req, res, next) {
+ res.status(200).render('user');
+});
- router.post('/userbearbeiten', function(req, res, next){
- var mid = req.body.mid;
- var token = req.body.token;
- var name = req.body.name;
- var pic = req.body.pic;
- var vm = this;
- firebaseAdmin.auth().verifyIdToken(token)
+router.post('/userbearbeiten', function (req, res, next) {
+ var mid = req.body.mid;
+ var token = req.body.token;
+ var name = req.body.name;
+ var pic = req.body.pic;
+ var vm = this;
+ firebaseAdmin.auth().verifyIdToken(token)
.then(async function (decodedToken) {
console.log("UID: ", decodedToken.uid);
- console.log("Name: ", name, ' \nPic: ', pic, ' \nToken: ', token, ' \nMID: ' , mid, "\nDecoded token: ", decodedToken.uid, decodedToken.email);
+ console.log("Name: ", name, ' \nPic: ', pic, ' \nToken: ', token, ' \nMID: ', mid, "\nDecoded token: ", decodedToken.uid, decodedToken.email);
try {
res.status(200).send(await postgres.realUpdateUser(decodedToken.uid, mid, name, pic, decodedToken.email));
@@ -39,19 +39,19 @@ var firebaseAdmin = admin.initializeApp({
console.error(await error);
});
- });
- router.get('/getuser/:uid', async function(req, res){
- try {
- var sender = await postgres.getUser(req.params.uid);
- res.status(200).send(sender);
- }catch (err) {
- res.status(400).send(await err);
- }
- });
+});
+router.get('/getuser/:uid', async function (req, res) {
+ try {
+ var sender = await postgres.getUser(req.params.uid);
+ res.status(200).send(sender);
+ } catch (err) {
+ res.status(400).send(await err);
+ }
+});
//Push
router.get('/push/:msgtoken/:message/:title', function (req, res, next) {
-
+
push.sendPush(req.params.msgtoken, req.params.title, req.params.message);
var sender = "Message Token: " + req.params.msgtoken + " Message: " + req.params.message + " Title: " + req.params.title;
res.status(200).send(sender);
@@ -218,20 +218,20 @@ router.get("/shoppinglist_json/:sl_id", async (req, res) => {
router.delete("/shoppinglist", async (req, res) => {
- var token = req.body.idtoken;
- var uid;
- firebaseAdmin.auth().verifyIdToken(token)
- .then(async function (decodedToken) {
- uid = decodedToken.uid;
-
- try {
- res.status(200).send(await postgres.deleteShoppinglist(req.body.sl_id, uid));
- } catch (err) {
- res.status(400).send(await err);
- }
- }).catch(function (error) {
- console.log(error)
- });
+ var token = req.body.idtoken;
+ var uid;
+ firebaseAdmin.auth().verifyIdToken(token)
+ .then(async function (decodedToken) {
+ uid = decodedToken.uid;
+
+ try {
+ res.status(200).send(await postgres.deleteShoppinglist(req.body.sl_id, uid));
+ } catch (err) {
+ res.status(400).send(await err);
+ }
+ }).catch(function (error) {
+ console.log(error)
+ });
});
router.post("/movedoneitem", (req, res) => {
diff --git a/express-server/views/index.ejs b/express-server/views/index.ejs
index a634c995..95520c3b 100644
--- a/express-server/views/index.ejs
+++ b/express-server/views/index.ejs
@@ -2,29 +2,124 @@
-
-
-
-
+
+
+
+
-
+
+
+
+
+ lock
+
+
+ User Login
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+ lock
+
+
+ User Registrieren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+