Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 54aa48c0a -> 1f72ff889
Keeping IdToken and UserInfo as siblings as opposed to parent-child Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1f72ff88 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1f72ff88 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1f72ff88 Branch: refs/heads/3.0.x-fixes Commit: 1f72ff889d60774f33f12adabc78f273a70375dd Parents: 54aa48c Author: Sergey Beryozkin <[email protected]> Authored: Thu Dec 3 14:15:15 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Dec 3 14:28:24 2015 +0000 ---------------------------------------------------------------------- .../security/oidc/common/AbstractUserInfo.java | 178 +++++++++++++++++++ .../cxf/rs/security/oidc/common/IdToken.java | 2 +- .../cxf/rs/security/oidc/common/UserInfo.java | 146 +-------------- 3 files changed, 180 insertions(+), 146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1f72ff88/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java new file mode 100644 index 0000000..426b1ed --- /dev/null +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java @@ -0,0 +1,178 @@ +/** + * 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.common; + +import java.util.Map; + +import org.apache.cxf.helpers.CastUtils; +import org.apache.cxf.rs.security.jose.jwt.JwtClaims; + +public abstract class AbstractUserInfo extends JwtClaims { + public static final String NAME_CLAIM = "name"; + public static final String GIVEN_NAME_CLAIM = "given_name"; + public static final String FAMILY_NAME_CLAIM = "family_name"; + public static final String MIDDLE_NAME_CLAIM = "middle_name"; + public static final String NICKNAME_CLAIM = "nickname"; + public static final String PREFERRED_USERNAME_CLAIM = "preferred_username"; + public static final String PROFILE_CLAIM = "profile"; + public static final String PICTURE_CLAIM = "picture"; + public static final String WEBSITE_CLAIM = "website"; + public static final String EMAIL_CLAIM = "email"; + public static final String EMAIL_VERIFIED_CLAIM = "email_verified"; + public static final String GENDER_CLAIM = "gender"; + public static final String ZONEINFO_CLAIM = "zoneinfo"; + public static final String LOCALE_CLAIM = "locale"; + public static final String BIRTHDATE_CLAIM = "birthdate"; + public static final String PHONE_CLAIM = "phone_number"; + public static final String PHONE_VERIFIED_CLAIM = "phone_number_verified"; + public static final String ADDRESS_CLAIM = "address"; + public static final String UPDATED_AT_CLAIM = "updated_at"; + public AbstractUserInfo() { + } + public AbstractUserInfo(JwtClaims claims) { + this(claims.asMap()); + } + public AbstractUserInfo(Map<String, Object> claims) { + super(claims); + } + + public void setName(String name) { + setProperty(NAME_CLAIM, name); + } + public String getName() { + return (String)getProperty(NAME_CLAIM); + } + public void setGivenName(String name) { + setProperty(GIVEN_NAME_CLAIM, name); + } + public String getGivenName() { + return (String)getProperty(GIVEN_NAME_CLAIM); + } + public void setFamilyName(String name) { + setProperty(FAMILY_NAME_CLAIM, name); + } + public String getFamilyName() { + return (String)getProperty(FAMILY_NAME_CLAIM); + } + public void setMiddleName(String name) { + setProperty(MIDDLE_NAME_CLAIM, name); + } + public String getMiddleName() { + return (String)getProperty(MIDDLE_NAME_CLAIM); + } + public void setNickName(String name) { + setProperty(NICKNAME_CLAIM, name); + } + public String getNickName() { + return (String)getProperty(NICKNAME_CLAIM); + } + public void setPreferredUserName(String name) { + setProperty(PREFERRED_USERNAME_CLAIM, name); + } + public String getPreferredUserName() { + return (String)getProperty(PREFERRED_USERNAME_CLAIM); + } + public void setProfile(String name) { + setProperty(PROFILE_CLAIM, name); + } + public String getProfile() { + return (String)getProperty(PROFILE_CLAIM); + } + public void setPicture(String name) { + setProperty(PICTURE_CLAIM, name); + } + public String getPicture() { + return (String)getProperty(PICTURE_CLAIM); + } + public void setWebsite(String name) { + setProperty(WEBSITE_CLAIM, name); + } + public String getWebsite() { + return (String)getProperty(WEBSITE_CLAIM); + } + public void setGender(String name) { + setProperty(GENDER_CLAIM, name); + } + public String getGender() { + return (String)getProperty(GENDER_CLAIM); + } + public void setZoneInfo(String name) { + setProperty(ZONEINFO_CLAIM, name); + } + public String getZoneInfo() { + return (String)getProperty(ZONEINFO_CLAIM); + } + public void setLocale(String name) { + setProperty(LOCALE_CLAIM, name); + } + public String getLocale() { + return (String)getProperty(LOCALE_CLAIM); + } + public void setEmail(String name) { + setProperty(EMAIL_CLAIM, name); + } + public String getEmail() { + return (String)getProperty(EMAIL_CLAIM); + } + public void setEmailVerified(Boolean verified) { + setProperty(EMAIL_VERIFIED_CLAIM, verified); + } + public Boolean getEmailVerified() { + return getBooleanProperty(EMAIL_VERIFIED_CLAIM); + } + public void setBirthDate(String date) { + setProperty(BIRTHDATE_CLAIM, date); + } + public String getBirthdate() { + return (String)getProperty(BIRTHDATE_CLAIM); + } + public String getPhoneNumber() { + return (String)getProperty(PHONE_CLAIM); + } + public void setPhoneNumber(String name) { + setProperty(PHONE_CLAIM, name); + } + public void setPhoneVerified(Boolean verified) { + setProperty(PHONE_VERIFIED_CLAIM, verified); + } + public Boolean getPhoneVerified() { + return getBooleanProperty(PHONE_VERIFIED_CLAIM); + } + public UserAddress getUserAddress() { + Object value = getProperty(ADDRESS_CLAIM); + if (value instanceof UserAddress) { + return (UserAddress)value; + } else if (value instanceof Map) { + Map<String, Object> map = CastUtils.cast((Map<?, ?>)value); + return new UserAddress(map); + } else { + return null; + } + } + public void setUserAddressNumber(UserAddress address) { + setProperty(ADDRESS_CLAIM, address); + } + public void setUpdatedAt(Long time) { + setProperty(UPDATED_AT_CLAIM, time); + } + public Long getUpdatedAt() { + return getLongProperty(UPDATED_AT_CLAIM); + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/1f72ff88/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java index ed5f7f4..0bcd1f1 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/IdToken.java @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.rs.security.jose.jwt.JwtClaims; -public class IdToken extends UserInfo { +public class IdToken extends AbstractUserInfo { public static final String AUTH_TIME_CLAIM = "auth_time"; public static final String NONCE_CLAIM = "nonce"; public static final String ACR_CLAIM = "acr"; http://git-wip-us.apache.org/repos/asf/cxf/blob/1f72ff88/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java index 14278fd..f8da67a 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/UserInfo.java @@ -20,29 +20,9 @@ package org.apache.cxf.rs.security.oidc.common; import java.util.Map; -import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.rs.security.jose.jwt.JwtClaims; -public class UserInfo extends JwtClaims { - public static final String NAME_CLAIM = "name"; - public static final String GIVEN_NAME_CLAIM = "given_name"; - public static final String FAMILY_NAME_CLAIM = "family_name"; - public static final String MIDDLE_NAME_CLAIM = "middle_name"; - public static final String NICKNAME_CLAIM = "nickname"; - public static final String PREFERRED_USERNAME_CLAIM = "preferred_username"; - public static final String PROFILE_CLAIM = "profile"; - public static final String PICTURE_CLAIM = "picture"; - public static final String WEBSITE_CLAIM = "website"; - public static final String EMAIL_CLAIM = "email"; - public static final String EMAIL_VERIFIED_CLAIM = "email_verified"; - public static final String GENDER_CLAIM = "gender"; - public static final String ZONEINFO_CLAIM = "zoneinfo"; - public static final String LOCALE_CLAIM = "locale"; - public static final String BIRTHDATE_CLAIM = "birthdate"; - public static final String PHONE_CLAIM = "phone_number"; - public static final String PHONE_VERIFIED_CLAIM = "phone_number_verified"; - public static final String ADDRESS_CLAIM = "address"; - public static final String UPDATED_AT_CLAIM = "updated_at"; +public class UserInfo extends AbstractUserInfo { public UserInfo() { } public UserInfo(JwtClaims claims) { @@ -51,128 +31,4 @@ public class UserInfo extends JwtClaims { public UserInfo(Map<String, Object> claims) { super(claims); } - - public void setName(String name) { - setProperty(NAME_CLAIM, name); - } - public String getName() { - return (String)getProperty(NAME_CLAIM); - } - public void setGivenName(String name) { - setProperty(GIVEN_NAME_CLAIM, name); - } - public String getGivenName() { - return (String)getProperty(GIVEN_NAME_CLAIM); - } - public void setFamilyName(String name) { - setProperty(FAMILY_NAME_CLAIM, name); - } - public String getFamilyName() { - return (String)getProperty(FAMILY_NAME_CLAIM); - } - public void setMiddleName(String name) { - setProperty(MIDDLE_NAME_CLAIM, name); - } - public String getMiddleName() { - return (String)getProperty(MIDDLE_NAME_CLAIM); - } - public void setNickName(String name) { - setProperty(NICKNAME_CLAIM, name); - } - public String getNickName() { - return (String)getProperty(NICKNAME_CLAIM); - } - public void setPreferredUserName(String name) { - setProperty(PREFERRED_USERNAME_CLAIM, name); - } - public String getPreferredUserName() { - return (String)getProperty(PREFERRED_USERNAME_CLAIM); - } - public void setProfile(String name) { - setProperty(PROFILE_CLAIM, name); - } - public String getProfile() { - return (String)getProperty(PROFILE_CLAIM); - } - public void setPicture(String name) { - setProperty(PICTURE_CLAIM, name); - } - public String getPicture() { - return (String)getProperty(PICTURE_CLAIM); - } - public void setWebsite(String name) { - setProperty(WEBSITE_CLAIM, name); - } - public String getWebsite() { - return (String)getProperty(WEBSITE_CLAIM); - } - public void setGender(String name) { - setProperty(GENDER_CLAIM, name); - } - public String getGender() { - return (String)getProperty(GENDER_CLAIM); - } - public void setZoneInfo(String name) { - setProperty(ZONEINFO_CLAIM, name); - } - public String getZoneInfo() { - return (String)getProperty(ZONEINFO_CLAIM); - } - public void setLocale(String name) { - setProperty(LOCALE_CLAIM, name); - } - public String getLocale() { - return (String)getProperty(LOCALE_CLAIM); - } - public void setEmail(String name) { - setProperty(EMAIL_CLAIM, name); - } - public String getEmail() { - return (String)getProperty(EMAIL_CLAIM); - } - public void setEmailVerified(Boolean verified) { - setProperty(EMAIL_VERIFIED_CLAIM, verified); - } - public Boolean getEmailVerified() { - return getBooleanProperty(EMAIL_VERIFIED_CLAIM); - } - public void setBirthDate(String date) { - setProperty(BIRTHDATE_CLAIM, date); - } - public String getBirthdate() { - return (String)getProperty(BIRTHDATE_CLAIM); - } - public String getPhoneNumber() { - return (String)getProperty(PHONE_CLAIM); - } - public void setPhoneNumber(String name) { - setProperty(PHONE_CLAIM, name); - } - public void setPhoneVerified(Boolean verified) { - setProperty(PHONE_VERIFIED_CLAIM, verified); - } - public Boolean getPhoneVerified() { - return getBooleanProperty(PHONE_VERIFIED_CLAIM); - } - public UserAddress getUserAddress() { - Object value = getProperty(ADDRESS_CLAIM); - if (value instanceof UserAddress) { - return (UserAddress)value; - } else if (value instanceof Map) { - Map<String, Object> map = CastUtils.cast((Map<?, ?>)value); - return new UserAddress(map); - } else { - return null; - } - } - public void setUserAddressNumber(UserAddress address) { - setProperty(ADDRESS_CLAIM, address); - } - public void setUpdatedAt(Long time) { - setProperty(UPDATED_AT_CLAIM, time); - } - public Long getUpdatedAt() { - return getLongProperty(UPDATED_AT_CLAIM); - } - }
