Fixes for sonar critical issues

[policy/engine.git] / ONAP-SDK-APP / src / main / java / org / openecomp / portalapp / login / LoginStrategyImpl.java

diff --git a/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
index a4b6847..13d8836 100644 (file)
--- a/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
+++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
@@ -14,60 +14,63 @@ import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.springframework.web.servlet.ModelAndView;
 
 public class LoginStrategyImpl extends LoginStrategy {
-       
-       private static final Logger LOGGER      = FlexLogger.getLogger(LoginStrategyImpl.class);
-       
-       @Override
-       public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception {
-               //'login' for opensource is same as 'external' login.
-               return doExternalLogin(request, response);
-       }
-       
-       @Override
-       public String getUserId(HttpServletRequest request) throws PortalAPIException {
-               // Check ONAP Portal cookie
-               if (!isLoginCookieExist(request))
-                       return null;
 
-               String userid = null;
-               try {
-                       userid = getUserIdFromCookie(request);
-               } catch (Exception e) {
-                       LOGGER.error("Exception Occured"+e);
-               }
-               return userid;  
-       }
+    private static final Logger LOGGER = FlexLogger.getLogger(LoginStrategyImpl.class);
 
-       private static String getUserIdFromCookie(HttpServletRequest request) throws Exception {
-               String userId = "";
-               Cookie[] cookies = request.getCookies();
-               Cookie userIdcookie = null;
-               if (cookies != null)
-                       for (Cookie cookie : cookies)
-                               if (cookie.getName().equals(USER_ID))
-                                       userIdcookie = cookie;
-               if(userIdcookie!=null){
-                       userId = CipherUtil.decrypt(userIdcookie.getValue(),
-                                       PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));
-               }
-               return userId;
-       
-       }
-       
-       private static boolean isLoginCookieExist(HttpServletRequest request) {
-               Cookie ep = getCookie(request, EP_SERVICE);
-               return (ep != null);
-       }
-       
-       private static Cookie getCookie(HttpServletRequest request, String cookieName) {
-               Cookie[] cookies = request.getCookies();
-               if (cookies != null)
-                       for (Cookie cookie : cookies)
-                               if (cookie.getName().equals(cookieName))
-                                       return cookie;
+    @Override
+    public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        // 'login' for opensource is same as 'external' login.
+        return doExternalLogin(request, response);
+    }
 
-               return null;
-       }
+    @Override
+    public String getUserId(HttpServletRequest request) throws PortalAPIException {
+        // Check ONAP Portal cookie
+        if (!isLoginCookieExist(request))
+            return null;
+
+        String userid = null;
+        try {
+            userid = getUserIdFromCookie(request);
+        } catch (Exception e) {
+            LOGGER.error("Exception Occured" + e);
+        }
+        return userid;
+    }
+
+    private static String getUserIdFromCookie(HttpServletRequest request) throws PortalAPIException {
+        String userId = "";
+        Cookie[] cookies = request.getCookies();
+        Cookie userIdcookie = null;
+        if (cookies != null)
+            for (Cookie cookie : cookies)
+                if (cookie.getName().equals(USER_ID))
+                    userIdcookie = cookie;
+        if (userIdcookie != null) {
+            try {
+                userId = CipherUtil.decrypt(userIdcookie.getValue(),
+                        PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));
+            } catch (Exception e) {
+                throw new PortalAPIException(e);
+            }
+        }
+        return userId;
+
+    }
+
+    private static boolean isLoginCookieExist(HttpServletRequest request) {
+        Cookie ep = getCookie(request, EP_SERVICE);
+        return (ep != null);
+    }
+
+    private static Cookie getCookie(HttpServletRequest request, String cookieName) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null)
+            for (Cookie cookie : cookies)
+                if (cookie.getName().equals(cookieName))
+                    return cookie;
+
+        return null;
+    }
 
-       
 }