Skip to content

Fixes #1. Inspect Accept header and return proper Content-Type. #2

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

Open
statonjr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #1. Inspect Accept header and return proper Content-Type. #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 18 additions & 13 deletions YouTypeIt/server/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var reScript = new RegExp('^\/script.js$','i');

// setup for API requests
var cjHeaders = {
'Content-type' : 'application/json' //vnd.collection+json'
'Content-Type' : 'application/vnd.collection+json'
};
var reAPIList = new RegExp('^\/api\/$', 'i');
var reAPIItem = new RegExp('^\/api\/.*', 'i');
Expand Down Expand Up @@ -107,7 +107,7 @@ function handler(req, res) {
sendHtmlError(req, res, 'Method Not Allowed', 405);
}
}

// API List
if(flg===false && reAPIList.test(req.url)) {
flg=true;
Expand All @@ -123,7 +123,7 @@ function handler(req, res) {
break;
}
}

// API Item
if(flg===false && reAPIItem.test(req.url)) {
flg=true;
Expand All @@ -142,7 +142,7 @@ function handler(req, res) {
break;
}
}

// not found
if(flg===false) {
sendHtmlError(req, res, 'Page Not Found', 404);
Expand Down Expand Up @@ -231,7 +231,7 @@ function postHtmlItem(req, res) {

function sendScript(req, res) {
var t;

try {
t = templates('script.js');
t = t.replace(/{@host}/g, root);
Expand All @@ -241,7 +241,7 @@ function sendScript(req, res) {
catch (ex) {
sendHtmlError(req, res, 'Server Error', 500);
}

}

function sendAPIList(req, res) {
Expand All @@ -251,11 +251,11 @@ function sendAPIList(req, res) {
rtn = messages('list');
list = rtn.list;
lmDate = rtn.lastDate;

t = templates('collection.js');
t = t.replace(/{@host}/g, root);
t = t.replace(/{@list}/g, formatAPIList(list));

sendAPIResponse(req, res, t, 200, new Date(lmDate).toGMTString());
}
catch (ex) {
Expand All @@ -274,7 +274,7 @@ function sendAPIItem(req, res, id) {
t = templates('collection.js');
t = t.replace(/{@host}/g, root);
t = t.replace(/{@list}/g, formatAPIItem(item));

sendAPIResponse(req, res, t, 200, new Date(lmDate).toGMTString());
}
catch(ex) {
Expand Down Expand Up @@ -399,16 +399,22 @@ function sendHtmlError(req, res, title, code) {
}

function sendHtmlResponse(req, res, body, code, lmDate) {
res.writeHead(code,
res.writeHead(code,
{'Content-Type' : 'text/html',
'ETag' : generateETag(body),
'Last-Modified' : lmDate});
res.end(body);
}

function sendAPIResponse(req, res, body, code, lmDate) {
res.writeHead(code,
{"Content-Type" : "application/json",
var ct;
if (req.headers.accept === 'application/vnd.collection+json') {
ct = req.headers.accept;
} else {
ct = 'application/json';
}
res.writeHead(code,
{"Content-Type" : ct,
"ETag" : generateETag(body),
"Last-Modified" : lmDate});
res.end(body);
Expand Down Expand Up @@ -439,4 +445,3 @@ function generateETag(data) {

// register listener for requests
http.createServer(handler).listen(port);