Skip to content

Commit 3328370

Browse files
committed
https and http connection
1 parent b1b4418 commit 3328370

File tree

4 files changed

+26
-66
lines changed

4 files changed

+26
-66
lines changed

back-end/app.js

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const passport = require('passport');
2323
const mongoose = require('mongoose');
2424
const compression = require('compression');
2525
const https = require('https');
26+
const http = require('http');
2627
const fs = require('fs');
2728
const cors = require('cors');
2829
const path = require('path');
@@ -54,7 +55,6 @@ mongoose
5455

5556
app.use(cors());
5657

57-
app.use(requireHTTPS);
5858

5959

6060
// Express body parser
@@ -82,14 +82,33 @@ const tokensCleanUp = new CronJob('10 3 * * *', function() {
8282
tokensCleanUp.start();
8383

8484
const PORT = process.env.PORT;
85-
https.createServer({
86-
key: fs.readFileSync(process.env.SSLKEY),
87-
cert: fs.readFileSync(process.env.SSLCERT),
85+
86+
87+
http.createServer({
8888
}, app)
8989
.listen(PORT, function() {
90-
console.log('App listening on port ' + PORT + '! Go to https://localhost:' + PORT + '/');
90+
console.log('App listening on port ' + PORT + '! Go to http://localhost:' + PORT + '/');
9191
});
9292

93+
94+
95+
// FOR HTTPS ONLY
96+
// https.createServer({
97+
// key: fs.readFileSync(process.env.SSLKEY),
98+
// cert: fs.readFileSync(process.env.SSLCERT),
99+
// }, app)
100+
// .listen(PORT, function() {
101+
// console.log('App listening on port ' + PORT + '! Go to https://localhost:' + PORT + '/');
102+
// });
103+
// app.use(requireHTTPS); FOR HTTPS
104+
// app.enable('trust proxy');
105+
// app.use(function(req, res, next) {
106+
// if (req.secure) {
107+
// return next();
108+
// }
109+
// res.redirect('https://' + req.headers.host + req.url);
110+
// });
111+
93112
/**
94113
* @param {int} req req.
95114
* @param {int} res res.
@@ -101,12 +120,4 @@ function requireHTTPS(req, res, next) {
101120
return res.redirect('https://' + req.get('host') + req.url);
102121
}
103122
next();
104-
}
105-
106-
app.enable('trust proxy');
107-
app.use(function(req, res, next) {
108-
if (req.secure) {
109-
return next();
110-
}
111-
res.redirect('https://' + req.headers.host + req.url);
112-
});
123+
}
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,2 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIEnDCCA4SgAwIBAgIUBZSPU0ukxsL1a6k/np//fLmRKGEwDQYJKoZIhvcNAQEL
3-
BQAwgYsxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZEZsYXJlLCBJbmMuMTQw
4-
MgYDVQQLEytDbG91ZEZsYXJlIE9yaWdpbiBTU0wgQ2VydGlmaWNhdGUgQXV0aG9y
5-
aXR5MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRMwEQYDVQQIEwpDYWxpZm9ybmlh
6-
MB4XDTIxMDEwNzE0NDgwMFoXDTM2MDEwNDE0NDgwMFowYjEZMBcGA1UEChMQQ2xv
7-
dWRGbGFyZSwgSW5jLjEdMBsGA1UECxMUQ2xvdWRGbGFyZSBPcmlnaW4gQ0ExJjAk
8-
BgNVBAMTHUNsb3VkRmxhcmUgT3JpZ2luIENlcnRpZmljYXRlMIIBIjANBgkqhkiG
9-
9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtI02w7auVFh4JqQ/TeROmu+siyNYwy5BG8WN
10-
ST3YWFMM8TD0z0qA8FtUBU38uMbVTI23kAlqzswjg6715x4afmTv0hDVe+o8eeaW
11-
Xlk4+EZ5uj/OUI+A5Ne+mVKz4TozyBTCH9OqEhqKI0SnoTp43GQwR/5mEIagQTTv
12-
K29Um5q7Sy8ktbrJAQoaB8ErVU5Lk60mFvp1StmBFi/GJG7t3dC/t27dITNhobUD
13-
ZZS2HEUuG8iLufIAP8ybp57aUTyBZgw2A6pPV4wnYLdgH/8jo+eNycLHAoChLmzG
14-
sqnF5s/soqeRwvjOApXmmTVRWlpEL5rOVtXKBJ5ViKiYL26vfQIDAQABo4IBHjCC
15-
ARowDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
16-
ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBThIGRfXQYzIRvAyRueA7UVjv91czAf
17-
BgNVHSMEGDAWgBQk6FNXXXw0QIep65TbuuEWePwppDBABggrBgEFBQcBAQQ0MDIw
18-
MAYIKwYBBQUHMAGGJGh0dHA6Ly9vY3NwLmNsb3VkZmxhcmUuY29tL29yaWdpbl9j
19-
YTAfBgNVHREEGDAWghRkZW1vLnByb2plY3RkYXRhLmRldjA4BgNVHR8EMTAvMC2g
20-
K6AphidodHRwOi8vY3JsLmNsb3VkZmxhcmUuY29tL29yaWdpbl9jYS5jcmwwDQYJ
21-
KoZIhvcNAQELBQADggEBAI1hwzgGn//c2JbjZhw93/RNJ1v4ENmwkoNuvI70N/kM
22-
s4YMgeJWwIN+cNUU/yV0gH8c1KtoEHS0/aFERBc+WoplBP3+VmQ+RTt1j62kiJYt
23-
/FigDaCWg+mdujDE/m+xVabkFclALwB7ol/JEYE+PHGjZDKr6qgsrY4zg/e7wUUh
24-
5FW1zq1hXQ0JfNKSvXDGs2Zw9tnK+JcdB7IVW8847QP52Q+1wscbFfk08S28Bz69
25-
ARXQlH9BMJZIw5bbFK6ZMXRXXFTPDpCmQsR3QicegEoTAl0ataKtwet2EQNy1DC4
26-
y1wMBGabCiWJxQH8KMusN1bfgpwlnkQL8NGsfKg4XV8=
272
-----END CERTIFICATE-----
Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,2 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0jTbDtq5UWHgm
3-
pD9N5E6a76yLI1jDLkEbxY1JPdhYUwzxMPTPSoDwW1QFTfy4xtVMjbeQCWrOzCOD
4-
rvXnHhp+ZO/SENV76jx55pZeWTj4Rnm6P85Qj4Dk176ZUrPhOjPIFMIf06oSGooj
5-
RKehOnjcZDBH/mYQhqBBNO8rb1SbmrtLLyS1uskBChoHwStVTkuTrSYW+nVK2YEW
6-
L8Ykbu3d0L+3bt0hM2GhtQNllLYcRS4byIu58gA/zJunntpRPIFmDDYDqk9XjCdg
7-
t2Af/yOj543JwscCgKEubMayqcXmz+yip5HC+M4CleaZNVFaWkQvms5W1coEnlWI
8-
qJgvbq99AgMBAAECggEAAQpKF3trzx+77gvrV7uukNLOGPaLT/Eg/gqunGnXOtDA
9-
0VXFA0wllk8yrN24TJaC9F3PgeyAiXTAe6C8Rs0GUAz2P5qTOW7Sd81SbnRvtbsK
10-
Nn6geBfG/MFjKHBnrlOBFkveCLroKltkgA87DkpPPDuIGxs4PwdFPoQSRT+l85FA
11-
l/Tg7VFguZs7mC6/eBvILjZhcK+XmtV/yVvYZF3Mk5LYcM/D96Vi6+QbienWoy11
12-
vg1da2pSAuShHnz/S3cPT+Q6WX/5cnO6ajRLcdzT3EaoNnCP1pvCCo972+b98GCt
13-
8sYxSevEsskO0bzhe17wYG8kunNTKQ23bDTe/EKWIQKBgQDgRhmSxMTOwfgB1Ypn
14-
9jCGgkCHt0tMEnZOLVwlfKUduXs68cEjOm4B0nHzDtDb6elD0dJA2H0Go4myVNJe
15-
33yTL5DxJQ2AiBIRHQ871MI4HaTpZo1CvnfxJaz3H4kHIrPETblovpU+pynOs2hT
16-
PeMzATAfZG/gIERc69J0Y6A5SQKBgQDOF7+jPiUee4opQJuKIMMbX7Gf4N99liyJ
17-
Z5Mw7fqSeu5ae7tW7CYjwyKEpzGC6lOK7CETPRGZL+zkTcewgCKWfbHUyzbyjZcj
18-
YtlLOL8wtXeuM5wxbqKkMfIvG2nijBfeUGEXBWpnj09/Sd3LSHHQa3kaJ7tRLakr
19-
hCHBAdqYlQKBgBvemi7y5MIMuJUBxEFHBqCwbvRugpzhbnIokNrXsm0PL5ETmbyW
20-
9jSjwiVCIhIx7xrOaCJGxMKeb+4JPFstyn0/2/Mbd6IRRq15vvrgZYIzrNqUM9mn
21-
caA13liXQp/wYAZ04iVyCXnPrBJTmRM/DYy5CRHdmUlwuQ4TAAQWnUKBAoGBAMaz
22-
Gu72sa8MCQ7w3YV1ROcVghnVI2Tf7xyjIcShDV9A6qGOffa2Q6djMdqXoCLKbbWZ
23-
J+J2lIsPK+SKISdIwxA5K8UwEFAWt0tEuJ/PnHYH39WyqLr4IhMQnKFSWuozi6ep
24-
85HQhOBHyau9ufuOYz1BAUd4Wx9PWLU99ZUyhmFpAoGAMdxATWVsYp/QXcmoh/pK
25-
VZItGldqrVecoUrG2NBR5XmZfxvQG0VFPo62VKVDq0Ayvw/iVfQj9iwoFZOUik7f
26-
NalOCHWMtAYwmOOifsYNuEp829kVALTz2gtAW06hrz/6M5SsLCtiXJ1E5QZwbSY1
27-
XCSiVOShTWqVDBPUGkkEOYk=
282
-----END PRIVATE KEY-----

front-end/src/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const config = {
2-
WS_BASE_URL: 'https://localhost:5100/api/',
2+
WS_BASE_URL: 'http://localhost:5100/api/',
33
DOMAIN_NAME: 'http://localhost:3000',
44
DEMO: true
55
}

0 commit comments

Comments
 (0)