syncope git commit: SYNCOPE-1120 - Use the standard Bearer Authorization header for JWT tokens

2017-06-23 Thread coheigea 
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 8a6e9f86a -> 652312dff


SYNCOPE-1120 - Use the standard Bearer Authorization header for JWT tokens


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/652312df
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/652312df
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/652312df

Branch: refs/heads/2_0_X
Commit: 652312dff5eb88dd2cbb462930e50508968afbc4
Parents: 8a6e9f8
Author: Colm O hEigeartaigh 
Authored: Fri Jun 23 16:36:16 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Jun 23 16:37:11 2017 +0100

--
 .../client/console/rest/BaseRestClient.java |  5 +++-
 .../syncope/client/lib/SyncopeClient.java   | 24 +---
 .../client/lib/SyncopeClientFactoryBean.java|  6 ++---
 .../security/JWTAuthenticationFilter.java   | 11 +
 .../rest/cxf/service/SAML2SPServiceImpl.java| 16 ++---
 .../org/apache/syncope/fit/AbstractITCase.java  |  4 +++-
 6 files changed, 46 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/652312df/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
index 8b3dce2..4a780a6 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
@@ -19,6 +19,9 @@
 package org.apache.syncope.client.console.rest;
 
 import java.net.URI;
+
+import javax.ws.rs.core.HttpHeaders;
+
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.lib.SyncopeClient;
@@ -76,7 +79,7 @@ public abstract class BaseRestClient implements RestClient {
 
webClient.accept(SyncopeConsoleSession.get().getMediaType()).to(location.toASCIIString(),
 false);
 return webClient.
 header(RESTHeaders.DOMAIN, 
SyncopeConsoleSession.get().getDomain()).
-header(RESTHeaders.TOKEN, 
SyncopeConsoleSession.get().getJWT()).
+header(HttpHeaders.AUTHORIZATION, "Bearer " + 
SyncopeConsoleSession.get().getJWT()).
 get(resultClass);
 }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/652312df/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
--
diff --git 
a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java 
b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
index f722cf8..c13fa77 100644
--- a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
+++ b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -107,18 +108,19 @@ public class SyncopeClient {
 restClientFactory.setPassword(((BasicAuthenticationHandler) 
handler).getPassword());
 
 String jwt = 
getService(AccessTokenService.class).login().getHeaderString(RESTHeaders.TOKEN);
-restClientFactory.getHeaders().put(RESTHeaders.TOKEN, 
Collections.singletonList(jwt));
+restClientFactory.getHeaders().put(HttpHeaders.AUTHORIZATION, 
Collections.singletonList("Bearer " + jwt));
 
 restClientFactory.setUsername(null);
 restClientFactory.setPassword(null);
 } else if (handler instanceof JWTAuthenticationHandler) {
 restClientFactory.getHeaders().put(
-RESTHeaders.TOKEN, 
Collections.singletonList(((JWTAuthenticationHandler) handler).getJwt()));
+HttpHeaders.AUTHORIZATION,
+Collections.singletonList("Bearer " + 
((JWTAuthenticationHandler) handler).getJwt()));
 }
 }
 
 protected void cleanup() {
-restClientFactory.getHeaders().remove(RESTHeaders.TOKEN);
+restClientFactory.getHeaders().remove(HttpHeaders.AUTHORIZATION);
 restClientFactory.setUsername(null);
 restClientFactory.setPassword(null);
 }
@@ -128,7 +130,7 @@ public class SyncopeClient {
  */
 public void refresh() {
 String jwt =

syncope git commit: SYNCOPE-1120 - Use the standard Bearer Authorization header for JWT tokens

2017-06-23 Thread coheigea 
Repository: syncope
Updated Branches:
  refs/heads/master e76c59da5 -> ab4c623a3


SYNCOPE-1120 - Use the standard Bearer Authorization header for JWT tokens


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ab4c623a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ab4c623a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ab4c623a

Branch: refs/heads/master
Commit: ab4c623a3f6ccdbe03968235b843ec81a2d97b1f
Parents: e76c59d
Author: Colm O hEigeartaigh 
Authored: Fri Jun 23 16:36:16 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Jun 23 16:36:48 2017 +0100

--
 .../client/console/rest/BaseRestClient.java |  5 +++-
 .../syncope/client/lib/SyncopeClient.java   | 24 +---
 .../client/lib/SyncopeClientFactoryBean.java|  6 ++---
 .../security/JWTAuthenticationFilter.java   | 11 +
 .../rest/cxf/service/SAML2SPServiceImpl.java| 16 ++---
 .../org/apache/syncope/fit/AbstractITCase.java  |  4 +++-
 6 files changed, 46 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/ab4c623a/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
index 8b3dce2..4a780a6 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/BaseRestClient.java
@@ -19,6 +19,9 @@
 package org.apache.syncope.client.console.rest;
 
 import java.net.URI;
+
+import javax.ws.rs.core.HttpHeaders;
+
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.lib.SyncopeClient;
@@ -76,7 +79,7 @@ public abstract class BaseRestClient implements RestClient {
 
webClient.accept(SyncopeConsoleSession.get().getMediaType()).to(location.toASCIIString(),
 false);
 return webClient.
 header(RESTHeaders.DOMAIN, 
SyncopeConsoleSession.get().getDomain()).
-header(RESTHeaders.TOKEN, 
SyncopeConsoleSession.get().getJWT()).
+header(HttpHeaders.AUTHORIZATION, "Bearer " + 
SyncopeConsoleSession.get().getJWT()).
 get(resultClass);
 }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/ab4c623a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
--
diff --git 
a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java 
b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
index f722cf8..c13fa77 100644
--- a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
+++ b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -107,18 +108,19 @@ public class SyncopeClient {
 restClientFactory.setPassword(((BasicAuthenticationHandler) 
handler).getPassword());
 
 String jwt = 
getService(AccessTokenService.class).login().getHeaderString(RESTHeaders.TOKEN);
-restClientFactory.getHeaders().put(RESTHeaders.TOKEN, 
Collections.singletonList(jwt));
+restClientFactory.getHeaders().put(HttpHeaders.AUTHORIZATION, 
Collections.singletonList("Bearer " + jwt));
 
 restClientFactory.setUsername(null);
 restClientFactory.setPassword(null);
 } else if (handler instanceof JWTAuthenticationHandler) {
 restClientFactory.getHeaders().put(
-RESTHeaders.TOKEN, 
Collections.singletonList(((JWTAuthenticationHandler) handler).getJwt()));
+HttpHeaders.AUTHORIZATION,
+Collections.singletonList("Bearer " + 
((JWTAuthenticationHandler) handler).getJwt()));
 }
 }
 
 protected void cleanup() {
-restClientFactory.getHeaders().remove(RESTHeaders.TOKEN);
+restClientFactory.getHeaders().remove(HttpHeaders.AUTHORIZATION);
 restClientFactory.setUsername(null);
 restClientFactory.setPassword(null);
 }
@@ -128,7 +130,7 @@ public class SyncopeClient {
  */
 public void refresh() {
 String jwt =