From 1d9aa8061c3568c7d1eee0b4f9faca58334b574c Mon Sep 17 00:00:00 2001
From: Patrick Fic <pfic@outlook.com>
Date: Tue, 14 Jan 2020 19:00:32 -0800
Subject: [PATCH] Testing s3 server on Heroku

---
 .../jobs-documents/jobs-documents.page.jsx    | 10 +++---
 server.cert                                   | 24 ++++++++++++++
 server.js                                     | 32 +++++++++++++++----
 server.key                                    | 28 ++++++++++++++++
 4 files changed, 82 insertions(+), 12 deletions(-)
 create mode 100644 server.cert
 create mode 100644 server.key

diff --git a/client/src/pages/jobs-documents/jobs-documents.page.jsx b/client/src/pages/jobs-documents/jobs-documents.page.jsx
index 9c22f963f..e335a0797 100644
--- a/client/src/pages/jobs-documents/jobs-documents.page.jsx
+++ b/client/src/pages/jobs-documents/jobs-documents.page.jsx
@@ -71,17 +71,15 @@ function JobsDetailPage({ match, loading, data }) {
     // Split the filename to get the name and type
     let fileName = ev.file.name;
     let fileType = ev.file.type;
-    console.log("Preparing the upload");
+    console.log("Preparing the upload ");
+
     axios
-      .post("https://localhost:5000/sign_s3", {
-        fileName: fileName,
-        fileType: fileType
-      })
+      .post("http://localhost:5000/sign_s3")
       .then(response => {
         var returnData = response.data.data.returnData;
         var signedRequest = returnData.signedRequest;
         var url = returnData.url;
-        this.setState({ url: url });
+        setState({ url: url });
         console.log("Recieved a signed request " + signedRequest);
 
         // Put the fileType in the headers for the upload
diff --git a/server.cert b/server.cert
new file mode 100644
index 000000000..379c731cc
--- /dev/null
+++ b/server.cert
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIECzCCAvOgAwIBAgIUFjwHhnj6LK35rYqhdtjDwjKspgAwDQYJKoZIhvcNAQEL
+BQAwgZQxCzAJBgNVBAYTAkNBMQswCQYDVQQIDAJCQzESMBAGA1UEBwwJVmFuY291
+dmVyMRwwGgYDVQQKDBNTbmFwdCBTb2Z0d2FyZSBJbmMuMQ4wDAYDVQQLDAVTbmFw
+dDESMBAGA1UEAwwJbG9jYWxob3N0MSIwIAYJKoZIhvcNAQkBFhNzbmFwdHNvZnRA
+Z21haWwuY29tMB4XDTIwMDExNTAxMzgzOFoXDTIwMDIxNDAxMzgzOFowgZQxCzAJ
+BgNVBAYTAkNBMQswCQYDVQQIDAJCQzESMBAGA1UEBwwJVmFuY291dmVyMRwwGgYD
+VQQKDBNTbmFwdCBTb2Z0d2FyZSBJbmMuMQ4wDAYDVQQLDAVTbmFwdDESMBAGA1UE
+AwwJbG9jYWxob3N0MSIwIAYJKoZIhvcNAQkBFhNzbmFwdHNvZnRAZ21haWwuY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApbWK/AYHMMUe/i08tyUu
+8AuMEF2JG9Vwmegh8zglMgfHxPBfrMu3AKzpMhTCsRQvWtrFLn0guk2dP9o7g1QM
+oXrgv79MkAKCjbgVM+n9wRlEGPv1oa3ha8izJvBIHfMoHv6xJBFVpj3PwX+HM9Vw
+CxxAtwxwfCaRlDYOKBD7EQ61K50+au01C5O7jvPp5ewOjZO0Zo415G9lohYHaqeU
+HBIOstMnFUnMOi4quJ1OVHO4670LE1ewEw8164P8MjPX/QJC+KhmlUsLmDrNcNpM
+ciWKYz+njTwey8/7Mr5/Q6srjRAwskvAg4usHaAL7vkxi7INmMpYmRSmas5TaLUg
+sQIDAQABo1MwUTAdBgNVHQ4EFgQUecAjiUAYDt7MdbrWVYdQY0dBBK4wHwYDVR0j
+BBgwFoAUecAjiUAYDt7MdbrWVYdQY0dBBK4wDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAIW4oMdEmrPji/Nl6EN/Mef3gkkTwEQsSGG5RM98g58vM
+EwJ7/Xh10+Z1Az9oEZckk/L32bLOO9ciECZE+8WE8WjjQwG98cVcz+dThSXKZPPB
+xBWjo0sDt5Y248ZXSEhBeUR/jIcG6wik2cCNVl+TVqwBd+KBeSpvf9E17I5cOKoa
++UUEWjsZm1Y7w+K9GqEjaTzdN+VI2iwKL/Be11+RioZrmSAWypL/kXmcffI3pQb5
+Ne63Tbb3znFGEqwlA95P+nZc+LYLAYPwQ+nQZU9fdqcAkT99QpUjD9ApwEEbvMpx
+imJpO46Iq7UL7biBXPCLXqIwaNx7r8gQRi6YxFUFZA==
+-----END CERTIFICATE-----
diff --git a/server.js b/server.js
index 617446f39..06219c2fa 100644
--- a/server.js
+++ b/server.js
@@ -6,6 +6,18 @@ const compression = require("compression");
 var enforce = require("express-sslify");
 if (process.env.NODE_ENV !== "production") require("dotenv").config();
 
+const https = require("https");
+const fs = require("fs");
+
+if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
+  var key = fs.readFileSync("server.key");
+  var cert = fs.readFileSync("server.cert");
+  var options = {
+    key: key,
+    cert: cert
+  };
+}
+
 const app = express();
 const port = process.env.PORT || 5000;
 
@@ -27,10 +39,18 @@ if (process.env.NODE_ENV === "production") {
   });
 }
 
