dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

User auto update

Browse Source 
Db wird bei login mit messageid geupdated
This commit is contained in:
Georg Reisinger
2019-02-18 08:19:31 +01:00
parent 4bfe8ce31a
commit 4464697a73
3 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
express-server/public/javascripts/firebase-app.js
View File

@@ -15,26 +15,35 @@
var msg = firebase.messaging(); var msg = firebase.messaging();
msg.requestPermission() msg.requestPermission()
.then(function(){ .then(function(){
console.log("Zugriff auf msg") console.log("Zugriff auf msg");
return msg.getToken(); return msg.getToken();
}) })
.then(token => { .then(token => {
console.log("MSG TOKEN: ", token) updateUser(token);
}) })
.catch(err => { .catch(err => {
console.error("Msg Error: ", err) console.error("Msg Error: ", err);
}) })
axios.post('/user', { function updateUser(token) {
message_id: 'test', firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
}) $.ajax({
.then(function (response) { type: "POST",
console.log(response); url: "/user",
}) data:{
.catch(function (error) { idtoken: idtoken,
console.log(error); 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 => { msg.onMessage(payload => {
const title = payload.data.title const title = payload.data.title

24
express-server/public/javascripts/login.js
View File

@@ -18,6 +18,7 @@ function checkAuth(){
try{ try{
firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idToken) { firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idToken) {
console.log("Vor Replace"); console.log("Vor Replace");
window.location.replace("/dash/" + idToken); window.location.replace("/dash/" + idToken);
}).catch(function(error) { }).catch(function(error) {
console.error("Get id token client error: ", error) console.error("Get id token client error: ", error)
@@ -40,6 +41,7 @@ window.onload = function(){
} }
var vue = new Vue({ var vue = new Vue({
el: '#vue-app', el: '#vue-app',
data:{ data:{
@@ -71,15 +73,15 @@ var vue = new Vue({
} }
}, },
mounted() { // mounted() {
axios.post('/user', { // axios.post('/user', {
message_id: 'test', // message_id: 'test',
}) // })
.then(function (response) { // .then(function (response) {
console.log(response); // console.log(response);
}) // })
.catch(function (error) { // .catch(function (error) {
console.log(error); // console.log(error);
}); // });
} // }
}); });

19
express-server/public/ocrscan/ocrscan.js
View File

@@ -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() { function updateUser() {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) { firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {