From 942afd96fe5fc304356b9afcc042cf1a89cf3f32 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 1 Oct 2020 11:36:58 -0400 Subject: [PATCH] returns user with login --- src/auth/graphql/resolvers/login.js | 5 ++--- src/auth/operations/login.js | 5 ++++- src/auth/requestHandlers/login.js | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/auth/graphql/resolvers/login.js b/src/auth/graphql/resolvers/login.js index 664bf4644c..031a894ddb 100644 --- a/src/auth/graphql/resolvers/login.js +++ b/src/auth/graphql/resolvers/login.js @@ -10,9 +10,8 @@ function login(collection) { res: context.res, }; - const token = await this.operations.collections.auth.login(options); - - return token; + const result = await this.operations.collections.auth.login(options); + return result; } const loginResolver = resolver.bind(this); diff --git a/src/auth/operations/login.js b/src/auth/operations/login.js index 1eae6170c0..90b217d4dd 100644 --- a/src/auth/operations/login.js +++ b/src/auth/operations/login.js @@ -121,7 +121,10 @@ async function login(args) { // 4. Return token // ///////////////////////////////////// - return token; + return { + token, + user, + }; } module.exports = login; diff --git a/src/auth/requestHandlers/login.js b/src/auth/requestHandlers/login.js index 7cff1d5e5b..0a2e6c2267 100644 --- a/src/auth/requestHandlers/login.js +++ b/src/auth/requestHandlers/login.js @@ -2,7 +2,7 @@ const httpStatus = require('http-status'); async function loginHandler(req, res, next) { try { - const token = await this.operations.collections.auth.login({ + const result = await this.operations.collections.auth.login({ req, res, collection: req.collection, @@ -12,7 +12,8 @@ async function loginHandler(req, res, next) { return res.status(httpStatus.OK) .json({ message: 'Auth Passed', - token, + user: result.user, + token: result.token, }); } catch (error) { return next(error);