improved adherence to types

This commit is contained in:
2025-07-13 20:28:27 +02:00
parent 473c807461
commit 0a40a8ce5d
14 changed files with 114 additions and 38 deletions

View File

@@ -1,9 +1,9 @@
import { userData } from "../Classes/userData.js";
import { characters } from "../Characters/characters.js";
import { users } from "./users.js";
import { userCheckResult, users } from "./users.js";
import { db } from "../index.js"
import { Socket } from "socket.io";
import { loginResponse } from "../Classes/Outgoing/accountResponses.js";
import { loginResponse, loginResult } from "../Classes/Outgoing/accountResponses.js";
import { Endpoints } from "../endpoints.js";
export async function login(socket : Socket, data){
@@ -14,12 +14,13 @@ export async function login(socket : Socket, data){
return
}
const user = await users.readUser(db, json.login, json.password);
const userCheck = await users.readUser(db, json.login, json.password);
if(user){
if(userCheck.result == userCheckResult.OK){
const user = userCheck.userData;
console.log(`User ${user.login} logged in`);
const character = await characters.readCharacter(db, user.id);
const result = new loginResponse(user, character)
const result = new loginResponse(loginResult.success, user, character)
socket.user = user
socket.character = character
@@ -27,7 +28,7 @@ export async function login(socket : Socket, data){
}
else{
console.log(`User ${json.login} did not log in`);
const result = new loginResponse(null, null)
const result = new loginResponse(loginResult.fail, null, null)
socket.emit(Endpoints.Login, JSON.stringify(result));
}
}