Fix session

Author: VladislavKostyukevich

src/main/java/main/Session.java

@@ -12,6 +12,7 @@
 import main.model.dto.*;
 import main.model.email.TestRunEmails;
 
+import javax.naming.AuthenticationException;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -22,9 +23,18 @@ public class Session {
     private String session;
     public  ControllerFactory controllerFactory;
 
-    public Session(String sessionId) throws AqualityException {
-        isSessionValid(sessionId);
-        controllerFactory = new ControllerFactory(user);
+    public Session(String sessionId) throws AqualityException, AuthenticationException {
+        if(isSessionValid(sessionId)) {
+            controllerFactory = new ControllerFactory(user);
+            return;
+        }
+        throw new AuthenticationException("Your session is not valid!");
+    }
+
+    public Session(UserDto user) throws AqualityException {
+        this.user = user;
+        setUserMembership();
+        controllerFactory = new ControllerFactory(this.user);
     }
 
     @Deprecated
@@ -81,11 +91,6 @@ 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());

src/main/java/main/view/Administration/AuthorizationServlet.java

@@ -25,13 +25,12 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
         String authString = req.getParameter("auth");
         boolean ldap = Boolean.parseBoolean(req.getParameter("ldap"));
         try {
-            Session session = createSession(req);
             UserDto systemUser = new UserDto();
             systemUser.setId(1);
             systemUser.setAdmin(1);
-            session.setCurrentUser(systemUser);
+            Session session = new Session(systemUser);
             UserDto user = session.getAdministrationController().auth(authString, ldap);
-            session.setCurrentUser(user);
+            session = new Session(user);
             boolean isMember = session.getProjectPermissions().size() > 0;
             resp.addHeader("accountMember", String.valueOf(isMember));
             setJSONContentType(resp);

src/main/java/main/view/ApplicationSettings/GeneralSettingsServlet.java

@@ -2,6 +2,7 @@
 
 import main.Session;
 import main.model.dto.AppSettingsDto;
+import main.model.dto.UserDto;
 import main.view.BaseServlet;
 import main.view.IGet;
 import main.view.IPost;
@@ -17,7 +18,7 @@ public class GeneralSettingsServlet extends BaseServlet implements IGet, IPost {
     public void doGet(HttpServletRequest req, HttpServletResponse resp){
         setGetResponseHeaders(resp);
         try {
-            Session session = createSession(req);
+            Session session = new Session(new UserDto());
             setJSONContentType(resp);
             resp.getWriter().write(mapper.serialize(session.getSettingsController().getApp()));
         }catch (Exception e) {

src/main/java/main/view/ApplicationSettings/MainAuthInfoServlet.java

@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.naming.AuthenticationException;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -24,7 +25,7 @@ public class BaseServlet extends HttpServlet{
     protected static Logger log = Logger.getLogger(BaseServlet.class.getName());
     protected DtoMapperGeneral mapper = new DtoMapperGeneral();
 
-    protected Session createSession(HttpServletRequest req) throws AqualityException {
+    protected Session createSession(HttpServletRequest req) throws AqualityException, AuthenticationException {
         String importToken = getStringQueryParameter(req, "importToken");
         Integer projectId = getIntegerQueryParameter(req, "projectId");
         if (importToken != null && projectId != null) {

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

@@ -33,7 +33,7 @@ public void doDelete(HttpServletRequest req, HttpServletResponse resp){
             test2Suite.setSuite_id(Integer.parseInt(req.getParameter("suiteId")));
             test2Suite.setTest_id(Integer.parseInt(req.getParameter("testId")));
             session.controllerFactory.getHandler(test2Suite).delete(test2Suite);
-        } catch (AqualityException e) {
+        } catch (Exception e) {
             handleException(resp, e);
         }
     }