Add fallback to bcryptjs

This commit is contained in:
TheArcaneBrony
2022-08-20 03:17:44 +02:00
parent 0232c592ed
commit 3795c67723
7 changed files with 77 additions and 20 deletions
+9 -2
View File
@@ -1,9 +1,16 @@
import { Request, Response, Router } from "express";
import { route } from "@fosscord/api";
import bcrypt from "bcrypt";
import { Config, User, generateToken, adjustEmail, FieldErrors, LoginSchema } from "@fosscord/util";
import { adjustEmail, Config, FieldErrors, generateToken, LoginSchema, User } from "@fosscord/util";
import crypto from "crypto";
let bcrypt: any;
try {
bcrypt = require("bcrypt");
} catch {
bcrypt = require("bcryptjs");
console.log("Warning: using bcryptjs because bcrypt is not installed! Performance will be affected.");
}
const router: Router = Router();
export default router;
+10 -4
View File
@@ -1,8 +1,14 @@
import { getIpAdress, IPAnalysis, isProxy, route } from "@fosscord/api";
import { adjustEmail, Config, FieldErrors, generateToken, HTTPError, Invite, RegisterSchema, User } from "@fosscord/util";
import { Request, Response, Router } from "express";
import { Config, generateToken, Invite, FieldErrors, User, adjustEmail, trimSpecial, RegisterSchema } from "@fosscord/util";
import { route, getIpAdress, IPAnalysis, isProxy } from "@fosscord/api";
import bcrypt from "bcrypt";
import { HTTPError } from "@fosscord/util";
let bcrypt: any;
try {
bcrypt = require("bcrypt");
} catch {
bcrypt = require("bcryptjs");
console.log("Warning: using bcryptjs because bcrypt is not installed! Performance will be affected.");
}
const router: Router = Router();
+10 -4
View File
@@ -1,8 +1,14 @@
import { Router, Request, Response } from "express";
import { Guild, Member, User } from "@fosscord/util";
import { route } from "@fosscord/api";
import bcrypt from "bcrypt";
import { HTTPError } from "@fosscord/util";
import { HTTPError, Member, User } from "@fosscord/util";
import { Request, Response, Router } from "express";
let bcrypt: any;
try {
bcrypt = require("bcrypt");
} catch {
bcrypt = require("bcryptjs");
console.log("Warning: using bcryptjs because bcrypt is not installed! Performance will be affected.");
}
const router = Router();
+9 -3
View File
@@ -1,7 +1,13 @@
import { User } from "@fosscord/util";
import { Router, Response, Request } from "express";
import { route } from "@fosscord/api";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
let bcrypt: any;
try {
bcrypt = require("bcrypt");
} catch {
bcrypt = require("bcryptjs");
console.log("Warning: using bcryptjs because bcrypt is not installed! Performance will be affected.");
}
const router = Router();
+20 -2
View File
@@ -1,8 +1,26 @@
import { Router, Request, Response } from "express";
import { User, PrivateUserProjection, emitEvent, UserUpdateEvent, handleFile, FieldErrors, UserModifySchema } from "@fosscord/util";
import { route } from "@fosscord/api";
import bcrypt from "bcrypt";
import { OrmUtils, generateToken } from "@fosscord/util";
import {
emitEvent,
FieldErrors,
generateToken,
handleFile,
OrmUtils,
PrivateUserProjection,
User,
UserModifySchema,
UserUpdateEvent
} from "@fosscord/util";
import { Request, Response, Router } from "express";
let bcrypt: any;
try {
bcrypt = require("bcrypt");
} catch {
bcrypt = require("bcryptjs");
console.log("Warning: using bcryptjs because bcrypt is not installed! Performance will be affected.");
}
const router: Router = Router();
+9 -1
View File
@@ -1,7 +1,15 @@
import { Router, Request, Response } from "express";
import { route } from "@fosscord/api";
import { BackupCode, Config, FieldErrors, generateMfaBackupCodes, MfaCodesSchema, User } from "@fosscord/util";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
let bcrypt: any;
try {
bcrypt = require("bcrypt");
} catch {
bcrypt = require("bcryptjs");
console.log("Warning: using bcryptjs because bcrypt is not installed! Performance will be affected.");
}
const router = Router();
+10 -4
View File
@@ -1,10 +1,16 @@
import { Router, Request, Response } from "express";
import { User, generateToken, BackupCode, generateMfaBackupCodes, Config, TotpEnableSchema } from "@fosscord/util";
import { route } from "@fosscord/api";
import bcrypt from "bcrypt";
import { BackupCode, Config, generateMfaBackupCodes, generateToken, TotpEnableSchema, User } from "@fosscord/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { verifyToken } from 'node-2fa';
let bcrypt: any;
try {
bcrypt = require("bcrypt");
} catch {
bcrypt = require("bcryptjs");
console.log("Warning: using bcryptjs because bcrypt is not installed! Performance will be affected.");
}
const router = Router();
router.post("/", route({ body: "TotpEnableSchema" }), async (req: Request, res: Response) => {