-app.listen(port, error => {
-  if (error) throw error;
-  console.log("Server running on port " + port);
-});
-
 var s3upload = require("./s3upload");
-app.get("/sign_s3", s3upload.sign_s3);
+app.post("/sign_s3", s3upload.sign_s3);
+
+if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
+  var server = https.createServer(options, app);
+
+  server.listen(port, () => {
+    console.log("[DEV] Server starting on port : " + port);
+  });
+} else {
+  app.listen(port, error => {
+    if (error) throw error;
+    console.log("Server running on port " + port);
+  });
+}
diff --git a/server.key b/server.key
new file mode 100644
index 000000000..0c175f59a
--- /dev/null
+++ b/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCltYr8BgcwxR7+
+LTy3JS7wC4wQXYkb1XCZ6CHzOCUyB8fE8F+sy7cArOkyFMKxFC9a2sUufSC6TZ0/
+2juDVAyheuC/v0yQAoKNuBUz6f3BGUQY+/WhreFryLMm8Egd8yge/rEkEVWmPc/B
+f4cz1XALHEC3DHB8JpGUNg4oEPsRDrUrnT5q7TULk7uO8+nl7A6Nk7RmjjXkb2Wi
+Fgdqp5QcEg6y0ycVScw6Liq4nU5Uc7jrvQsTV7ATDzXrg/wyM9f9AkL4qGaVSwuY
+Os1w2kxyJYpjP6eNPB7Lz/syvn9DqyuNEDCyS8CDi6wdoAvu+TGLsg2YyliZFKZq
+zlNotSCxAgMBAAECggEAZAlw2iyZcqvNxgxxNu9PosKVz9tnxlHYJFGrDTW73rQr
+uYyTdbGVzOaV8RHvZw+UdvjTSPlpJI9uevm4K9Q1u9Z+j8Ng6R9ayUt0IV8FPemO
+3rZc1zotd/A1lzA/mTUN54hCUE/WsQFnxpzCdlxHw61OtDLiRVDTWfI4IZ/+sZCC
+qQC7hG3z0tchBiBkDghkbMmTTmzNk9OBvePNOYqpNvmm+hBes1IQPau9m7GBTgp3
+tPb7twEQOmU9OvGZxO9ryfh6JDbSI7lxaCRYwq8XDFM64H34lxrp9giMIz0J6nsR
+XGPfog4lsqlZGMV+qyMpdwvzO2b79tIcmFx8HPEIAQKBgQDUh4NXhtrADYVuXTqB
+s7aGRAUHS9lvlvYGx1L9NDKlVoi1gYYRONJM3uP+6lMQ0T+Qe2D3VllcY3qzt1tP
+ufxYngXwnzIUhIuqtqUUmadv4E6FEj5zGDv+4HHf7nyxo0MmYzGxsZmNZeznaRcY
+J4woiragUjNv6g9JnfAaWOlQ4QKBgQDHmmzZyXtNxp+G5znzCboBy9W/dGmwyl/J
+8hj5aBLSV6yc9Cv6K1m8Y2q1qFpBPhL3PZ0CzGoHACri2KxU15xNvvsNf6HQLCjQ
+mqFw18Tglc+fpz0JkDtPaC5JxzaC2zRByHDb/BPav7neVzaSt4xf4DTK8oKR1mZs
+mSYK7jg50QKBgHwEk9UogU/e1AUB7BkxqIoS+Sg3z6s5WVm9SKUup3sp0t6vtW8p
+TDbFPiBL1qsSn9gM1xmdzsmF11012tfcPO/tTqQKEaw9aE73A7/Qpg83wjoO2lhJ
+RQFHMcwtm6ABGDc3XRFHBMapOqQTBAH5WeVyhH1rWk6tM7yOqESHq6ahAoGBAL5k
+penDz1Lr4CU9EECsiXnHJfc+osYY8+/cd0gHptRu/t6j5gL2MN2K8zGeCaFsBYlC
+gy81LvnIhh/lz9QJ6jUas7w3f3Djfnck2FOb7VbQb8B5NLaXloty85w6YtvFHf6V
+pFmiBIpHEZNtG0gtvr+BTLo9QqC7ou151BjfDFDRAoGAO7+Zh/zW0N9j0Z/a4+8T
+pkbXu9VBxlbUaCUm8ojKYpe5YIYyQWxO+2YTz/TpS5zlgZoMGtQcL8ZgZGS6v3To
+E7spdcqza8vBqVZh/itx+cbTJvXN6LRzMZID/WyplnHxkwYbaBqgLPKcEooh/Iwa
+7mM28slPg6nLerX9n1PupEQ=
+-----END PRIVATE KEY-----