Skip to content

Commit fee66e5

Browse files
VladislavKostyukevichVladislavKostyukevich
authored
Merge pull request #20 from aquality-automation/develop
Develop
2 parents 47ae091 + 5d50b2f commit fee66e5

File tree

128 files changed

+2092
-1434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+2092
-1434
lines changed

‎LICENSE‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2019 Aquality Automation
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>unifi_reporting_api</groupId>
77
<artifactId>api</artifactId>
88
<packaging>war</packaging>
9-
<version>0.3.0</version>
9+
<version>0.3.1</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎src/main/java/main/Session.java‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22

33
import main.controllers.*;
44
import main.controllers.Administration.AdministrationController;
5+
import main.controllers.Administration.AppSettingsController;
56
import main.controllers.Project.ProjectController;
67
import main.controllers.Project.ProjectUserController;
7-
import main.exceptions.RPException;
8+
import main.exceptions.AqualityException;
89
import main.model.db.dao.project.UserDao;
910
import main.model.db.imports.Importer;
1011
import main.model.db.imports.TestNameNodeType;
11-
import main.model.dto.ProjectUserDto;
12-
import main.model.dto.TestRunDto;
13-
import main.model.dto.UserDto;
12+
import main.model.dto.*;
1413
import main.model.email.TestRunEmails;
15-
import org.xml.sax.SAXException;
1614

17-
import javax.xml.parsers.ParserConfigurationException;
15+
import javax.naming.AuthenticationException;
16+
import java.util.Collections;
1817
import java.util.List;
1918
import java.util.stream.Collectors;
2019

@@ -24,19 +23,32 @@ public class Session {
2423
private String session;
2524
public ControllerFactory controllerFactory;
2625

27-
public Session(String sessionId) throws RPException {
28-
if(isSessionValid(sessionId)){
29-
setUserMembership();
26+
public Session(String sessionId) throws AqualityException, AuthenticationException {
27+
if(isSessionValid(sessionId)) {
28+
controllerFactory = new ControllerFactory(user);
29+
return;
3030
}
31-
controllerFactory = new ControllerFactory(user);
31+
throw new AuthenticationException("Your session is not valid!");
32+
}
33+
34+
public Session(UserDto user) throws AqualityException {
35+
this.user = user;
36+
setUserMembership();
37+
controllerFactory = new ControllerFactory(this.user);
3238
}
3339

34-
public Session(){
40+
@Deprecated
41+
public Session(String importToken, int projectId) throws AqualityException {
3542
user = new UserDto();
36-
user.setAdmin(1);
37-
user.setUnit_coordinator(1);
38-
user.setManager(1);
3943
controllerFactory = new ControllerFactory(user);
44+
if(controllerFactory.getHandler(new ImportTokenDto()).isTokenValid(importToken, projectId)){
45+
ProjectUserDto projectUser = new ProjectUserDto();
46+
projectUser.setProject_id(projectId);
47+
projectUser.setEngineer(1);
48+
projectUser.setViewer(1);
49+
user.setProjectUsers(Collections.singletonList(projectUser));
50+
controllerFactory = new ControllerFactory(user);
51+
}
4052
}
4153

4254
public List<ProjectUserDto> getProjectPermissions(){
@@ -47,12 +59,8 @@ public List<ProjectUserDto> getProjectPermissions(Integer projectId){
4759
return user.getProjectUsers().stream().filter(x -> x.getProject_id().equals(projectId)).collect(Collectors.toList());
4860
}
4961

50-
public Importer getImporter(List<String> filePaths, TestRunDto testRunTemplate, String pattern, String format, TestNameNodeType nodeType, boolean singleTestRun) throws RPException {
51-
try {
52-
return new Importer(filePaths, testRunTemplate, pattern, format, nodeType, singleTestRun, user);
53-
} catch (ParserConfigurationException | SAXException e) {
54-
throw new RPException("Some Internal SAX error: " + e.getMessage());
55-
}
62+
public Importer getImporter(List<String> filePaths, TestRunDto testRunTemplate, String pattern, String format, TestNameNodeType nodeType, boolean singleTestRun) throws AqualityException {
63+
return new Importer(filePaths, testRunTemplate, pattern, format, nodeType, singleTestRun, user);
5664
}
5765

5866
public TestRunEmails getTestRunEmails(){
@@ -67,45 +75,36 @@ public AdministrationController getAdministrationController() {
6775
return new AdministrationController(user);
6876
}
6977

70-
public ProjectController getProjectController () throws RPException {
78+
public ProjectController getProjectController (){
7179
return new ProjectController(user);
7280
}
7381

7482
public CustomerController getCustomerController () {
7583
return new CustomerController(user);
7684
}
7785

78-
public SettingsController getSettingsController () {
79-
return new SettingsController(user);
86+
public AppSettingsController getSettingsController () {
87+
return new AppSettingsController(user);
8088
}
8189

8290
public UserDto getCurrentUser() {
8391
return user;
8492
}
8593

86-
public void setCurrentUser(UserDto user) throws RPException {
87-
this.user = user;
88-
setUserMembership();
89-
}
90-
91-
private void setUserMembership() throws RPException {
94+
private void setUserMembership() throws AqualityException {
9295
ProjectUserDto projectUserDto = new ProjectUserDto();
9396
projectUserDto.setUser_id(user.getId());
9497
user.setProjectUsers(new ProjectUserController(user).getProjectUserForPermissions(projectUserDto));
9598
}
9699

97-
public boolean isSessionValid() throws RPException {
98-
return isSessionValid(session);
100+
public boolean isSessionValid() throws AqualityException {
101+
return isSessionValid(session);
99102
}
100103

101-
private boolean isSessionValid(String sessionId) throws RPException {
102-
if(sessionId != null){
103-
UserDao userDao = new UserDao();
104-
user = userDao.IsAuthorized(sessionId);
105-
session = sessionId;
106-
return user != null;
107-
}
108-
user = null;
109-
return false;
104+
private boolean isSessionValid(String sessionId) throws AqualityException {
105+
UserDao userDao = new UserDao();
106+
user = userDao.GetAuthorizedUser(sessionId);
107+
session = sessionId;
108+
return user != null;
110109
}
111110
}

‎src/main/java/main/controllers/Administration/AdministrationController.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main.controllers.Administration;
22

3-
import main.controllers.Administration.UserController;
4-
import main.exceptions.RPException;
3+
import main.exceptions.AqualityException;
54
import main.model.dto.UserDto;
65

76
public class AdministrationController {
@@ -16,7 +15,7 @@ public AdministrationController(UserDto user) {
1615
* @param ldap do authorization with LDAP or not
1716
* @return User
1817
*/
19-
public UserDto auth(String authString, boolean ldap) throws RPException {
18+
public UserDto auth(String authString, boolean ldap) throws AqualityException {
2019
return userController.auth(authString, ldap);
2120
}
2221
}

0 commit comments

Comments
 (0)