Skip to content

Commit

Permalink
Removing lint warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
avoidwork committed Jul 5, 2016
1 parent d9ba63b commit e1fb95c
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 92 deletions.
83 changes: 2 additions & 81 deletions lib/utility.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
const path = require("path"),
http = require("http"),
array = require("retsu"),
coerce = require("tiny-coerce"),
keysort = require("keysort"),
url = require("url"),
session = require("express-session"),
cookie = require("cookie-parser"),
lusca = require("lusca"),
Expand Down Expand Up @@ -98,8 +96,8 @@ function auth (obj, config) {
res.redirect(config.auth.redirect);
}

obj.server.use(middleware.decorate).blacklist(middleware.decorate);
obj.server.use(middleware.parse).blacklist(middleware.parse);
obj.server.use(middleware.decorate, "all").blacklist(middleware.decorate);
obj.server.use(middleware.parse, "all").blacklist(middleware.parse);

obj.server.blacklist(middleware.asyncFlag);

Expand Down Expand Up @@ -578,81 +576,6 @@ function bootstrap (obj, config) {
return obj;
}

function queryString (qstring = "") {
let obj = {};
let aresult = qstring.split("?");
let result;

if (aresult.length > 1) {
aresult.shift();
}

result = aresult.join("?");
result.split("&").forEach(function (prop) {
let aitem = prop.replace(/\+/g, " ").split("=");
let item;

if (aitem.length > 2) {
item = [aitem.shift(), aitem.join("=")];
} else {
item = aitem;
}

if (isEmpty(item[0])) {
return;
}

if (item[1] === undefined) {
item[1] = "";
} else {
item[1] = coerce(decodeURIComponent(item[1]));
}

if (obj[item[0]] === undefined) {
obj[item[0]] = item[1];
} else if (obj[item[0]] instanceof Array === false) {
obj[item[0]] = [obj[item[0]]];
obj[item[0]].push(item[1]);
} else {
obj[item[0]].push(item[1]);
}
});

return obj;
}

function parse (uri) {
let luri = uri;
let idxAscii, idxQ, parsed;

if (luri === undefined || luri === null) {
luri = "";
} else {
idxAscii = luri.indexOf("%3F");
idxQ = luri.indexOf("?");

switch (true) {
case idxQ === -1 && idxAscii > -1:
case idxAscii < idxQ:
luri = luri.replace("%3F", "?");
break;
default:
void 0;
}
}

parsed = url.parse(luri);
parsed.query = parsed.search ? queryString(parsed.search) : {};

iterate(parsed, function (v, k) {
if (v === null) {
parsed[k] = "";
}
});

return parsed;
}

function hypermedia (server, req, rep, headers) {
let seen = {},
collection = req.parsed.pathname,
Expand Down Expand Up @@ -801,7 +724,5 @@ module.exports = {
escape: escape,
hypermedia: hypermedia,
isEmpty: isEmpty,
queryString: queryString,
parse: parse,
trim: trim
};
29 changes: 18 additions & 11 deletions sample.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
require("./index.js")({
port: 8000,
routes: require("./test/routes.js"),
logging: {
level: "debug"
level: "error",
dtrace: true,
stderr: true
},
websocket: {
enabled: true,
options: {
port: 3000
}
},
coap: {
enabled: true
},
routes: require(__dirname + "/test/routes.js")
auth: {
local: {
enabled: true,
auth: function (username, password, callback) {
if (username === "test" && password === 123) {
callback(null, {username: username, password: password});
} else {
callback(true, null);
}
}
},
protect: ["/uuid"]
}
});

0 comments on commit e1fb95c

Please sign in to comment.