diff --git a/charts/account-service/Chart.yaml b/charts/account-service/Chart.yaml index d3c5b5e8d7034b8ed6555b3592f08302a2d27133..941149ae3147e76aea34d5dc374abc2ed4dca672 100644 --- a/charts/account-service/Chart.yaml +++ b/charts/account-service/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja account service. name: account-service -version: 0.2.1 +version: 0.2.3 diff --git a/releases/dev/account-service.yaml b/releases/dev/account-service.yaml index 30956c077bbcef633e391fbc34d54985b73c06dc..3d7e0975839d7e8709c93f359a2eea261c64cf96 100644 --- a/releases/dev/account-service.yaml +++ b/releases/dev/account-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: account-service - version: 0.2.1 + version: 0.2.3 values: replicaCount: 1 diff --git a/releases/prod/account-service.yaml b/releases/prod/account-service.yaml index 93bed2085a6b3b0208494f2b51cfa03a07a53508..0975a472596addf756e3d90ea641081800481702 100644 --- a/releases/prod/account-service.yaml +++ b/releases/prod/account-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: account-service - version: 0.2.1 + version: 0.2.3 values: replicaCount: 2 diff --git a/releases/staging/account-service.yaml b/releases/staging/account-service.yaml index 60a1b6742bc9aa93b5d4ec1ce11efbf0315c7ac4..32c2d3f22ddad5ea143e49c10d04722b0050c0b1 100644 --- a/releases/staging/account-service.yaml +++ b/releases/staging/account-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: account-service - version: 0.2.1 + version: 0.2.3 values: replicaCount: 2 diff --git a/src/main/java/biz/nynja/account/grid/ag/AdminServiceImpl.java b/src/main/java/biz/nynja/account/grid/ag/AdminServiceImpl.java index d86831a30778f5107cfa69c58d92ca193fab96af..76f912728993461b550e4602f1494776c74a5f9e 100644 --- a/src/main/java/biz/nynja/account/grid/ag/AdminServiceImpl.java +++ b/src/main/java/biz/nynja/account/grid/ag/AdminServiceImpl.java @@ -155,7 +155,7 @@ public class AdminServiceImpl extends AdminAccountServiceGrpc.AdminAccountServic .newBuilder().setAccountId(pendingAccountResponse.getPendingAccountDetails().getAccountId()) .setAvatar(request.getAvatar()).setAccountMark(request.getAccountMark()) .setAccountName(request.getAccountName()).setFirstName(request.getFirstName()) - .setLastName(request.getLastName()).setUsername(request.getUsername()) + .setLastName(request.getLastName()).setUsername(request.getUsername().toLowerCase()) .addAllRoles(request.getRolesList()).setAccessStatus(request.getAccessStatus()) .setQrCode(request.getQrCode()).build(); diff --git a/src/main/java/biz/nynja/account/models/AccountBuilder.java b/src/main/java/biz/nynja/account/models/AccountBuilder.java index 1718ac10524ccb808bde0c1c903446188cae0eaf..6d7e3d53a095e8f264a2285d73e8513d695d738a 100644 --- a/src/main/java/biz/nynja/account/models/AccountBuilder.java +++ b/src/main/java/biz/nynja/account/models/AccountBuilder.java @@ -10,6 +10,7 @@ import biz.nynja.account.validation.Validators; import org.apache.commons.lang3.SerializationUtils; import java.time.LocalDate; +import java.util.Locale; import java.util.stream.Collectors; public class AccountBuilder { @@ -26,7 +27,7 @@ public class AccountBuilder { newAccount.setLastName(request.getLastName()); newAccount.setAvatar(request.getAvatar()); newAccount.setAccountName(request.getAccountName()); - newAccount.setUsername(request.getUsername()); + newAccount.setUsername(request.getUsername().toLowerCase()); newAccount.setCreationTimestamp(creationTimestamp); newAccount.setQrCode(request.getQrCode()); newAccount.setRoles(request.getRolesList().stream().map(Enum::toString).collect(Collectors.toSet())); @@ -41,7 +42,7 @@ public class AccountBuilder { updatedAccount.setAccountName(request.getAccountName()); updatedAccount.setFirstName(request.getFirstName()); updatedAccount.setLastName(request.getLastName()); - updatedAccount.setUsername(request.getUsername()); + updatedAccount.setUsername(request.getUsername().toLowerCase()); updatedAccount.setLastUpdateTimestamp(lastUpdateTimestamp); updatedAccount.setAccessStatus(request.getAccessStatus().toString()); if (Validators.util.validateBirthdayIsSet(request.getBirthday())) { diff --git a/src/main/java/biz/nynja/account/models/AccountByUsername.java b/src/main/java/biz/nynja/account/models/AccountByUsername.java index e3c829e2aefb7471417429088fad1498ba85cb81..a59e9b42f6452399a88c4fab5f0bd1e0054b79db 100644 --- a/src/main/java/biz/nynja/account/models/AccountByUsername.java +++ b/src/main/java/biz/nynja/account/models/AccountByUsername.java @@ -334,7 +334,7 @@ public class AccountByUsername { builder.setLastName(getLastName()); } if (getUsername() != null) { - builder.setUsername(getUsername()); + builder.setUsername(getUsername().toLowerCase()); } if (getQrCode() != null) { builder.setQrCode(getQrCode()); diff --git a/src/main/java/biz/nynja/account/phone/PhoneNumberNormalizer.java b/src/main/java/biz/nynja/account/phone/PhoneNumberNormalizer.java index 6c0998445a79ed4bb6f203b191970c852bbe9c9c..0b98c4a0e2be3ab2ebaf5902e7996ed7bc922bea 100644 --- a/src/main/java/biz/nynja/account/phone/PhoneNumberNormalizer.java +++ b/src/main/java/biz/nynja/account/phone/PhoneNumberNormalizer.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import biz.nynja.account.grpc.AddContactInfoRequest; import biz.nynja.account.grpc.AuthProviderDetails; @@ -147,4 +148,28 @@ public class PhoneNumberNormalizer { } return country + ":" + normalizedPhoneNumber; } + + public String getNormalizedPhoneNumberWithoutSelector(String rawPhoneNumber) throws InvalidPhoneNumberException { + logger.info("libphone: New phone number normalization request received - phone number: {}", + rawPhoneNumber); + + String phone = rawPhoneNumber.replaceAll("[^\\d]", "").replaceAll("^0*", ""); + phone = "+" + phone; + + PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); + + String normalizedPhoneNumber = ""; + Phonenumber.PhoneNumber pn = new PhoneNumber(); + try { + pn = phoneUtil.parse(phone, ""); + normalizedPhoneNumber = Integer.toString(pn.getCountryCode()) + Long.toString(pn.getNationalNumber()); + logger.info("libphone: Normalized phone number: " + normalizedPhoneNumber); + } catch (NumberParseException e) { + logger.error("libphone: NumberParseException was thrown: {}", e.toString()); + logger.debug("libphone: NumberParseException was thrown: {}", e.getCause()); + throw new InvalidPhoneNumberException("Phone number with wrong format: " + rawPhoneNumber); + } + return normalizedPhoneNumber; + } + } diff --git a/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java index 277f72f0c55c7d9062380783398ec6463efade82..924de5234b3d09fa4a2e5c182b0f42d3ce35c1d1 100644 --- a/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java +++ b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java @@ -511,7 +511,7 @@ public class AccountRepositoryAdditionalImpl implements AccountRepositoryAdditio } public boolean foundExistingNotOwnUsername(UUID accountId, String username) { - AccountByUsername foundAccountByUsername = accountByUsernameRepository.findByUsername(username); + AccountByUsername foundAccountByUsername = accountByUsernameRepository.findByUsername(username.toLowerCase()); if (foundAccountByUsername == null) { return false; } else if (!foundAccountByUsername.getAccountId().equals(accountId)) { diff --git a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java index 63e4580a02a70c981f4f9815736ec7c51c91489e..f5bcaee78ce470e8bc58f7369430c3947036f73c 100644 --- a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java +++ b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java @@ -67,6 +67,7 @@ import biz.nynja.account.permissions.PerformPermissionCheck; import biz.nynja.account.permissions.PermissionsValidator; import biz.nynja.account.permissions.Permitted; import biz.nynja.account.permissions.RoleConstants; +import biz.nynja.account.phone.InvalidPhoneNumberException; import biz.nynja.account.phone.PhoneNumberNormalizer; import biz.nynja.account.repositories.AccountByProfileIdRepository; import biz.nynja.account.repositories.AccountByQrCodeRepository; @@ -222,19 +223,19 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas Cause.MISSING_PHONENUMBER, ""); return; } - if (!phoneValidator.isPhoneNumberValid(request.getPhoneNumber())) { - logAndBuildGrpcSearchResponse(responseObserver, SearchResponse.newBuilder(), - "Invalid phone number. Value: {}", request.getPhoneNumber(), Cause.INVALID_PHONENUMBER, - "Phone number parameter has invalid format."); - return; - } Optional account = Optional.empty(); try { - account = accountProvider.searchAccountByLoginOption(AuthenticationType.PHONE, request.getPhoneNumber()); + account = accountProvider.searchAccountByLoginOptionWithoutSelector(AuthenticationType.PHONE, request.getPhoneNumber()); } catch (IncorrectAccountCountException e) { logAndBuildGrpcSearchResponse(responseObserver, SearchResponse.newBuilder(), "Error while searching for phone: ", request.getPhoneNumber(), Cause.INTERNAL_SERVER_ERROR, ""); + return; + } catch (InvalidPhoneNumberException e) { + logAndBuildGrpcSearchResponse(responseObserver, SearchResponse.newBuilder(), + "Invalid phone number. Value: {}", request.getPhoneNumber(), Cause.INVALID_PHONENUMBER, + "Phone number parameter has invalid format."); + return; } if (!account.isPresent()) { @@ -257,7 +258,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas @Permitted(role = RoleConstants.ACCOUNT_ADMIN) @Permitted(role = RoleConstants.USER) public void getAccountByUsername(GetByUsernameRequest request, StreamObserver responseObserver) { - logger.info("Getting account by username: {}", request.getUsername()); + logger.info("Getting account by username: {}", request.getUsername().toLowerCase()); Validation validation = validateGetByUsernameRequest(request); if (validation.hasErrors()) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), validation.getErrorMessage(), @@ -265,7 +266,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } - Optional accountResponse = accountProvider.getAccountResponseByUsername(request.getUsername()); + Optional accountResponse = accountProvider.getAccountResponseByUsername(request.getUsername().toLowerCase()); if (!accountResponse.isPresent()) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), "Account not found", "", @@ -281,7 +282,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas } AccountResponse response = accountResponse.get(); - logger.info("SUCCESS: Found result for account by username {}. Account Id = {}.", request.getUsername(), + logger.info("SUCCESS: Found result for account by username {}. Account Id = {}.", request.getUsername().toLowerCase(), response.getAccountDetails().getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); @@ -290,7 +291,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas @Override @Permitted(role = RoleConstants.ANY) public void searchByUsername(GetByUsernameRequest request, StreamObserver responseObserver) { - logger.info("Searching account by username: {}", request.getUsername()); + logger.info("Searching account by username: {}", request.getUsername().toLowerCase()); Validation validation = validateGetByUsernameRequest(request); if (validation.hasErrors()) { logAndBuildGrpcSearchResponse(responseObserver, SearchResponse.newBuilder(), validation.getErrorMessage(), @@ -298,10 +299,10 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } - AccountByUsername account = accountByUsernameRepository.findByUsername(request.getUsername()); + AccountByUsername account = accountByUsernameRepository.findByUsername(request.getUsername().toLowerCase()); if (account == null) { logAndBuildGrpcSearchResponse(responseObserver, SearchResponse.newBuilder(), - "No matching accounts found for username: ", request.getUsername(), Cause.ACCOUNT_NOT_FOUND, + "No matching accounts found for username: ", request.getUsername().toLowerCase(), Cause.ACCOUNT_NOT_FOUND, "No matching accounts found for give username."); return; } @@ -310,7 +311,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas account.getAvatar(), account.getFirstName(), account.getLastName()); SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); - logger.info("SUCCESS: Found result for account by username {}: \"{}\"", request.getUsername(), response); + logger.info("SUCCESS: Found result for account by username {}: \"{}\"", request.getUsername().toLowerCase(), response); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -320,9 +321,9 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas if ((request.getUsername() == null) || request.getUsername().isEmpty()) { validation.addError(new ValidationError("Missing username.", Cause.MISSING_USERNAME)); - } else if (!account.isValidUsername(request.getUsername())) { + } else if (!account.isValidUsername(request.getUsername().toLowerCase())) { validation.addError( - new ValidationError("Invalid username. Value: " + request.getUsername(), Cause.INVALID_USERNAME)); + new ValidationError("Invalid username. Value: " + request.getUsername().toLowerCase(), Cause.INVALID_USERNAME)); } return validation; } @@ -498,7 +499,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas StreamObserver responseObserver) { logger.info("Complete pending account creation for account id {} and username {} ...", request.getAccountId(), - request.getUsername()); + request.getUsername().toLowerCase()); logger.debug("Complete pending account creation...: {} ...", request); AccountResponse response = accountCreator.retrieveCompletePendingAccountResponse(request); @@ -547,7 +548,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas if (request.getUsername() != null && !request.getUsername().trim().isEmpty() && accountRepositoryAdditional .foundExistingNotOwnUsername(UUID.fromString(request.getAccountId()), request.getUsername())) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), - "User name already in use: {}", request.getUsername(), Cause.USERNAME_ALREADY_USED, + "User name already in use: {}", request.getUsername().toLowerCase(), Cause.USERNAME_ALREADY_USED, "Username is already used"); return; } diff --git a/src/main/java/biz/nynja/account/services/decomposition/AccountCreator.java b/src/main/java/biz/nynja/account/services/decomposition/AccountCreator.java index cc374ba508ba1f0684ba803dcc1544f874c9e59a..cdcb8ea11eb4fbb575cc122c8e353a2f7d260d5a 100644 --- a/src/main/java/biz/nynja/account/services/decomposition/AccountCreator.java +++ b/src/main/java/biz/nynja/account/services/decomposition/AccountCreator.java @@ -183,7 +183,7 @@ public class AccountCreator { if (request.getUsername() != null && !request.getUsername().trim().isEmpty() && accountRepositoryAdditional .foundExistingNotOwnUsername(UUID.fromString(request.getAccountId()), request.getUsername())) { return logAndBuildGrpcAccountResponse(AccountResponse.newBuilder(), "User name already in use: {}", - request.getUsername(), Cause.USERNAME_ALREADY_USED, "Username is already used"); + request.getUsername().toLowerCase(), Cause.USERNAME_ALREADY_USED, "Username is already used"); } return null; } diff --git a/src/main/java/biz/nynja/account/services/decomposition/AccountProvider.java b/src/main/java/biz/nynja/account/services/decomposition/AccountProvider.java index a062706fd22304beb2c5cadf72460bff6bb98478..3065030f9b1922f565ae69b4e4e3796d5dfe174c 100644 --- a/src/main/java/biz/nynja/account/services/decomposition/AccountProvider.java +++ b/src/main/java/biz/nynja/account/services/decomposition/AccountProvider.java @@ -26,6 +26,7 @@ import biz.nynja.account.models.AccountByProfileId; import biz.nynja.account.models.AccountByQrCode; import biz.nynja.account.models.AccountByUsername; import biz.nynja.account.models.AuthenticationProvider; +import biz.nynja.account.phone.InvalidPhoneNumberException; import biz.nynja.account.phone.PhoneNumberNormalizer; import biz.nynja.account.repositories.AccountByProfileIdRepository; import biz.nynja.account.repositories.AccountByQrCodeRepository; @@ -136,6 +137,22 @@ public class AccountProvider { return Optional.of(accountByProfileId.get().toAccount()); } + public Optional searchAccountByLoginOptionWithoutSelector(AuthenticationType type, String authenticationIdentifier) + throws IncorrectAccountCountException, InvalidPhoneNumberException { + if (type == AuthenticationType.PHONE) { + authenticationIdentifier = phoneNumberNormalizer.getNormalizedPhoneNumberWithoutSelector(authenticationIdentifier); + } + + Optional accountByProfileId = accountRepositoryAdditional.searchAccountByLoginOption( + AuthenticationProvider.createAuthenticationProviderFromStringsWithDefaultSearchableOption( + type.toString(), authenticationIdentifier)); + if (!accountByProfileId.isPresent()) { + return Optional.empty(); + } + + return Optional.of(accountByProfileId.get().toAccount()); + } + public Optional getAccountResponseByAuthenticationProvider(AuthenticationType type, String authenticationIdentifier) { Optional account = getAccountByAuthenticationProvider(type, authenticationIdentifier); diff --git a/src/main/java/biz/nynja/account/validation/Validators.java b/src/main/java/biz/nynja/account/validation/Validators.java index 388e89e88bc15e831f594ea751e2632462d51030..78d20805e2f08ca620c6fc7e53205741d416e59d 100644 --- a/src/main/java/biz/nynja/account/validation/Validators.java +++ b/src/main/java/biz/nynja/account/validation/Validators.java @@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import biz.nynja.account.grpc.AddAuthenticationProviderRequest; import biz.nynja.account.grpc.AuthProviderDetails; @@ -162,7 +163,7 @@ public class Validators { } if (request.getUsername() != null && !request.getUsername().trim().isEmpty() - && !isUsernameValid(request.getUsername())) { + && !isUsernameValid(request.getUsername().toLowerCase())) { validation.addError(new ValidationError("Invalid username", Cause.INVALID_USERNAME)); } @@ -465,6 +466,7 @@ public class Validators { return true; } + } public static class Util { @@ -519,7 +521,7 @@ public class Validators { } if (request.getUsername() != null && !request.getUsername().trim().isEmpty() - && !account.isUsernameValid(request.getUsername())) { + && !account.isUsernameValid(request.getUsername().toLowerCase())) { validation.addError(new ValidationError("Invalid username", Cause.INVALID_USERNAME)); } diff --git a/src/test/java/biz/nynja/account/services/AccountServiceTests.java b/src/test/java/biz/nynja/account/services/AccountServiceTests.java index 955277f747ad642b9e75a19407d50cf0e4fdcc9b..148df8dd1465d7bf09e2d816b99ff2bae34cad22 100644 --- a/src/test/java/biz/nynja/account/services/AccountServiceTests.java +++ b/src/test/java/biz/nynja/account/services/AccountServiceTests.java @@ -8,7 +8,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.LinkedList; @@ -104,6 +106,7 @@ import biz.nynja.account.services.decomposition.IncorrectAccountCountException; import biz.nynja.account.services.decomposition.ProfileProvider; import biz.nynja.account.utils.GrpcServerTestBase; import biz.nynja.account.utils.Util; +import biz.nynja.account.phone.InvalidPhoneNumberException; import io.grpc.Metadata; import io.grpc.stub.MetadataUtils; @@ -1546,7 +1549,7 @@ public class AccountServiceTests extends GrpcServerTestBase { Optional response = Optional.of(savedAccount); - given(accountProvider.searchAccountByLoginOption(AuthenticationType.PHONE, request.getPhoneNumber())) + given(accountProvider.searchAccountByLoginOptionWithoutSelector(AuthenticationType.PHONE, request.getPhoneNumber())) .willReturn(response); final SearchResponse reply = searchServiceBlockingStub.searchByPhoneNumber(request); @@ -1585,10 +1588,13 @@ public class AccountServiceTests extends GrpcServerTestBase { } @Test - public void testSearchByPhoneNumberInvalid() { + public void testSearchByPhoneNumberInvalid() throws InvalidPhoneNumberException, IncorrectAccountCountException { + Exception ex = new InvalidPhoneNumberException("Invalid phone number"); final GetByPhoneNumberRequest request = GetByPhoneNumberRequest.newBuilder() .setPhoneNumber(Util.S_INVALID_PHONENUMBER).build(); + given(accountProvider.searchAccountByLoginOptionWithoutSelector(AuthenticationType.PHONE, request.getPhoneNumber())).willThrow(ex); + final SearchResponse reply = searchServiceBlockingStub.searchByPhoneNumber(request); assertNotNull("Reply should not be null", reply);