steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting

deepsource-autofix-76c6eb20
Dan Gowans 2022-08-22 14:21:48 -04:00
parent 8df9d11c51
commit 32f8332c3c
4 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app.js
View File

@ -43,10 +43,12 @@ app.use(express.urlencoded({
extended: false extended: false
})); }));
app.use(cookieParser()); app.use(cookieParser());
app.use(csurf({ cookie: true })); app.use(csurf({
cookie: true
}));
const limiter = rateLimit({ const limiter = rateLimit({
windowMs: 60 * 1000, windowMs: 1000,
max: 1000 max: 25 * Math.max(3, configFunctions.getProperty("users.canLogin").length)
}); });
app.use(limiter); app.use(limiter);
const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix");

138
app.ts
View File

@ -23,7 +23,10 @@ import * as configFunctions from "./helpers/functions.config.js";
import * as dateTimeFns from "@cityssm/expressjs-server-js/dateTimeFns.js"; import * as dateTimeFns from "@cityssm/expressjs-server-js/dateTimeFns.js";
import * as stringFns from "@cityssm/expressjs-server-js/stringFns.js"; import * as stringFns from "@cityssm/expressjs-server-js/stringFns.js";
import * as htmlFns from "@cityssm/expressjs-server-js/htmlFns.js"; import * as htmlFns from "@cityssm/expressjs-server-js/htmlFns.js";
import { version } from "./version.js";
import {
version
} from "./version.js";
import * as databaseInitializer from "./helpers/initializer.database.js"; import * as databaseInitializer from "./helpers/initializer.database.js";
@ -49,7 +52,7 @@ const __dirname = ".";
export const app = express(); export const app = express();
if (!configFunctions.getProperty("reverseProxy.disableEtag")) { if (!configFunctions.getProperty("reverseProxy.disableEtag")) {
app.set("etag", false); app.set("etag", false);
} }
// View engine setup // View engine setup
@ -57,22 +60,24 @@ app.set("views", path.join(__dirname, "views"));
app.set("view engine", "ejs"); app.set("view engine", "ejs");
if (!configFunctions.getProperty("reverseProxy.disableCompression")) { if (!configFunctions.getProperty("reverseProxy.disableCompression")) {
app.use(compression()); app.use(compression());
} }
app.use((request, _response, next) => { app.use((request, _response, next) => {
debugApp(`${request.method} ${request.url}`); debugApp(`${request.method} ${request.url}`);
next(); next();
}); });
app.use(express.json()); app.use(express.json());
app.use(express.urlencoded({ app.use(express.urlencoded({
extended: false extended: false
})); }));
app.use(cookieParser()); app.use(cookieParser());
app.use(csurf({ cookie: true })); app.use(csurf({
cookie: true
}));
/* /*
@ -80,8 +85,8 @@ app.use(csurf({ cookie: true }));
*/ */
const limiter = rateLimit({ const limiter = rateLimit({
windowMs: 60 * 1000, windowMs: 1000,
max: 1000 max: 25 * Math.max(3, configFunctions.getProperty("users.canLogin").length)
}); });
app.use(limiter); app.use(limiter);
@ -95,22 +100,22 @@ app.use(limiter);
const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix");
if (urlPrefix !== "") { if (urlPrefix !== "") {
debugApp("urlPrefix = " + urlPrefix); debugApp("urlPrefix = " + urlPrefix);
} }
app.use(urlPrefix, express.static(path.join("public"))); app.use(urlPrefix, express.static(path.join("public")));
app.use(urlPrefix + "/lib/fa", app.use(urlPrefix + "/lib/fa",
express.static(path.join("node_modules", "@fortawesome", "fontawesome-free"))); express.static(path.join("node_modules", "@fortawesome", "fontawesome-free")));
app.use(urlPrefix + "/lib/cityssm-bulma-webapp-js", app.use(urlPrefix + "/lib/cityssm-bulma-webapp-js",
express.static(path.join("node_modules", "@cityssm", "bulma-webapp-js"))); express.static(path.join("node_modules", "@cityssm", "bulma-webapp-js")));
app.use(urlPrefix + "/lib/cityssm-bulma-js", app.use(urlPrefix + "/lib/cityssm-bulma-js",
express.static(path.join("node_modules", "@cityssm", "bulma-js", "dist"))); express.static(path.join("node_modules", "@cityssm", "bulma-js", "dist")));
app.use(urlPrefix + "/lib/leaflet", app.use(urlPrefix + "/lib/leaflet",
express.static(path.join("node_modules", "leaflet", "dist"))); express.static(path.join("node_modules", "leaflet", "dist")));
/* /*
@ -123,40 +128,40 @@ const FileStoreSession = FileStore(session);
// Initialize session // Initialize session
app.use(session({ app.use(session({
store: new FileStoreSession({ store: new FileStoreSession({
path: "./data/sessions", path: "./data/sessions",
logFn: debug("general-licence-manager:session"), logFn: debug("general-licence-manager:session"),
retries: 10 retries: 10
}), }),
name: sessionCookieName, name: sessionCookieName,
secret: configFunctions.getProperty("session.secret"), secret: configFunctions.getProperty("session.secret"),
resave: true, resave: true,
saveUninitialized: false, saveUninitialized: false,
rolling: true, rolling: true,
cookie: { cookie: {
maxAge: configFunctions.getProperty("session.maxAgeMillis"), maxAge: configFunctions.getProperty("session.maxAgeMillis"),
sameSite: "strict" sameSite: "strict"
} }
})); }));
// Clear cookie if no corresponding session // Clear cookie if no corresponding session
app.use((request, response, next) => { app.use((request, response, next) => {
if (request.cookies[sessionCookieName] && !request.session.user) { if (request.cookies[sessionCookieName] && !request.session.user) {
response.clearCookie(sessionCookieName); response.clearCookie(sessionCookieName);
} }
next(); next();
}); });
// Redirect logged in users // Redirect logged in users
const sessionChecker = (request: express.Request, response: express.Response, next: express.NextFunction) => { const sessionChecker = (request: express.Request, response: express.Response, next: express.NextFunction) => {
if (request.session.user && request.cookies[sessionCookieName]) { if (request.session.user && request.cookies[sessionCookieName]) {
return next(); return next();
} }
return response.redirect(`${urlPrefix}/login?redirect=${request.originalUrl}`); return response.redirect(`${urlPrefix}/login?redirect=${request.originalUrl}`);
}; };
@ -169,24 +174,24 @@ const sessionChecker = (request: express.Request, response: express.Response, ne
app.use((request, response, next) => { app.use((request, response, next) => {
response.locals.buildNumber = version; response.locals.buildNumber = version;
response.locals.user = request.session.user; response.locals.user = request.session.user;
response.locals.csrfToken = request.csrfToken(); response.locals.csrfToken = request.csrfToken();
response.locals.configFunctions = configFunctions; response.locals.configFunctions = configFunctions;
response.locals.dateTimeFunctions = dateTimeFns; response.locals.dateTimeFunctions = dateTimeFns;
response.locals.stringFunctions = stringFns; response.locals.stringFunctions = stringFns;
response.locals.htmlFunctions = htmlFns; response.locals.htmlFunctions = htmlFns;
response.locals.urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); response.locals.urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix");
next(); next();
}); });
app.get(urlPrefix + "/", sessionChecker, (_request, response) => { app.get(urlPrefix + "/", sessionChecker, (_request, response) => {
response.redirect(urlPrefix + "/dashboard"); response.redirect(urlPrefix + "/dashboard");
}); });
app.use(urlPrefix + "/dashboard", sessionChecker, routerDashboard); app.use(urlPrefix + "/dashboard", sessionChecker, routerDashboard);
@ -200,44 +205,45 @@ app.use(urlPrefix + "/reports", sessionChecker, routerReports);
app.use(urlPrefix + "/admin", sessionChecker, routerAdmin); app.use(urlPrefix + "/admin", sessionChecker, routerAdmin);
app.all(urlPrefix + "/keepAlive", (_request, response) => { app.all(urlPrefix + "/keepAlive", (_request, response) => {
response.json(true); response.json(true);
}); });
app.use(urlPrefix + "/login", routerLogin); app.use(urlPrefix + "/login", routerLogin);
app.get(urlPrefix + "/logout", (request, response) => { app.get(urlPrefix + "/logout", (request, response) => {
if (request.session.user && request.cookies[sessionCookieName]) { if (request.session.user && request.cookies[sessionCookieName]) {
// eslint-disable-next-line unicorn/no-null // eslint-disable-next-line unicorn/no-null
request.session.destroy(null); request.session.destroy(null);
request.session = undefined; request.session = undefined;
response.clearCookie(sessionCookieName); response.clearCookie(sessionCookieName);
response.redirect(urlPrefix + "/"); response.redirect(urlPrefix + "/");
} else { } else {
response.redirect(urlPrefix + "/login");
response.redirect(urlPrefix + "/login"); }
}
}); });
// Catch 404 and forward to error handler // Catch 404 and forward to error handler
app.use((_request, _response, next) => { app.use((_request, _response, next) => {
next(createError(404)); next(createError(404));
}); });
// Error handler // Error handler
app.use((error: { status: number; message: string }, app.use((error: {
request: express.Request, response: express.Response) => { status: number;message: string
},
request: express.Request, response: express.Response) => {
// Set locals, only providing error in development // Set locals, only providing error in development
response.locals.message = error.message; response.locals.message = error.message;
response.locals.error = request.app.get("env") === "development" ? error : {}; response.locals.error = request.app.get("env") === "development" ? error : {};
// Render the error page // Render the error page
response.status(error.status || 500); response.status(error.status || 500);
response.render("error"); response.render("error");
}); });

1
helpers/functions.fee.ts
View File

@ -1,4 +1,3 @@
import e from "express";
import * as recordTypes from "../types/recordTypes"; import * as recordTypes from "../types/recordTypes";

13
public-scss/style.scss
View File

@ -31,8 +31,7 @@ fieldset:enabled .is-hidden-enabled {
pointer-events: none; pointer-events: none;
} }
// to fix page titles inside level components // to fix page titles inside level components, set on .level-left
// set on .level-left
.has-flex-shrink-1 { .has-flex-shrink-1 {
flex-shrink: 1; flex-shrink: 1;
@ -89,12 +88,10 @@ fieldset:enabled .is-hidden-enabled {
} }
} }
/* /*
* SVG * SVG
*/ */
.image svg { .image svg {
display: block; display: block;
height: auto; height: auto;
@ -117,22 +114,18 @@ fieldset:enabled .is-hidden-enabled {
} }
} }
/* /*
* "Readonly" selects * "Readonly" selects
*/ */
.select option:disabled {
.select option:disabled {
display: none; display: none;
} }
/* /*
* Modal Size Fix * Modal Size Fix
*/ */
.modal-card { .modal-card {
max-width: 100%; max-width: 100%;
} }