Merge pull request #17 from aquality-automation/feature/REPPORTQA-1037

Feature/repportqa 1037

Author: VladislavKostyukevich

src/main/java/main/Session.java

@@ -9,13 +9,11 @@
 import main.model.db.dao.project.UserDao;
 import main.model.db.imports.Importer;
 import main.model.db.imports.TestNameNodeType;
-import main.model.dto.ProjectUserDto;
-import main.model.dto.TestRunDto;
-import main.model.dto.UserDto;
+import main.model.dto.*;
 import main.model.email.TestRunEmails;
-import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
+import javax.naming.AuthenticationException;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -25,19 +23,32 @@ public class Session {
     private String session;
     public  ControllerFactory controllerFactory;
 
-    public Session(String sessionId) throws AqualityException {
-        if(isSessionValid(sessionId)){
-            setUserMembership();
+    public Session(String sessionId) throws AqualityException, AuthenticationException {
+        if(isSessionValid(sessionId)) {
+            controllerFactory = new ControllerFactory(user);
+            return;
         }
-        controllerFactory = new ControllerFactory(user);
+        throw new AuthenticationException("Your session is not valid!");
+    }
+
+    public Session(UserDto user) throws AqualityException {
+        this.user = user;
+        setUserMembership();
+        controllerFactory = new ControllerFactory(this.user);
     }
 
-    public Session(){
+    @Deprecated
+    public Session(String importToken, int projectId) throws AqualityException {
         user = new UserDto();
-        user.setAdmin(1);
-        user.setUnit_coordinator(1);
-        user.setManager(1);
         controllerFactory = new ControllerFactory(user);
+        if(controllerFactory.getHandler(new ImportTokenDto()).isTokenValid(importToken, projectId)){
+            ProjectUserDto projectUser = new ProjectUserDto();
+            projectUser.setProject_id(projectId);
+            projectUser.setEngineer(1);
+            projectUser.setViewer(1);
+            user.setProjectUsers(Collections.singletonList(projectUser));
+            controllerFactory = new ControllerFactory(user);
+        }
     }
 
     public List<ProjectUserDto> getProjectPermissions(){
@@ -49,11 +60,7 @@ public List<ProjectUserDto> getProjectPermissions(Integer projectId){
     }
 
     public Importer getImporter(List<String> filePaths, TestRunDto testRunTemplate, String pattern, String format, TestNameNodeType nodeType, boolean singleTestRun) throws AqualityException {
-        try {
-            return new Importer(filePaths, testRunTemplate, pattern, format, nodeType, singleTestRun, user);
-        } catch (ParserConfigurationException | SAXException e) {
-            throw new AqualityException("Some Internal SAX error: " + e.getMessage());
-        }
+        return new Importer(filePaths, testRunTemplate, pattern, format, nodeType, singleTestRun, user);
     }
 
     public TestRunEmails getTestRunEmails(){
@@ -68,7 +75,7 @@ public AdministrationController getAdministrationController() {
         return new AdministrationController(user);
     }
 
-    public ProjectController getProjectController () throws AqualityException {
+    public ProjectController getProjectController (){
         return new ProjectController(user);
     }
 
@@ -84,29 +91,20 @@ public UserDto getCurrentUser() {
         return user;
     }
 
-    public void setCurrentUser(UserDto user) throws AqualityException {
-        this.user = user;
-        setUserMembership();
-    }
-
     private void setUserMembership() throws AqualityException {
         ProjectUserDto projectUserDto = new ProjectUserDto();
         projectUserDto.setUser_id(user.getId());
         user.setProjectUsers(new ProjectUserController(user).getProjectUserForPermissions(projectUserDto));
     }
 
     public boolean isSessionValid() throws AqualityException {
-        return  isSessionValid(session);
+        return isSessionValid(session);
     }
 
     private boolean isSessionValid(String sessionId) throws AqualityException {
-        if(sessionId != null){
-            UserDao userDao = new UserDao();
-            user = userDao.IsAuthorized(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/controllers/Administration/UserController.java

@@ -103,29 +103,6 @@ public UserDto auth(String authString, boolean ldap) throws AqualityException {
         throw new AqualityException("Seems your password was updated. Log in again please.");
     }
 
-    public UserDto checkSession(String session) throws AqualityException {
-        Base64 base64 = new Base64();
-        DateUtils dates = new DateUtils();
-        String[] strings = StringUtils.newStringUtf8(base64.decode(session)).split(":");
-        UserDto user = new UserDto();
-        user.setUser_name(strings[0]);
-        List<UserDto> users = userDao.searchAll(user);
-        if(users.size() > 0){
-            user = users.get(0);
-            if(!user.getSession_code().equals(session)){
-                throw new AqualityException("Credentials you've provided are not valid. Reenter please.");
-            }
-            if(new Date().after(dates.fromyyyyMMdd(strings[2]))){
-                throw new AqualityException("Session Expired.");
-            }
-        }
-        else{
-            throw new AqualityException("Credentials you've provided are not valid. Reenter please.");
-        }
-
-        return user;
-    }
-
     private List<UserDto> toPublicUsers(List<UserDto> users) {
         for (UserDto user :
                 users) {

src/main/java/main/controllers/ControllerFactory.java

@@ -11,6 +11,7 @@ public class ControllerFactory {
     public ControllerFactory(UserDto user){
         this.user = user;
     }
+
     public ProjectController getHandler(ProjectDto entity) {
         return new ProjectController(user);
     }

src/main/java/main/controllers/Project/ProjectController.java

@@ -32,7 +32,11 @@ public ProjectDto create(ProjectDto template) throws AqualityException {
 
     @Override
     public List<ProjectDto> get(ProjectDto template) throws AqualityException {
-        template.setUser_id(baseUser.getId());
+        if (baseUser.getApiSessionProjectId() != null) {
+            template.setId(baseUser.getApiSessionProjectId());
+        } else {
+            template.setUser_id(baseUser.getId());
+        }
         List<ProjectDto> projects = projectDao.searchAll(template);
         return fillCustomers(projects);
     }

src/main/java/main/exceptions/AqualityPermissionsException.java

@@ -4,7 +4,7 @@
 
 public class AqualityPermissionsException extends AqualityException {
     public AqualityPermissionsException(String error, UserDto user) {
-        super(String.format("[Permissions %s]: " + error, user != null ? user.getUser_name() : "anonymous"));
+        super(String.format("[Permissions %s]: " + error, user != null && user.getUser_name() != null ? user.getUser_name() : "anonymous"));
         this.responseCode = 403;
     }
 }

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

@@ -1,13 +1,18 @@
 package main.model.db.dao.project;
 
+import main.controllers.Project.ImportTokenController;
+import main.controllers.Project.ProjectUserController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.DAO;
+import main.model.dto.ProjectUserDto;
 import main.model.dto.UserDto;
 import main.utils.DateUtils;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.StringUtils;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -20,25 +25,76 @@ public UserDao() {
         remove = "{call REMOVE_USER(?)}";
     }
 
-    public UserDto IsAuthorized(String sessionId) throws AqualityException {
+    /**
+     * Check id session or token is valid
+     * @param sessionHash Base64 String with Session ID = {username}:{uuid}:{creationDate} or project:{projectId}:{token}
+     * @return User for session
+     * @throws AqualityException error about authorization status
+     */
+    public UserDto GetAuthorizedUser(String sessionHash) throws AqualityException {
         Base64 base64 = new Base64();
+        String sessionId = StringUtils.newStringUtf8(base64.decode(sessionHash));
+        boolean isApiToken = sessionId.startsWith("project");
+        if(isApiToken){
+            return IsAuthorizedToken(sessionId);
+        }
+        return IsAuthorizedUser(sessionId, sessionHash);
+    }
+
+    /**
+     * Check If User Authorized
+     * @param sessionId Session ID = {username}:{uuid}:{creationDate}
+     * @param sessionHash Hash of Session ID = {username}:{uuid}:{creationDate}
+     * @return Authorized User
+     * @throws AqualityException error about authorization status
+     */
+    private UserDto IsAuthorizedUser(String sessionId, String sessionHash) throws AqualityException {
+        String[] strings = sessionId.split(":");
         DateUtils dates = new DateUtils();
-        String[] strings = StringUtils.newStringUtf8(base64.decode(sessionId)).split(":");
         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(sessionId)){
-                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);
+                }
             }
         }
+        throw new AqualityPermissionsException("Credentials you've provided are not valid. Reenter please.", user);
+    }
+
+    /**
+     * Check If Token Valid
+     * @param sessionId Session ID = project:{projectId}:{token}
+     * @return Project Engineer
+     * @throws AqualityException error about authorization status
+     */
+    private UserDto IsAuthorizedToken(String sessionId) throws AqualityException {
+        String[] strings = sessionId.split(":");
+        Integer projectId =  Integer.parseInt(strings[1]);
+        boolean isTokenValid = new ImportTokenController(new UserDto()).isTokenValid(strings[2],projectId);
+
+        if(isTokenValid){
+            UserDto user = new UserDto();
+            ProjectUserDto projectUser = new ProjectUserDto();
+            projectUser.setProject_id(projectId);
+            projectUser.setViewer(1);
+            projectUser.setEngineer(1);
+            user.setProjectUsers(Collections.singletonList(projectUser));
+            user.setApiSessionProjectId(projectId);
+            return user;
+        }
         else{
-            throw new AqualityPermissionsException("Credentials you've provided are not valid. Reenter please.", user);
+            throw new AqualityPermissionsException("The import token is not valid", null);
         }
-        return user;
     }
 }

src/main/java/main/model/db/imports/Importer.java

@@ -4,9 +4,7 @@
 import main.model.dto.ImportDto;
 import main.model.dto.TestRunDto;
 import main.model.dto.UserDto;
-import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,7 +25,7 @@ public class Importer extends BaseImporter {
 
     private HandlerFactory handlerFactory = new HandlerFactory();
 
-    public Importer(List<String> files, TestRunDto testRunTemplate, String pattern, String type, TestNameNodeType testNameNodeType, boolean singleTestRun, UserDto user) throws AqualityException, ParserConfigurationException, SAXException {
+    public Importer(List<String> files, TestRunDto testRunTemplate, String pattern, String type, TestNameNodeType testNameNodeType, boolean singleTestRun, UserDto user) {
         super(testRunTemplate.getProject_id(), pattern, user);
         this.environment = testRunTemplate.getExecution_environment();
         this.ci_build = testRunTemplate.getCi_build();

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,22 +30,22 @@ public class ProjectUserDto extends BaseDto {
     private Integer viewer;
 
     public boolean isAdmin(){
-        return admin > 0;
+        return BooleanUtil.intToBoolean(admin);
     }
 
     public boolean isManager(){
-        return manager > 0;
+        return BooleanUtil.intToBoolean(manager);
     }
 
     public boolean isEngineer(){
-        return engineer > 0;
+        return BooleanUtil.intToBoolean(engineer);
     }
 
     public boolean isViewer(){
-        return viewer > 0;
+        return BooleanUtil.intToBoolean(viewer);
     }
 
     public boolean isEditor() {
-        return admin > 0 || manager > 0 || engineer > 0;
+        return isAdmin() || isManager() || isEngineer();
     }
 }

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;
 
@@ -69,29 +70,30 @@ public class UserDto extends BaseDto {
     @DataBaseInsert
     private Integer audit_notifications;
     private List<ProjectUserDto> projectUsers;
+    private Integer ApiSessionProjectId;
 
     public boolean isAdmin(){
-        return admin > 0;
+        return BooleanUtil.intToBoolean(admin);
     }
 
     public boolean isCoordinator(){
-        return unit_coordinator > 0;
+        return BooleanUtil.intToBoolean(unit_coordinator);
     }
 
     public boolean isAuditor(){
-        return auditor > 0;
+        return BooleanUtil.intToBoolean(auditor);
     }
 
     public boolean isAuditAdmin(){
-        return audit_admin > 0;
+        return BooleanUtil.intToBoolean(audit_admin);
     }
 
     public boolean isManager(){
-        return  manager > 0;
+        return BooleanUtil.intToBoolean(manager);
     }
 
     public boolean isFromGlobalManagement(){
-        return isManager() || isAuditor() || isAuditAdmin() || account_manager > 0 || isCoordinator() || head > 0;
+        return isManager() || isAuditor() || isAuditAdmin() || BooleanUtil.intToBoolean(account_manager) || isCoordinator() || BooleanUtil.intToBoolean(head);
     }
 
     public ProjectUserDto getProjectUser(Integer projectId){

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;
+    }
+}