mirror of
https://github.com/spacebarchat/server.git
synced 2026-05-24 01:35:26 +00:00
🐛 fix user projection
This commit is contained in:
@@ -79,7 +79,7 @@ router.post("/", route({ body: "RegisterSchema" }), async (req: Request, res: Re
|
||||
|
||||
if (!register.allowMultipleAccounts) {
|
||||
// TODO: check if fingerprint was eligible generated
|
||||
const exists = await User.findOne({ where: { fingerprints: body.fingerprint } });
|
||||
const exists = await User.findOne({ where: { fingerprints: body.fingerprint }, select: ["id"] });
|
||||
|
||||
if (exists) {
|
||||
throw FieldErrors({
|
||||
@@ -109,7 +109,7 @@ router.post("/", route({ body: "RegisterSchema" }), async (req: Request, res: Re
|
||||
}
|
||||
|
||||
// check if there is already an account with this email
|
||||
const exists = await User.findOneOrFail({ email: email }).catch((e) => {});
|
||||
const exists = await User.findOne({ email: email });
|
||||
|
||||
if (exists) {
|
||||
throw FieldErrors({
|
||||
|
||||
@@ -7,7 +7,7 @@ import { HTTPError } from "lambert-server";
|
||||
const router = Router();
|
||||
|
||||
router.post("/", route({}), async (req: Request, res: Response) => {
|
||||
const user = await User.findOneOrFail({ id: req.user_id }); //User object
|
||||
const user = await User.findOneOrFail({ where: { id: req.user_id }, select: ["data"] }); //User object
|
||||
let correctpass = true;
|
||||
|
||||
if (user.data.hash) {
|
||||
|
||||
@@ -6,7 +6,7 @@ import bcrypt from "bcrypt";
|
||||
const router = Router();
|
||||
|
||||
router.post("/", route({}), async (req: Request, res: Response) => {
|
||||
const user = await User.findOneOrFail({ id: req.user_id }); //User object
|
||||
const user = await User.findOneOrFail({ where: { id: req.user_id }, select: ["data"] }); //User object
|
||||
let correctpass = true;
|
||||
|
||||
if (user.data.hash) {
|
||||
|
||||
@@ -18,7 +18,11 @@ const router = Router();
|
||||
const userProjection: (keyof User)[] = ["relationships", ...PublicUserProjection];
|
||||
|
||||
router.get("/", route({}), async (req: Request, res: Response) => {
|
||||
const user = await User.findOneOrFail({ where: { id: req.user_id }, relations: ["relationships", "relationships.to"] });
|
||||
const user = await User.findOneOrFail({
|
||||
where: { id: req.user_id },
|
||||
relations: ["relationships", "relationships.to"],
|
||||
select: ["relationships"]
|
||||
});
|
||||
|
||||
//TODO DTO
|
||||
const related_users = user.relationships.map((r) => {
|
||||
|
||||
Reference in New Issue
Block a user