Merge pull request #67 from aquality-automation/feature/improve_tests_with_admin_api

Feature/improve tests with admin api

Author: VladislavKostyukevich

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.3.10 (unreleased)
 
 Features:
+  - Update Tests to use Admin API to create preconditions -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/100)
 
 Bugfixes:
   - Test run View Page performance is bad -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/99)

pom.xml

@@ -197,12 +197,12 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>RELEASE</version>
+            <version>19.0.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>RELEASE</version>
+            <version>4.13</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/main/Session.java

@@ -40,20 +40,6 @@ public Session(UserDto user) throws AqualityException {
         controllerFactory = new ControllerFactory(this.user);
     }
 
-    @Deprecated
-    public Session(String apiToken, int projectId) throws AqualityException {
-        user = new UserDto();
-        controllerFactory = new ControllerFactory(user);
-        if(controllerFactory.getHandler(new APITokenDto()).isTokenValid(apiToken, 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(){
         return user.getProjectUsers();
     }

src/main/java/main/controllers/Administration/UserController.java

@@ -25,9 +25,9 @@
 import java.util.UUID;
 
 public class UserController extends BaseController<UserDto> {
-    private UserDao userDao;
-    private PasswordDao passwordDao;
-    private UserSessionDao userSessionDao;
+    private final UserDao userDao;
+    private final PasswordDao passwordDao;
+    private final UserSessionDao userSessionDao;
 
     public UserController(UserDto user) {
         super(user);
@@ -42,7 +42,7 @@ public UserDto create(UserDto template) throws AqualityException {
             if (template.getPassword() != null) {
                 template.setPassword(saltPassword(template, template.getPassword()));
             }
-            return userDao.create(template);
+            return toPublicUser(userDao.create(template));
         } else {
             throw new AqualityPermissionsException("Account is not allowed to create User", baseUser);
         }
@@ -104,14 +104,18 @@ UserDto auth(String authString, boolean ldap) throws AqualityException {
     }
 
     private List<UserDto> toPublicUsers(List<UserDto> users) {
-        for (UserDto user :
-                users) {
-            user.setPassword("");
-            user.setSession_code("");
+        for (UserDto user : users) {
+            toPublicUser(user);
         }
         return users;
     }
 
+    private UserDto toPublicUser(UserDto user) {
+        user.setPassword("");
+        user.setSession_code("");
+        return user;
+    }
+
     private String generateSessionCode(UserDto user) {
         Base64 base64 = new Base64();
         DateUtils dates = new DateUtils();

src/main/java/main/controllers/Project/ProjectUserController.java

@@ -32,7 +32,7 @@ public ProjectUserDto create(ProjectUserDto template) throws AqualityException {
     @Override
     public List<ProjectUserDto> get(ProjectUserDto template) throws AqualityException {
         boolean isViewer = template.getProject_id() != null && baseUser.getProjectUser(template.getProject_id()).isViewer();
-        if (baseUser.isFromGlobalManagement() || isViewer || template.getUser_id() != null) {
+        if (baseUser.isAdmin() || baseUser.isFromGlobalManagement() || isViewer || template.getUser_id() != null) {
             return fillProjectUsers(projectUserDao.searchAll(template));
         } else {
             throw new AqualityPermissionsException("Account is not allowed to view Project Users", baseUser);

src/main/java/main/view/Administration/UsersServlet.java

@@ -35,14 +35,13 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         setPostResponseHeaders(resp);
         setEncoding(resp);
-        resp.addHeader("Access-Control-Expose-Headers", "id");
-        resp.addHeader("Access-Control-Allow-Headers", "id");
 
         try {
             Session session = createSession(req);
             UserDto user = mapper.mapObject(UserDto.class, getRequestJson(req));
             user = session.controllerFactory.getHandler(user).create(user);
-            resp.setHeader("id", user.getId().toString());
+            setJSONContentType(resp);
+            resp.getWriter().write(mapper.serialize(user));
         } catch (Exception e) {
             handleException(resp, e);
         }

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

@@ -26,13 +26,7 @@ public class BaseServlet extends HttpServlet {
     protected static final String PROJECT_ID_KEY = "project_id";
 
     protected Session createSession(HttpServletRequest req) throws AqualityException, AuthenticationException {
-        String importToken = getStringQueryParameter(req, "importToken");
-        Integer projectId = getIntegerQueryParameter(req, "projectId");
-        if (importToken != null && projectId != null) {
-            return new Session(importToken, projectId);
-        } else {
-            return new Session(getSessionId(req));
-        }
+        return new Session(getSessionId(req));
     }
 
     private String replacer(String value) {

src/main/java/main/view/Project/APITokenServlet.java

@@ -22,6 +22,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
             APITokenDto tokenDto = new APITokenDto();
             tokenDto.getSearchTemplateFromRequestParameters(req);
             tokenDto.setApi_token(session.controllerFactory.getHandler(tokenDto).create(tokenDto).getApi_token());
+            setJSONContentType(resp);
             resp.getWriter().write(mapper.serialize(tokenDto));
         } catch (Exception e) {
             handleException(resp, e);

src/main/java/main/view/Project/ExecuteImportServlet.java

@@ -51,9 +51,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         setPostResponseHeaders(resp);
         try {
             readParameters(req);
-            Session session = importToken != null
-                    ? new Session(importToken, projectId)
-                    : createSession(req);
+            Session session = createSession(req);
 
             suiteController = session.controllerFactory.getHandler(new TestSuiteDto());
             testRunController = session.controllerFactory.getHandler(new TestRunDto());
@@ -130,6 +128,10 @@ private Integer getTestRunId() throws AqualityException {
     }
 
     private void validateRequest() throws AqualityQueryParameterException {
+        if(importToken != null)
+        {
+            throw new AqualityQueryParameterException("Import Token is deprecated. Follow instructions on the API Token page.");
+        }
 
         if(singleTestRun)
         {