max/gg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Max Hunt 2020-05-15 18:28:27 +01:00
parent ab8eaf2698
commit eab73be3e5
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/views/js/fAuth.js
View File

@ -7,7 +7,7 @@ function checkAuth(){
firebase.auth().currentUser.getIdToken().then(function(idToken) { firebase.auth().currentUser.getIdToken().then(function(idToken) {
let url = 'login-user-api' let url = 'login-user-api'
let data = {uToken: idToken, user: user} let data = {uToken: idToken}
let postData = {method: 'POST', body: JSON.stringify(data),headers: {'Content-Type': 'application/json'}} let postData = {method: 'POST', body: JSON.stringify(data),headers: {'Content-Type': 'application/json'}}
fetch(url, postData) fetch(url, postData)
.then(response => response.json()) .then(response => response.json())

22
server.js
View File

@ -376,24 +376,16 @@ app.post('/sold-api', async function(request, responce){
}) })
app.post('/login-user-api', function(request, responce){ app.post('/login-user-api', function(request, responce){
if (request.body.uToken && request.body.user) { if (request.body.uToken) {
admin.auth().verifyIdToken(request.body.uToken) admin.auth().verifyIdToken(request.body.uToken)
.then(async function(decodedToken) { .then(async function(decodedToken) {
let user = request.body.user
let uid = decodedToken.uid let uid = decodedToken.uid
let rsp = await checkNewUser(uid)
if (uid != user.uid){
responce.send({success:false, error:'Stop hacking'})
}
else {
let rsp = await checkNewUser(user)
responce.send(rsp) responce.send(rsp)
}
}) })
.catch(function(error) { .catch(e=>{
responce.send({success:false, error:'invalid auth token'}) responce.send({success:false, error:'invalid auth token, ' + e})
console.log(error) })
});
} }
else { else {
responce.send({success:false, error: 'invalid data'}) responce.send({success:false, error: 'invalid data'})
@ -520,8 +512,8 @@ async function authCheck(token) {
return uid return uid
} }
async function checkNewUser(user){ async function checkNewUser(uid){
let snapshot = await checkUserExists(user.uid) let snapshot = await checkUserExists(uid)
if (snapshot){ if (snapshot){
let users = snapshot.val() let users = snapshot.val()
let keys = Object.keys(users) let keys = Object.keys(users)