Return-Path: 
 <commits-return-41034-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1883B18417
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon,  7 Mar 2016 18:50:58 +0000 (UTC)
Received: (qmail 73041 invoked by uid 500); 7 Mar 2016 18:50:57 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 72977 invoked by uid 500); 7 Mar 2016 18:50:57 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 72968 invoked by uid 99); 7 Mar 2016 18:50:57 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Mar 2016 18:50:57 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 688DDDFBD7; Mon,  7 Mar 2016 18:50:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sergeyb@apache.org
To: commits@cxf.apache.org
Message-Id: <d9c23f5e6ef64e60826fb27641e8110c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: cxf-fediz git commit: Initial support for all of OIDC Core flows
Date: Mon,  7 Mar 2016 18:50:57 +0000 (UTC)

Repository: cxf-fediz
Updated Branches:
  refs/heads/master af2feff06 -> 278dd0967


Initial support for all of OIDC Core flows


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

Branch: refs/heads/master
Commit: 278dd09676cbe4b333591e170290db4f6693f40d
Parents: af2feff
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon Mar 7 18:50:20 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon Mar 7 18:50:20 2016 +0000

----------------------------------------------------------------------
 services/oidc/src/main/webapp/WEB-INF/applicationContext.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/278dd096/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index b676c98..8a51037 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -40,6 +40,7 @@
 		
     <import resource="data-manager.xml" />
     
+    <!-- Supports OIDC code flow -->
     <bean id="oidcAuthorizationService" class="org.apache.cxf.rs.security.oidc.idp.OidcAuthorizationCodeService">
          <property name="dataProvider" ref="oauthProvider"/>
          <property name="subjectCreator" ref="subjectCreator"/>
@@ -49,16 +50,18 @@
          -->
          <property name="canSupportPublicClients" value="true"/>
     </bean>
-    <bean id="oidcImplicitService" class="org.apache.cxf.rs.security.oidc.idp.OidcImplicitService">
+    <!-- Supports OIDC implicit and hybrid flows -->
+    <bean id="oidcHybridService" class="org.apache.cxf.rs.security.oidc.idp.OidcHybridService">
          <property name="dataProvider" ref="oauthProvider"/>
          <property name="subjectCreator" ref="subjectCreator"/>
          <property name="skipAuthorizationWithOidcScope" value="true"/>
          <property name="responseFilter" ref="idTokenFilter"/>
+         <property name="codeService" ref="oidcAuthorizationService"/>
     </bean>
     
     <util:list id="oidcServices">
         <ref bean="oidcAuthorizationService"/>
-        <ref bean="oidcImplicitService"/>
+        <ref bean="oidcHybridService"/>
     </util:list>
     
     <bean id="authorizationService" class="org.apache.cxf.rs.security.oauth2.services.AuthorizationService">