diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js index 68413e19..05e90a27 100644 --- a/express-server/db-connect/db-connect.js +++ b/express-server/db-connect/db-connect.js @@ -382,6 +382,7 @@ async function createInvite(sl_id) { } } +//User manuell einladen async function manInvite(sl_id, uid) { try { await nonQuery('INSERT INTO "Shoppinglist_member" (username, sl_id) VALUES ($1, $2);', [uid, sl_id]); @@ -392,7 +393,17 @@ async function manInvite(sl_id, uid) { } } +//member von shoppinglist entfernen +async function removeMember(uid, sl_id) { + try { + await nonQuery('DELETE FROM "Shoppinglist_member" WHERE username = $1 AND sl_id = $2', [uid, sl_id]); + } + + catch(error) { + console.error(error); + } +} @@ -550,5 +561,5 @@ function probability(cur_item, data) { module.exports = { getShoppinglistsAdmin, getShoppinglistsShared, newShoppinglist, displayShoppinglist, deleteShoppinglist, addGroup, addItem, verifyInvite, createInvite, editShoppinglist, editGroup, editItem, deleteGroup, deleteItem, manInvite, updateUser, - moveDoneItems, getDonePurchases, getShoppinglistsByLink, searchUsers + moveDoneItems, getDonePurchases, getShoppinglistsByLink, searchUsers, removeMember } diff --git a/express-server/public/ocrscan/ocrscan.js b/express-server/public/ocrscan/ocrscan.js index cd7961a5..29247d63 100644 --- a/express-server/public/ocrscan/ocrscan.js +++ b/express-server/public/ocrscan/ocrscan.js @@ -132,8 +132,12 @@ function updateUser() { function testSearch() { console.log("dpne"); $.ajax({ - type: "GET", - url: "/users?search=Lukas", + type: "DELETE", + url: "/member", + data: { + sl_id: "PDADo1iJ", + uid: "VZT25Xd3rLXEmGGUcrtocbJ9QBu2" + }, success(data) { console.log(data); }, diff --git a/express-server/routes/index.js b/express-server/routes/index.js index c935d6dc..5ee8f0f2 100644 --- a/express-server/routes/index.js +++ b/express-server/routes/index.js @@ -345,22 +345,25 @@ router.post("/invite", async (req, res) => { }); router.post("/maninvite", async (req, res) => { + try { + res.status(200).send(await postgres.manInvite(req.body.sl_id, req.body.uid)); + } - var token = req.query.idtoken; - var uid; - firebaseAdmin.auth().verifyIdToken(token) - .then(function(decodedToken) { - uid = decodedToken.uid; - console.log("UID: ", uid); - try { - res.status(200).send(postgres.manInvite(req.body.sl_id, uid)); - } - catch(err) { - console.error(error); - } - }).catch(function(error) { - console.error(error) - }); + catch(err) { + res.status(400).send(err); + } + + +}); + +router.delete("/member", (req, res) => { + try { + postgres.removeMember(req.body.uid, req.body.sl_id) + } + + catch(err) { + return err; + } }); router.get("/invite/:invitelink", async (req, res) => {