diff --git a/app/views/publishPhotos.ejs b/app/views/publishPhotos.ejs index 24da85e..b824a4f 100644 --- a/app/views/publishPhotos.ejs +++ b/app/views/publishPhotos.ejs @@ -55,26 +55,23 @@ return false; } - function uploadFile(file) { + function uploadFile(file) { $("#status").html('Starting Upload...') url = c; fetch(url, { method: 'PUT', - headers: { - "content-type": "image/*" - }, + headers: new Headers({'content-type': 'image/*'}), mode: 'cors', body: file }) .then(response => response.text()) .then (response => { - console.log(response); return response; } ) .catch(error => $("#status").html(error) ) - .then(response => $("#status").html('File uploaded successfully: ' + filename + 'Response:' + response.text())); + .then(response => $("#status").html('File uploaded successfully: ' + filename )); } \ No newline at end of file diff --git a/index.js b/index.js index 8861c34..5bb27be 100644 --- a/index.js +++ b/index.js @@ -59,13 +59,10 @@ setInterval(checkUpNotify, 1000 * 60 * 60 * 24); //Google storage req const PROJECT_ID = "marketalarm"; -const KEY_FILENAME = "marketalarm-262e746e533c.json"; //relative path +const KEY_FILENAME = ""; //relative path const BUCKET_NAME = "marketalarm-photos"; //Tried implicitly creating with env credentials and direktcly as here -const storage = new Storage({ - projectId: PROJECT_ID, - keyFilename: KEY_FILENAME -}); +const storage = new Storage(); const bucket = storage.bucket(BUCKET_NAME); @@ -77,8 +74,7 @@ app.get("/generateSignedURL", (req, res) => { //Tried to define Google ID and private key while debugging version: "v2", //tried v4 also action: "write", - "Content-Type": "image/*", - //contentType: "image/*", //tried without and with specific image/png ex. + contentType: "image/*", //tried without and with specific image/png ex. expires: Date.now() + 86400000 }; const filename = req.query.filename; @@ -90,10 +86,6 @@ app.get("/generateSignedURL", (req, res) => { console.log(`The signed url is ${url}.`); - res.header("Access-Control-Allow-Origin", "http://localhost:5000"); - res.header("Access-Control-Allow-Methods", "PUT,OPTIONS"); - res.header("Access-Control-Allow-Headers", "Content-Type, Origin"); - res.header("Access-Control-Max-Age", "86400000"); res.status(200).send(url); } generateSignedUrl().catch(console.error); diff --git a/marketalarm-262e746e533c.json b/marketalarm-262e746e533c.json deleted file mode 100644 index 1aaa350..0000000 --- a/marketalarm-262e746e533c.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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-d4b71394407e.json b/marketalarm-d4b71394407e.json new file mode 100644 index 0000000..672a051 --- /dev/null +++ b/marketalarm-d4b71394407e.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "marketalarm", + "private_key_id": "d4b71394407eb3dba9e431851dab60b198d6985d", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDTE6dkFr0bzDXg\n7ghMxkzq8cajqqqes9JZVqsXh+b/kFJYmEImFUILJJZdI080KM2sEYsIapBCxhMP\nFH017f/gfH3jnRbp3c70hghNh8noSTsq7kPA4l25o8GQnJ6AS+nhy8umPjb4KzX9\nkmC6OOD4P8mAmGqhoUv4s2jld1cXNur6NJjCpjEd2cH3SUbI71oA3V/4W8aK4dvS\n660kLY0PRt7mCiITe0hbTUBZY48W2ijZ7wM2r0HUtPG9XEeGMGmNsC+qD2oWxUU3\nvnm7l1fEIUvLYF4GrLRDJDSkpChBXNcWhoGV2AOvuTc+yghU2+lJWqrKcpLlI23E\nlVJjt9UhAgMBAAECggEABatr8sxq+SQOf9hSIe3Me9Kc1nunrC42scFHRKBNxahJ\ndXw5B9FQPh738Cqhk0xEz6hlrln1Agj6HhRIz8U0r9R+z4TRRr6kfnWmBZAMShu0\nC4JW448abpAYx8CQ/CvRmq2GlF+/M+QBeqpLS8gPzyaKTB/5IBaKG8Bn0fXXQZ2e\n7RaTpGx62jq79omPwiKz0PMVBGZrzPu8Z4tW47muV51osdKSNVgsXb4gCZl28zN2\n6zzY1ZK7u89MesY8joILMHm8cw0oyv9o+RVGEa1I1nq2q1A8ftZny4p7kUA/ITZX\nEZ6SCOP87z9HeVCr8lzexcovD8uZCOTYpcfotlSjGQKBgQD1VVGU2bzExiV0XQGc\n8n6m4TR6Y9zwXBiQPe0rXPZhvsj8QMTXk+L0ejCo4m7NF1dEyH6u+qX6wjNL1Hm9\nN/ZuDFqYtd9w6cQ8CtDZ6QZIE60k6tLQhMNRNMvHdMfedq+VOz3LX6TdyTnv8dP3\nbEsD8wIfFd6t5wNgeZkbKsNxBwKBgQDcQQsUppjglGpUoz7lGHKbFcKMPpIj9fMY\nfze1DXeTAtHGxGm2F10WZvxOEs4DCOUllBlarL5xDAJIJHk/NYlgnI6MJXMLro6d\nsb4iNTUuJKdqAijyOaZQUADJpdYKGwu5y66PUOuojWFV9kiamquXduJ9jzOa1vr1\nSJPUy2YGlwKBgQDNJrpgwa8z0QozAy89Ih68x+fNTMLNkAXOYKp6L3OsixCguDyi\nlP0dOSyFnUvQXutQDmS5R8oSJeElURk4HJsKrXP47WVak3DQUK8S+eSR0zpfe6os\nSkjWGFMriEE2i4MKRI7JCULhX8r+FfgNl9YnCEfG3M/oFhzhyO06JYlncwKBgF6n\nBSAGyEQbA+cDkI/bhcToAQdMDHmvxJyOb147P1vKJmSJG/TI7ZQnBd53blkXhYI0\ntwCko+LpCkH+iqyDUVpXbVsE7P/kMB3MuKzyuLvvvJJuAzK1W6e/+daukeEd5lge\nFBI68EsrFt1eTa1DMuKQkJzs4Xx1TrwCSKV2E45ZAoGBAIZkXyAOhwqCxwDF7B69\nt/7CWs0gPGqp6lFO7fgt7jPmcmSEr/xgUbBDFwd7D49jpXVgCEtr1Bd6MItlu/Ns\nXgXyOa5LPQmglF7UtnvuQLASBy5X6boKaf3sz7I5eho1kXczPGQUHfR5e0DaTND3\nTi2NLIAUci8T7hc8mONdeEHD\n-----END PRIVATE KEY-----\n", + "client_email": "marketalarm-photos-service-acc@marketalarm.iam.gserviceaccount.com", + "client_id": "115644068453290488813", + "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-service-acc%40marketalarm.iam.gserviceaccount.com" +}