login now returns json on error

src/user/user.service.ts

@@ -10,15 +10,15 @@ import { GameDTO } from '../game/game.dto';
 @Injectable()
 export class UserService {
     constructor(
-        @InjectRepository(PersonEntity) 
+        @InjectRepository(PersonEntity)
         private userRepository: Repository<PersonEntity>,
         @InjectRepository(GameEntity)
         private gameRepository: Repository<GameEntity>
-        ){}
+    ) { }
 
     async register(data: UserDTO) {
         const { name } = data;
-        let user = await this.userRepository.findOne({where: {name}});
+        let user = await this.userRepository.findOne({ where: { name } });
         if (user) {
             throw new HttpException('User already exists', HttpStatus.BAD_REQUEST);
         }
@@ -28,23 +28,20 @@ export class UserService {
     }
 
     async login(data: UserDTO) {
-        try{
+        try {
             const { name, password } = data;
-            const user = await this.userRepository.findOne({ where: { name }});
+            const user = await this.userRepository.findOne({ where: { name } });
             if (!user || !(await user.comparePassword(password))) {
-                throw new HttpException(
-                    'Invalid username/password',
-                    HttpStatus.BAD_REQUEST,
-                );
+                throw new HttpException('invalid password', HttpStatus.BAD_REQUEST);
             }
             return user.tokenObject();
-        }catch(error){
-            return error.message;
+        } catch (error) {
+            throw new HttpException(error.message, HttpStatus.BAD_REQUEST);
         }
     }
 
     // liitytään peliin
-    async joinGame(game: GameDTO, data: UserDTO){
+    async joinGame(game: GameDTO, data: UserDTO) {
         try {
             // etsi peli valinnan mukaan ja otetaan käyttäjän rooli kyseisestä pelistä talteen
             const role = await this.gameRepository.findOne();
@@ -55,7 +52,7 @@ export class UserService {
     }
 
     // liitytään factionii
-    async joinFaction(game: GameDTO, data: UserDTO): Promise<boolean>{
+    async joinFaction(game: GameDTO, data: UserDTO): Promise<boolean> {
         try {
             // tarkistetaan factionin salasana
             return true;