Skip to content

Prepend http protocol #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabriciojs merged 2 commits into from
Nov 10, 2020
Merged

Prepend http protocol #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c08035
Prepend http protocol
leandroncbrito Nov 4, 2020
8a15cff
code improvement
leandroncbrito Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pdf-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ app.post('/from-html', async (req, res) => {

app.get('/from-url', async (req, res) => {
calls.fromUrl++;
const url = req.query.url;
let url = req.query.url;
console.log('/from-url');

if (!url) {
Expand All @@ -71,7 +71,7 @@ app.get('/from-url', async (req, res) => {

let pdfFilePath;
try {
pdfFilePath = await generatePdf(url, req.query.media);
pdfFilePath = await generatePdf(withHttp(url), req.query.media);

deliverPdfFile(res, pdfFilePath);
} catch (err) {
Expand All @@ -82,6 +82,12 @@ app.get('/from-url', async (req, res) => {
}
});

function withHttp (url) {
return !/^https?:\/\//i.test(url)
? `http://${url}`
: url;
}

function deliverJson(res, resp, status = 200) {
res.status(status).contentType('json').send(resp);
}
Expand Down