This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new 8e3a59c [MEECROWAVE-267] oauth2 claim support (basic)
8e3a59c is described below
commit 8e3a59c47f24fdd6b537faf55756fd627a443414
Author: Romain Manni-Bucau
AuthorDate: Sun Nov 8 21:06:40 2020 +0100
[MEECROWAVE-267] oauth2 claim support (basic)
---
meecrowave-core/pom.xml| 13 ++
meecrowave-junit/pom.xml | 13 ++
meecrowave-oauth2/pom.xml | 47
.../oauth2/configuration/OAuth2Configurer.java | 251 +
.../oauth2/configuration/OAuth2Options.java| 11 +
.../OAuth2AuthorizationCodeGrantService.java | 40 +++-
.../org/apache/meecrowave/oauth2/OAuth2Test.java | 75 +++---
7 files changed, 361 insertions(+), 89 deletions(-)
diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml
index d2e71a3..48726f1 100644
--- a/meecrowave-core/pom.xml
+++ b/meecrowave-core/pom.xml
@@ -32,6 +32,19 @@
${project.groupId}.core
+
+
+ dev
+
+
+ org.apache.meecrowave
+ meecrowave-specs-api
+ ${project.version}
+
+
+
+
+
org.apache.meecrowave
diff --git a/meecrowave-junit/pom.xml b/meecrowave-junit/pom.xml
index 9cebb27..08dfcbf 100644
--- a/meecrowave-junit/pom.xml
+++ b/meecrowave-junit/pom.xml
@@ -28,6 +28,19 @@
meecrowave-junit
Meecrowave :: JUnit
+
+
+ dev
+
+
+ org.apache.meecrowave
+ meecrowave-specs-api
+ ${project.version}
+
+
+
+
+
junit
diff --git a/meecrowave-oauth2/pom.xml b/meecrowave-oauth2/pom.xml
index a7c13fc..193ea6e 100644
--- a/meecrowave-oauth2/pom.xml
+++ b/meecrowave-oauth2/pom.xml
@@ -32,6 +32,19 @@
${project.groupId}.oauth2
+
+
+ dev
+
+
+ org.apache.meecrowave
+ meecrowave-specs-api
+ ${project.version}
+
+
+
+
+
org.apache.meecrowave
@@ -42,6 +55,40 @@
org.apache.cxf
cxf-rt-rs-security-oauth2
${cxf.version}
+
+
+ org.apache.geronimo.specs
+ geronimo-jta_1.1_spec
+
+
+ jakarta.xml.ws
+ jakarta.xml.ws-api
+
+
+ jakarta.xml.soap
+ jakarta.xml.soap-api
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+
+
+ jakarta.jws
+ jakarta.jws-api
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+ org.jboss.spec.javax.rmi
+ jboss-rmi-api_1.0_spec
+
+
+ com.sun.xml.messaging.saaj
+ saaj-impl
+
+
org.apache.geronimo.specs
diff --git
a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
b/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
index cb6c2f0..94f9865 100644
---
a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
+++
b/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
@@ -18,41 +18,12 @@
*/
package org.apache.meecrowave.oauth2.configuration;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptySet;
-import static java.util.Locale.ENGLISH;
-import static java.util.Optional.ofNullable;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-import static
org.apache.cxf.rs.security.oauth2.common.AuthenticationMethod.PASSWORD;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import javax.annotation.PostConstruct;
-import javax.crypto.spec.SecretKeySpec;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.cxf.Bus;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.security.AuthenticationException;
import org.apache.cxf.jaxrs.ext.MessageContext;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import