From ff7b79bb05f522ea935829599669333279940ef6 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 1 Dec 2021 16:22:36 +0100
Subject: [PATCH] Improving code

---
 pom.xml                                                |  2 +-
 .../common/authorization/utils/secret/GCubeSecret.java |  5 -----
 .../common/authorization/utils/secret/JWTSecret.java   | 10 ----------
 .../common/authorization/utils/secret/Secret.java      |  9 ++++++++-
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 58cbed8..2a2439d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.1.0-SNAPSHOT</version>
+				<version>2.0.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/src/main/java/org/gcube/common/authorization/utils/secret/GCubeSecret.java b/src/main/java/org/gcube/common/authorization/utils/secret/GCubeSecret.java
index 8702588..79e485d 100644
--- a/src/main/java/org/gcube/common/authorization/utils/secret/GCubeSecret.java
+++ b/src/main/java/org/gcube/common/authorization/utils/secret/GCubeSecret.java
@@ -61,11 +61,6 @@ public class GCubeSecret extends Secret {
 		return getAuthorizationEntry().getContext();
 	}
 	
-	@Override
-	public String getUsername() throws Exception {
-		return getClientInfo().getId();
-	}
-	
 	@Override
 	public Map<String, String> getHTTPAuthorizationHeaders() {
 		Map<String, String> authorizationHeaders = new HashMap<>();
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 0cfa07b..0447977 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
@@ -80,14 +80,4 @@ public class JWTSecret extends Secret {
 		return authorizationHeaders;
 	}
 
-	@Override
-	public String getUsername() throws Exception {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-
-	
-
 }
diff --git a/src/main/java/org/gcube/common/authorization/utils/secret/Secret.java b/src/main/java/org/gcube/common/authorization/utils/secret/Secret.java
index 517d848..9ae7b73 100644
--- a/src/main/java/org/gcube/common/authorization/utils/secret/Secret.java
+++ b/src/main/java/org/gcube/common/authorization/utils/secret/Secret.java
@@ -3,6 +3,7 @@ package org.gcube.common.authorization.utils.secret;
 import java.util.Map;
 import java.util.Objects;
 
+import org.gcube.common.authorization.library.ClientType;
 import org.gcube.common.authorization.library.exception.AuthorizationException;
 import org.gcube.common.authorization.library.provider.AuthorizationProvider;
 import org.gcube.common.authorization.library.provider.ClientInfo;
@@ -57,7 +58,13 @@ public abstract class Secret implements Comparable<Secret> {
 	
 	public abstract String getContext() throws Exception;
 	
-	public abstract String getUsername() throws Exception;
+	public String getUsername() throws Exception {
+		return getClientInfo().getId();
+	}
+	
+	public boolean isApplication() throws Exception {
+		return getClientInfo().getType() == ClientType.EXTERNALSERVICE;
+	}
 	
 	public abstract Map<String,String> getHTTPAuthorizationHeaders();