Skip to content
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

Jump to bottom

[Lint] Fix non-Mongoose violations of no-var-requires #179

Merged
merged 1 commit into from
Jun 16, 2024
Merged

[Lint] Fix non-Mongoose violations of no-var-requires #179

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/routes/InAppRoutes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ router.get(DOWNLOAD_USER_DATA, rateLimiter, requireLogIn, downloadUserData);

router.get(DELETE_ACCOUNT, rateLimiter, requireLogIn, deleteAccount);

module.exports = router;
export = router;
69 changes: 36 additions & 33 deletions src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,45 @@
*/

import * as trpcExpress from "@trpc/server/adapters/express";
import { Request, Response } from "express";

import { IS_DEV } from "./config";
import { json, urlencoded } from "body-parser";
import MongoStore from "connect-mongo";
import cookieParser from "cookie-parser";
import express, { Request, Response } from "express";
import session, { MemoryStore } from "express-session";
import { HTTPS } from "express-sslify";
import { join } from "path";

import {
IS_DEV,
IS_TS_NODE,
MONGO_URI,
PORT,
STUDY_BUDDY_SESSION_SECRET_1,
} from "./config";
import { createContext } from "./context";
import { getDefaultTemplateVars } from "./controllers/ControllerUtilities";
import { addPublicUser } from "./models/Miscellaneous";
import expressAuthRouter from "./routes/AuthenticationRoutes";
import { inAppRouter } from "./routes/InAppRouter";
import expressInAppRouter from "./routes/InAppRoutes";
import { populateDummyAccountWithCards } from "./tests/DummyAccountUtils";
import { mergeRouters } from "./trpc";

const express = require("express");
const session = require("express-session");
const MongoStore = require("connect-mongo");
const path = require("path");
const bodyParser = require("body-parser");
const cookieParser = require("cookie-parser");
const enforce = require("express-sslify");
const lusca = require("lusca");

const AccountRoutes = require("./routes/AuthenticationRoutes");
const InAppRoutes = require("./routes/InAppRoutes");
const config = require("./config");
const misc = require("./models/Miscellaneous");

// Needed to get a Mongoose instance running for this process
const dbConnection = require("./models/MongooseClient");

// Set up the default account for publicly viewable cards
(async () => {
await misc.addPublicUser();
await addPublicUser();
})();

const app = express();
const port = config.PORT;
const port = PORT;

// In Heroku's honesty we trust. Beware otherwise as headers can be spoofed
// https://github.com/florianheinemann/express-sslify
if (process.env.NODE_ENV === "production") {
app.use(enforce.HTTPS({ trustProtoHeader: true }));
app.use(HTTPS({ trustProtoHeader: true }));
}

const appRouter = mergeRouters(
Expand All @@ -56,20 +57,22 @@ const appRouter = mergeRouters(
export type AppRouter = typeof appRouter;

app.use(session({
secret: [config.STUDY_BUDDY_SESSION_SECRET_1],
secure: true,
httpOnly: true,
secret: [STUDY_BUDDY_SESSION_SECRET_1],
cookie: {
secure: true,
httpOnly: true,
},
resave: false,
name: "c13u-study-buddy",
store: config.IS_DEV ? session.MemoryStore() : MongoStore.create({
mongoUrl: config.MONGO_URI,
store: IS_DEV ? new MemoryStore() : MongoStore.create({
mongoUrl: MONGO_URI,
touchAfter: 24 * 3600,
}),
saveUninitialized: true,
}));
app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json());
app.use(express.static(path.join(__dirname, "public")));
app.use(urlencoded({ extended: true }));
app.use(json());
app.use(express.static(join(__dirname, "public")));
app.use(cookieParser());

/**
Expand All @@ -86,7 +89,7 @@ app.use(cookieParser());
*/
// app.use(lusca.csrf());

app.set("views", path.join(__dirname, "views"));
app.set("views", join(__dirname, "views"));
app.set("view engine", "ejs");

app.use(
Expand All @@ -97,11 +100,11 @@ app.use(
}),
);

app.use("/", AccountRoutes);
app.use("/", InAppRoutes);
app.use("/", expressAuthRouter);
app.use("/", expressInAppRouter);

if (config.IS_TS_NODE) {
const newStaticsPath = path.join(__dirname, "..", "dist", "public");
if (IS_TS_NODE) {
const newStaticsPath = join(__dirname, "..", "dist", "public");
console.log(`Detected ts-node: Using ${newStaticsPath} as the static path`);
app.use(express.static(newStaticsPath));
}
Expand Down
Loading