Return-Path: 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 CF7F91888E for ; Fri, 30 Oct 2015 16:08:48 +0000 (UTC) Received: (qmail 15435 invoked by uid 500); 30 Oct 2015 16:08:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 15371 invoked by uid 500); 30 Oct 2015 16:08:48 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 15362 invoked by uid 99); 30 Oct 2015 16:08:48 -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; Fri, 30 Oct 2015 16:08:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7FD51E0099; Fri, 30 Oct 2015 16:08:48 +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: <5f088ec15678461bb861edf49e9c814b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Minor update to OIDC service Date: Fri, 30 Oct 2015 16:08:48 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master d21d47f63 -> d58695e24 Minor update to OIDC service Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d58695e2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d58695e2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d58695e2 Branch: refs/heads/master Commit: d58695e24fa0cc7f951ba4894f0dc946fdfb27f6 Parents: d21d47f Author: Sergey Beryozkin Authored: Fri Oct 30 16:08:30 2015 +0000 Committer: Sergey Beryozkin Committed: Fri Oct 30 16:08:30 2015 +0000 ---------------------------------------------------------------------- .../cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d58695e2/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java index bb3b27e..e1e7c3f 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcAuthorizationCodeService.java @@ -37,7 +37,7 @@ public class OidcAuthorizationCodeService extends AuthorizationCodeGrantService // No need to challenge the authenticated user with the authorization form // if all the client application redirecting a user needs is to get this user authenticated // with OIDC IDP - return requestedScope.size() == 1 && skipAuthorizationWithOidcScope + return requestedScope.size() == 1 && permissions.size() == 1 && skipAuthorizationWithOidcScope && OPEN_ID_CONNECT_SCOPE.equals(requestedScope.get(0)); } public void setSkipAuthorizationWithOidcScope(boolean skipAuthorizationWithOidcScope) {