FEATURE: support SSO website and location overrides

Add location and website + the ability to override using SSO using the `sso_overrides_location` and `sso_overrides_website` site settings.
This commit is contained in:
mentalstring
2020-04-28 07:06:35 +01:00
committed by GitHub
parent 23ff071ebd
commit 67f3fe14aa
12 changed files with 89 additions and 12 deletions

View File

@@ -51,6 +51,8 @@ class UserSerializer < UserCardSerializer
:ignored_usernames,
:mailing_list_posts_per_day,
:can_change_bio,
:can_change_location,
:can_change_website,
:user_api_keys,
:user_auth_tokens
@@ -108,6 +110,14 @@ class UserSerializer < UserCardSerializer
!(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
end
def can_change_location
!(SiteSetting.enable_sso && SiteSetting.sso_overrides_location)
end
def can_change_website
!(SiteSetting.enable_sso && SiteSetting.sso_overrides_website)
end
def user_api_keys
keys = object.user_api_keys.where(revoked_at: nil).map do |k|
{

View File

@@ -27,6 +27,8 @@ class WebHookUserSerializer < UserSerializer
gravatar_avatar_upload_id
custom_avatar_upload_id
can_change_bio
can_change_location
can_change_website
user_api_keys
group_users
user_auth_tokens