cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename id_oauth_application to id_application in settings

Browse source
This commit is contained in:
Tom Hughes 2022-06-08 13:28:07 +01:00
parent a566589c1b
commit 16210d9f4f
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CONFIGURE.md
View file

@ -73,7 +73,7 @@ For iD, do the following:
* 'Modify notes'
* On the next page, copy the "Client ID"
* Edit config/settings.local.yml in your rails tree
* Add the "id_oauth_application" configuration with the "Client ID" as the value
* Add the "id_application" configuration with the "Client ID" as the value
* Restart your rails server
An example excerpt from settings.local.yml:
@ -82,7 +82,7 @@ An example excerpt from settings.local.yml:
# Default editor
default_editor: "id"
# OAuth 2 Client ID for iD
id_oauth_application: "Snv…OA0"
id_application: "Snv…OA0"
```
To allow [Notes](https://wiki.openstreetmap.org/wiki/Notes) and changeset discussions to work, follow a similar process, this time registering an OAuth 2 application for the web site:

2
app/views/site/_id.html.erb
View file

@ -1,7 +1,7 @@
<%= javascript_include_tag "edit/id" %>
<div id="map">
<% data = { :configured => Settings.key?(:id_oauth_application) }
<% data = { :configured => Settings.key?(:id_application) }
data[:lat] = @lat if @lat
data[:lon] = @lon if @lon
data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]

4
app/views/site/id.html.erb
View file

@ -9,8 +9,8 @@
</head>
<body>
<% data = {}
if Settings.key?(:id_oauth_application)
token = current_user.oauth_token(Settings.id_oauth_application)
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

4
config/settings.yml
View file

@ -81,8 +81,8 @@ nominatim_url: "https://nominatim.openstreetmap.org/"
default_editor: "id"
# OAuth application for the web site
#oauth_application: ""
# OAuth consumer key for iD
#id_oauth_application: ""
# OAuth application for iD
#id_application: ""
# Imagery to return in capabilities as blacklisted
imagery_blacklist:
# Current Google imagery URLs have google or googleapis in the domain