diff --git a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java index b9fdf4aa5d8a7afca9e494565b0b8eb53e570664..d2c12674f1c4b7ceedcad07a23638169aae688bf 100644 --- a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java +++ b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java @@ -690,7 +690,13 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas AuthenticationProvider authenticationProviderToDelete = AuthenticationProvider .createAuthenticationProviderFromProto(request.getAuthenticationProvider()); - profile.removeAuthenticationProvider(authenticationProviderToDelete); + + boolean removedFromObject = profile.removeAuthenticationProvider(authenticationProviderToDelete); + if(!removedFromObject) { + logAndBuildGrpcStatusResponse(responseObserver, StatusResponse.newBuilder(), "Authentication provider {} is not used by this profile.", + authenticationProviderToDelete.toString(), Cause.AUTH_PROVIDER_NOT_FOUND); + return; + } if (profile.getAuthenticationProviders().size() < MIN_NUMBER_OF_AUTH_PROVIDERS_IN_PROFILE) { logger.error(