jonathan/combine.fm
jonathan/combine.fm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add variable to request for user's protocol

Browse source
This commit is contained in:
Jonathan Cremin 2014-12-06 14:46:30 +00:00
parent 01c7f418dc
commit da5e67f9ad
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app.js
View file

@ -52,9 +52,12 @@ app.use(function(req, res, next) {
app.get('*', function(req,res,next) { app.get('*', function(req,res,next) {
if (req.headers['cf-visitor'] && req.headers['cf-visitor'] != '{"scheme":"https"}') { if (req.headers['cf-visitor'] && req.headers['cf-visitor'] != '{"scheme":"https"}') {
res.redirect("https://" + req.headers['host'] + req.url); res.redirect("https://" + req.headers['host'] + req.url);
} else if (req.headers['cf-visitor']) {
req.userProtocol = "https";
} else { } else {
next(); req.userProtocol = "http"
} }
next();
}); });
app.get('/', function(req, res) { app.get('/', function(req, res) {

4
routes/share.js
View file

@ -30,7 +30,7 @@ module.exports = function(req, res, next) {
page: type, page: type,
title: doc.items[0].name + " by " + doc.items[0].artist.name, title: doc.items[0].name + " by " + doc.items[0].artist.name,
items: doc.items, items: doc.items,
thisUrl: req.protocol + '://' + req.get('host') + req.originalUrl thisUrl: req.userProtocol + '://' + req.get('host') + req.originalUrl
}); });
} else { } else {
Q.timeout(services[serviceId].lookupId(itemId, type), 5000).then(function(item) { Q.timeout(services[serviceId].lookupId(itemId, type), 5000).then(function(item) {
@ -63,7 +63,7 @@ module.exports = function(req, res, next) {
page: type, page: type,
title: item.name + " by " + item.artist.name, title: item.name + " by " + item.artist.name,
items: items, items: items,
thisUrl: req.protocol + '://' + req.get('host') + req.originalUrl thisUrl: req.userProtocol + '://' + req.get('host') + req.originalUrl
}); });
}); });
}, function(error) { }, function(error) {