Skip to content

Commit 8933528

Browse files
knyshknysh
committed
removed getProjectUserBySuiteId and getProjectUserByTest from UserDto
1 parent 5ba157b commit 8933528

29 files changed

+336
-285
lines changed

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

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

33
import main.controllers.BaseController;
4+
import main.controllers.IController;
45
import main.exceptions.AqualityException;
56
import main.exceptions.AqualityPermissionsException;
67
import main.model.db.dao.settings.AppSettingsDao;
@@ -15,7 +16,7 @@
1516
import java.io.UnsupportedEncodingException;
1617
import java.util.List;
1718

18-
public class AppSettingsController extends BaseController<AppSettingsDto> {
19+
public class AppSettingsController extends BaseController<AppSettingsDto> implements IController<AppSettingsDto> {
1920
private AppSettingsDao appSettingsDao;
2021
private LdapDao ldapDao;
2122

@@ -26,43 +27,46 @@ public AppSettingsController(UserDto user) {
2627
}
2728

2829
public LdapDto getLdap() throws AqualityException {
29-
if(baseUser.isAdmin()){
30+
if (baseUser.isAdmin()) {
3031
return ldapDao.getAll().get(0);
31-
}else{
32+
} else {
3233
throw new AqualityPermissionsException("Account is not allowed to view LDAP Settings", baseUser);
3334
}
3435
}
36+
3537
public AppSettingsDto getApp() throws AqualityException {
3638
return appSettingsDao.getAll().get(0);
3739
}
3840

3941
public LdapDto create(LdapDto template) throws AqualityException {
40-
if(baseUser.isAdmin()){
42+
if (baseUser.isAdmin()) {
4143
template.setAdminSecret(template.getAdminSecret() == null || template.getAdminSecret().equals("")
4244
? ""
4345
: hideAdminSecret(template.getAdminSecret()));
4446
return ldapDao.create(template);
45-
}else{
47+
} else {
4648
throw new AqualityPermissionsException("Account is not allowed to update LDAP Settings", baseUser);
4749
}
4850
}
4951

5052

5153
@Override
5254
public AppSettingsDto create(AppSettingsDto template) throws AqualityException {
53-
if(baseUser.isAdmin()){
55+
if (baseUser.isAdmin()) {
5456
return appSettingsDao.create(template);
55-
}else{
57+
} else {
5658
throw new AqualityPermissionsException("Account is not allowed to update Application Settings", baseUser);
5759
}
5860
}
5961

60-
@Override @NotImplemented
62+
@Override
63+
@NotImplemented
6164
public List<AppSettingsDto> get(AppSettingsDto entity) throws AqualityException {
6265
throw new UnsupportedOperationException();
6366
}
6467

65-
@Override @NotImplemented
68+
@Override
69+
@NotImplemented
6670
public boolean delete(AppSettingsDto entity) throws AqualityException {
6771
throw new UnsupportedOperationException();
6872
}
@@ -79,11 +83,11 @@ public String getAdminSecret() throws AqualityException {
7983
}
8084

8185
private String hideAdminSecret(String secret) throws AqualityException {
82-
try{
86+
try {
8387
Base64 base64 = new Base64();
84-
secret = base64.encodeToString(("JmbGFzYmRmamtiYXNsZA"+secret+"qYXNkaGxma2poYXNka2xqZmJka2").getBytes("utf-8"));
85-
return base64.encodeToString(("YXNkamhmbGtqYXNkaGx"+secret+"a2poYXNka2xqZmJka2phc2JmbGFzYmRmamtiYXNsZA").getBytes("utf-8"));
86-
}catch (UnsupportedEncodingException e){
88+
secret = base64.encodeToString(("JmbGFzYmRmamtiYXNsZA" + secret + "qYXNkaGxma2poYXNka2xqZmJka2").getBytes("utf-8"));
89+
return base64.encodeToString(("YXNkamhmbGtqYXNkaGx" + secret + "a2poYXNka2xqZmJka2phc2JmbGFzYmRmamtiYXNsZA").getBytes("utf-8"));
90+
} catch (UnsupportedEncodingException e) {
8791
throw new AqualityException("Cannot hide Admin Secret.");
8892
}
8993
}

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

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

33
import main.controllers.BaseController;
4+
import main.controllers.IController;
45
import main.exceptions.AqualityException;
56
import main.model.db.dao.settings.EmailSettingsDao;
67
import main.model.dto.EmailSettingsDto;
@@ -9,7 +10,7 @@
910

1011
import java.util.List;
1112

12-
public class EmailSettingsController extends BaseController<EmailSettingsDto> {
13+
public class EmailSettingsController extends BaseController<EmailSettingsDto> implements IController<EmailSettingsDto> {
1314
private EmailSettingsDao emailSettingsDao;
1415

1516
public EmailSettingsController(UserDto user) {
@@ -29,7 +30,8 @@ public EmailSettingsDto create(EmailSettingsDto template) throws AqualityExcepti
2930
return emailSettingsDao.create(template);
3031
}
3132

32-
@Override @NotImplemented
33+
@Override
34+
@NotImplemented
3335
public boolean delete(EmailSettingsDto entity) throws AqualityException {
3436
throw new UnsupportedOperationException();
3537
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package main.controllers.Administration;
22

33
import main.controllers.BaseController;
4+
import main.controllers.IController;
45
import main.exceptions.AqualityException;
56
import main.model.db.dao.project.StepTypeDao;
67
import main.model.dto.StepTypeDto;
78
import main.model.dto.UserDto;
89

910
import java.util.List;
1011

11-
public class StepTypeController extends BaseController<StepTypeDto> {
12+
public class StepTypeController extends BaseController<StepTypeDto> implements IController<StepTypeDto> {
1213
private StepTypeDao stepTypeDao;
1314

1415
public StepTypeController(UserDto user) {

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.mysql.cj.core.conf.url.ConnectionUrlParser;
44
import main.controllers.BaseController;
5+
import main.controllers.IController;
56
import main.exceptions.AqualityException;
67
import main.exceptions.AqualityPermissionsException;
78
import main.model.db.dao.project.PasswordDao;
@@ -24,7 +25,7 @@
2425
import java.util.Objects;
2526
import java.util.UUID;
2627

27-
public class UserController extends BaseController<UserDto> {
28+
public class UserController extends BaseController<UserDto> implements IController<UserDto> {
2829
private UserDao userDao;
2930
private PasswordDao passwordDao;
3031
private UserSessionDao userSessionDao;
@@ -38,12 +39,12 @@ public UserController(UserDto user) {
3839

3940
@Override
4041
public UserDto create(UserDto template) throws AqualityException {
41-
if(baseUser.isAdmin() || baseUser.getId().equals(template.getId())){
42-
if(template.getPassword() != null){
42+
if (baseUser.isAdmin() || baseUser.getId().equals(template.getId())) {
43+
if (template.getPassword() != null) {
4344
template.setPassword(saltPassword(template, template.getPassword()));
4445
}
4546
return userDao.create(template);
46-
}else{
47+
} else {
4748
throw new AqualityPermissionsException("Account is not allowed to create User", baseUser);
4849
}
4950
}
@@ -55,9 +56,9 @@ public List<UserDto> get(UserDto template) throws AqualityException {
5556

5657
@Override
5758
public boolean delete(UserDto template) throws AqualityException {
58-
if(baseUser.isAdmin()){
59+
if (baseUser.isAdmin()) {
5960
return userDao.delete(template);
60-
}else{
61+
} else {
6162
throw new AqualityPermissionsException("Account is not allowed to delete User", baseUser);
6263
}
6364
}
@@ -77,7 +78,7 @@ public UserDto updatePassword(PasswordDto password) throws AqualityException {
7778
}
7879

7980
UserDto auth(String authString, boolean ldap) throws AqualityException {
80-
Base64 base64= new Base64();
81+
Base64 base64 = new Base64();
8182
String authStringDecoded = StringUtils.newStringUtf8(base64.decode(authString));
8283
String[] authStringSplit = authStringDecoded.split(":");
8384
ConnectionUrlParser.Pair<String, PrivateKey> privateKeyPair
@@ -94,7 +95,7 @@ UserDto auth(String authString, boolean ldap) throws AqualityException {
9495

9596
UserDto user = ldap ? handleLDAPAuthorization(authStringSplit[0], password) : checkUser(authStringSplit[0], password);
9697

97-
if(user != null){
98+
if (user != null) {
9899
user.setSession_code(generateSessionCode(user));
99100
updateSession(user);
100101
return user;
@@ -113,7 +114,7 @@ private List<UserDto> toPublicUsers(List<UserDto> users) {
113114
}
114115

115116
private String generateSessionCode(UserDto user) {
116-
Base64 base64= new Base64();
117+
Base64 base64 = new Base64();
117118
DateUtils dates = new DateUtils();
118119
String encode = null;
119120
try {
@@ -124,21 +125,21 @@ private String generateSessionCode(UserDto user) {
124125
return encode;
125126
}
126127

127-
private String saltPassword(UserDto user, String password){
128+
private String saltPassword(UserDto user, String password) {
128129
String passHash = DigestUtils.md5Hex(password);
129-
return DigestUtils.md5Hex(user.getEmail()+passHash+"kjr1fdd00das");
130+
return DigestUtils.md5Hex(user.getEmail() + passHash + "kjr1fdd00das");
130131
}
131132

132133
private UserDto checkUser(String user_name, String password) throws AqualityException {
133134
UserDto user = new UserDto();
134135
user.setUser_name(user_name);
135136
List<UserDto> users = userDao.searchAll(user);
136137

137-
if(users.size() > 0){
138+
if (users.size() > 0) {
138139
user = users.get(0);
139140
String correctHex = user.getPassword();
140141
String actualHex = saltPassword(user, password);
141-
if(correctHex.equals(actualHex)){
142+
if (correctHex.equals(actualHex)) {
142143
return user;
143144
}
144145
}
@@ -150,12 +151,12 @@ private UserDto handleLDAPAuthorization(String userName, String password) throws
150151
LDAPAuthenticator ldap = new LDAPAuthenticator();
151152
UserDto user;
152153
user = ldap.tryAuthWithLdap(userName, password);
153-
if(user != null){
154+
if (user != null) {
154155
UserDto templateUser = new UserDto();
155156
templateUser.setUser_name(user.getUser_name());
156157
List<UserDto> users = get(templateUser);
157158

158-
if(users.size() > 0){
159+
if (users.size() > 0) {
159160
user.setId(users.get(0).getId());
160161
}
161162

0 commit comments

Comments
 (0)