chore: use strict compilation mode

This commit is contained in:
tdurieux
2023-02-13 13:38:57 +01:00
parent 3ab9b0c7a4
commit ec6098b3a1
33 changed files with 4007 additions and 2160 deletions

View File

@@ -118,7 +118,7 @@ router.get("/repos", async (req, res) => {
if (req.query.search) {
query.push({ repoId: { $regex: req.query.search } });
}
let status = [];
const status: { status: string }[] = [];
query.push({ $or: status });
if (ready) {
status.push({ status: "ready" });

View File

@@ -4,6 +4,7 @@ import Conference from "../Conference";
import ConferenceModel from "../database/conference/conferences.model";
import { ensureAuthenticated } from "./connection";
import { handleError, getUser, isOwnerOrAdmin } from "./route-utils";
import { IConferenceDocument } from "../database/conference/conferences.types";
const router = express.Router();
@@ -66,7 +67,7 @@ router.get("/", async (req: express.Request, res: express.Response) => {
}
});
function validateConferenceForm(conf) {
function validateConferenceForm(conf: any) {
if (!conf.name)
throw new AnonymousError("conf_name_missing", {
object: conf,
@@ -148,11 +149,17 @@ router.post(
async (req: express.Request, res: express.Response) => {
try {
const user = await getUser(req);
let model = new ConferenceModel();
let model: IConferenceDocument = new ConferenceModel();
if (req.params.conferenceID) {
model = await ConferenceModel.findOne({
const queryModel = await ConferenceModel.findOne({
conferenceID: req.params.conferenceID,
});
if (!queryModel) {
throw new AnonymousError("conference_not_found", {
httpStatus: 404,
});
}
model = queryModel;
isOwnerOrAdmin(model.owners, user);
}
validateConferenceForm(req.body);
@@ -197,7 +204,10 @@ router.post(
res.send("ok");
} catch (error) {
if (error.message?.indexOf(" duplicate key") > -1) {
if (
error instanceof Error &&
error.message?.indexOf(" duplicate key") > -1
) {
return handleError(
new AnonymousError("conf_id_used", {
object: req.params.conferenceID,
@@ -219,16 +229,18 @@ router.get(
conferenceID: req.params.conferenceID,
});
if (!data)
throw new AnonymousError("conf_not_found", {
object: req.params.conferenceID,
httpStatus: 404,
});
throw new AnonymousError("conf_not_found", {
object: req.params.conferenceID,
httpStatus: 404,
});
const user = await getUser(req);
const conference = new Conference(data);
try {
isOwnerOrAdmin(conference.ownerIDs, user);
const o: any = conference.toJSON();
o.repositories = (await conference.repositories()).map((r) => r.toJSON());
o.repositories = (await conference.repositories()).map((r) =>
r.toJSON()
);
res.json(o);
} catch (error) {
return res.json({
@@ -238,7 +250,7 @@ router.get(
startDate: conference.startDate,
endDate: conference.endDate,
options: conference.options,
})
});
}
} catch (error) {
handleError(error, res, req);

View File

@@ -10,8 +10,6 @@ import config from "../../config";
import UserModel from "../database/users/users.model";
import { IUserDocument } from "../database/users/users.types";
const RedisStore = connectRedis(session);
export function ensureAuthenticated(
req: express.Request,
res: express.Response,
@@ -29,7 +27,7 @@ const verify = async (
profile: Profile,
done: OAuth2Strategy.VerifyCallback
): Promise<void> => {
let user: IUserDocument;
let user: IUserDocument | null = null;
try {
user = await UserModel.findOne({ "externalIDs.github": profile.id });
if (user) {
@@ -84,23 +82,27 @@ passport.deserializeUser((user: Express.User, done) => {
done(null, user);
});
const redisClient = createClient({
legacyMode: true,
socket: {
port: config.REDIS_PORT,
host: config.REDIS_HOSTNAME,
},
});
redisClient.on("error", (err) => console.log("Redis Client Error", err));
redisClient.connect();
export const appSession = session({
secret: "keyboard cat",
store: new RedisStore({
client: redisClient,
}),
saveUninitialized: false,
resave: false,
});
export function initSession() {
const RedisStore = connectRedis(session);
const redisClient = createClient({
legacyMode: true,
socket: {
port: config.REDIS_PORT,
host: config.REDIS_HOSTNAME,
},
});
redisClient.on("error", (err) => console.log("Redis Client Error", err));
redisClient.connect();
return session({
secret: "keyboard cat",
store: new RedisStore({
client: redisClient,
}),
saveUninitialized: false,
resave: false,
});
}
export const router = express.Router();

View File

@@ -96,7 +96,7 @@ router.get(
}
);
function validateNewPullRequest(pullRequestUpdate): void {
function validateNewPullRequest(pullRequestUpdate: any): void {
const validCharacters = /^[0-9a-zA-Z\-\_]+$/;
if (
!pullRequestUpdate.pullRequestId.match(validCharacters) ||
@@ -151,7 +151,7 @@ function updatePullRequestModel(
expirationMode: pullRequestUpdate.options.expirationMode,
expirationDate: pullRequestUpdate.options.expirationDate
? new Date(pullRequestUpdate.options.expirationDate)
: null,
: undefined,
update: pullRequestUpdate.options.update,
image: pullRequestUpdate.options.image,
link: pullRequestUpdate.options.link,
@@ -220,7 +220,10 @@ router.post("/", async (req: express.Request, res: express.Response) => {
await pullRequest.anonymize();
res.send(pullRequest.toJSON());
} catch (error) {
if (error.message?.indexOf(" duplicate key") > -1) {
if (
error instanceof Error &&
error.message.indexOf(" duplicate key") > -1
) {
return handleError(
new AnonymousError("pullRequestId_already_used", {
httpStatus: 400,

View File

@@ -70,6 +70,12 @@ router.post("/claim", async (req: express.Request, res: express.Response) => {
}
const r = gh(req.body.repoUrl);
if (!r?.owner || !r?.name) {
throw new AnonymousError("repo_not_found", {
object: req.body,
httpStatus: 404,
});
}
const repo = await getRepositoryFromGitHub({
owner: r.owner,
repo: r.name,
@@ -259,7 +265,7 @@ router.get("/:repoId/", async (req: express.Request, res: express.Response) => {
}
});
function validateNewRepo(repoUpdate): void {
function validateNewRepo(repoUpdate: any): void {
const validCharacters = /^[0-9a-zA-Z\-\_]+$/;
if (
!repoUpdate.repoId.match(validCharacters) ||
@@ -322,7 +328,7 @@ function updateRepoModel(
expirationMode: repoUpdate.options.expirationMode,
expirationDate: repoUpdate.options.expirationDate
? new Date(repoUpdate.options.expirationDate)
: null,
: undefined,
update: repoUpdate.options.update,
image: repoUpdate.options.image,
pdf: repoUpdate.options.pdf,
@@ -359,7 +365,7 @@ router.post(
updateRepoModel(repo.model, repoUpdate);
async function removeRepoFromConference(conferenceID) {
const removeRepoFromConference = async (conferenceID: string) => {
const conf = await ConferenceModel.findOne({
conferenceID,
});
@@ -368,7 +374,7 @@ router.post(
if (r.length == 1) r[0].removeDate = new Date();
await conf.save();
}
}
};
if (!repoUpdate.conference) {
// remove conference
if (repo.model.conference) {
@@ -394,7 +400,7 @@ router.post(
if (f.length) {
// the repository already referenced the conference
f[0].addDate = new Date();
f[0].removeDate = null;
f[0].removeDate = undefined;
} else {
conf.repositories.push({
id: repo.model.id,
@@ -426,12 +432,25 @@ router.post("/", async (req: express.Request, res: express.Response) => {
validateNewRepo(repoUpdate);
const r = gh(repoUpdate.fullName);
if (!r?.owner || !r?.name) {
throw new AnonymousError("repo_not_found", {
object: req.body,
httpStatus: 404,
});
}
const repository = await getRepositoryFromGitHub({
accessToken: user.accessToken,
owner: r.owner,
repo: r.name,
});
if (!repository) {
throw new AnonymousError("repo_not_found", {
object: req.body,
httpStatus: 404,
});
}
const repo = new AnonymizedRepositoryModel();
repo.repoId = repoUpdate.repoId;
repo.anonymizeDate = new Date();
@@ -444,14 +463,20 @@ router.post("/", async (req: express.Request, res: express.Response) => {
if (repo.source.type == "GitHubDownload") {
// details.size is in kilobytes
if (repository.size > config.MAX_REPO_SIZE) {
if (
repository.size === undefined ||
repository.size > config.MAX_REPO_SIZE
) {
throw new AnonymousError("invalid_mode", {
object: repository,
httpStatus: 400,
});
}
}
if (repository.size < config.AUTO_DOWNLOAD_REPO_SIZE) {
if (
repository.size !== undefined &&
repository.size < config.AUTO_DOWNLOAD_REPO_SIZE
) {
repo.source.type = "GitHubDownload";
}
repo.conference = repoUpdate.conference;
@@ -488,7 +513,10 @@ router.post("/", async (req: express.Request, res: express.Response) => {
attempts: 3,
});
} catch (error) {
if (error.message?.indexOf(" duplicate key") > -1) {
if (
error instanceof Error &&
error.message?.indexOf(" duplicate key") > -1
) {
return handleError(
new AnonymousError("repoId_already_used", {
httpStatus: 400,

View File

@@ -44,7 +44,7 @@ export async function getRepo(
) {
try {
const repo = await db.getRepository(req.params.repoId, {
includeFiles: opt.includeFiles,
includeFiles: opt.includeFiles === true,
});
if (opt.nocheck == true) {
} else {
@@ -79,7 +79,7 @@ function printError(error: any, req?: express.Request) {
io.notifyError(error, error.value);
if (error instanceof AnonymousError) {
let message = `[ERROR] ${error.toString()} ${error.stack
.split("\n")[1]
?.split("\n")[1]
.trim()}`;
if (req) {
message += ` ${req.originalUrl}`;

View File

@@ -4,7 +4,7 @@ import * as path from "path";
import AnonymizedFile from "../AnonymizedFile";
import GitHubDownload from "../source/GitHubDownload";
import AnonymousError from "../AnonymousError";
import { TreeElement } from "../types";
import { Tree, TreeElement } from "../types";
import * as marked from "marked";
import { streamToString } from "../anonymize-utils";
@@ -68,13 +68,13 @@ async function webView(req: express.Request, res: express.Response) {
if (fileName == "") {
continue;
}
if (!currentAnonymized[fileName]) {
if (!(currentAnonymized as Tree)[fileName]) {
throw new AnonymousError("file_not_found", {
object: this,
object: repo,
httpStatus: 404,
});
}
currentAnonymized = currentAnonymized[fileName];
currentAnonymized = (currentAnonymized as Tree)[fileName];
}
let best_match = null;