cxf git commit: Making it easier to inject IdToken/UserInfo as context proxies

2015-12-15 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d7fd946ab -> d4bfacb8c


Making it easier to inject IdToken/UserInfo as context proxies


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

Branch: refs/heads/3.1.x-fixes
Commit: d4bfacb8cc5ed8247ff74eb52061070c0457cbf3
Parents: d7fd946
Author: Sergey Beryozkin 
Authored: Tue Dec 15 12:41:23 2015 +
Committer: Sergey Beryozkin 
Committed: Tue Dec 15 12:42:58 2015 +

--
 .../cxf/rs/security/oidc/rp/IdTokenContext.java | 25 
 .../oidc/rp/OidcClientTokenContext.java |  7 ++
 .../security/oidc/rp/OidcIdTokenProvider.java   | 19 +++
 .../security/oidc/rp/OidcUserInfoProvider.java  | 22 +
 .../rs/security/oidc/rp/UserInfoContext.java| 25 
 5 files changed, 83 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d4bfacb8/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
new file mode 100644
index 000..7e4cc2f
--- /dev/null
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.oidc.rp;
+
+import org.apache.cxf.rs.security.oidc.common.IdToken;
+
+public interface IdTokenContext {
+IdToken getIdToken();
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/d4bfacb8/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
index 5a1e136..5187392 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
@@ -19,10 +19,7 @@
 package org.apache.cxf.rs.security.oidc.rp;
 
 import org.apache.cxf.rs.security.oauth2.client.ClientTokenContext;
-import org.apache.cxf.rs.security.oidc.common.IdToken;
-import org.apache.cxf.rs.security.oidc.common.UserInfo;
 
-public interface OidcClientTokenContext extends ClientTokenContext {
-IdToken getIdToken();
-UserInfo getUserInfo();
+public interface OidcClientTokenContext extends ClientTokenContext,
+IdTokenContext, UserInfoContext {
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d4bfacb8/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
index fab9ae8..b87ea2c 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
@@ -23,14 +23,23 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.rs.security.oauth2.client.ClientTokenContext;
 import org.apache.cxf.rs.security.oidc.common.IdToken;
 
-public class OidcIdTokenProvider implements ContextProvider {
+public class OidcIdTokenProvider implements ContextProvider {

cxf git commit: Making it easier to inject IdToken/UserInfo as context proxies

2015-12-15 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 332551899 -> b316007cc


Making it easier to inject IdToken/UserInfo as context proxies


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

Branch: refs/heads/master
Commit: b316007cc8c78508b006dcfc99c8398f516cc37a
Parents: 3325518
Author: Sergey Beryozkin 
Authored: Tue Dec 15 12:41:23 2015 +
Committer: Sergey Beryozkin 
Committed: Tue Dec 15 12:41:23 2015 +

--
 .../cxf/rs/security/oidc/rp/IdTokenContext.java | 25 
 .../oidc/rp/OidcClientTokenContext.java |  7 ++
 .../security/oidc/rp/OidcIdTokenProvider.java   | 19 +++
 .../security/oidc/rp/OidcUserInfoProvider.java  | 22 +
 .../rs/security/oidc/rp/UserInfoContext.java| 25 
 5 files changed, 83 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b316007c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
new file mode 100644
index 000..7e4cc2f
--- /dev/null
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/IdTokenContext.java
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.oidc.rp;
+
+import org.apache.cxf.rs.security.oidc.common.IdToken;
+
+public interface IdTokenContext {
+IdToken getIdToken();
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/b316007c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
index 5a1e136..5187392 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientTokenContext.java
@@ -19,10 +19,7 @@
 package org.apache.cxf.rs.security.oidc.rp;
 
 import org.apache.cxf.rs.security.oauth2.client.ClientTokenContext;
-import org.apache.cxf.rs.security.oidc.common.IdToken;
-import org.apache.cxf.rs.security.oidc.common.UserInfo;
 
-public interface OidcClientTokenContext extends ClientTokenContext {
-IdToken getIdToken();
-UserInfo getUserInfo();
+public interface OidcClientTokenContext extends ClientTokenContext,
+IdTokenContext, UserInfoContext {
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/b316007c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
index fab9ae8..b87ea2c 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenProvider.java
@@ -23,14 +23,23 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.rs.security.oauth2.client.ClientTokenContext;
 import org.apache.cxf.rs.security.oidc.common.IdToken;
 
-public class OidcIdTokenProvider implements ContextProvider {
+public class OidcIdTokenProvider implements ContextProvider {