From 6da43964b5c4372368c4391753ce5abd648937fe Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 2 Dec 2021 15:43:58 +0100
Subject: [PATCH] improved classes

---
 .../utils/manager/SecretHolder.java           | 18 ++++++++++++++
 .../utils/manager/SecretManager.java          | 24 +++----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/gcube/common/authorization/utils/manager/SecretHolder.java b/src/main/java/org/gcube/common/authorization/utils/manager/SecretHolder.java
index c1c7e93..7aeb251 100644
--- a/src/main/java/org/gcube/common/authorization/utils/manager/SecretHolder.java
+++ b/src/main/java/org/gcube/common/authorization/utils/manager/SecretHolder.java
@@ -39,6 +39,24 @@ public class SecretHolder {
 		}
 	}
 	
+	public void set() throws Exception {
+		boolean first = true;
+		for(Secret secret : secrets) {
+			/*
+			 * Only the most important Secret must set
+			 * AuthorizationProvider and ScopeProvider
+			 * the others just need to set their token
+			 * in the correspondent provider
+			 */
+			if(first) {
+				secret.set();
+				first = false;
+			}else {
+				secret.setToken();
+			}
+		}
+	}
+	
 	public SortedSet<Secret> getSecrets() {
 		return secrets;
 	}
diff --git a/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java b/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java
index 50ce62d..07cb22b 100644
--- a/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java
+++ b/src/main/java/org/gcube/common/authorization/utils/manager/SecretManager.java
@@ -69,39 +69,21 @@ public class SecretManager {
 			throw new Exception("You are already in a session. You must terminate the session first.");
 		}
 		currentSecretHolder = new SecretHolder(secret);
-		secret.set();
+		currentSecretHolder.set();
 	}
 	
 	public synchronized  void startSession(SortedSet<Secret> secrets) throws Exception {
 		currentSecretHolder = new SecretHolder(secrets);
-		setAll(secrets);
+		currentSecretHolder.set();
 	}
 	
 	public synchronized void endSession() throws Exception {
 		if(currentSecretHolder!=initialSecretHolder) {
-			setAll(initialSecretHolder.getSecrets());
+			initialSecretHolder.set();
 			currentSecretHolder = initialSecretHolder;
 		}
 	}
 	
-	private void setAll(SortedSet<Secret> secrets) throws Exception {
-		boolean first = true;
-		for(Secret secret : secrets) {
-			/*
-			 * Only the most important Secret must set
-			 * AuthorizationProvider and ScopeProvider
-			 * the others just need to set their token
-			 * in the correspondent provider
-			 */
-			if(first) {
-				secret.set();
-				first = false;
-			}else {
-				secret.setToken();
-			}
-		}
-	}
-	
 	public String getUsername() {
 		return currentSecretHolder.getUsername();
 	}