From 3fbcaf37ad4c4a505ff0aa2f812145d109ac36f9 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 24 Mar 2022 14:30:16 +0100 Subject: [PATCH] Avoiding null pointer exceptions --- .../common/authorization/utils/secret/JWTSecret.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/common/authorization/utils/secret/JWTSecret.java b/src/main/java/org/gcube/common/authorization/utils/secret/JWTSecret.java index 392da15..d86ed61 100644 --- a/src/main/java/org/gcube/common/authorization/utils/secret/JWTSecret.java +++ b/src/main/java/org/gcube/common/authorization/utils/secret/JWTSecret.java @@ -99,7 +99,7 @@ public class JWTSecret extends Secret { AccessTokenProvider.instance.reset(); } - protected AccessToken getAccessToken() throws Exception { + protected AccessToken getAccessToken() { if(accessToken==null) { String realUmaTokenEncoded = token.split("\\.")[1]; String realUmaToken = new String(Base64.getDecoder().decode(realUmaTokenEncoded.getBytes())); @@ -108,7 +108,7 @@ public class JWTSecret extends Secret { accessToken = mapper.readValue(realUmaToken, AccessToken.class); }catch(Exception e){ logger.error("Error parsing JWT token",e); - throw new Exception("Error parsing JWT token", e); + throw new RuntimeException("Error parsing JWT token", e); } } return accessToken; @@ -193,7 +193,7 @@ public class JWTSecret extends Secret { @Override public boolean isExpired() { - return isExpired(accessToken); + return isExpired(getAccessToken()); } @Override @@ -214,7 +214,7 @@ public class JWTSecret extends Secret { if(user==null) { try { ObjectMapper objectMapper = new ObjectMapper(); - String accessTokenString = objectMapper.writeValueAsString(accessToken); + String accessTokenString = objectMapper.writeValueAsString(getAccessToken()); user = objectMapper.readValue(accessTokenString, KeycloakUser.class); user.setRoles(getRoles()); } catch (Exception e) {