From 4464697a73a90d5ad14389012b874f6d4c9ef5db Mon Sep 17 00:00:00 2001
From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com>
Date: Mon, 18 Feb 2019 08:19:31 +0100
Subject: [PATCH] User auto update

Db wird bei login mit messageid geupdated
---
 .../public/javascripts/firebase-app.js        | 33 ++++++++++++-------
 express-server/public/javascripts/login.js    | 24 +++++++-------
 express-server/public/ocrscan/ocrscan.js      | 19 +----------
 3 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/express-server/public/javascripts/firebase-app.js b/express-server/public/javascripts/firebase-app.js
index 1330c8f9..dd63abc3 100644
--- a/express-server/public/javascripts/firebase-app.js
+++ b/express-server/public/javascripts/firebase-app.js
@@ -15,26 +15,35 @@
 var msg = firebase.messaging();
 msg.requestPermission()
 .then(function(){
-    console.log("Zugriff auf msg")
+    console.log("Zugriff auf msg");
     return msg.getToken();
 })
 .then(token => {
-    console.log("MSG TOKEN: ", token)
+    updateUser(token);
     
 })
 .catch(err => {
-    console.error("Msg Error: ", err)
+    console.error("Msg Error: ", err);
 })
 
-axios.post('/user', {
-    message_id: 'test',
-  })
-  .then(function (response) {
-    console.log(response);
-  })
-  .catch(function (error) {
-    console.log(error);
-});
+function updateUser(token) {
+  firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
+      $.ajax({
+          type: "POST",
+          url: "/user",
+          data:{
+              idtoken: idtoken,
+              message_id: token
+          },
+          success(){
+              console.log("User updated");
+          },
+          error(err){
+              console.error("Error: " + err);
+          }
+      });
+  }).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
+}
 
 msg.onMessage(payload => {
     const title = payload.data.title
diff --git a/express-server/public/javascripts/login.js b/express-server/public/javascripts/login.js
index 45e9f931..ee54d2ac 100644
--- a/express-server/public/javascripts/login.js
+++ b/express-server/public/javascripts/login.js
@@ -18,6 +18,7 @@ function checkAuth(){
             try{
             firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idToken) {
                 console.log("Vor Replace");
+
                 window.location.replace("/dash/" + idToken);
               }).catch(function(error) {
                 console.error("Get id token client error: ", error)
@@ -40,6 +41,7 @@ window.onload = function(){
 }
 
 
+
 var vue = new Vue({
     el: '#vue-app',
     data:{
@@ -71,15 +73,15 @@ var vue = new Vue({
         }
 
     },
-    mounted() {
-        axios.post('/user', {
-            message_id: 'test',
-          })
-          .then(function (response) {
-            console.log(response);
-          })
-          .catch(function (error) {
-            console.log(error);
-          });
-    }
+    // mounted() {
+    //     axios.post('/user', {
+    //         message_id: 'test',
+    //       })
+    //       .then(function (response) {
+    //         console.log(response);
+    //       })
+    //       .catch(function (error) {
+    //         console.log(error);
+    //       });
+    // }
 });
\ No newline at end of file
diff --git a/express-server/public/ocrscan/ocrscan.js b/express-server/public/ocrscan/ocrscan.js
index 3eee5280..693ed28b 100644
--- a/express-server/public/ocrscan/ocrscan.js
+++ b/express-server/public/ocrscan/ocrscan.js
@@ -189,24 +189,7 @@ var loading = false;
 }
 */
 
-function updateUser() {
-    firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
-        $.ajax({
-            type: "POST",
-            url: "/user",
-            data:{
-                idtoken: idtoken,
-                message_id: "msgtest"
-            },
-            success(){
-                console.log("USer updated");
-            },
-            error(err){
-                console.error("Error: " + err);
-            }
-        });
-    }).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
-}
+
 
 function updateUser() {
     firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {