diff --git a/functions/package.json b/functions/package.json index 6341e20..8486a0a 100644 --- a/functions/package.json +++ b/functions/package.json @@ -12,6 +12,7 @@ "node": "8" }, "dependencies": { + "body-parser": "^1.19.0", "ejs": "^3.0.2", "express": "^4.17.1", "firebase-admin": "^8.11.0", diff --git a/functions/views/js/fdb.js b/functions/views/js/fdb.js index 88f065f..e5c802d 100644 --- a/functions/views/js/fdb.js +++ b/functions/views/js/fdb.js @@ -89,8 +89,8 @@ function updateImgs() { // console.log(images) Array.from(images).forEach((image) => { var pathReference = rootReference.child(image.title) - pathReference.getDownloadURL().then(function(url) {image.src = url}) - }) + pathReference.getDownloadURL().then(function(url) {image.src = url}) + }) } updateImgs(); @@ -108,5 +108,13 @@ function purchaseItem() { } function my_products() { - console.log(firebase.auth().currentUser.getIdToken()) + firebase.auth().currentUser.getIdToken().then(function(idToken) { + let data = JSON.stringify({uToken: idToken}) + + fetch("my-products", { + method: "POST", + headers: {"Content-type": "application/json"}, + body: data + }) + }) } \ No newline at end of file diff --git a/package.json b/package.json index 11cea27..e938024 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "author": "", "license": "ISC", "dependencies": { + "body-parser": "^1.19.0", "ejs": "^3.0.2", "express": "^4.17.1", "firebase-admin": "^8.11.0", diff --git a/server.js b/server.js index 4dc950d..fc50fb9 100644 --- a/server.js +++ b/server.js @@ -1,5 +1,6 @@ var express = require('express') var logger = require('morgan') +var bodyParser = require('body-parser') var admin = require("firebase-admin"); var serviceAccount = require("./secrets/project-gg-3b754-firebase-adminsdk-4848h-5a5778b77b.json"); @@ -8,9 +9,11 @@ var firebaseadmin = admin.initializeApp({ databaseURL: "https://project-gg-3b754.firebaseio.com" }); var database = firebaseadmin.database() +var auth = admin.auth(); var app = express() - +app.use(bodyParser.json()) +app.use(bodyParser.urlencoded({extended: true})) app.use(logger('dev')) app.use(express.static('views')) @@ -53,22 +56,27 @@ app.get('/additmpage', function(request, responce){ responce.render('add-item.ejs') }) -app.get('/my-products', function(request, responce){ - request.query.userid = "FhZpTE7ZYzgDDwBBl2MYkc243Se2" - if (request.query.userid) { - var dbRef = database.ref("/products") - dbRef.orderByChild('owner').equalTo(request.query.userid).once('value', function(snapshot){ - var data = {} - data = snapshot.val() - responce.render('my-products.ejs', {products: data}) +app.post('/my-products', function(request, responce){ + admin.auth().verifyIdToken(request.body.uToken) + .then(function(decodedToken) { + let uid = decodedToken.uid; + var dbRef = database.ref("/products") + dbRef.orderByChild('owner').equalTo(uid).once('value', function(snapshot){ + var data = {} + data = snapshot.val() + console.log(data) + responce.render('my-products.ejs', {products: data}) + }) }) - } - else { - responce.render('404.ejs') - } - + .catch(function(error) { + console.log(error) + }); }) + + + + app.get('/product', function(request, responce){ if (request.query.productid) { var dbRef = database.ref("/products/"+request.query.productid)