diff --git a/express-server/public/javascripts/user.js b/express-server/public/javascripts/user.js index adf34b29..d1500179 100644 --- a/express-server/public/javascripts/user.js +++ b/express-server/public/javascripts/user.js @@ -31,10 +31,46 @@ var vue = new Vue({ }, methods: { fertig() { - console.log("IMAGE befor dbuserupdate: ", this.image) - this.dbUserUpdate(this.idToken, name, this.image, this.mid); - this.image = ''; - this.startGetUser(); + if(!this.image){ + this.image = this.dataPic + var currentUser = firebase.auth().currentUser; + var vm = this; + currentUser.getIdToken( /* forceRefresh */ true).then(function (idToken) { + console.log("Vor Replace"); + msg.requestPermission() + .then(function () { + + return msg.getToken(); + }) + .then(token => { + console.log("Zugriff auf msg", token, this.name, vm.dataPic); + vm.idToken = idToken; + vm.mid = token; + console.log("IMAGE befor dbuserupdate: ", vm.image) + vm.dbUserUpdate(vm.idToken, name, vm.image, vm.mid); + vm.image = ''; + vm.startGetUser(); + }) + .catch(err => { + console.error("Msg Error: ", err); + vm.idToken = idToken; + vm.mid = ""; + console.log("IMAGE befor dbuserupdate: ", vm.image) + vm.dbUserUpdate(vm.idToken, name, vm.image, vm.mid); + vm.image = ''; + vm.startGetUser(); + }) + + }).catch(function (error) { + console.error("Get id token client error: ", error) + }); + }else{ + console.log("IMAGE befor dbuserupdate: ", this.image) + this.dbUserUpdate(this.idToken, name, this.image, this.mid); + this.image = ''; + this.startGetUser(); + } + }, updateUser() { console.log("updateuser")