Merge pull request #27 from navikt/GHAS-oppdater-avhengigheter

MMA-7694 Oppgrader avhengigheter

Author: ctumyr

src/main/java/no/nav/bilag/BilagExceptionHandler.java

@@ -65,7 +65,7 @@ public ResponseEntity<Object> funksjonellFeilHandler(Exception e) {
 
 	@ExceptionHandler({Exception.class})
 	public ResponseEntity<Object> catchUnhandledExceptions(Exception e) {
-		log.warn("Uhåndtert execption: " + e);
+		log.warn("Uhåndtert execption: {}", e.getMessage(), e);
 
 		return ResponseEntity
 				.status(INTERNAL_SERVER_ERROR)

src/main/java/no/nav/bilag/auth/LoginFilter.java

@@ -28,7 +28,7 @@ public class LoginFilter extends GenericFilterBean {
 	private static final String READINESS_URI = "/actuator/health/readiness";
 	private static final List<String> URIS_WITHOUT_REDIRECT = List.of(CALLBACK_URI, HEALTH_URI, READINESS_URI, LIVENESS_URI, METRICS_URI);
 
-	OauthService oauthService;
+	private final OauthService oauthService;
 
 	public LoginFilter(OauthService oauthService) {
 		this.oauthService = oauthService;
@@ -41,7 +41,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 		HttpServletResponse servletResponse = (HttpServletResponse) response;
 
 		if (URIS_WITHOUT_REDIRECT.contains(servletRequest.getRequestURI())) {
-			log.debug("Ingen redirect for uri=" + servletRequest.getRequestURI());
+			log.debug("Ingen redirect for uri={}", servletRequest.getRequestURI());
 		} else {
 			var accessToken = oauthService.getOAuth2AuthorizationFromSession(servletRequest.getSession());
 

src/main/java/no/nav/bilag/auth/NavJwtClaimSet.java

@@ -4,10 +4,6 @@
 
 public record NavJwtClaimSet(JWTClaimsSet jwtClaimsSet) {
 
-	public String getName() {
-		return (String) jwtClaimsSet.getClaim("name");
-	}
-
 	public String getNavIdent() {
 		return (String) jwtClaimsSet.getClaim("NAVident");
 	}

src/main/java/no/nav/bilag/auth/OauthController.java

@@ -41,10 +41,10 @@ public ResponseEntity<String> handleOauthCallback(HttpServletRequest incomingReq
 					.location(URI.create((String) session.getAttribute(ORIGINAL_URI)))
 					.build();
 		} catch (UserAuthorizationException e) {
-			log.error("Something went wrong when authenticating user with Microsoft: {}", e.getMessage());
+			log.error("Something went wrong when authenticating user with Microsoft: {}", e.getMessage(), e);
 			return ResponseEntity.status(BAD_REQUEST).build();
 		} catch (TokenAcquisitionException e) {
-			log.error("Something went wrong when acquiring access-token for authenticated user: {}", e.getMessage());
+			log.error("Something went wrong when acquiring access-token for authenticated user: {}", e.getMessage(), e);
 			return ResponseEntity.status(BAD_GATEWAY).build();
 		}
 	}

src/main/java/no/nav/bilag/auth/OboTokenService.java

@@ -67,7 +67,7 @@ public String fetchAccessToken(String accessToken) {
 	}
 
 	private void handleError(Throwable error) {
-		if (error instanceof WebClientResponseException response && ((WebClientResponseException) error).getStatusCode().is4xxClientError()) {
+		if (error instanceof WebClientResponseException response && response.getStatusCode().is4xxClientError()) {
 
 			// TODO: Når gruppetilgang blir strammet inn må en håndtere feilmelding her dersom gruppetilgang mangler
 			String feilmelding = format("Klarte ikke hente token fra Azure. Kall mot Microsoft feilet funksjonelt med status=%s, feilmelding=%s, response=%s",

src/main/java/no/nav/bilag/mdc/MDCInterceptor.java

@@ -18,8 +18,8 @@
 public class MDCInterceptor implements HandlerInterceptor {
 
 	private static final String USER_ID = "UserId";
-	public static final String MDC_CALL_ID = "callId";
-	public static final String MDC_USER_ID = "userId";
+	private static final String MDC_CALL_ID = "callId";
+	private static final String MDC_USER_ID = "userId";
 
 	private final OauthService oauthService;
 

src/main/java/no/nav/bilag/webclient/NavHeadersFilter.java

@@ -11,8 +11,8 @@
 
 public class NavHeadersFilter implements ExchangeFilterFunction {
 
-	public static final String NAV_CALLID = "Nav-Callid";
-	public static final String NAV_USER_ID = "Nav-User-Id";
+	private static final String NAV_CALLID = "Nav-Callid";
+	private static final String NAV_USER_ID = "Nav-User-Id";
 
 	@Override
 	public Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next) {

src/test/java/no/nav/bilag/BilagITest.java

@@ -11,9 +11,9 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 import java.util.Optional;
@@ -35,6 +35,7 @@
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 import static org.springframework.http.HttpStatus.OK;
 import static org.springframework.http.HttpStatus.PAYLOAD_TOO_LARGE;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.http.MediaType.APPLICATION_PDF_VALUE;
 
 @SpringBootTest(webEnvironment = RANDOM_PORT)
@@ -46,18 +47,18 @@ public class BilagITest {
 	private static final String AZURE_ENDEPUNKT = "/azure/token";
 	private static final String ACCESS_TOKEN_RESPONSE_BODY = """
 			{
-			  "access_token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ii1LSTNROW5OUjdiUm9meG1lWm9YcWJIWkdldyJ9.eyJhdWQiOiJiNTc5ZjM3OC1kMGZmLTRjZGUtOWVlYy0zZTNlODFlNzQ3NGUiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vOTY2YWM1NzItZjViNy00YmJlLWFhODgtYzc2NDE5YzBmODUxL3YyLjAiLCJpYXQiOjE2NzMyNzMxMzUsIm5iZiI6MTY3MzI3MzEzNSwiZXhwIjoxNjczMjc4MTE3LCJhaW8iOiJBVFFBeS84VEFBQUF1NU5EaXpKMDBSSS9zZkpiYUJod1VOSm5uQktzY2JoRGN5K204TWNqY1ExYVFYZXJyN3FvMU5sUGxuajVBb1lpIiwiYXpwIjoiYjU3OWYzNzgtZDBmZi00Y2RlLTllZWMtM2UzZTgxZTc0NzRlIiwiYXpwYWNyIjoiMSIsImdyb3VwcyI6WyJkZWMzZWU1MC1iNjgzLTQ2NDQtOTUwNy01MjBlOGYwNTRhYzIiXSwibmFtZSI6IkZfWjk5NDA1OSBFX1o5OTQwNTkiLCJvaWQiOiI3ZDA4YzczMS1mNGYwLTRhNzQtYTNjOS03NWRkYTZlMjg5NWEiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJGX1o5OTQwNTkuRV9aOTk0MDU5QHRyeWdkZWV0YXRlbi5ubyIsInJoIjoiMC5BVWNBY3NWcWxyZjF2a3VxaU1ka0djRDRVWGp6ZWJYXzBONU1udXctUG9IblIwNUhBUDAuIiwic2NwIjoiZGVmYXVsdGFjY2VzcyIsInN1YiI6InpZR0xFbndvVFNfdmtRclBxY0VsaEJ3SkpBU3d4eFB0cllNSjEtX1h6UTgiLCJ0aWQiOiI5NjZhYzU3Mi1mNWI3LTRiYmUtYWE4OC1jNzY0MTljMGY4NTEiLCJ1dGkiOiJNV1A1UW1pbklrYTZZNjFuSjFrM0FnIiwidmVyIjoiMi4wIiwiTkFWaWRlbnQiOiJaOTk0MDU5IiwiYXpwX25hbWUiOiJkZXYtZnNzOnRlYW1kb2t1bWVudGhhbmR0ZXJpbmc6ZG9rbWV0In0.NhFn9sHpdprRl_3GNBQplQEQIZ4RvWC4oYQdQ_7Q0vTey9tE7pZaNW3kGLnZYqO-LeegZJ1AAM1ddwivLOivhomL5lNyzM3nQORy4vKuZ9UXLpb3L-RXqyVs2KW4mPvhNQ1xPmNzFGEm1jOmuBFcJDkP8wbwXMXTJtS53oBBqOLK7jrcv6qnS0TATMHMdm6oHA4rXZcUlGfX__se1D9PY4g90QHkmpt6BcQyYdXkp7R5h21BVSM6VZ2AMA0f3DuudllvcgB_RyoJ9Bc1QUiArHiDVjFsIumWUCGryUKyTLS9NFBM0tFSTuJP7G8KGidQafLa5s8ZXD1sWaK_yWzsbQ",
+			  "access_token":"dummy-token",
 			  "token_type":"Bearer",
 			  "expires_in":3600,
-			  "refresh_token":"tGzv3JOkF0XG5Qx2TlKWIA",
+			  "refresh_token":"dummy-refresh-token",
 			  "example_parameter":"example_value"
 			}
 			""";
 
 	@Autowired
 	public WebTestClient webTestClient;
 
-	@MockBean
+	@MockitoBean
 	public OauthService oauthService; // Mock av oauthService for å unngå loginFilter
 
 	@BeforeEach
@@ -67,10 +68,8 @@ void setUp() {
 
 	@Test
 	void skalReturnereTemporaryDirectVedManglendeAccessToken() {
-		long dokId = 123L;
-
 		webTestClient.get()
-				.uri("/hent/" + dokId)
+				.uri("/hent/123")
 				.exchange()
 				.expectStatus().isTemporaryRedirect();
 	}
@@ -175,7 +174,7 @@ private void stubAzureObo() {
 		stubFor(post(urlMatching(AZURE_ENDEPUNKT))
 				.willReturn(aResponse()
 						.withStatus(200)
-						.withHeader("Content-Type", "application/json")
+						.withHeader(CONTENT_TYPE, APPLICATION_JSON_VALUE)
 						.withBody(ACCESS_TOKEN_RESPONSE_BODY)));
 	}
 

src/test/java/no/nav/bilag/auth/LoginFilterTest.java

@@ -24,7 +24,6 @@
 @ExtendWith(MockitoExtension.class)
 public class LoginFilterTest {
 
-
 	private final String HENTDOKUMENT_PATH = "/hent/123";
 	private final String CALLBACK_PATH = "/oauth2/callback";
 	private final String READINESS_PATH = "/actuator/health/readiness";