Merge remote-tracking branch 'upstream/pull/5410'

[rails.git] / app / views / site / id.html.erb
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb

index 39f75c8cac722abed2a1257d647267a94bcb9e65..64cb4fd58e84be24042079846fb0364899454b72 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -8,17 +8,13 @@
    <!-- <![endif]-->
  </head>
  <body>
    <!-- <![endif]-->
  </head>
  <body>
-<% data = {} -%>
-<% if Settings.key?(:id_key) %>
-<% token = current_user.access_token(Settings.id_key) %>
-<% data[:token] = token.token -%>
-<% data[:token_secret] = token.secret -%>
-<% data[:consumer_key] = token.client_application.key -%>
-<% data[:consumer_secret] = token.client_application.secret -%>
-<% end %>
-<% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>
-<% data[:locale_path] = asset_path("iD/locales/#{data[:locale]}.json") -%>
-<% data[:asset_map] = assets("iD").to_json -%>
+<% data = {}
+   if Settings.key?(:id_application)
+     token = current_user.oauth_token(Settings.id_application)
+     data[:token] = token.token
+   end
+   data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s
+   data[:asset_map] = assets("iD").to_json %>
  <%= tag.div "", :id => "id-container", :data => data %>
  </body>
  </html>
  <%= tag.div "", :id => "id-container", :data => data %>
  </body>
  </html>