From 57826ed6ffe3cec78371f6cb2d385ee65b34f60e Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Wed, 12 May 2021 17:45:47 +0200
Subject: [PATCH] refactoring code

---
 .../org/gcube/contentmanager/storageserver/utils/Utils.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java b/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java
index 4e4dde7..149d52f 100644
--- a/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java
+++ b/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java
@@ -23,9 +23,10 @@ public class Utils {
 	
 	public static  JWTToken setToken(URL oidcAddress, String clientId, String secret) throws OpenIdConnectRESTHelperException {
 		JWTToken token=null;
+		String context=ScopeProvider.instance.get();
 		try {
 			logger.trace("setToken method");
-			String context=ScopeProvider.instance.get();
+			
 			logger.trace("we are in "+context);
 			if((!Objects.isNull(context)) && (!Objects.isNull(clientId))&& (!Objects.isNull(secret))) {
 				logger.info(clientId+" getting the UMAtoken for context "+context);	
@@ -40,6 +41,7 @@ public class Utils {
 			}
 		}catch(Throwable t) {
 			logger.error("Exception: ", t);
+			throw new RuntimeException("Problem with tokens in context"+context+" ", t);
 		}
 		return token;
 	}