From a77353fa2bb829b7484cc1b3ab11048706730dd9 Mon Sep 17 00:00:00 2001
From: Lucio <lucio.lelii@isti.cnr.it>
Date: Tue, 17 Nov 2020 15:37:12 +0100
Subject: [PATCH] porting to the new IAM

---
 .classpath                                                    | 1 -
 .settings/org.eclipse.jdt.core.prefs                          | 2 ++
 changelog.xml                                                 | 3 +++
 pom.xml                                                       | 2 +-
 .../common/authorization/library/AuthorizationEntry.java      | 4 +++-
 src/main/resources/default.authorization                      | 2 +-
 src/main/resources/gcube.authorization                        | 2 +-
 src/main/resources/pre.authorization                          | 2 +-
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.classpath b/.classpath
index c67d98a..a5d9509 100644
--- a/.classpath
+++ b/.classpath
@@ -26,7 +26,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 8445b6b..db24ee7 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/changelog.xml b/changelog.xml
index 7fda34d..da673e4 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -14,4 +14,7 @@
 	<Changeset component="authorization-library-2.1.6" date="2019-01-14">
 		<Change>added ListMapper</Change>
 	</Changeset>
+	<Changeset component="authorization-library-2.3.0" date="2020-05-20">
+		<Change>thread local to manage OIDC UMA bearer token added</Change>
+	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 70fe399..e0ab869 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     	<modelVersion>4.0.0</modelVersion>
     	<groupId>org.gcube.common</groupId>
     	<artifactId>common-authorization</artifactId>
-    	<version>2.2.0</version>
+    	<version>2.3.0-SNAPSHOT</version>
     	<name>authorization service common library</name>
 
     	<parent>
diff --git a/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java b/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
index 3a6ab8b..c69245c 100644
--- a/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
+++ b/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
@@ -34,8 +34,10 @@ public class AuthorizationEntry {
 	ClientInfo clientInfo;
 	
 	private String context;
-	@XmlElementRefs({@XmlElementRef(type=DefaultServiceMap.class)})
+	
+	@XmlElementRef(type = DefaultServiceMap.class)
 	private ServiceMap map;
+	
 	@XmlElementRefs({
 		@XmlElementRef(type = Service2ServicePolicy.class),
 		@XmlElementRef(type = User2ServicePolicy.class),
diff --git a/src/main/resources/default.authorization b/src/main/resources/default.authorization
index 35e591d..71af8a7 100644
--- a/src/main/resources/default.authorization
+++ b/src/main/resources/default.authorization
@@ -1 +1 @@
-<authorization-endpoint priority="10" infrastructure="d4science.research-infrastructures.eu"><host>authorization.d4science.org</host><secure>false</secure><port>80</port></authorization-endpoint>
\ No newline at end of file
+<authorization-endpoint priority="10" infrastructure="d4science.research-infrastructures.eu"><host>authorization.d4science.org</host><secure>true</secure><port>443</port></authorization-endpoint>
\ No newline at end of file
diff --git a/src/main/resources/gcube.authorization b/src/main/resources/gcube.authorization
index ccaa7fb..f41cde8 100644
--- a/src/main/resources/gcube.authorization
+++ b/src/main/resources/gcube.authorization
@@ -1 +1 @@
-<authorization-endpoint priority="10" infrastructure="gcube"><host>auth-d.dev.d4science.org</host><secure>false</secure><port>80</port></authorization-endpoint>
\ No newline at end of file
+<authorization-endpoint priority="10" infrastructure="gcube"><host>auth.dev.d4science.org</host><secure>true</secure><port>443</port></authorization-endpoint>
\ No newline at end of file
diff --git a/src/main/resources/pre.authorization b/src/main/resources/pre.authorization
index da00e3f..ddbcff8 100644
--- a/src/main/resources/pre.authorization
+++ b/src/main/resources/pre.authorization
@@ -1 +1 @@
-<authorization-endpoint priority="10" infrastructure="pred4s"><host>auth-pre.d4science.org</host><secure>false</secure><port>80</port></authorization-endpoint>
\ No newline at end of file
+<authorization-endpoint priority="10" infrastructure="pred4s"><host>auth-pre.d4science.org</host><secure>true</secure><port>443</port></authorization-endpoint>
\ No newline at end of file