You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/17 08:57:06 UTC

[incubator-dlab] branch feature/projects updated: DLAB-903 changed error message in case when aws verification failed

This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/feature/projects by this push:
     new 1533495  DLAB-903 changed error message in case when aws verification failed
1533495 is described below

commit 1533495a10f9b3676bea25bbbf1d7acd476218c7
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Jul 17 11:56:46 2019 +0300

    DLAB-903 changed error message in case when aws verification failed
---
 .../src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java           | 2 +-
 .../java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java b/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java
index 3304dc5..d004368 100644
--- a/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java
+++ b/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java
@@ -64,7 +64,7 @@ public class LdapUserDAOImpl implements LdapUserDAO {
 			return getUserInfo(username, password, connection.getBoundConnection());
 		} catch (Exception e) {
 			log.error("Can not get user info for user {} due to: {}", username, e.getMessage());
-			throw new DlabException("Can not get user info due to: " + e.getMessage(), e);
+			throw new DlabException("Username or password is invalid");
 		}
 	}
 
diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java b/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java
index b324cad..36dbe02 100644
--- a/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java
+++ b/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java
@@ -63,7 +63,7 @@ public class LdapAuthenticationService implements AuthenticationService {
 			return StringUtils.isNoneBlank(token) ? getUserInfo(token) : getLdapUserInfo(credentialDTO);
 		} catch (Exception e) {
 			log.error("Error occurred during login for user {}: {}", credentialDTO.getUsername(), e.getMessage());
-			throw new DlabAuthenticationException("Username or password is invalid");
+			throw new DlabAuthenticationException(e.getMessage());
 		}
 	}
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org