Made requested changes

Author: keyurdoshi03

deploy/docker/docker-compose.yml

@@ -48,7 +48,6 @@ services:
       - TLS_KEYSTORE_PASSWORD=passw0rd
       - TLS_KEY_PASSWORD=passw0rd
       - TLS_KEY_ALIAS=identity
-      - [email protected]
     depends_on:
       postgresdb:
         condition: service_healthy

deploy/helm/templates/identity/config.yaml

@@ -37,4 +37,3 @@ data:
   TLS_KEYSTORE_PASSWORD: {{ .Values.identity.config.keyStorePassword }}
   TLS_KEY_PASSWORD: {{ .Values.identity.config.keyPassword }}
   TLS_KEY_ALIAS: {{ .Values.identity.config.keyAlias }}
-  ADMIN_EMAILS: {{ .Values.identity.config.adminEmails | quote }}

deploy/helm/values.yaml

@@ -77,7 +77,6 @@ identity:
     keyStorePassword: passw0rd
     keyPassword: passw0rd
     keyAlias: identity
-    adminEmails: [email protected]
   deploymentLabels:
     app: crapi-identity
   podLabels:

services/identity/src/main/java/com/crapi/service/Impl/UserServiceImpl.java

@@ -33,13 +33,10 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.transaction.Transactional;
 import java.text.ParseException;
-import java.util.Arrays;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.impl.Log4jContextFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -76,9 +73,6 @@ public class UserServiceImpl implements UserService {
 
   @Autowired ChangePhoneRepository changePhoneRepository;
 
-  @Value("${app.admin.emails}")
-  private String adminEmails;
-
   public UserServiceImpl() {
     setFactory(log4jContextFactory);
     LOG4J_LOGGER = LogManager.getLogger(UserService.class);
@@ -491,11 +485,6 @@ public ApiKeyResponse generateApiKey(HttpServletRequest request, LoginForm login
       log.debug("User not found to generate API key");
       return new ApiKeyResponse(null, UserMessage.INVALID_CREDENTIALS);
     }
-    List<String> adminEmailList = Arrays.asList(adminEmails.split(","));
-    if (!adminEmailList.contains(user.getEmail())) {
-      log.debug("User {} is not authorized to generate API Key", user.getEmail());
-      return new ApiKeyResponse(null, UserMessage.API_KEY_GENERATION_FAILED);
-    }
     // if apiKey is already generated
     if (user.getApiKey() != null) {
       log.debug("Api Key already generated for user: {}", user.getEmail());

services/identity/src/main/resources/application.properties

@@ -42,7 +42,6 @@ mail.mailhog.domain=${MAILHOG_DOMAIN}
 
 app.enable_shell_injection=${ENABLE_SHELL_INJECTION}
 app.service.name=crapi-identity
-app.admin.emails=${ADMIN_EMAILS}
 
 api.gateway.url=${API_GATEWAY_URL}
 

services/identity/src/test/java/com/crapi/service/Impl/UserServiceImplTest.java

@@ -66,7 +66,6 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.test.util.ReflectionTestUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UserServiceImplTest {
@@ -158,7 +157,6 @@ public void testAuthenticateUserApiKey() throws UnsupportedEncodingException {
     Mockito.when(authenticationManager.authenticate(Mockito.any(Authentication.class)))
         .thenReturn(mockAuth);
     Mockito.when(userRepository.findByEmail(Mockito.anyString())).thenReturn(user);
-    ReflectionTestUtils.setField(userService, "adminEmails", user.getEmail());
     ApiKeyResponse jwtResponse = userService.generateApiKey(getMockHttpRequest(), loginForm);
     Assertions.assertEquals(jwtResponse.getApiKey(), "sampleApiKey");
   }