From 054e421829026d186d1bdbae4f404582b5595c70 Mon Sep 17 00:00:00 2001
From: theworldbright <kent@kentshikama.com>
Date: Fri, 7 Aug 2015 22:09:28 +0900
Subject: [PATCH] Remove zone info claim

---
 app/controllers/api/openid_connect/discovery_controller.rb | 2 +-
 app/serializers/user_info_serializer.rb                    | 6 +-----
 features/step_definitions/oidc_common_steps.rb             | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/openid_connect/discovery_controller.rb b/app/controllers/api/openid_connect/discovery_controller.rb
index df1cfec34..c6c8f6cc1 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 67cf3db11..86c89ef47 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 e9a812d41..f73d4407b 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|