Compare commits

...
3 Commits
Author SHA1 Message Date
gisle 01b501f9e5 Fixed /logs/<lig-id> route not supporting dash in channel name.
the build was successful
2019-07-20 10:18:05 +02:00
gisle 9b7d182955 Removed limit argument in logs query if it's not needed.
the build was successful
2019-05-21 20:45:27 +02:00
gisle 7c55fc03aa Fixed locals middleware doing an auth check for assets, scripts and other static content.
the build was successful
2019-05-19 21:37:01 +02:00
3 changed files with 17 additions and 10 deletions
+11 -9
View File
@@ -28,15 +28,17 @@ module.exports = (req, res, next) => {
} }
} }
if (req.user) { if (["/static/", "/hax/", "/assets/"].find(p => req.path.startsWith(p)) == null) {
res.locals.user = { if (req.user) {
loggedIn: true, res.locals.user = {
name: req.user._json.name, loggedIn: true,
permissions: getPermissions(req.user._json.name), name: req.user._json.name,
} permissions: getPermissions(req.user._json.name),
} else { }
res.locals.user = { } else {
loggedIn: false, res.locals.user = {
loggedIn: false,
}
} }
} }
+5
View File
@@ -89,6 +89,11 @@ const logHeaderApi = {
* @returns {Promise<LogHeader[]>} * @returns {Promise<LogHeader[]>}
*/ */
list(filter = {}) { list(filter = {}) {
filter = Object.assign({}, filter)
if (filter.limit != null && filter.limit <= 0) {
delete filter.limit
}
return query(` return query(`
query LogHeaders($filter: LogsFilter) { query LogHeaders($filter: LogsFilter) {
headers: logs(filter:$filter) { headers: logs(filter:$filter) {
+1 -1
View File
@@ -102,7 +102,7 @@ app.use("/story/by-author/", require("./routes/story/by-author"))
app.use("/story/tag-list/", require("./routes/story/tag-list")) app.use("/story/tag-list/", require("./routes/story/tag-list"))
app.use("/story/:id(S[0-9a-z]{15})/", require("./routes/story-content")) app.use("/story/:id(S[0-9a-z]{15})/", require("./routes/story-content"))
app.use("/logs/", require("./routes/logs")) app.use("/logs/", require("./routes/logs"))
app.use("/logs/:id([0-9]{4}-[0-1][0-9]-[0-3][0-9]_[0-9]{9}_[A-Za-z0-9\,\']{2,})/", require("./routes/logs-content")) app.use("/logs/:id([0-9]{4}-[0-1][0-9]-[0-3][0-9]_[0-9]{9}_[A-Za-z0-9\,\'\-]{2,})/", require("./routes/logs-content"))
app.use("/logs/:id(L[0-9]{0,7})/", require("./routes/logs-content")) app.use("/logs/:id(L[0-9]{0,7})/", require("./routes/logs-content"))
app.use("/data/", require("./routes/data")) app.use("/data/", require("./routes/data"))
app.use("/data/characters/", require("./routes/data/characters")) app.use("/data/characters/", require("./routes/data/characters"))