X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a13b40ace9c98dd2271ef05811b448e28af1751a..b4d7a83adfb034c6647b54dd200bcc22d1824cee:/app/views/site/id.html.erb?ds=sidebyside diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index 39f75c8ca..64cb4fd58 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -8,17 +8,13 @@ -<% 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 %>