add mfa to roles endpoint

Author: eisbilir

src/main/java/com/appirio/tech/core/service/identity/dao/UserDAO.java

@@ -171,8 +171,10 @@ public abstract class UserDAO implements DaoBase<User>, Transactional<UserDAO> {
     @RegisterMapperFactory(TCBeanMapperFactory.class)
     @SqlQuery(
             "SELECT " + USER_COLUMNS + ", " +
-            "e.address AS email, e.status_id AS emailStatus " +
+            "e.address AS email, e.status_id AS emailStatus, " +
+            "mfa.enabled AS mfaEnabled, mfa.verified AS mfaVerified " +
             "FROM common_oltp.user AS u JOIN common_oltp.email AS e ON e.user_id = u.user_id " +
+            "LEFT JOIN common_oltp.user_2fa AS mfa ON mfa.user_id = u.user_id " +
             "WHERE e.address = :email"
     )
     public abstract List<User> findUsersByEmailCS(@Bind("email") String email);

src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java

@@ -1513,8 +1513,6 @@ public ApiResponse updateUser2fa(
             @Valid PostPutRequest<User2fa> postRequest,
             @Context HttpServletRequest request) {
 
-        logger.info(String.format("update user 2fa(%s)", resourceId));
-
         TCID id = new TCID(resourceId);
         validateResourceIdAndCheckPermission(authUser, id, user2faFactory.getUpdateScopes());
         // checking param
@@ -1525,6 +1523,7 @@ public ApiResponse updateUser2fa(
         if(user2fa.getEnabled() == null) {
             throw new APIRuntimeException(SC_BAD_REQUEST, String.format(MSG_TEMPLATE_MANDATORY, "enabled"));
         }
+        logger.info(String.format("update user 2fa(%s) - %b", resourceId, user2fa.getEnabled()));
 
         Long userId = Utils.toLongValue(id);