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

Login, Registrieren reperiert

Browse Source
This commit is contained in:
Georg Reisinger
2019-03-31 22:54:42 +02:00
parent 74977a257a
commit f645aee8e5
6 changed files with 315 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
express-server/routes/index.js
View File

@ -11,24 +11,24 @@ var postgres = require("./../db-connect/db-connect");
var admin = require('firebase-admin');
var serviceAccount = require('../login/firebaseAdminKey.json');
var firebaseAdmin = admin.initializeApp({
credential: admin.credential.cert(serviceAccount),
databaseURL: 'https://test-667ca.firebaseio.com'
});
credential: admin.credential.cert(serviceAccount),
databaseURL: 'https://test-667ca.firebaseio.com'
});
router.get('/user', function(req, res, next){
res.status(200).render('user');
});
router.get('/user', function (req, res, next) {
res.status(200).render('user');
});
router.post('/userbearbeiten', function(req, res, next){
var mid = req.body.mid;
var token = req.body.token;
var name = req.body.name;
var pic = req.body.pic;
var vm = this;
firebaseAdmin.auth().verifyIdToken(token)
router.post('/userbearbeiten', function (req, res, next) {
var mid = req.body.mid;
var token = req.body.token;
var name = req.body.name;
var pic = req.body.pic;
var vm = this;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function (decodedToken) {
console.log("UID: ", decodedToken.uid);
console.log("Name: ", name, ' \nPic: ', pic, ' \nToken: ', token, ' \nMID: ' , mid, "\nDecoded token: ", decodedToken.uid, decodedToken.email);
console.log("Name: ", name, ' \nPic: ', pic, ' \nToken: ', token, ' \nMID: ', mid, "\nDecoded token: ", decodedToken.uid, decodedToken.email);
try {
res.status(200).send(await postgres.realUpdateUser(decodedToken.uid, mid, name, pic, decodedToken.email));
@ -39,19 +39,19 @@ var firebaseAdmin = admin.initializeApp({
console.error(await error);
});
});
router.get('/getuser/:uid', async function(req, res){
try {
var sender = await postgres.getUser(req.params.uid);
res.status(200).send(sender);
}catch (err) {
res.status(400).send(await err);
}
});
});
router.get('/getuser/:uid', async function (req, res) {
try {
var sender = await postgres.getUser(req.params.uid);
res.status(200).send(sender);
} catch (err) {
res.status(400).send(await err);
}
});
//Push
router.get('/push/:msgtoken/:message/:title', function (req, res, next) {
push.sendPush(req.params.msgtoken, req.params.title, req.params.message);
var sender = "Message Token: " + req.params.msgtoken + " Message: " + req.params.message + " Title: " + req.params.title;
res.status(200).send(sender);
@ -218,20 +218,20 @@ router.get("/shoppinglist_json/:sl_id", async (req, res) => {
router.delete("/shoppinglist", async (req, res) => {
var token = req.body.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function (decodedToken) {
uid = decodedToken.uid;
try {
res.status(200).send(await postgres.deleteShoppinglist(req.body.sl_id, uid));
} catch (err) {
res.status(400).send(await err);
}
}).catch(function (error) {
console.log(error)
});
var token = req.body.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function (decodedToken) {
uid = decodedToken.uid;
try {
res.status(200).send(await postgres.deleteShoppinglist(req.body.sl_id, uid));
} catch (err) {
res.status(400).send(await err);
}
}).catch(function (error) {
console.log(error)
});
});
router.post("/movedoneitem", (req, res) => {