From 4b67c0be411be6814e4d2c182f068a79d45f7f95 Mon Sep 17 00:00:00 2001
From: Trivernis <trivernis@gmail.com>
Date: Wed, 8 Jan 2020 15:36:56 +0100
Subject: [PATCH] Fixed invalid login on token generation

---
 src/graphql/resolvers.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts
index 94222f8..a03814a 100644
--- a/src/graphql/resolvers.ts
+++ b/src/graphql/resolvers.ts
@@ -4,6 +4,8 @@ import * as yaml from "js-yaml";
 import {Op} from "sequelize";
 import dataaccess from "../lib/dataAccess";
 import {NotLoggedInGqlError, PostNotFoundGqlError} from "../lib/errors/graphqlErrors";
+import {InvalidLoginError} from "../lib/errors/InvalidLoginError";
+import {UserNotFoundError} from "../lib/errors/UserNotFoundError";
 import globals from "../lib/globals";
 import {InternalEvents} from "../lib/InternalEvents";
 import * as models from "../lib/models";
@@ -151,10 +153,15 @@ export function resolver(req: any, res: any): any {
             if (email && passwordHash) {
                 try {
                     const user = await dataaccess.getUserByLogin(email, passwordHash);
-                    return {
-                        expires: Number(user.authExpire),
-                        value: user.token(),
-                    };
+                    if (!user) {
+                        res.status(status.BAD_REQUEST);
+                        return new InvalidLoginError(email);
+                    } else {
+                        return {
+                            expires: Number(user.authExpire),
+                            value: user.token(),
+                        };
+                    }
                 } catch (err) {
                     res.status(status.BAD_REQUEST);
                     return err.graphqlError ?? new GraphQLError(err.message);