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
Show Stats 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();
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

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

@ -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);
// });
// }
});

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