Fix PR Comments

Author: VladislavKostyukevich

src/main/java/main/Session.java

@@ -102,13 +102,9 @@ public boolean isSessionValid() throws AqualityException {
     }
 
     private boolean isSessionValid(String sessionId) throws AqualityException {
-        if(sessionId != null){
-            UserDao userDao = new UserDao();
-            user = userDao.GetAuthorizedUser(sessionId);
-            session = sessionId;
-            return user != null;
-        }
-        user = null;
-        return false;
+        UserDao userDao = new UserDao();
+        user = userDao.GetAuthorizedUser(sessionId);
+        session = sessionId;
+        return user != null;
     }
 }

src/main/java/main/model/db/dao/project/UserDao.java

@@ -38,7 +38,6 @@ public UserDto GetAuthorizedUser(String sessionHash) throws AqualityException {
         if(isApiToken){
             return IsAuthorizedToken(sessionId);
         }
-
         return IsAuthorizedUser(sessionId, sessionHash);
     }
 
@@ -55,23 +54,22 @@ private UserDto IsAuthorizedUser(String sessionId, String sessionHash) throws Aq
         UserDto user = new UserDto();
         user.setUser_name(strings[0]);
         List<UserDto> users = searchAll(user);
+
         if(users.size() > 0){
             user = users.get(0);
-            if(!user.getSession_code().equals(sessionHash)){
-                throw new AqualityPermissionsException("Credentials you've provided are not valid. Reenter please.", user);
-            }
-            if(new Date().after(dates.fromyyyyMMdd(strings[2]))){
-                throw new AqualityPermissionsException("Session Expired.", user);
+            if (user.getSession_code().equals(sessionHash)) {
+                if (new Date().before(dates.fromyyyyMMdd(strings[2]))) {
+                    ProjectUserDto projectUserDto = new ProjectUserDto();
+                    projectUserDto.setUser_id(user.getId());
+                    user.setProjectUsers(new ProjectUserController(user).getProjectUserForPermissions(projectUserDto));
+                    return user;
+                }
+                else{
+                    throw new AqualityPermissionsException("Session Expired.", user);
+                }
             }
         }
-        else{
-            throw new AqualityPermissionsException("Credentials you've provided are not valid. Reenter please.", user);
-        }
-
-        ProjectUserDto projectUserDto = new ProjectUserDto();
-        projectUserDto.setUser_id(user.getId());
-        user.setProjectUsers(new ProjectUserController(user).getProjectUserForPermissions(projectUserDto));
-        return user;
+        throw new AqualityPermissionsException("Credentials you've provided are not valid. Reenter please.", user);
     }
 
     /**

src/main/java/main/model/dto/ProjectUserDto.java

@@ -2,6 +2,7 @@
 
 import lombok.Data; import lombok.EqualsAndHashCode;
 import main.annotations.*;
+import main.utils.BooleanUtil;
 
 
 @Data @EqualsAndHashCode(callSuper = true)
@@ -29,26 +30,22 @@ public class ProjectUserDto extends BaseDto {
     private Integer viewer;
 
     public boolean isAdmin(){
-        return isPermissionTrue(admin);
+        return BooleanUtil.intToBoolean(admin);
     }
 
     public boolean isManager(){
-        return isPermissionTrue(manager);
+        return BooleanUtil.intToBoolean(manager);
     }
 
     public boolean isEngineer(){
-        return isPermissionTrue(engineer);
+        return BooleanUtil.intToBoolean(engineer);
     }
 
     public boolean isViewer(){
-        return isPermissionTrue(viewer);
+        return BooleanUtil.intToBoolean(viewer);
     }
 
     public boolean isEditor() {
         return isAdmin() || isManager() || isEngineer();
     }
-
-    private boolean isPermissionTrue(Integer permission){
-        return permission != null && permission > 0;
-    }
 }

src/main/java/main/model/dto/UserDto.java

@@ -7,6 +7,7 @@
 import main.annotations.DataBaseSearchable;
 import main.exceptions.AqualityException;
 import main.model.db.dao.project.TestSuiteDao;
+import main.utils.BooleanUtil;
 
 import java.util.List;
 
@@ -72,27 +73,27 @@ public class UserDto extends BaseDto {
     private Integer ApiSessionProjectId;
 
     public boolean isAdmin(){
-        return isPermissionTrue(admin);
+        return BooleanUtil.intToBoolean(admin);
     }
 
     public boolean isCoordinator(){
-        return isPermissionTrue(unit_coordinator);
+        return BooleanUtil.intToBoolean(unit_coordinator);
     }
 
     public boolean isAuditor(){
-        return isPermissionTrue(auditor);
+        return BooleanUtil.intToBoolean(auditor);
     }
 
     public boolean isAuditAdmin(){
-        return isPermissionTrue(audit_admin);
+        return BooleanUtil.intToBoolean(audit_admin);
     }
 
     public boolean isManager(){
-        return isPermissionTrue(manager);
+        return BooleanUtil.intToBoolean(manager);
     }
 
     public boolean isFromGlobalManagement(){
-        return isManager() || isAuditor() || isAuditAdmin() || isPermissionTrue(account_manager) || isCoordinator() || isPermissionTrue(head);
+        return isManager() || isAuditor() || isAuditAdmin() || BooleanUtil.intToBoolean(account_manager) || isCoordinator() || BooleanUtil.intToBoolean(head);
     }
 
     public ProjectUserDto getProjectUser(Integer projectId){
@@ -120,8 +121,4 @@ public UserDto toPublic(){
         this.setSession_code("");
         return this;
     }
-
-    private boolean isPermissionTrue(Integer permission){
-        return permission != null && permission > 0;
-    }
 }

src/main/java/main/utils/BooleanUtil.java

@@ -0,0 +1,7 @@
+package main.utils;
+
+public class BooleanUtil {
+    public static boolean intToBoolean(Integer value){
+        return value != null && value > 0;
+    }
+}

src/main/java/main/view/BaseServlet.java

@@ -33,8 +33,6 @@ protected Session createSession(HttpServletRequest req) throws AqualityException
         } else {
             return new Session(getSessionId(req));
         }
-
-
     }
 
     private String replacer(String value) {
@@ -147,19 +145,18 @@ protected void setErrorHeader(@NotNull HttpServletResponse resp, String errorMes
         resp.addHeader("ErrorMessage", errorMessage);
     }
 
-    @Nullable
-    private String getSessionId(@NotNull HttpServletRequest req) throws AqualityException {
+    private String getSessionId(@NotNull HttpServletRequest req) throws AqualityException, AuthenticationException {
         String header = req.getHeader("Authorization");
         if(header != null){
             validateAuthHeader(header);
             String[] strings = header.split(" ");
             return strings[1];
         }
-        return null;
+        throw new AuthenticationException("You've missed your authorization header!");
     }
 
     private void validateAuthHeader(String header) throws AqualityException {
-        if(!header.toLowerCase().startsWith("basic ")){
+        if(!header.toLowerCase().startsWith("basic ".toLowerCase())){
             throw new AqualityException("Use Basic Authorization Header! (Should start with 'Basic ')");
         }
     }