diff --git a/src/main/java/org/gcube/common/security/secrets/AccessTokenSecret.java b/src/main/java/org/gcube/common/security/secrets/AccessTokenSecret.java index d75cfce..cbcf270 100644 --- a/src/main/java/org/gcube/common/security/secrets/AccessTokenSecret.java +++ b/src/main/java/org/gcube/common/security/secrets/AccessTokenSecret.java @@ -9,10 +9,10 @@ import org.gcube.common.keycloak.model.AccessToken; import org.gcube.common.security.Owner; public class AccessTokenSecret extends Secret { - + private static final String AUTH_HEADER = "Authorization"; private static final String USER_HEADER = "d4s-user"; - + private String encodedAccessToken; private Owner owner; @@ -24,7 +24,7 @@ public class AccessTokenSecret extends Secret { public AccessTokenSecret(String encodedAccessToken) { this.encodedAccessToken = encodedAccessToken; - + } @Override @@ -48,12 +48,12 @@ public class AccessTokenSecret extends Secret { return authorizationHeaders; } - + protected String getEncodedAccessToken() { return encodedAccessToken; } - - + + @Override public boolean isExpired() { init(); @@ -63,11 +63,11 @@ public class AccessTokenSecret extends Secret { private synchronized void init() { if (!initialised) try { - + String realAccessTokenEncoded = encodedAccessToken.split("\\.")[1]; - + String decodedAccessPart = new String(Base64.getDecoder().decode(realAccessTokenEncoded.getBytes())); - + ObjectMapper objectMapper = new ObjectMapper(); GCubeJWTObject obj = objectMapper.readValue(decodedAccessPart, GCubeJWTObject.class); owner = new Owner(obj.getUsername(), obj.getRoles(), obj.getEmail(), obj.getFirstName(), obj.getLastName(), obj.isExternalService()); @@ -75,14 +75,14 @@ public class AccessTokenSecret extends Secret { owner.setContactOrganisation(obj.getContactOrganisation()); owner.setClientName(obj.getClientName()); context = obj.getContext(); - + this.accessToken = objectMapper.readValue(decodedAccessPart, AccessToken.class); - + initialised = true; } catch (Exception e) { throw new RuntimeException(e); } } - + } diff --git a/src/main/java/org/gcube/common/security/secrets/CredentialSecret.java b/src/main/java/org/gcube/common/security/secrets/CredentialSecret.java index a5a3512..b430e81 100644 --- a/src/main/java/org/gcube/common/security/secrets/CredentialSecret.java +++ b/src/main/java/org/gcube/common/security/secrets/CredentialSecret.java @@ -61,5 +61,4 @@ public class CredentialSecret extends Secret { public boolean isExpired() { return false; } - } diff --git a/src/main/java/org/gcube/common/security/secrets/JWTSecret.java b/src/main/java/org/gcube/common/security/secrets/JWTSecret.java index 24ffd54..de3782d 100644 --- a/src/main/java/org/gcube/common/security/secrets/JWTSecret.java +++ b/src/main/java/org/gcube/common/security/secrets/JWTSecret.java @@ -24,7 +24,7 @@ public class JWTSecret extends Secret { private String jwtToken; - + private String context; private AccessTokenSecret accessTokenSecret; @@ -79,4 +79,5 @@ public class JWTSecret extends Secret { return false; } + } \ No newline at end of file