Skip to content

Phone number change web service #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
piyushroshan merged 15 commits into from
Aug 29, 2024
+13 −13
Merged

Phone number change web service #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b008558
Added functionality to send otp for phone number change request
Aug 28, 2024
da74144
OTP verification added
Aug 28, 2024
f2f459d
comments
Aug 28, 2024
da5eeb4
comments changed
Aug 28, 2024
2dab310
Unit tests Added for send OTP and verify OTP functionality
Aug 28, 2024
b42e07a
endpoint name change
Aug 28, 2024
01a3af7
issues fixed
Aug 28, 2024
88512b3
Merge branch 'OWASP:develop' into change-phoneNumber-feature
pushkarpawar15 Aug 28, 2024
10d03e3
Merge branch 'develop' into change-phoneNumber-feature
piyushroshan Aug 28, 2024
099dd8a
Sent OTP to mail web service impl
Aug 29, 2024
c8a52a1
Merge branch 'develop' into change-phoneNumber-feature
piyushroshan Aug 29, 2024
852c6ce
web service verify OTP impl
Aug 29, 2024
2215c1c
Merge branch 'change-phoneNumber-feature' of https://github.com/pushk…
Aug 29, 2024
95e3fff
minor identity service changes
Aug 29, 2024
f2c7f97
Merge branch 'develop' into phoneNumber-change-web-service
piyushroshan Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions services/identity/src/main/java/com/crapi/constant/UserMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public class UserMessage {
public static final String CHANGE_PHONE_MESSAGE =
"The otp has been sent to your email. If you have used example.com email, check your email using the MailHog web portal.";
public static final String NUMBER_CHANGE_SUCCESSFUL = "Phone number change is successful";
public static final String NEW_NUMBER_DOES_NOT_BELONG =
"Fail, new number parameter doesn’t match with OTP";
public static final String NEW_NUMBER_DOES_NOT_BELONG = "Fail, invalid new number";
public static final String OLD_NUMBER_DOES_NOT_BELONG =
"Fail, number parameter doesn’t belong to the user";
"Fail, number parameter doesn’t belong to the user";
public static final String INVALID_CHANGE_REQUEST = "Fail, invalid change request";
public static final String EMAIL_ALREADY_REGISTERED = "Email already registered! Email: ";
public static final String GIVEN_URL_ALREADY_USED =
"Given URL is already used! Please try to login..";
Expand Down
8 changes: 4 additions & 4 deletions services/identity/src/main/java/com/crapi/service/Impl/UserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,13 +546,13 @@ public CRAPIResponse verifyPhoneOTP(HttpServletRequest request, ChangePhoneForm
userRepository.save(user);
return new CRAPIResponse(UserMessage.NUMBER_CHANGE_SUCCESSFUL, 200);
}
return new CRAPIResponse(UserMessage.NEW_NUMBER_DOES_NOT_BELONG, 500);
return new CRAPIResponse(UserMessage.NEW_NUMBER_DOES_NOT_BELONG, 403);
}
return new CRAPIResponse(UserMessage.OLD_NUMBER_DOES_NOT_BELONG, 500);
return new CRAPIResponse(UserMessage.OLD_NUMBER_DOES_NOT_BELONG, 403);
}
return new CRAPIResponse(UserMessage.INVALID_OTP, 500);
return new CRAPIResponse(UserMessage.INVALID_OTP, 400);
}

return new CRAPIResponse(UserMessage.INVALID_CREDENTIALS, 500);
return new CRAPIResponse(UserMessage.INVALID_CHANGE_REQUEST, 400);
}
}
12 changes: 6 additions & 6 deletions services/identity/src/test/java/com/crapi/service/Impl/UserServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,13 +563,13 @@ public void verifyPhoneOTPSuccessful() {
@Test
public void verifyOTPFailWhenChangePhoneRequestIsNull() {
User user = getDummyUser();
String expectedMessage = UserMessage.INVALID_CREDENTIALS;
String expectedMessage = UserMessage.INVALID_CHANGE_REQUEST;
ChangePhoneForm changePhoneForm = getDummyChangePhoneForm();
Mockito.doReturn(user).when(userService).getUserFromToken(Mockito.any());
Mockito.when(changePhoneRepository.findByUser(user)).thenReturn(null);
CRAPIResponse crapiResponse = userService.verifyPhoneOTP(getMockHttpRequest(), changePhoneForm);
Assertions.assertEquals(expectedMessage, crapiResponse.getMessage());
Assertions.assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), crapiResponse.getStatus());
Assertions.assertEquals(HttpStatus.BAD_REQUEST.value(), crapiResponse.getStatus());
}

@Test
Expand All @@ -583,7 +583,7 @@ public void verifyOTPFailWhenOTPIsNull() {
Mockito.when(changePhoneRepository.findByUser(user)).thenReturn(changePhoneRequest);
CRAPIResponse crapiResponse = userService.verifyPhoneOTP(getMockHttpRequest(), changePhoneForm);
Assertions.assertEquals(expectedMessage, crapiResponse.getMessage());
Assertions.assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), crapiResponse.getStatus());
Assertions.assertEquals(HttpStatus.BAD_REQUEST.value(), crapiResponse.getStatus());
}

@Test
Expand All @@ -597,7 +597,7 @@ public void verifyOTPFailWhenOTPNotMatch() {
Mockito.when(changePhoneRepository.findByUser(user)).thenReturn(changePhoneRequest);
CRAPIResponse crapiResponse = userService.verifyPhoneOTP(getMockHttpRequest(), changePhoneForm);
Assertions.assertEquals(expectedMessage, crapiResponse.getMessage());
Assertions.assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), crapiResponse.getStatus());
Assertions.assertEquals(HttpStatus.BAD_REQUEST.value(), crapiResponse.getStatus());
}

@Test
Expand All @@ -611,7 +611,7 @@ public void verifyOTPFailWhenOldNumberNotMatch() {
Mockito.when(changePhoneRepository.findByUser(user)).thenReturn(changePhoneRequest);
CRAPIResponse crapiResponse = userService.verifyPhoneOTP(getMockHttpRequest(), changePhoneForm);
Assertions.assertEquals(expectedMessage, crapiResponse.getMessage());
Assertions.assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), crapiResponse.getStatus());
Assertions.assertEquals(HttpStatus.FORBIDDEN.value(), crapiResponse.getStatus());
}

@Test
Expand All @@ -626,7 +626,7 @@ public void verifyOTPFailWhenNewNumberNotMatch() {
Mockito.when(changePhoneRepository.findByUser(user)).thenReturn(changePhoneRequest);
CRAPIResponse crapiResponse = userService.verifyPhoneOTP(getMockHttpRequest(), changePhoneForm);
Assertions.assertEquals(expectedMessage, crapiResponse.getMessage());
Assertions.assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), crapiResponse.getStatus());
Assertions.assertEquals(HttpStatus.FORBIDDEN.value(), crapiResponse.getStatus());
}

private LoginWithEmailToken getDummyLoginWithEmailToken() {
Expand Down