users = usersPage.getContent();
164 |
165 | for (UserEntity userEntity : users) {
166 | UserDto userDto = new UserDto();
167 | BeanUtils.copyProperties(userEntity, userDto);
168 | returnValue.add(userDto);
169 | }
170 |
171 | return returnValue;
172 | }
173 |
174 | @Override
175 | public boolean verifyEmailToken(String token) {
176 | boolean returnValue = false;
177 |
178 | // Find user by token
179 | UserEntity userEntity = userRepository.findUserByEmailVerificationToken(token);
180 |
181 | if (userEntity != null) {
182 | boolean hastokenExpired = Utils.hasTokenExpired(token);
183 | if (!hastokenExpired) {
184 | userEntity.setEmailVerificationToken(null);
185 | userEntity.setEmailVerificationStatus(Boolean.TRUE);
186 | userRepository.save(userEntity);
187 | returnValue = true;
188 | }
189 | }
190 |
191 | return returnValue;
192 | }
193 |
194 | @Override
195 | public boolean requestPasswordReset(String email) {
196 |
197 | boolean returnValue = false;
198 |
199 | UserEntity userEntity = userRepository.findByEmail(email);
200 |
201 | if (userEntity == null) {
202 | return returnValue;
203 | }
204 |
205 | String token = new Utils().generatePasswordResetToken(userEntity.getUserId());
206 |
207 | PasswordResetTokenEntity passwordResetTokenEntity = new PasswordResetTokenEntity();
208 | passwordResetTokenEntity.setToken(token);
209 | passwordResetTokenEntity.setUserDetails(userEntity);
210 | passwordResetTokenRepository.save(passwordResetTokenEntity);
211 |
212 | returnValue = new AmazonSES().sendPasswordResetRequest(
213 | userEntity.getFirstName(),
214 | userEntity.getEmail(),
215 | token);
216 |
217 | return returnValue;
218 | }
219 |
220 | @Override
221 | public boolean resetPassword(String token, String password) {
222 | boolean returnValue = false;
223 |
224 | if( Utils.hasTokenExpired(token) )
225 | {
226 | return returnValue;
227 | }
228 |
229 | PasswordResetTokenEntity passwordResetTokenEntity = passwordResetTokenRepository.findByToken(token);
230 |
231 | if (passwordResetTokenEntity == null) {
232 | return returnValue;
233 | }
234 |
235 | // Prepare new password
236 | String encodedPassword = bCryptPasswordEncoder.encode(password);
237 |
238 | // Update User password in database
239 | UserEntity userEntity = passwordResetTokenEntity.getUserDetails();
240 | userEntity.setEncryptedPassword(encodedPassword);
241 | UserEntity savedUserEntity = userRepository.save(userEntity);
242 |
243 | // Verify if password was saved successfully
244 | if (savedUserEntity != null && savedUserEntity.getEncryptedPassword().equalsIgnoreCase(encodedPassword)) {
245 | returnValue = true;
246 | }
247 |
248 | // Remove Password Reset token from database
249 | passwordResetTokenRepository.delete(passwordResetTokenEntity);
250 |
251 | return returnValue;
252 | }
253 |
254 | }
255 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/shared/AmazonSES.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.shared;
2 |
3 | import org.springframework.stereotype.Service;
4 |
5 | import com.amazonaws.regions.Regions;
6 | import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
7 | import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder;
8 | import com.amazonaws.services.simpleemail.model.Body;
9 | import com.amazonaws.services.simpleemail.model.Content;
10 | import com.amazonaws.services.simpleemail.model.Destination;
11 | import com.amazonaws.services.simpleemail.model.Message;
12 | import com.amazonaws.services.simpleemail.model.SendEmailRequest;
13 | import com.amazonaws.services.simpleemail.model.SendEmailResult;
14 | import com.appsdeveloperblog.app.ws.shared.dto.UserDto;
15 |
16 | @Service
17 | public class AmazonSES {
18 | // This address must be verified with Amazon SES.
19 | final String FROM = "sergey.kargopolov@swiftdeveloperblog.com";
20 |
21 | // The subject line for the email.
22 | final String SUBJECT = "One last step to complete your registration with PhotoApp";
23 |
24 | final String PASSWORD_RESET_SUBJECT = "Password reset request";
25 |
26 | // The HTML body for the email.
27 | final String HTMLBODY = "Please verify your email address
"
28 | + "Thank you for registering with our mobile app. To complete registration process and be able to log in,"
29 | + " click on the following link: "
30 | + ""
31 | + "Final step to complete your registration" + "
"
32 | + "Thank you! And we are waiting for you inside!";
33 |
34 | // The email body for recipients with non-HTML email clients.
35 | final String TEXTBODY = "Please verify your email address. "
36 | + "Thank you for registering with our mobile app. To complete registration process and be able to log in,"
37 | + " open then the following URL in your browser window: "
38 | + " http://ec2-35-173-238-100.compute-1.amazonaws.com:8080/verification-service/email-verification.html?token=$tokenValue"
39 | + " Thank you! And we are waiting for you inside!";
40 |
41 |
42 | final String PASSWORD_RESET_HTMLBODY = "
A request to reset your password
"
43 | + "Hi, $firstName!
"
44 | + "Someone has requested to reset your password with our project. If it were not you, please ignore it."
45 | + " otherwise please click on the link below to set a new password: "
46 | + ""
47 | + " Click this link to Reset Password"
48 | + "
"
49 | + "Thank you!";
50 |
51 | // The email body for recipients with non-HTML email clients.
52 | final String PASSWORD_RESET_TEXTBODY = "A request to reset your password "
53 | + "Hi, $firstName! "
54 | + "Someone has requested to reset your password with our project. If it were not you, please ignore it."
55 | + " otherwise please open the link below in your browser window to set a new password:"
56 | + " http://localhost:8080/verification-service/password-reset.html?token=$tokenValue"
57 | + " Thank you!";
58 |
59 |
60 | public void verifyEmail(UserDto userDto) {
61 |
62 | // You can also set your keys this way. And it will work!
63 | //System.setProperty("aws.accessKeyId", "");
64 | //System.setProperty("aws.secretKey", "");
65 |
66 | AmazonSimpleEmailService client = AmazonSimpleEmailServiceClientBuilder.standard().withRegion(Regions.US_EAST_1)
67 | .build();
68 |
69 | String htmlBodyWithToken = HTMLBODY.replace("$tokenValue", userDto.getEmailVerificationToken());
70 | String textBodyWithToken = TEXTBODY.replace("$tokenValue", userDto.getEmailVerificationToken());
71 |
72 | SendEmailRequest request = new SendEmailRequest()
73 | .withDestination(new Destination().withToAddresses(userDto.getEmail()))
74 | .withMessage(new Message()
75 | .withBody(new Body().withHtml(new Content().withCharset("UTF-8").withData(htmlBodyWithToken))
76 | .withText(new Content().withCharset("UTF-8").withData(textBodyWithToken)))
77 | .withSubject(new Content().withCharset("UTF-8").withData(SUBJECT)))
78 | .withSource(FROM);
79 |
80 | client.sendEmail(request);
81 |
82 | System.out.println("Email sent!");
83 |
84 | }
85 |
86 | public boolean sendPasswordResetRequest(String firstName, String email, String token)
87 | {
88 | boolean returnValue = false;
89 |
90 | AmazonSimpleEmailService client =
91 | AmazonSimpleEmailServiceClientBuilder.standard()
92 | .withRegion(Regions.US_EAST_1).build();
93 |
94 | String htmlBodyWithToken = PASSWORD_RESET_HTMLBODY.replace("$tokenValue", token);
95 | htmlBodyWithToken = htmlBodyWithToken.replace("$firstName", firstName);
96 |
97 | String textBodyWithToken = PASSWORD_RESET_TEXTBODY.replace("$tokenValue", token);
98 | textBodyWithToken = textBodyWithToken.replace("$firstName", firstName);
99 |
100 |
101 | SendEmailRequest request = new SendEmailRequest()
102 | .withDestination(
103 | new Destination().withToAddresses( email ) )
104 | .withMessage(new Message()
105 | .withBody(new Body()
106 | .withHtml(new Content()
107 | .withCharset("UTF-8").withData(htmlBodyWithToken))
108 | .withText(new Content()
109 | .withCharset("UTF-8").withData(textBodyWithToken)))
110 | .withSubject(new Content()
111 | .withCharset("UTF-8").withData(PASSWORD_RESET_SUBJECT)))
112 | .withSource(FROM);
113 |
114 | SendEmailResult result = client.sendEmail(request);
115 | if(result != null && (result.getMessageId()!=null && !result.getMessageId().isEmpty()))
116 | {
117 | returnValue = true;
118 | }
119 |
120 | return returnValue;
121 | }
122 |
123 | }
124 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/shared/Utils.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.shared;
2 |
3 | import java.security.SecureRandom;
4 | import java.util.Date;
5 | import java.util.Random;
6 |
7 | import org.springframework.stereotype.Service;
8 |
9 | import com.appsdeveloperblog.app.ws.security.SecurityConstants;
10 |
11 | import io.jsonwebtoken.Claims;
12 | import io.jsonwebtoken.ExpiredJwtException;
13 | import io.jsonwebtoken.Jwts;
14 | import io.jsonwebtoken.SignatureAlgorithm;
15 |
16 | @Service
17 | public class Utils {
18 |
19 | private final Random RANDOM = new SecureRandom();
20 | private final String ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
21 |
22 | public String generateUserId(int length) {
23 | return generateRandomString(length);
24 | }
25 |
26 | public String generateAddressId(int length) {
27 | return generateRandomString(length);
28 | }
29 |
30 | private String generateRandomString(int length) {
31 | StringBuilder returnValue = new StringBuilder(length);
32 |
33 | for (int i = 0; i < length; i++) {
34 | returnValue.append(ALPHABET.charAt(RANDOM.nextInt(ALPHABET.length())));
35 | }
36 |
37 | return new String(returnValue);
38 | }
39 |
40 | public static boolean hasTokenExpired(String token) {
41 | boolean returnValue = false;
42 |
43 | try {
44 | Claims claims = Jwts.parser().setSigningKey(SecurityConstants.getTokenSecret()).parseClaimsJws(token)
45 | .getBody();
46 |
47 | Date tokenExpirationDate = claims.getExpiration();
48 | Date todayDate = new Date();
49 |
50 | returnValue = tokenExpirationDate.before(todayDate);
51 | } catch (ExpiredJwtException ex) {
52 | returnValue = true;
53 | }
54 |
55 | return returnValue;
56 | }
57 |
58 | public String generateEmailVerificationToken(String userId) {
59 | String token = Jwts.builder()
60 | .setSubject(userId)
61 | .setExpiration(new Date(System.currentTimeMillis() + SecurityConstants.EXPIRATION_TIME))
62 | .signWith(SignatureAlgorithm.HS512, SecurityConstants.getTokenSecret())
63 | .compact();
64 | return token;
65 | }
66 |
67 | public String generatePasswordResetToken(String userId)
68 | {
69 | String token = Jwts.builder()
70 | .setSubject(userId)
71 | .setExpiration(new Date(System.currentTimeMillis() + SecurityConstants.EXPIRATION_TIME))
72 | .signWith(SignatureAlgorithm.HS512, SecurityConstants.getTokenSecret())
73 | .compact();
74 | return token;
75 | }
76 | }
77 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/shared/dto/AddressDTO.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.shared.dto;
2 |
3 | public class AddressDTO {
4 | private long id;
5 | private String addressId;
6 | private String city;
7 | private String country;
8 | private String streetName;
9 | private String postalCode;
10 | private String type;
11 | private UserDto userDetails;
12 |
13 | public long getId() {
14 | return id;
15 | }
16 |
17 | public void setId(long id) {
18 | this.id = id;
19 | }
20 |
21 | public String getCity() {
22 | return city;
23 | }
24 |
25 | public void setCity(String city) {
26 | this.city = city;
27 | }
28 |
29 | public String getCountry() {
30 | return country;
31 | }
32 |
33 | public void setCountry(String country) {
34 | this.country = country;
35 | }
36 |
37 | public String getStreetName() {
38 | return streetName;
39 | }
40 |
41 | public void setStreetName(String streetName) {
42 | this.streetName = streetName;
43 | }
44 |
45 | public String getPostalCode() {
46 | return postalCode;
47 | }
48 |
49 | public void setPostalCode(String postalCode) {
50 | this.postalCode = postalCode;
51 | }
52 |
53 | public String getType() {
54 | return type;
55 | }
56 |
57 | public void setType(String type) {
58 | this.type = type;
59 | }
60 |
61 | public UserDto getUserDetails() {
62 | return userDetails;
63 | }
64 |
65 | public void setUserDetails(UserDto userDetails) {
66 | this.userDetails = userDetails;
67 | }
68 |
69 | public String getAddressId() {
70 | return addressId;
71 | }
72 |
73 | public void setAddressId(String addressId) {
74 | this.addressId = addressId;
75 | }
76 | }
77 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/shared/dto/UserDto.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.shared.dto;
2 |
3 | import java.io.Serializable;
4 | import java.util.List;
5 |
6 | public class UserDto implements Serializable{
7 |
8 | private static final long serialVersionUID = 6835192601898364280L;
9 | private long id;
10 | private String userId;
11 | private String firstName;
12 | private String lastName;
13 | private String email;
14 | private String password;
15 | private String encryptedPassword;
16 | private String emailVerificationToken;
17 | private Boolean emailVerificationStatus = false;
18 | private List addresses;
19 |
20 | public long getId() {
21 | return id;
22 | }
23 | public void setId(long id) {
24 | this.id = id;
25 | }
26 | public String getUserId() {
27 | return userId;
28 | }
29 | public void setUserId(String userId) {
30 | this.userId = userId;
31 | }
32 | public String getFirstName() {
33 | return firstName;
34 | }
35 | public void setFirstName(String firstName) {
36 | this.firstName = firstName;
37 | }
38 | public String getLastName() {
39 | return lastName;
40 | }
41 | public void setLastName(String lastName) {
42 | this.lastName = lastName;
43 | }
44 | public String getEmail() {
45 | return email;
46 | }
47 | public void setEmail(String email) {
48 | this.email = email;
49 | }
50 | public String getPassword() {
51 | return password;
52 | }
53 | public void setPassword(String password) {
54 | this.password = password;
55 | }
56 | public String getEncryptedPassword() {
57 | return encryptedPassword;
58 | }
59 | public void setEncryptedPassword(String encryptedPassword) {
60 | this.encryptedPassword = encryptedPassword;
61 | }
62 | public String getEmailVerificationToken() {
63 | return emailVerificationToken;
64 | }
65 | public void setEmailVerificationToken(String emailVerificationToken) {
66 | this.emailVerificationToken = emailVerificationToken;
67 | }
68 | public Boolean getEmailVerificationStatus() {
69 | return emailVerificationStatus;
70 | }
71 | public void setEmailVerificationStatus(Boolean emailVerificationStatus) {
72 | this.emailVerificationStatus = emailVerificationStatus;
73 | }
74 | public List getAddresses() {
75 | return addresses;
76 | }
77 | public void setAddresses(List addresses) {
78 | this.addresses = addresses;
79 | }
80 |
81 |
82 |
83 | }
84 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/contoller/AuthenticationController.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.contoller;
2 |
3 | import org.springframework.web.bind.annotation.PostMapping;
4 | import org.springframework.web.bind.annotation.RequestBody;
5 | import org.springframework.web.bind.annotation.RestController;
6 |
7 | import io.swagger.annotations.ApiOperation;
8 | import io.swagger.annotations.ApiResponse;
9 | import io.swagger.annotations.ApiResponses;
10 | import io.swagger.annotations.ResponseHeader;
11 |
12 | import com.appsdeveloperblog.app.ws.ui.model.request.LoginRequestModel;
13 |
14 | @RestController
15 | public class AuthenticationController {
16 |
17 | @ApiOperation("User login")
18 | @ApiResponses(value = {
19 | @ApiResponse(code = 200,
20 | message = "Response Headers",
21 | responseHeaders = {
22 | @ResponseHeader(name = "authorization",
23 | description = "Bearer "),
24 | @ResponseHeader(name = "userId",
25 | description = "")
26 | })
27 | })
28 | @PostMapping("/users/login")
29 | public void theFakeLogin(@RequestBody LoginRequestModel loginRequestModel)
30 | {
31 | throw new IllegalStateException("This method should not be called. This method is implemented by Spring Security");
32 | }
33 | }
34 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/contoller/RequestOperationName.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.contoller;
2 |
3 | public enum RequestOperationName {
4 | DELETE,
5 | VERIFY_EMAIL,
6 | REQUEST_PASSWORD_RESET,
7 | PASSWORD_RESET
8 | }
9 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/request/AddressRequestModel.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.request;
2 |
3 | public class AddressRequestModel {
4 | private String city;
5 | private String country;
6 | private String streetName;
7 | private String postalCode;
8 | private String type;
9 |
10 | public String getCity() {
11 | return city;
12 | }
13 |
14 | public void setCity(String city) {
15 | this.city = city;
16 | }
17 |
18 | public String getCountry() {
19 | return country;
20 | }
21 |
22 | public void setCountry(String country) {
23 | this.country = country;
24 | }
25 |
26 | public String getStreetName() {
27 | return streetName;
28 | }
29 |
30 | public void setStreetName(String streetName) {
31 | this.streetName = streetName;
32 | }
33 |
34 | public String getPostalCode() {
35 | return postalCode;
36 | }
37 |
38 | public void setPostalCode(String postalCode) {
39 | this.postalCode = postalCode;
40 | }
41 |
42 | public String getType() {
43 | return type;
44 | }
45 |
46 | public void setType(String type) {
47 | this.type = type;
48 | }
49 | }
50 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/request/LoginRequestModel.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.request;
2 |
3 | public class LoginRequestModel {
4 | private String email;
5 | private String password;
6 |
7 | public String getEmail() {
8 | return email;
9 | }
10 |
11 | public void setEmail(String email) {
12 | this.email = email;
13 | }
14 |
15 | public String getPassword() {
16 | return password;
17 | }
18 |
19 | public void setPassword(String password) {
20 | this.password = password;
21 | }
22 | }
23 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/request/PasswordResetModel.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.request;
2 |
3 | public class PasswordResetModel {
4 | private String token;
5 | private String password;
6 |
7 | public String getToken() {
8 | return token;
9 | }
10 |
11 | public void setToken(String token) {
12 | this.token = token;
13 | }
14 |
15 | public String getPassword() {
16 | return password;
17 | }
18 |
19 | public void setPassword(String password) {
20 | this.password = password;
21 | }
22 | }
23 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/request/PasswordResetRequestModel.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.request;
2 |
3 | public class PasswordResetRequestModel {
4 | private String email;
5 |
6 | public String getEmail() {
7 | return email;
8 | }
9 |
10 | public void setEmail(String email) {
11 | this.email = email;
12 | }
13 | }
14 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/request/UserDetailsRequestModel.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.request;
2 |
3 | import java.util.List;
4 |
5 | public class UserDetailsRequestModel {
6 |
7 | private String firstName;
8 | private String lastName;
9 | private String email;
10 | private String password;
11 | private List addresses;
12 |
13 | public String getFirstName() {
14 | return firstName;
15 | }
16 | public void setFirstName(String firstName) {
17 | this.firstName = firstName;
18 | }
19 | public String getLastName() {
20 | return lastName;
21 | }
22 | public void setLastName(String lastName) {
23 | this.lastName = lastName;
24 | }
25 | public String getEmail() {
26 | return email;
27 | }
28 | public void setEmail(String email) {
29 | this.email = email;
30 | }
31 | public String getPassword() {
32 | return password;
33 | }
34 | public void setPassword(String password) {
35 | this.password = password;
36 | }
37 | public List getAddresses() {
38 | return addresses;
39 | }
40 | public void setAddresses(List addresses) {
41 | this.addresses = addresses;
42 | }
43 |
44 | }
45 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/request/UserLoginRequestModel.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.request;
2 |
3 | public class UserLoginRequestModel {
4 | private String email;
5 | private String password;
6 |
7 | public String getEmail() {
8 | return email;
9 | }
10 |
11 | public void setEmail(String email) {
12 | this.email = email;
13 | }
14 |
15 | public String getPassword() {
16 | return password;
17 | }
18 |
19 | public void setPassword(String password) {
20 | this.password = password;
21 | }
22 | }
23 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/response/AddressesRest.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.response;
2 |
3 | import org.springframework.hateoas.ResourceSupport;
4 |
5 | public class AddressesRest extends ResourceSupport{
6 | private String addressId;
7 | private String city;
8 | private String country;
9 | private String streetName;
10 | private String postalCode;
11 | private String type;
12 |
13 | public String getAddressId() {
14 | return addressId;
15 | }
16 |
17 | public void setAddressId(String addressId) {
18 | this.addressId = addressId;
19 | }
20 |
21 | public String getCity() {
22 | return city;
23 | }
24 |
25 | public void setCity(String city) {
26 | this.city = city;
27 | }
28 |
29 | public String getCountry() {
30 | return country;
31 | }
32 |
33 | public void setCountry(String country) {
34 | this.country = country;
35 | }
36 |
37 | public String getStreetName() {
38 | return streetName;
39 | }
40 |
41 | public void setStreetName(String streetName) {
42 | this.streetName = streetName;
43 | }
44 |
45 | public String getPostalCode() {
46 | return postalCode;
47 | }
48 |
49 | public void setPostalCode(String postalCode) {
50 | this.postalCode = postalCode;
51 | }
52 |
53 | public String getType() {
54 | return type;
55 | }
56 |
57 | public void setType(String type) {
58 | this.type = type;
59 | }
60 | }
61 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/response/ErrorMessage.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.response;
2 |
3 | import java.util.Date;
4 |
5 | public class ErrorMessage {
6 | private Date timestamp;
7 | private String message;
8 |
9 | public ErrorMessage() {}
10 |
11 | public ErrorMessage(Date timestamp, String message)
12 | {
13 | this.timestamp = timestamp;
14 | this.message = message;
15 | }
16 |
17 | public Date getTimestamp() {
18 | return timestamp;
19 | }
20 |
21 | public void setTimestamp(Date timestamp) {
22 | this.timestamp = timestamp;
23 | }
24 |
25 | public String getMessage() {
26 | return message;
27 | }
28 |
29 | public void setMessage(String message) {
30 | this.message = message;
31 | }
32 | }
33 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/response/ErrorMessages.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.response;
2 |
3 | public enum ErrorMessages {
4 |
5 | MISSING_REQUIRED_FIELD("Missing required field. Please check documentation for required fields"),
6 | RECORD_ALREADY_EXISTS("Record already exists"),
7 | INTERNAL_SERVER_ERROR("Internal server error"),
8 | NO_RECORD_FOUND("Record with provided id is not found"),
9 | AUTHENTICATION_FAILED("Authentication failed"),
10 | COULD_NOT_UPDATE_RECORD("Could not update record"),
11 | COULD_NOT_DELETE_RECORD("Could not delete record"),
12 | EMAIL_ADDRESS_NOT_VERIFIED("Email address could not be verified");
13 |
14 |
15 | private String errorMessage;
16 |
17 | ErrorMessages(String errorMessage) {
18 | this.errorMessage = errorMessage;
19 | }
20 |
21 | /**
22 | * @return the errorMessage
23 | */
24 | public String getErrorMessage() {
25 | return errorMessage;
26 | }
27 |
28 | /**
29 | * @param errorMessage the errorMessage to set
30 | */
31 | public void setErrorMessage(String errorMessage) {
32 | this.errorMessage = errorMessage;
33 | }
34 |
35 | }
36 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/response/OperationStatusModel.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.response;
2 |
3 | public class OperationStatusModel {
4 | private String operationResult;
5 | private String operationName;
6 |
7 | public String getOperationResult() {
8 | return operationResult;
9 | }
10 |
11 | public void setOperationResult(String operationResult) {
12 | this.operationResult = operationResult;
13 | }
14 |
15 | public String getOperationName() {
16 | return operationName;
17 | }
18 |
19 | public void setOperationName(String operationName) {
20 | this.operationName = operationName;
21 | }
22 | }
23 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/response/RequestOperationStatus.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.response;
2 |
3 | public enum RequestOperationStatus {
4 | ERROR, SUCCESS
5 | }
6 |
--------------------------------------------------------------------------------
/src/main/java/com/appsdeveloperblog/app/ws/ui/model/response/UserRest.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.model.response;
2 |
3 | import java.util.List;
4 |
5 | public class UserRest {
6 | private String userId;
7 | private String firstName;
8 | private String lastName;
9 | private String email;
10 | private List addresses;
11 |
12 | public String getUserId() {
13 | return userId;
14 | }
15 |
16 | public void setUserId(String userId) {
17 | this.userId = userId;
18 | }
19 |
20 | public String getFirstName() {
21 | return firstName;
22 | }
23 |
24 | public void setFirstName(String firstName) {
25 | this.firstName = firstName;
26 | }
27 |
28 | public String getLastName() {
29 | return lastName;
30 | }
31 |
32 | public void setLastName(String lastName) {
33 | this.lastName = lastName;
34 | }
35 |
36 | public String getEmail() {
37 | return email;
38 | }
39 |
40 | public void setEmail(String email) {
41 | this.email = email;
42 | }
43 |
44 | public List getAddresses() {
45 | return addresses;
46 | }
47 |
48 | public void setAddresses(List addresses) {
49 | this.addresses = addresses;
50 | }
51 |
52 | }
53 |
--------------------------------------------------------------------------------
/src/main/resources/application.properties:
--------------------------------------------------------------------------------
1 | spring.datasource.username=sergey
2 | spring.datasource.password=sergey
3 | #spring.datasource.url=jdbc:mysql://localhost:3306/photo_app
4 | spring.jpa.hibernate.ddl-auto=update
5 | tokenSecret = jf9i4jgu83nfl0jfu57ejf7
6 | server.servlet.context-path=/mobile-app-ws
7 | server.port=8080
8 | spring.h2.console.enabled=true
--------------------------------------------------------------------------------
/src/main/webapp/META-INF/context.xml:
--------------------------------------------------------------------------------
1 |
2 |
3 |
--------------------------------------------------------------------------------
/src/test/java/com/appsdeveloperblog/app/ws/MobileAppWsApplicationTests.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws;
2 |
3 | import org.junit.Test;
4 | import org.junit.runner.RunWith;
5 | import org.springframework.boot.test.context.SpringBootTest;
6 | import org.springframework.test.context.junit4.SpringRunner;
7 |
8 | @RunWith(SpringRunner.class)
9 | @SpringBootTest
10 | public class MobileAppWsApplicationTests {
11 |
12 | @Test
13 | public void contextLoads() {
14 | }
15 |
16 | }
17 |
--------------------------------------------------------------------------------
/src/test/java/com/appsdeveloperblog/app/ws/io/repository/UserRepositoryTest.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.io.repository;
2 |
3 | import static org.junit.jupiter.api.Assertions.*;
4 |
5 | import java.util.ArrayList;
6 | import java.util.List;
7 | import org.junit.jupiter.api.BeforeEach;
8 | import org.junit.jupiter.api.Test;
9 | import org.junit.jupiter.api.extension.ExtendWith;
10 | import org.springframework.beans.factory.annotation.Autowired;
11 | import org.springframework.boot.test.context.SpringBootTest;
12 | import org.springframework.data.domain.Page;
13 | import org.springframework.data.domain.PageRequest;
14 | import org.springframework.data.domain.Pageable;
15 | import org.springframework.test.context.junit.jupiter.SpringExtension;
16 |
17 | import com.appsdeveloperblog.app.ws.io.entity.AddressEntity;
18 | import com.appsdeveloperblog.app.ws.io.entity.UserEntity;
19 |
20 | @ExtendWith(SpringExtension.class)
21 | @SpringBootTest
22 | class UserRepositoryTest {
23 |
24 | @Autowired
25 | UserRepository userRepository;
26 |
27 | static boolean recordsCreated = false;
28 |
29 |
30 | @BeforeEach
31 | void setUp() throws Exception {
32 |
33 | if(!recordsCreated) createRecrods();
34 | }
35 |
36 | @Test
37 | final void testGetVerifiedUsers() {
38 | Pageable pageableRequest = PageRequest.of(1, 1);
39 | Page page = userRepository.findAllUsersWithConfirmedEmailAddress(pageableRequest);
40 | assertNotNull(page);
41 |
42 | List userEntities = page.getContent();
43 | assertNotNull(userEntities);
44 | assertTrue(userEntities.size() == 1);
45 | }
46 |
47 | @Test
48 | final void testFindUserByFirstName()
49 | {
50 | String firstName="Sergey";
51 | List users = userRepository.findUserByFirstName(firstName);
52 | assertNotNull(users);
53 | assertTrue(users.size() == 2);
54 |
55 | UserEntity user = users.get(0);
56 | assertTrue(user.getFirstName().equals(firstName));
57 | }
58 |
59 | @Test
60 | final void testFindUserByLastName()
61 | {
62 | String lastName="Kargopolov";
63 | List users = userRepository.findUserByLastName(lastName);
64 | assertNotNull(users);
65 | assertTrue(users.size() == 2);
66 |
67 | UserEntity user = users.get(0);
68 | assertTrue(user.getLastName().equals(lastName));
69 | }
70 |
71 | @Test
72 | final void testFindUsersByKeyword()
73 | {
74 | String keyword="erg";
75 | List users = userRepository.findUsersByKeyword(keyword);
76 | assertNotNull(users);
77 | assertTrue(users.size() == 2);
78 |
79 | UserEntity user = users.get(0);
80 | assertTrue(
81 | user.getLastName().contains(keyword) ||
82 | user.getFirstName().contains(keyword)
83 | );
84 | }
85 |
86 | @Test
87 | final void testFindUserFirstNameAndLastNameByKeyword()
88 | {
89 | String keyword="erg";
90 | List users = userRepository.findUserFirstNameAndLastNameByKeyword(keyword);
91 | assertNotNull(users);
92 | assertTrue(users.size() == 2);
93 |
94 | Object[] user = users.get(0);
95 |
96 | assertTrue(user.length == 2);
97 |
98 | String userFirstName = String.valueOf(user[0]);
99 | String userLastName = String.valueOf(user[1]);
100 |
101 | assertNotNull(userFirstName);
102 | assertNotNull(userLastName);
103 |
104 | System.out.println("First name = " + userFirstName);
105 | System.out.println("Last name = " + userLastName);
106 |
107 | }
108 |
109 | @Test
110 | final void testUpdateUserEmailVerificationStatus()
111 | {
112 | boolean newEmailVerificationStatus = true;
113 | userRepository.updateUserEmailVerificationStatus(newEmailVerificationStatus, "1a2b3c");
114 |
115 | UserEntity storedUserDetails = userRepository.findByUserId("1a2b3c");
116 |
117 | boolean storedEmailVerificationStatus = storedUserDetails.getEmailVerificationStatus();
118 |
119 | assertTrue(storedEmailVerificationStatus == newEmailVerificationStatus);
120 |
121 | }
122 |
123 |
124 | @Test
125 | final void testFindUserEntityByUserId()
126 | {
127 | String userId = "1a2b3c";
128 | UserEntity userEntity = userRepository.findUserEntityByUserId(userId);
129 |
130 | assertNotNull(userEntity);
131 | assertTrue(userEntity.getUserId().equals(userId));
132 | }
133 |
134 | @Test
135 | final void testGetUserEntityFullNameById()
136 | {
137 | String userId = "1a2b3c";
138 | List records = userRepository.getUserEntityFullNameById(userId);
139 |
140 | assertNotNull(records);
141 | assertTrue(records.size() == 1);
142 |
143 | Object[] userDetails = records.get(0);
144 |
145 | String firstName = String.valueOf(userDetails[0]);
146 | String lastName = String.valueOf(userDetails[1]);
147 |
148 | assertNotNull(firstName);
149 | assertNotNull(lastName);
150 | }
151 |
152 | @Test
153 | final void testUpdateUserEntityEmailVerificationStatus()
154 | {
155 | boolean newEmailVerificationStatus = true;
156 | userRepository.updateUserEntityEmailVerificationStatus(newEmailVerificationStatus, "1a2b3c");
157 |
158 | UserEntity storedUserDetails = userRepository.findByUserId("1a2b3c");
159 |
160 | boolean storedEmailVerificationStatus = storedUserDetails.getEmailVerificationStatus();
161 |
162 | assertTrue(storedEmailVerificationStatus == newEmailVerificationStatus);
163 |
164 | }
165 |
166 | private void createRecrods()
167 | {
168 | // Prepare User Entity
169 | UserEntity userEntity = new UserEntity();
170 | userEntity.setFirstName("Sergey");
171 | userEntity.setLastName("Kargopolov");
172 | userEntity.setUserId("1a2b3c");
173 | userEntity.setEncryptedPassword("xxx");
174 | userEntity.setEmail("test@test.com");
175 | userEntity.setEmailVerificationStatus(true);
176 |
177 | // Prepare User Addresses
178 | AddressEntity addressEntity = new AddressEntity();
179 | addressEntity.setType("shipping");
180 | addressEntity.setAddressId("ahgyt74hfy");
181 | addressEntity.setCity("Vancouver");
182 | addressEntity.setCountry("Canada");
183 | addressEntity.setPostalCode("ABCCDA");
184 | addressEntity.setStreetName("123 Street Address");
185 |
186 | List addresses = new ArrayList<>();
187 | addresses.add(addressEntity);
188 |
189 | userEntity.setAddresses(addresses);
190 |
191 | userRepository.save(userEntity);
192 |
193 |
194 |
195 |
196 | // Prepare User Entity
197 | UserEntity userEntity2 = new UserEntity();
198 | userEntity2.setFirstName("Sergey");
199 | userEntity2.setLastName("Kargopolov");
200 | userEntity2.setUserId("1a2b3cddddd");
201 | userEntity2.setEncryptedPassword("xxx");
202 | userEntity2.setEmail("test@test.com");
203 | userEntity2.setEmailVerificationStatus(true);
204 |
205 | // Prepare User Addresses
206 | AddressEntity addressEntity2 = new AddressEntity();
207 | addressEntity2.setType("shipping");
208 | addressEntity2.setAddressId("ahgyt74hfywwww");
209 | addressEntity2.setCity("Vancouver");
210 | addressEntity2.setCountry("Canada");
211 | addressEntity2.setPostalCode("ABCCDA");
212 | addressEntity2.setStreetName("123 Street Address");
213 |
214 | List addresses2 = new ArrayList<>();
215 | addresses2.add(addressEntity2);
216 |
217 | userEntity2.setAddresses(addresses2);
218 |
219 | userRepository.save(userEntity2);
220 |
221 | recordsCreated = true;
222 |
223 | }
224 |
225 | }
226 |
--------------------------------------------------------------------------------
/src/test/java/com/appsdeveloperblog/app/ws/service/impl/UserServiceImplTest.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.service.impl;
2 |
3 | import static org.junit.Assert.assertEquals;
4 | import static org.junit.Assert.assertNotNull;
5 | import static org.junit.jupiter.api.Assertions.assertThrows;
6 | import static org.mockito.ArgumentMatchers.any;
7 | import static org.mockito.ArgumentMatchers.anyInt;
8 | import static org.mockito.ArgumentMatchers.anyString;
9 | import static org.mockito.Mockito.times;
10 | import static org.mockito.Mockito.verify;
11 | import static org.mockito.Mockito.when;
12 |
13 | import java.lang.reflect.Type;
14 | import java.util.ArrayList;
15 | import java.util.List;
16 |
17 | import org.junit.jupiter.api.BeforeEach;
18 | import org.junit.jupiter.api.Test;
19 | import org.mockito.InjectMocks;
20 | import org.mockito.Mock;
21 | import org.mockito.Mockito;
22 | import org.mockito.MockitoAnnotations;
23 | import org.modelmapper.ModelMapper;
24 | import org.modelmapper.TypeToken;
25 | import org.springframework.security.core.userdetails.UsernameNotFoundException;
26 | import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
27 |
28 | import com.appsdeveloperblog.app.ws.exceptions.UserServiceException;
29 | import com.appsdeveloperblog.app.ws.io.entity.AddressEntity;
30 | import com.appsdeveloperblog.app.ws.io.entity.UserEntity;
31 | import com.appsdeveloperblog.app.ws.io.repository.UserRepository;
32 | import com.appsdeveloperblog.app.ws.shared.AmazonSES;
33 | import com.appsdeveloperblog.app.ws.shared.Utils;
34 | import com.appsdeveloperblog.app.ws.shared.dto.AddressDTO;
35 | import com.appsdeveloperblog.app.ws.shared.dto.UserDto;
36 |
37 | class UserServiceImplTest {
38 |
39 | @InjectMocks
40 | UserServiceImpl userService;
41 |
42 | @Mock
43 | UserRepository userRepository;
44 |
45 | @Mock
46 | Utils utils;
47 |
48 | @Mock
49 | AmazonSES amazonSES;
50 |
51 | @Mock
52 | BCryptPasswordEncoder bCryptPasswordEncoder;
53 |
54 | String userId = "hhty57ehfy";
55 | String encryptedPassword = "74hghd8474jf";
56 |
57 | UserEntity userEntity;
58 |
59 | @BeforeEach
60 | void setUp() throws Exception {
61 | MockitoAnnotations.initMocks(this);
62 |
63 | userEntity = new UserEntity();
64 | userEntity.setId(1L);
65 | userEntity.setFirstName("Sergey");
66 | userEntity.setLastName("Kargopolov");
67 | userEntity.setUserId(userId);
68 | userEntity.setEncryptedPassword(encryptedPassword);
69 | userEntity.setEmail("test@test.com");
70 | userEntity.setEmailVerificationToken("7htnfhr758");
71 | userEntity.setAddresses(getAddressesEntity());
72 | }
73 |
74 | @Test
75 | final void testGetUser() {
76 |
77 | when(userRepository.findByEmail(anyString())).thenReturn(userEntity);
78 |
79 | UserDto userDto = userService.getUser("test@test.com");
80 |
81 | assertNotNull(userDto);
82 | assertEquals("Sergey", userDto.getFirstName());
83 |
84 | }
85 |
86 | @Test
87 | final void testGetUser_UsernameNotFoundException() {
88 | when(userRepository.findByEmail(anyString())).thenReturn(null);
89 |
90 | assertThrows(UsernameNotFoundException.class,
91 |
92 | () -> {
93 | userService.getUser("test@test.com");
94 | }
95 |
96 | );
97 | }
98 |
99 | @Test
100 | final void testCreateUser_CreateUserServiceException()
101 | {
102 | when(userRepository.findByEmail(anyString())).thenReturn(userEntity);
103 | UserDto userDto = new UserDto();
104 | userDto.setAddresses(getAddressesDto());
105 | userDto.setFirstName("Sergey");
106 | userDto.setLastName("Kargopolov");
107 | userDto.setPassword("12345678");
108 | userDto.setEmail("test@test.com");
109 |
110 | assertThrows(UserServiceException.class,
111 |
112 | () -> {
113 | userService.createUser(userDto);
114 | }
115 |
116 | );
117 | }
118 |
119 | @Test
120 | final void testCreateUser()
121 | {
122 | when(userRepository.findByEmail(anyString())).thenReturn(null);
123 | when(utils.generateAddressId(anyInt())).thenReturn("hgfnghtyrir884");
124 | when(utils.generateUserId(anyInt())).thenReturn(userId);
125 | when(bCryptPasswordEncoder.encode(anyString())).thenReturn(encryptedPassword);
126 | when(userRepository.save(any(UserEntity.class))).thenReturn(userEntity);
127 | Mockito.doNothing().when(amazonSES).verifyEmail(any(UserDto.class));
128 |
129 | UserDto userDto = new UserDto();
130 | userDto.setAddresses(getAddressesDto());
131 | userDto.setFirstName("Sergey");
132 | userDto.setLastName("Kargopolov");
133 | userDto.setPassword("12345678");
134 | userDto.setEmail("test@test.com");
135 |
136 | UserDto storedUserDetails = userService.createUser(userDto);
137 | assertNotNull(storedUserDetails);
138 | assertEquals(userEntity.getFirstName(), storedUserDetails.getFirstName());
139 | assertEquals(userEntity.getLastName(), storedUserDetails.getLastName());
140 | assertNotNull(storedUserDetails.getUserId());
141 | assertEquals(storedUserDetails.getAddresses().size(), userEntity.getAddresses().size());
142 | verify(utils,times(storedUserDetails.getAddresses().size())).generateAddressId(30);
143 | verify(bCryptPasswordEncoder, times(1)).encode("12345678");
144 | verify(userRepository,times(1)).save(any(UserEntity.class));
145 | }
146 |
147 | private List getAddressesDto() {
148 | AddressDTO addressDto = new AddressDTO();
149 | addressDto.setType("shipping");
150 | addressDto.setCity("Vancouver");
151 | addressDto.setCountry("Canada");
152 | addressDto.setPostalCode("ABC123");
153 | addressDto.setStreetName("123 Street name");
154 |
155 | AddressDTO billingAddressDto = new AddressDTO();
156 | billingAddressDto.setType("billling");
157 | billingAddressDto.setCity("Vancouver");
158 | billingAddressDto.setCountry("Canada");
159 | billingAddressDto.setPostalCode("ABC123");
160 | billingAddressDto.setStreetName("123 Street name");
161 |
162 | List addresses = new ArrayList<>();
163 | addresses.add(addressDto);
164 | addresses.add(billingAddressDto);
165 |
166 | return addresses;
167 |
168 | }
169 |
170 | private List getAddressesEntity()
171 | {
172 | List addresses = getAddressesDto();
173 |
174 | Type listType = new TypeToken>() {}.getType();
175 |
176 | return new ModelMapper().map(addresses, listType);
177 | }
178 |
179 |
180 | }
181 |
--------------------------------------------------------------------------------
/src/test/java/com/appsdeveloperblog/app/ws/shared/UtilsTest.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.shared;
2 |
3 | import static org.junit.Assert.assertNotNull;
4 | import static org.junit.Assert.assertTrue;
5 | import static org.junit.jupiter.api.Assertions.assertFalse;
6 | import static org.junit.jupiter.api.Assertions.assertThrows;
7 | import static org.junit.jupiter.api.Assertions.fail;
8 |
9 | import org.junit.jupiter.api.BeforeEach;
10 | import org.junit.jupiter.api.Disabled;
11 | import org.junit.jupiter.api.Test;
12 | import org.junit.jupiter.api.extension.ExtendWith;
13 | import org.springframework.beans.factory.annotation.Autowired;
14 | import org.springframework.boot.test.context.SpringBootTest;
15 | import org.springframework.security.core.userdetails.UsernameNotFoundException;
16 | import org.springframework.test.context.junit.jupiter.SpringExtension;
17 |
18 | import io.jsonwebtoken.SignatureException;
19 |
20 | @ExtendWith(SpringExtension.class)
21 | @SpringBootTest
22 | class UtilsTest {
23 |
24 | @Autowired
25 | Utils utils;
26 |
27 | @BeforeEach
28 | void setUp() throws Exception {
29 | }
30 |
31 | @Test
32 | final void testGenerateUserId() {
33 | String userId = utils.generateUserId(30);
34 | String userId2 = utils.generateUserId(30);
35 |
36 | assertNotNull(userId);
37 | assertNotNull(userId2);
38 |
39 | assertTrue(userId.length() == 30);
40 | assertTrue( !userId.equalsIgnoreCase(userId2) );
41 | }
42 |
43 | @Test
44 | final void testHasTokenNotExpired() {
45 | String token = utils.generateEmailVerificationToken("4yr65hhyid84");
46 | assertNotNull(token);
47 |
48 | boolean hasTokenExpired = Utils.hasTokenExpired(token);
49 | assertFalse(hasTokenExpired);
50 | }
51 |
52 | @Test
53 | final void testHasTokenExpired()
54 | {
55 | String expiredToken = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZXN0MUB0ZXN0LmNvbSIsImV4cCI6MTUzMjc3Nzc3NX0.cdudUo3pwZLN9UiTuXiT7itpaQs6BgUPU0yWbNcz56-l1Z0476N3H_qSEHXQI5lUfaK2ePtTWJfROmf0213UJA";
56 | boolean hasTokenExpired = Utils.hasTokenExpired(expiredToken);
57 |
58 | assertTrue(hasTokenExpired);
59 | }
60 |
61 | }
62 |
--------------------------------------------------------------------------------
/src/test/java/com/appsdeveloperblog/app/ws/ui/controller/UserControllerTest.java:
--------------------------------------------------------------------------------
1 | package com.appsdeveloperblog.app.ws.ui.controller;
2 |
3 | import static org.junit.jupiter.api.Assertions.*;
4 | import static org.mockito.Mockito.when;
5 |
6 | import java.util.ArrayList;
7 | import java.util.List;
8 |
9 | import static org.mockito.ArgumentMatchers.*;
10 | import org.junit.jupiter.api.BeforeEach;
11 | import org.junit.jupiter.api.Test;
12 | import org.mockito.InjectMocks;
13 | import org.mockito.Mock;
14 | import org.mockito.MockitoAnnotations;
15 |
16 | import com.appsdeveloperblog.app.ws.service.impl.UserServiceImpl;
17 | import com.appsdeveloperblog.app.ws.shared.dto.AddressDTO;
18 | import com.appsdeveloperblog.app.ws.shared.dto.UserDto;
19 | import com.appsdeveloperblog.app.ws.ui.contoller.UserController;
20 | import com.appsdeveloperblog.app.ws.ui.model.response.UserRest;
21 |
22 | class UserControllerTest {
23 |
24 | @InjectMocks
25 | UserController userController;
26 |
27 | @Mock
28 | UserServiceImpl userService;
29 |
30 | UserDto userDto;
31 |
32 | final String USER_ID = "bfhry47fhdjd7463gdh";
33 |
34 | @BeforeEach
35 | void setUp() throws Exception {
36 | MockitoAnnotations.initMocks(this);
37 |
38 | userDto = new UserDto();
39 | userDto.setFirstName("Sergey");
40 | userDto.setLastName("Kargopolov");
41 | userDto.setEmail("test@test.com");
42 | userDto.setEmailVerificationStatus(Boolean.FALSE);
43 | userDto.setEmailVerificationToken(null);
44 | userDto.setUserId(USER_ID);
45 | userDto.setAddresses(getAddressesDto());
46 | userDto.setEncryptedPassword("xcf58tugh47");
47 |
48 | }
49 |
50 | @Test
51 | final void testGetUser() {
52 | when(userService.getUserByUserId(anyString())).thenReturn(userDto);
53 |
54 | UserRest userRest = userController.getUser(USER_ID);
55 |
56 | assertNotNull(userRest);
57 | assertEquals(USER_ID, userRest.getUserId());
58 | assertEquals(userDto.getFirstName(), userRest.getFirstName());
59 | assertEquals(userDto.getLastName(), userRest.getLastName());
60 | assertTrue(userDto.getAddresses().size() == userRest.getAddresses().size());
61 | }
62 |
63 |
64 | private List getAddressesDto() {
65 | AddressDTO addressDto = new AddressDTO();
66 | addressDto.setType("shipping");
67 | addressDto.setCity("Vancouver");
68 | addressDto.setCountry("Canada");
69 | addressDto.setPostalCode("ABC123");
70 | addressDto.setStreetName("123 Street name");
71 |
72 | AddressDTO billingAddressDto = new AddressDTO();
73 | billingAddressDto.setType("billling");
74 | billingAddressDto.setCity("Vancouver");
75 | billingAddressDto.setCountry("Canada");
76 | billingAddressDto.setPostalCode("ABC123");
77 | billingAddressDto.setStreetName("123 Street name");
78 |
79 | List addresses = new ArrayList<>();
80 | addresses.add(addressDto);
81 | addresses.add(billingAddressDto);
82 |
83 | return addresses;
84 |
85 | }
86 |
87 | }
88 |
--------------------------------------------------------------------------------
Loading updates...
112 |