From 647baac5e1578ab41bca48f52610bf0fee7e62b6 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Thu, 22 Oct 2020 19:30:50 +0530 Subject: [PATCH] fetching user role through handle too --- .../core/service/identity/resource/UserResource.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java b/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java index d1fbf0b..69a7023 100644 --- a/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java +++ b/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java @@ -767,12 +767,18 @@ public ApiResponse login( @Timed public ApiResponse roles( @FormParam("email") String email, + @FormParam("handle") String handle, @Context HttpServletRequest request) throws Exception { - if(Utils.isEmpty(email)) - throw new APIRuntimeException(SC_BAD_REQUEST, String.format(MSG_TEMPLATE_MANDATORY, "email")); + if(Utils.isEmpty(email) && Utils.isEmpty(handle)) + throw new APIRuntimeException(SC_BAD_REQUEST, String.format(MSG_TEMPLATE_MANDATORY, "email/handle")); - User user = userDao.findUserByEmail(email); + User user = null; + if (!Utils.isEmpty(handle)) { + user = userDao.findUserByHandle(handle); + } else{ + user = userDao.findUserByEmail(email); + } if(user==null) { throw new APIRuntimeException(SC_UNAUTHORIZED, "Credentials are incorrect.");