diff --git a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java index 72542ac18d938c727e46fa841fa3ff562b2775ba..d507130a18ee73945fb668c8f5faf5e713937c68 100644 --- a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java +++ b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java @@ -11,14 +11,12 @@ import static biz.nynja.account.validation.Validators.util; import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.ImmutablePair; import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import biz.nynja.account.configuration.AccountDataConfiguration; import biz.nynja.account.configuration.ProfileDataConfiguration; import biz.nynja.account.grpc.AccountByAccountIdRequest; import biz.nynja.account.grpc.AccountResponse; @@ -110,8 +108,8 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas AccountByQrCodeRepository accountByQrCodeRepository, AccountByUsernameRepository accountByUsernameRepository, AccountProvider accountProvider, AccountByProfileIdRepository accountByProfileIdRepository, PhoneNumberNormalizer phoneNumberNormalizer, - AccountCreator accountCreator, ProfileProvider profileProvider, - PermissionsValidator permissionsValidator, ProfileDataConfiguration profileDataConfiguration) { + AccountCreator accountCreator, ProfileProvider profileProvider, PermissionsValidator permissionsValidator, + ProfileDataConfiguration profileDataConfiguration) { this.accountRepositoryAdditional = accountRepositoryAdditional; this.profileRepository = profileRepository; this.profileByAutheticationProviderRepository = profileByAutheticationProviderRepository; @@ -145,21 +143,23 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "Missing authentication provider identifier", "", Cause.MISSING_AUTH_PROVIDER_ID); return; } - Optional account = accountProvider.getAccountResponseByAuthenticationProvider( + Optional accountResponse = accountProvider.getAccountResponseByAuthenticationProvider( request.getAuthenticationType(), request.getAuthenticationIdentifier()); - if (!account.isPresent()) { + if (!accountResponse.isPresent()) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), "Account not found for identifier: {}", request.getAuthenticationIdentifier(), Cause.ACCOUNT_NOT_FOUND); return; } - if (!permissionsValidator.isRpcAllowed(account.get().getAccountDetails().getAccountId())) { + if (!permissionsValidator.isRpcAllowed(accountResponse.get().getAccountDetails().getAccountId())) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), "Account info can not be obtained for this account.", "", Cause.ERROR_PERMISSION_DENIED); return; } - responseObserver.onNext(account.get()); + AccountResponse response = accountResponse.get(); + logger.info("SUCCESS: Found account by provider {}: \"{}\"", request.getAuthenticationIdentifier(), response); + responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -191,16 +191,14 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "No matching accounts found for e-mail: ", request.getEmail(), Cause.ACCOUNT_NOT_FOUND, "No matching accounts found for given e-mail."); return; - } else { - SearchResultDetails searchResultDetails = buildSearchResultDetails(account.get().getAccountId().toString(), - account.get().getAvatar(), account.get().getFirstName(), account.get().getLastName()); - - SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); - logger.debug("Found result for account by e-mail {}: \"{}\"", request.getEmail(), response); - responseObserver.onNext(response); - responseObserver.onCompleted(); - return; } + SearchResultDetails searchResultDetails = buildSearchResultDetails(account.get().getAccountId().toString(), + account.get().getAvatar(), account.get().getFirstName(), account.get().getLastName()); + + SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); + logger.info("SUCCESS: Found result for account by e-mail {}: \"{}\"", request.getEmail(), response); + responseObserver.onNext(response); + responseObserver.onCompleted(); } @Override @@ -233,16 +231,14 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "No matching accounts found for phone: ", request.getPhoneNumber(), Cause.ACCOUNT_NOT_FOUND, "No matching accounts found for given phone number."); return; - } else { - SearchResultDetails searchResultDetails = buildSearchResultDetails(account.get().getAccountId().toString(), - account.get().getAvatar(), account.get().getFirstName(), account.get().getLastName()); - - SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); - logger.debug("Found result for account by phone {}: \"{}\"", request.getPhoneNumber(), response); - responseObserver.onNext(response); - responseObserver.onCompleted(); - return; } + SearchResultDetails searchResultDetails = buildSearchResultDetails(account.get().getAccountId().toString(), + account.get().getAvatar(), account.get().getFirstName(), account.get().getLastName()); + + SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); + logger.info("SUCCESS: Found result for account by phone {}: \"{}\"", request.getPhoneNumber(), response); + responseObserver.onNext(response); + responseObserver.onCompleted(); } @Override @@ -271,7 +267,10 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "Account info can not be obtained for this account.", "", Cause.ERROR_PERMISSION_DENIED); return; } - responseObserver.onNext(accountResponse.get()); + + AccountResponse response = accountResponse.get(); + logger.info("SUCCESS: Found result for account by username {}: \"{}\"", request.getUsername(), response); + responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -298,11 +297,9 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas account.getAvatar(), account.getFirstName(), account.getLastName()); SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); - logger.debug("Found result for account by username {}: \"{}\"", request.getUsername(), response); + logger.info("SUCCESS: Found result for account by username {}: \"{}\"", request.getUsername(), response); responseObserver.onNext(response); responseObserver.onCompleted(); - - return; } private Validation validateGetByUsernameRequest(GetByUsernameRequest request) { @@ -343,20 +340,21 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } - Optional accountResonse = accountProvider.getAccountResponseByQrCode(request.getQrCode()); - - if (!accountResonse.isPresent()) { + Optional accountResponse = accountProvider.getAccountResponseByQrCode(request.getQrCode()); + if (!accountResponse.isPresent()) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), "Account not found", "", Cause.ACCOUNT_NOT_FOUND); return; } - if (!permissionsValidator.isRpcAllowed(accountResonse.get().getAccountDetails().getAccountId())) { + if (!permissionsValidator.isRpcAllowed(accountResponse.get().getAccountDetails().getAccountId())) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), "Account info can not be obtained for this account.", "", Cause.ERROR_PERMISSION_DENIED); return; } - responseObserver.onNext(accountResonse.get()); + AccountResponse response = accountResponse.get(); + logger.info("SUCCESS: Found result for account by QR code {}: \"{}\"", request.getQrCode(), response); + responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -382,11 +380,9 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas account.getAvatar(), account.getFirstName(), account.getLastName()); SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); - logger.debug("Found result for account by QR code {}: \"{}\"", request.getQrCode(), response); + logger.info("SUCCESS: Found result for account by QR code {}: \"{}\"", request.getQrCode(), response); responseObserver.onNext(response); responseObserver.onCompleted(); - - return; } @Override @@ -410,12 +406,12 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas if (!accounts.isPresent()) { logAndBuildGrpcAccountsResponse(responseObserver, AccountsResponse.newBuilder(), "Account not found for profile id: {}", request.getProfileId(), Cause.ACCOUNT_NOT_FOUND); - } else { - responseObserver.onNext(accounts.get()); - responseObserver.onCompleted(); return; } - + AccountsResponse response = accounts.get(); + logger.info("SUCCESS: Found result for account by profile ID {}: \"{}\"", request.getProfileId(), response); + responseObserver.onNext(response); + responseObserver.onCompleted(); } @Override @@ -448,11 +444,12 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas if (!account.isPresent()) { logAndBuildGrpcAccountResponse(responseObserver, AccountResponse.newBuilder(), "Account id not found: {}", request.getAccountId(), Cause.ACCOUNT_NOT_FOUND); - } else { - responseObserver.onNext(account.get()); - responseObserver.onCompleted(); return; } + AccountResponse response = account.get(); + logger.info("SUCCESS: Found result for account by account ID {}: \"{}\"", request.getAccountId(), response); + responseObserver.onNext(response); + responseObserver.onCompleted(); } @Override @@ -466,6 +463,9 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas logger.debug("Creating pending account: {} ...", request); CreatePendingAccountResponse response = accountCreator.retrieveCreatePendingAccountResponse(request); + + logger.info("SUCCESS: Created pending account for provider {}: \"{}\"", request.getAuthenticationProvider(), + response); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -480,6 +480,9 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas logger.debug("Complete pending account creation...: {} ...", request); AccountResponse response = accountCreator.retrieveCompletePendingAccountResponse(request); + + logger.info("SUCCESS: Completed pending account creattion for account ID {}: \"{}\"", request.getAccountId(), + response); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -528,13 +531,11 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "", Cause.ERROR_UPDATING_ACCOUNT); return; } - logger.debug("Account \"{}\" updated in the DB", updatedAccount.toString()); - logger.debug("Account: \"{}\" updated successfully.", updatedAccount); + logger.info("SUCCESS: Account \"{}\" updated in the DB", updatedAccount.toString()); + logger.info("SUCCESS: Account: \"{}\" updated successfully.", updatedAccount); AccountResponse response = AccountResponse.newBuilder().setAccountDetails(updatedAccount.toProto()).build(); responseObserver.onNext(response); responseObserver.onCompleted(); - logger.info("Account updated successfully."); - return; } @Override @@ -562,16 +563,14 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas } boolean wasAccountDeleted = accountRepositoryAdditional.deleteAccount(UUID.fromString(request.getAccountId())); - if (wasAccountDeleted) { - logger.info("Account successfully deleted: {}", request.getAccountId()); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); - responseObserver.onCompleted(); + if (!wasAccountDeleted) { + logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), + "Error deleting account with id", request.getAccountId(), Cause.ERROR_DELETING_ACCOUNT); return; } - - logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), "Error deleting account with id", - request.getAccountId(), Cause.ERROR_DELETING_ACCOUNT); - return; + logger.info("SUCCESS: Account successfully deleted: {}", request.getAccountId()); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onCompleted(); } @Override @@ -594,14 +593,14 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas UUID profileId = UUID.fromString(request.getProfileId()); Optional wasProfileDeleted = accountRepositoryAdditional.deleteProfile(profileId); - if (!wasProfileDeleted.isPresent()) { - logger.info("The profile was deleted successfully."); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); - responseObserver.onCompleted(); - } else { + if (wasProfileDeleted.isPresent()) { logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), "Error deleting profile.", "", wasProfileDeleted.get()); + return; } + logger.info("SUCCESS: The profile was deleted successfully."); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onCompleted(); } @Override @@ -663,9 +662,11 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas } // Make sure there will be no more than providers in this profile - if(profile.getAuthenticationProviders().size() >= profileDataConfiguration.getMaxAuthenticationprovidersPerProfile()) { + if (profile.getAuthenticationProviders().size() >= profileDataConfiguration + .getMaxAuthenticationprovidersPerProfile()) { logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), - "Max number of authentication providers reached for profile id {}.", request.getProfileId(), Cause.MAX_PROVIDERS_PER_PROFILE_REACHED); + "Max number of authentication providers reached for profile id {}.", request.getProfileId(), + Cause.MAX_PROVIDERS_PER_PROFILE_REACHED); return; } @@ -683,18 +684,18 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas boolean result = accountRepositoryAdditional.addAuthenticationProvider(UUID.fromString(request.getProfileId()), AuthenticationProvider.createAuthenticationProviderFromProto(request.getAuthenticationProvider())); - if (result) { - logger.info("Authentication provider {}:{} successfuly added for profile id {}.", - request.getAuthenticationProvider().getAuthenticationType().name(), - request.getAuthenticationProvider().getAuthenticationProvider(), request.getProfileId()); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); - responseObserver.onCompleted(); + if (!result) { + logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), + "Authentication provider was not successfuly added for profile id {}.", request.getProfileId(), + Cause.INTERNAL_SERVER_ERROR); return; } - logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), - "Authentication provider was not successfuly added for profile id {}.", request.getProfileId(), - Cause.INTERNAL_SERVER_ERROR); - return; + + logger.info("SUCCESS: Authentication provider {}:{} successfuly added for profile id {}.", + request.getAuthenticationProvider().getAuthenticationType().name(), + request.getAuthenticationProvider().getAuthenticationProvider(), request.getProfileId()); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onCompleted(); } @Override @@ -743,16 +744,16 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas Cause.MAX_CONTACT_INFO_OF_TYPE_REACHED); return; } - if (result.get().booleanValue()) { - logger.info("Contact info {}:{} was added to account {}.", request.getContactInfo().getType().name(), - request.getContactInfo().getValue(), request.getAccountId()); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); - responseObserver.onCompleted(); + if (!result.get().booleanValue()) { + logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), + "Contact info was not added to account {}.", request.getAccountId(), + Cause.ERROR_ADDING_CONTACT_INFO); return; } - logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), - "Contact info was not added to account {}.", request.getAccountId(), Cause.ERROR_ADDING_CONTACT_INFO); - return; + logger.info("SUCCESS: Contact info {}:{} was added to account {}.", request.getContactInfo().getType().name(), + request.getContactInfo().getValue(), request.getAccountId()); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onCompleted(); } @Override @@ -790,17 +791,16 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas boolean result = accountRepositoryAdditional.deleteContactInfo(UUID.fromString(request.getAccountId()), ContactInfo.createContactInfoFromProto(request.getContactInfo())); - if (result) { - logger.info("Contact info {}:{} was removed from account {}.", request.getContactInfo().getType().name(), - request.getContactInfo().getValue(), request.getAccountId()); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); - responseObserver.onCompleted(); + if (!result) { + logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), + "Contact info was not removed from account {}.", request.getAccountId(), + Cause.ERROR_DELETING_CONTACT_INFO); return; } - logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), - "Contact info was not removed from account {}.", request.getAccountId(), - Cause.ERROR_DELETING_CONTACT_INFO); - return; + logger.info("SUCCESS: Contact info {}:{} was removed from account {}.", + request.getContactInfo().getType().name(), request.getContactInfo().getValue(), request.getAccountId()); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onCompleted(); } @Override @@ -880,8 +880,8 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas boolean removedFromObject = profile.removeAuthenticationProvider(existingAuthProviderToDelete.get()); if (!removedFromObject) { logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), - "Error removing authentication provider {}.", - existingAuthProviderToDelete.get().toString(), Cause.INTERNAL_SERVER_ERROR); + "Error removing authentication provider {}.", existingAuthProviderToDelete.get().toString(), + Cause.INTERNAL_SERVER_ERROR); return; } @@ -898,21 +898,20 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas boolean result = accountRepositoryAdditional.deleteAuthenticationProvider(profile, existingAuthProviderToDelete.get()); - if (result) { - logger.info("Authentication provider {}:{} successfuly deleted from profile id {}.", + if (!result) { + logger.error("Authentication provider {}:{} was not successfuly deleted from profile id {}.", request.getAuthenticationProvider().getAuthenticationType().name(), request.getAuthenticationProvider().getAuthenticationProvider(), request.getProfileId()); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onNext(StatusResponse.newBuilder() + .setError(ErrorResponse.newBuilder().setCause(Cause.INTERNAL_SERVER_ERROR)).build()); responseObserver.onCompleted(); return; } - logger.error("Authentication provider {}:{} was not successfuly deleted from profile id {}.", + logger.info("SUCCESS: Authentication provider {}:{} successfuly deleted from profile id {}.", request.getAuthenticationProvider().getAuthenticationType().name(), request.getAuthenticationProvider().getAuthenticationProvider(), request.getProfileId()); - responseObserver.onNext(StatusResponse.newBuilder() - .setError(ErrorResponse.newBuilder().setCause(Cause.INTERNAL_SERVER_ERROR)).build()); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); responseObserver.onCompleted(); - return; } @Override @@ -949,11 +948,12 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas if (!profile.isPresent()) { logAndBuildGrpcProfileResponse(responseObserver, ProfileResponse.newBuilder(), "Profile id not found: {}", request.getProfileId(), Cause.PROFILE_NOT_FOUND); - } else { - responseObserver.onNext(profile.get()); - responseObserver.onCompleted(); return; } + ProfileResponse response = profile.get(); + logger.info("SUCCESS: Found profile by profile ID {}: \"{}\"", request.getProfileId(), response); + responseObserver.onNext(response); + responseObserver.onCompleted(); } @Override @@ -1005,19 +1005,18 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas boolean result = accountRepositoryAdditional.editContactInfo(UUID.fromString(request.getAccountId()), ContactInfo.createContactInfoFromProto(request.getOldContactInfo()), ContactInfo.createContactInfoFromProto(request.getEditedContactInfo())); - if (result) { - logger.info("Edited Contact Info {}:{} to {}:{} for account {}.", - request.getOldContactInfo().getType().name(), request.getOldContactInfo().getValue(), - request.getEditedContactInfo().getType().name(), request.getEditedContactInfo().getValue(), - request.getAccountId()); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); - responseObserver.onCompleted(); + if (!result) { + logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), + "Contact info was not edited for account {}.", request.getAccountId(), + Cause.ERROR_EDITING_CONTACT_INFO); return; } - logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), - "Contact info was not edited for account {}.", request.getAccountId(), - Cause.ERROR_EDITING_CONTACT_INFO); - return; + logger.info("SUCCESS: Edited Contact Info {}:{} to {}:{} for account {}.", + request.getOldContactInfo().getType().name(), request.getOldContactInfo().getValue(), + request.getEditedContactInfo().getType().name(), request.getEditedContactInfo().getValue(), + request.getAccountId()); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onCompleted(); } private SearchResultDetails buildSearchResultDetails(String id, String avatar, String firstName, String lastName) { @@ -1098,23 +1097,22 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas UUID.fromString(request.getProfileId()), AuthenticationProvider.createAuthenticationProviderFromProto(request.getOldAuthProvider()), AuthenticationProvider.createAuthenticationProviderFromProto(request.getUpdatedAuthProvider())); - if (result) { - logger.info("Updated auth provider {}:{} to {}:{} for profile {}.", + if (!result) { + logger.error("Auth provider {}:{} was not updated for profile {}.", request.getOldAuthProvider().getAuthenticationType().name(), - request.getOldAuthProvider().getAuthenticationProvider(), - request.getUpdatedAuthProvider().getAuthenticationType().name(), - request.getUpdatedAuthProvider().getAuthenticationProvider(), request.getProfileId()); - responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); - responseObserver.onCompleted(); + request.getOldAuthProvider().getAuthenticationProvider(), request.getProfileId()); + logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), + "Auth provider was not updated for profile {}.", request.getProfileId(), + Cause.ERROR_UPDATING_AUTH_PROVIDER); return; } - logger.error("Auth provider {}:{} was not updated for profile {}.", + logger.info("SUCCESS: Updated auth provider {}:{} to {}:{} for profile {}.", request.getOldAuthProvider().getAuthenticationType().name(), - request.getOldAuthProvider().getAuthenticationProvider(), request.getProfileId()); - logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), - "Auth provider was not updated for profile {}.", request.getProfileId(), - Cause.ERROR_UPDATING_AUTH_PROVIDER); - return; + request.getOldAuthProvider().getAuthenticationProvider(), + request.getUpdatedAuthProvider().getAuthenticationType().name(), + request.getUpdatedAuthProvider().getAuthenticationProvider(), request.getProfileId()); + responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); + responseObserver.onCompleted(); } @Override @@ -1142,9 +1140,11 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas + request.getAuthenticationIdentifier() + ":" + request.getAuthenticationIdentifier(), "", Cause.ACCOUNT_NOT_FOUND); } else { - responseObserver.onNext(account.get()); + AccountResponse response = account.get(); + logger.info("SUCCESS: Found account by login option {}: \"{}\"", request.getAuthenticationIdentifier(), + response); + responseObserver.onNext(response); responseObserver.onCompleted(); - return; } } catch (IncorrectAccountCountException e) { logger.error("Error getting account by login option {}:{}: {}", request.getAuthenticationType(), @@ -1197,8 +1197,8 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas account.get().getAvatar(), account.get().getFirstName(), account.get().getLastName()); SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); - logger.debug("Found result for account by social provider {}: \"{}\"", request.getAuthenticationIdentifier(), - response); + logger.info("SUCCESS: Found result for account by social provider {}: \"{}\"", + request.getAuthenticationIdentifier(), response); responseObserver.onNext(response); responseObserver.onCompleted(); }