aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/RouteManager.ts8
-rw-r--r--src/server/index.ts17
2 files changed, 11 insertions, 14 deletions
diff --git a/src/server/RouteManager.ts b/src/server/RouteManager.ts
index 37eaded0d..a3841249b 100644
--- a/src/server/RouteManager.ts
+++ b/src/server/RouteManager.ts
@@ -10,8 +10,8 @@ export enum Method {
}
export interface CoreArguments {
- req: express.Request,
- res: express.Response,
+ req: express.Request;
+ res: express.Response;
isRelease: boolean;
}
@@ -65,9 +65,9 @@ export default class RouteManager {
_error(res, `The server encountered an internal error when serving ${target}.`, e);
}
}
- }
+ };
if (user) {
- await tryExecute(onValidation, { ...core, user: user as any });
+ await tryExecute(onValidation, { ...core, user });
} else {
req.session!.target = target;
if (onUnauthenticated) {
diff --git a/src/server/index.ts b/src/server/index.ts
index 81e236894..70add4ab2 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -322,7 +322,7 @@ async function PreliminaryFunctions() {
});
zip.finalize();
}
- })
+ });
router.addSupervisedRoute({
method: Method.POST,
@@ -427,7 +427,7 @@ async function PreliminaryFunctions() {
} catch (e) { console.log(e); }
});
}
- })
+ });
router.addSupervisedRoute({
method: Method.GET,
@@ -533,7 +533,7 @@ async function PreliminaryFunctions() {
let detector = new mobileDetect(req.headers['user-agent'] || "");
let filename = detector.mobile() !== null ? 'mobile/image.html' : 'index.html';
res.sendFile(path.join(__dirname, '../../deploy/' + filename));
- }
+ };
router.addSupervisedRoute({
method: Method.GET,
@@ -559,11 +559,8 @@ async function PreliminaryFunctions() {
router.addSupervisedRoute({
method: Method.GET,
subscription: RouteStore.getCurrUser,
- onValidation: ({ res, user }) => { res.send(JSON.stringify(user)); },
- onUnauthenticated: ({ res }) => {
- res.send(JSON.stringify({ id: "__guest__", email: "" }))
- return true;
- }
+ onValidation: ({ res, user }) => res.send(JSON.stringify(user)),
+ onUnauthenticated: ({ res }) => res.send(JSON.stringify({ id: "__guest__", email: "" }))
});
const ServicesApiKeyMap = new Map<string, string | undefined>([
@@ -951,7 +948,7 @@ async function PreliminaryFunctions() {
await Database.Auxiliary.DeleteAll();
res.redirect(RouteStore.delete);
}
- })
+ });
router.addSupervisedRoute({
method: Method.GET,
@@ -996,7 +993,7 @@ async function PreliminaryFunctions() {
}
_invalid(res, requestError);
}
- })
+ });
const suffixMap: { [type: string]: (string | [string, string | ((json: any) => any)]) } = {
"number": "_n",