From 57df42dd057ec76a9f58c7af6a48b73709b9a952 Mon Sep 17 00:00:00 2001 From: Naida Vatric Date: Sun, 16 Feb 2020 01:06:53 +0100 Subject: [PATCH] WiP CORS Issue. --- index.js | 20 ++++++++++++++------ marketalarm-262e746e533c.json | 12 ++++++++++++ marketalarm-cors.json | 8 ++++++++ marketalarm-dd909e0aeef1.json | 12 ------------ 4 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 marketalarm-262e746e533c.json create mode 100644 marketalarm-cors.json delete mode 100644 marketalarm-dd909e0aeef1.json diff --git a/index.js b/index.js index f83e728..1495b4e 100644 --- a/index.js +++ b/index.js @@ -55,8 +55,15 @@ setInterval(crawl, CRAWLER_INTERVAL * 1000); setInterval(checkUpNotify, 1000 * 60 * 60 * 24); //Google storage req -const storage = new Storage(); -const BUCKET_NAME = "kivi_original_photos"; +const PROJECT_ID = "marketalarm"; +const KEY_FILENAME = "marketalarm-262e746e533c.json"; //relative path +const BUCKET_NAME = "marketalarm-photos"; + +const storage = new Storage({ + projectId: PROJECT_ID, + keyFilename: KEY_FILENAME +}); + const bucket = storage.bucket(BUCKET_NAME); /* async function generateSignedUrl() { @@ -79,11 +86,12 @@ app.get("/generateSignedURL", (req, res) => { console.log("Started server function!"); const options = { - GoogleAccessID: - " kivi-original-photos-id@marketalarm.iam.gserviceaccount.com", - PrivateKey: "dd909e0aeef15920e7fc18229ce421246c143f90", - version: "v4", + // GoogleAccessID: + // " kivi-original-photos-id@marketalarm.iam.gserviceaccount.com", + // PrivateKey: "dd909e0aeef15920e7fc18229ce421246c143f90", + version: "v2", action: "write", + contentType: "image/*", expires: Date.now() + 86400000 }; const filename = req.query.filename; diff --git a/marketalarm-262e746e533c.json b/marketalarm-262e746e533c.json new file mode 100644 index 0000000..1aaa350 --- /dev/null +++ b/marketalarm-262e746e533c.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "marketalarm", + "private_key_id": "262e746e533ce0437dd550c4bc709d879df1a8ff", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC/9hpeJGAG5pN2\nYiIeWuyabVO9cHhzi7mlUcfyHmQKoDEcdVYC8iv2sle0Me/SjnK53AaxRBKGXEXy\nS00dKCEw9DkAmG6kTm3R7dduG/uu3jCr29xp2v8ttLtIBt7lq55g1FfqngNX9xcX\nNmkYf6f1LMiAEX5utkwGEiVOXk2kzUQiHTjmcE1XTSIQTAuFLZd9UsUDYKhLjwob\nu5UsCbIhoBeWmKcTun/MsKBocmpOoSl4GGMqt3orgvKedbCyzuA0r8AJ3rnFp2x0\n9APgvqnUy9WrKvM+TB0u3MDmvOfPUDxzu0/o2e5ZcrD2LkbFrB7nX41mKjk4Z1dN\nOIcW9k0BAgMBAAECggEAP6QYXtDBc1g7WFq1hAnR+mq3gg1JKcmPnUMNPnSb5zfv\nwEcYYnamY64BzLBnmY93cq4DG/79A0WRPQCBCuMUifXV9iATQm7sEta+/vbRDMsG\nKNwF6aRcyGrsUjdQ66Tnp6OOmC6V3jKBmcUEt8YOyYZ03JywJYVTlAmtC5vRMwr0\ny7DGE1lPYkfJnLiZLJHNXLABT+wPWCmbmOArBEHh9Ea9cJ7lsVJJw+YvRGU8bt7i\nDqEwT44O0w/WU31Wts4OUNA7o+ynheGHoYH4grIW1pEJmHKyNJRU/2CNAbFk+iJU\n8h5uZ/2BDGA+Nc0aeomVOCvdLEr1l/MRd9owZQKGXwKBgQD0/KAjdtVrMARrlaUo\nUHoJpHfc7GFC3pqybXVx1Q6Axk5WZr0wa7a4UmlxVvXcYkH8swfyle73K1gQlqy0\nUumznAt5yWFyKn+Og4nMmRplC0dn5JjYoZUskqEnMTyM85DY1l56smOZV1DeH0FE\nbKS6M2pEJx7Ran9iJBnIYguNpwKBgQDIlz71We7M1RIsfZVNvU5BrLPWI+4jS3g/\ni37Rbhlq9WHpWTuV8pFInYmFrFXehNfEgg4sIQeQ7ouQXorKYW37pfF/BekBhMTL\nmnpdBcJ+7NSQcfzuqrSltq764XNW4CmO+uRaRW7F9HSQVXVKsgITlzDP6Qa6sCFb\nKrb5rL81FwKBgCR3MfL1bkD9LbtB1AqTKAclZv4IZVXJwqcKae/escDzQ5fSxRhf\nAByhj7ZiJkh+i6nskCNItAAwgHQ/qUdSDB1C/eZL1mhi8QeqhqlgpLAjpKZPPX0J\nWCYBUWF/D68/VfEgv4Ft6itZ9tyJNHLV5RMeMhQg6pJrUrit/PR5u5SDAoGAVD/i\nO57IQ9QCTBl7CinGoqLs7bYtoTljih0G6OO7XUcvFplaA4LcLomsZy6Y6lsVXP3b\nAgHlcaQfjkWHObVuQlHSeq16zh57oaCCYGu44yKJrRmTSJL+SNPP7qOelBCWo+0Q\n2DFtc0tXYf/iwbq+UIgiAlE3eFXdzLLGI1vA+4UCgYAKhZbtn3hPOEpBixHKsF5h\n8Whz7+T+0XcAZ2D7bYqipSH+pMLDCgBaoAtvR6y1OJ8yWIVyVgRYaz8GGjEcPIWB\n0nSGfW771fyL+aMDK/69iOUu2opHl/ivbD9Bx6+zRZU4UsSHYmwBIWzHpWZcULCB\nz8gyCCcySL444h0frGPDeQ==\n-----END PRIVATE KEY-----\n", + "client_email": "marketalarm-photos@marketalarm.iam.gserviceaccount.com", + "client_id": "104397210403856258050", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/marketalarm-photos%40marketalarm.iam.gserviceaccount.com" +} diff --git a/marketalarm-cors.json b/marketalarm-cors.json new file mode 100644 index 0000000..2af91b2 --- /dev/null +++ b/marketalarm-cors.json @@ -0,0 +1,8 @@ +[ + { + "maxAgeSeconds": 3600, + "method": ["*"], + "origin": ["*"], + "responseHeader": ["*"] + } +] diff --git a/marketalarm-dd909e0aeef1.json b/marketalarm-dd909e0aeef1.json deleted file mode 100644 index df7c80e..0000000 --- a/marketalarm-dd909e0aeef1.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "marketalarm", - "private_key_id": "dd909e0aeef15920e7fc18229ce421246c143f90", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLedKH5aM2yOo5\nPh8XRl8HsGZOdq4RveBT8ulJw33KexMckvCkRctSJkRPdbXF3I+N25/WihiUKEXy\nBlVqmDOCEM4qo4/sLllN7hxsoGdIGhnMEAzf8vO1/+NBdErKdu6lRW84GY29gVTH\nQBv54gMcbr2jvBW9qGqmx0Tn0DI0w3BLDd45Sz/yqhE42jmYLDEZ96E1uOR1jlG7\nwdaVlv0r3xdgmV51SjeZevlJxbWFjYCO7UXzhkvldklAjEK2Bgf0hkx9GPUHlo8u\n4TAePLXw35vx7wfrFG8cfDoPPAcB3O5WEzxX9z9/bdG4OZchcTWhguUfEGQ9Oq8Y\n3qnRpg+HAgMBAAECggEAFUWtpGZ2Cz6y+fwMHQ9O1Qt0jqRqq1Ep+CzPhdYpuvbl\n9xlHjiz7xiFZB+Oa9s4Jtf9tdOzoB+kz8ssFuAikbeca3qtN2xe3X2XS0+prEcck\nxkgxSGJqZy8Sz598SDFp3p5lM7y8LEEun0wNALFHuPu82LbLoRHP4JK5mfCSpyBN\nztXE+WFTFsNubgE3kqhZopVXXfQ+Wl43Gfx9jnFkFvxonL23soPP8JLd/Px7rsIZ\nFcaxCGjw3YsuEc3vSO6M7HY2rSx9ho+uSX9XpEb50p6bHXBTAb0ESE4Xf/uslVA5\nCqCxkzf7wB4RzveR6gLrDeTlg4Y5zN+Ioxzq6+8vSQKBgQDlGrAghbfAN6NemR8n\naiYTZ+cvZMigYuy9jSNMnCLmTYDe66r9+PWfT0jQdwaUFmhSbC3939goBAUiZlB9\nAfP4ygFR/TLJXHSXAt6c/9+VpU78lRbGCqs/RGSvH7NyObwSd1wzRXOXtzegXtjf\nz0hSYcOAZljayTEt/RX3fpERzwKBgQDjXOuB6dFRqEmNtetmB4qxBk1stHaFstiG\nG2Rcis09IlCPb0uom7wOxo0CBq8J/3QZWOouwkiXzaMoy8X/UuSJWJ8g0hgGhtNl\n/zlwSnLxaxpWdrP1zQ4vltcdmwc0oDGCjoXbUsJ3L7K/quRfdM1vyEcfNWkdxCus\nY6ugQ7isyQKBgQDN/lcKhvCWxfAAaJEYcVrW6/90H5w8iXXvYO2yPlkq1djfluph\n/O1sVm9T8RFbKWKXaWlY8WF7aVHsgi4wmAbzVT4mqBB3+Mdj2FKsu2wfM0l31d1q\nJ8Gd2zLkOw6vz7WIrQWbnAC5EyXS7jT113xhhkGwO1X9MhUkEoEjzQtHBQKBgGAK\nzGEgiA9aa1e1VS7QWMHWy7XztW1c0yIzR/3flDsS17z/YpJi1tnW/ZGxiRdMFZrv\neF0wLMITV6zQB1+HgIqUKQQQO53mLj6TxYutp0hb2dBUbEiUyj1IFq6m4jBUyxU/\nZ0PyfbsjJvrYEYhRKsbhb0m7oh+00k4L/F/Cu6whAoGAK/lwGbnxx4b+2bHLizol\nC1SCWfehwopZ6+RJDlh+nmdotLHqoJUuywQ4w1+3IfR4gfzsDsOo4hctyNDZXvK/\n5xDR5WpCXNDi1xLDajU5DcHPu+IqltvXe/KUEnEQdogIwsQMigp/MTNDy4tqVbaf\nDDaHojsNuJRgD2iek9vuciw=\n-----END PRIVATE KEY-----\n", - "client_email": "kivi-original-photos-id@marketalarm.iam.gserviceaccount.com", - "client_id": "105188302286128652978", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://oauth2.googleapis.com/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/kivi-original-photos-id%40marketalarm.iam.gserviceaccount.com" -}