From b44689ae5c69bcb1b4acc9ec74f6206350ae74a7 Mon Sep 17 00:00:00 2001 From: Jens-Otto Larsen Date: Tue, 5 Nov 2024 14:51:31 +0100 Subject: [PATCH] =?UTF-8?q?Sett=20claim=20oid=20p=C3=A5=20vtp-genererte=20?= =?UTF-8?q?mock-azure-token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vtp/server/auth/rest/azuread/AzureAdRestTjeneste.java | 2 +- .../vtp/server/auth/rest/azuread/AzureOidcTokenGenerator.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureAdRestTjeneste.java b/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureAdRestTjeneste.java index 79bb04c62..4c400589a 100644 --- a/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureAdRestTjeneste.java +++ b/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureAdRestTjeneste.java @@ -98,7 +98,7 @@ public Response accessToken(@FormParam(GRANT_TYPE) String grantType, return switch (grantType) { case "client_credentials" -> { - token = azureClientCredentialsToken(UUID.randomUUID().toString().substring(0, 19), ISSUER); + token = azureClientCredentialsToken(UUID.randomUUID().toString(), ISSUER); yield ok(new Oauth2AccessTokenResponse(token)).build(); } case "urn:ietf:params:oauth:grant-type:jwt-bearer" -> { diff --git a/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureOidcTokenGenerator.java b/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureOidcTokenGenerator.java index 17c6ba701..70883ab85 100644 --- a/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureOidcTokenGenerator.java +++ b/server/src/main/java/no/nav/foreldrepenger/vtp/server/auth/rest/azuread/AzureOidcTokenGenerator.java @@ -51,6 +51,7 @@ static String getNavIdent(JwtClaims claims) { public static String azureUserToken(NAVAnsatt bruker, String issuer, String nonce) { JwtClaims claims = createCommonClaims(bruker.ident(), issuer); + claims.setStringClaim("oid", bruker.oid().toString()); claims.setStringClaim("NAVident", bruker.ident()); claims.setStringListClaim("groups", bruker.vtpgrupper().stream().toList());