diff --git a/app/controllers/api/openid_connect/discovery_controller.rb b/app/controllers/api/openid_connect/discovery_controller.rb index df1cfec34175a1a593fd922bc5ad5145cefbf3a9..c6c8f6cc10319062a5db6f2e5b494439f9b61c9d 100644 --- a/app/controllers/api/openid_connect/discovery_controller.rb +++ b/app/controllers/api/openid_connect/discovery_controller.rb @@ -26,7 +26,7 @@ module Api subject_types_supported: %w(public pairwise), id_token_signing_alg_values_supported: %i(RS256), token_endpoint_auth_methods_supported: %w(client_secret_basic client_secret_post), - claims_supported: %w(sub nickname profile picture zoneinfo) + claims_supported: %w(sub nickname profile picture) ) end end diff --git a/app/serializers/user_info_serializer.rb b/app/serializers/user_info_serializer.rb index 67cf3db112705dc6512bb5f4497087ca670de14f..86c89ef47f9d26e2c0100f47153e96d37865ed3e 100644 --- a/app/serializers/user_info_serializer.rb +++ b/app/serializers/user_info_serializer.rb @@ -1,5 +1,5 @@ class UserInfoSerializer < ActiveModel::Serializer - attributes :sub, :nickname, :profile, :picture, :zoneinfo + attributes :sub, :nickname, :profile, :picture def sub auth = serialization_options[:authorization] @@ -24,8 +24,4 @@ class UserInfoSerializer < ActiveModel::Serializer def picture File.join(AppConfig.environment.url, object.image_url).to_s end - - def zoneinfo - object.language - end end diff --git a/features/step_definitions/oidc_common_steps.rb b/features/step_definitions/oidc_common_steps.rb index e9a812d41f6a7ea84c2c1b0eba2e7f744d384da1..f73d4407bf8968965ebbdeaf8fac3451db831967 100644 --- a/features/step_definitions/oidc_common_steps.rb +++ b/features/step_definitions/oidc_common_steps.rb @@ -32,7 +32,6 @@ Then /^I should receive "([^\"]*)"'s id, username, and email$/ do |username| user = User.find_by_username(username) user_profile_url = File.join(AppConfig.environment.url, "people", user.guid).to_s expect(user_info_json["profile"]).to have_content(user_profile_url) - expect(user_info_json["zoneinfo"]).to have_content(user.language) end Then /^I should receive an "([^\"]*)" error$/ do |error_message|