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 15C791869E for ; Tue, 10 Nov 2015 13:20:50 +0000 (UTC) Received: (qmail 87966 invoked by uid 500); 10 Nov 2015 13:20:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87908 invoked by uid 500); 10 Nov 2015 13:20: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 87899 invoked by uid 99); 10 Nov 2015 13:20: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; Tue, 10 Nov 2015 13:20:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4AEEDFD86; Tue, 10 Nov 2015 13:20: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: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Fixing an openid scope constant Date: Tue, 10 Nov 2015 13:20:48 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 4a8b60d9a -> e10281adf Fixing an openid scope constant Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e10281ad Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e10281ad Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e10281ad Branch: refs/heads/master Commit: e10281adf28fa2f840b3b518e3eb98ba47f5572d Parents: 4a8b60d Author: Sergey Beryozkin Authored: Tue Nov 10 13:20:33 2015 +0000 Committer: Sergey Beryozkin Committed: Tue Nov 10 13:20:33 2015 +0000 ---------------------------------------------------------------------- .../cxf/rs/security/oidc/utils/OidcUtils.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e10281ad/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java index 7ced717..42837fd 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java @@ -33,7 +33,7 @@ import org.apache.cxf.rt.security.crypto.MessageDigestUtils; public final class OidcUtils { public static final String ID_TOKEN = "id_token"; - public static final String OIDC_SCOPE = "oidc"; + public static final String OPENID_SCOPE = "openid"; public static final String PROFILE_SCOPE = "profile"; public static final String EMAIL_SCOPE = "email"; public static final String ADDRESS_SCOPE = "address"; @@ -56,23 +56,23 @@ public final class OidcUtils { private OidcUtils() { } - public static String getOidcScope() { - return OIDC_SCOPE; + public static String getOpenIdScope() { + return OPENID_SCOPE; } public static String getProfileScope() { - return getScope(OIDC_SCOPE, PROFILE_SCOPE); + return getScope(OPENID_SCOPE, PROFILE_SCOPE); } public static String getEmailScope() { - return getScope(OIDC_SCOPE, EMAIL_SCOPE); + return getScope(OPENID_SCOPE, EMAIL_SCOPE); } public static String getAddressScope() { - return getScope(OIDC_SCOPE, ADDRESS_SCOPE); + return getScope(OPENID_SCOPE, ADDRESS_SCOPE); } public static String getPhoneScope() { - return getScope(OIDC_SCOPE, PHONE_SCOPE); + return getScope(OPENID_SCOPE, PHONE_SCOPE); } public static String getAllScopes() { - return getScope(OIDC_SCOPE, PROFILE_SCOPE, EMAIL_SCOPE, ADDRESS_SCOPE, PHONE_SCOPE); + return getScope(OPENID_SCOPE, PROFILE_SCOPE, EMAIL_SCOPE, ADDRESS_SCOPE, PHONE_SCOPE); } public static List getScopeProperties(String scope) { return SCOPES_MAP.get(scope);