Added username to the header (bastillion-io#253)

lucapalano · lucapalano · commit 1b2c535f8403 · 2017-11-15T16:18:54.000+01:00
diff --git a/src/main/java/com/keybox/common/util/AuthUtil.java b/src/main/java/com/keybox/common/util/AuthUtil.java
@@ -32,6 +32,7 @@ public class AuthUtil {
 
     public static final String SESSION_ID = "sessionId";
     public static final String USER_ID = "userId";
+    public static final String USER_NAME = "userName";
     public static final String AUTH_TOKEN = "authToken";
     public static final String TIMEOUT = "timeout";
     public static final String CSRF_TOKEN_NM = "_csrf";
@@ -139,6 +140,18 @@ public static Long getUserId(HttpSession session) {
         return userId;
     }
 
+    /**
+     * query session for the user name
+     *
+     * @param session http session
+     * @return user name
+     */
+    public static String getUsername(HttpSession session) {
+        String userNameStrEncripted = (String) session.getAttribute(USER_NAME);
+        String userNameStr = EncryptionUtil.decrypt(userNameStrEncripted);
+        return userNameStr;
+    }
+
     /**
      * query session for authentication token
      *
@@ -198,6 +211,20 @@ public static void setUserId(HttpSession session, Long userId) {
         }
     }
 
+
+    /**
+     * set session user name
+     *
+     * @param session http session
+     * @param userName user name
+     */
+    public static void setUsername(HttpSession session, String userName) {
+        if (userName != null) {
+            session.setAttribute(USER_NAME, EncryptionUtil.encrypt(userName));
+        }
+    }
+
+
     /**
      * set session authentication token
      *
diff --git a/src/main/java/com/keybox/manage/action/LoginAction.java b/src/main/java/com/keybox/manage/action/LoginAction.java
@@ -111,6 +111,7 @@ public String loginSubmit() {
                 AuthUtil.setUserId(servletRequest.getSession(), user.getId());
                 AuthUtil.setAuthType(servletRequest.getSession(), user.getAuthType());
                 AuthUtil.setTimeout(servletRequest.getSession());
+                AuthUtil.setUsername(servletRequest.getSession(), user.getUsername());
 
                 //for first time login redirect to set OTP
                 if (otpEnabled && StringUtils.isEmpty(sharedSecret)) {
diff --git a/src/main/webapp/_res/inc/navigation.jsp b/src/main/webapp/_res/inc/navigation.jsp
@@ -16,7 +16,7 @@
      */
 %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
-
+<%@ page import="com.keybox.common.util.AuthUtil" %>
 
 <div class="navbar navbar-default navbar-fixed-top" role="navigation">
     <div class="container">
@@ -87,6 +87,14 @@
                 
                 <li><a href="../logout.action">Logout</a></li>
             </ul>
+
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="navbar-text">
+                    <% out.println(AuthUtil.getUsername(session)); %>
+                </li>
+            </ul>
+
         </div>
         <!--/.nav-collapse -->
     </div>
