Merge branch 'main' into snyk-upgrade-4b20f466e87cbecfd4adbd81bf5f6f40

api/pom.xml

@@ -13,7 +13,7 @@
     <properties>
         <project.root>${basedir}/..</project.root>
         <springfox.version>3.0.0</springfox.version>
-        <okta-jwt.version>0.5.8</okta-jwt.version>
+        <okta-jwt.version>0.5.10</okta-jwt.version>
         <sonar.coverage.exclusions>**/JobClient.java</sonar.coverage.exclusions>
         <!-- 
             - AB2D-6099 -

api/src/test/java/gov/cms/ab2d/api/security/CustomUserDetailsServiceTest.java

@@ -0,0 +1,39 @@
+package gov.cms.ab2d.api.security;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+import gov.cms.ab2d.common.model.PdpClient;
+import gov.cms.ab2d.common.repository.PdpClientRepository;
+
+class CustomUserDetailsServiceTest {
+
+  @Test
+  void testLoadUserByUsername1() {
+    PdpClientRepository pdpClientRepository = mock(PdpClientRepository.class);
+    CustomUserDetailsService customUserDetailsService = new CustomUserDetailsService(pdpClientRepository);
+    PdpClient pdpClient = new PdpClient();
+    when(pdpClientRepository.findByClientId("clientId")).thenReturn(pdpClient);
+    assertEquals(
+      customUserDetailsService.loadUserByUsername("clientId"),
+      pdpClient
+    );
+  }
+
+  @Test
+  void testLoadUserByUsername2() {
+    PdpClientRepository pdpClientRepository = mock(PdpClientRepository.class);
+    CustomUserDetailsService customUserDetailsService = new CustomUserDetailsService(pdpClientRepository);
+    when(pdpClientRepository.findByClientId(null)).thenReturn(null);
+    assertThrows(
+      UsernameNotFoundException.class,
+      () -> {customUserDetailsService.loadUserByUsername(null);}
+    );
+  }
+
+}

pom.xml

@@ -34,7 +34,7 @@
         <checkstyle.config>${project.root}/src/main/resources/checkstyle.xml</checkstyle.config>
         <logback-encoder.version>7.3</logback-encoder.version>
         <testcontainers.version>1.18.3</testcontainers.version>
-        <newrelic.version>8.4.0</newrelic.version>
+        <newrelic.version>8.15.0</newrelic.version>
         <postgres.version>42.7.3</postgres.version>
         <spring-cloud-aws.version>2.4.4</spring-cloud-aws.version>