CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to osm-auth v2 which uses OAuth2 to connect to OSM API

Browse Source
This commit is contained in:
Bryan Housel
2022-04-27 14:32:20 -04:00
committed by Martin Raifer
parent e4ed585ce4
commit 6058f89460
5 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.html vendored
View File

@@ -45,13 +45,13 @@
.assetPath('')
.apiConnections([
{
'urlroot': 'https://www.openstreetmap.org',
'oauth_consumer_key': '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
'oauth_secret': 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL'
url: 'https://www.openstreetmap.org',
client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE'
}, {
'urlroot': 'https://api06.dev.openstreetmap.org',
'oauth_consumer_key': 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R',
'oauth_secret': 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p'
url: 'https://api06.dev.openstreetmap.org',
client_id: 'zod4KxHLYtOOvr8LTdUIhZqeAtDxzHRoEsaNkMt2pBc',
client_secret: 'wnDUzUidx8CM948E5fgdk89_-IeOOyjfvDhtn0-mX6k'
}
])
.containerNode(container);

12
index.html
View File

@@ -45,13 +45,13 @@
.assetPath('dist/')
.apiConnections([
{
'urlroot': 'https://www.openstreetmap.org',
'oauth_consumer_key': '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
'oauth_secret': 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL'
url: 'https://www.openstreetmap.org',
client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE'
}, {
'urlroot': 'https://api06.dev.openstreetmap.org',
'oauth_consumer_key': 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R',
'oauth_secret': 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p'
url: 'https://api06.dev.openstreetmap.org',
client_id: 'zod4KxHLYtOOvr8LTdUIhZqeAtDxzHRoEsaNkMt2pBc',
client_secret: 'wnDUzUidx8CM948E5fgdk89_-IeOOyjfvDhtn0-mX6k'
}
])
.containerNode(container);

35
modules/services/osm.js
View File

@@ -2,26 +2,30 @@ import _throttle from 'lodash-es/throttle';
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { json as d3_json, xml as d3_xml } from 'd3-fetch';
import osmAuth from 'osm-auth';
import { osmAuth } from 'osm-auth';
import RBush from 'rbush';
import { JXON } from '../util/jxon';
import { geoExtent, geoRawMercator, geoVecAdd, geoZoomToScale } from '../geo';
import { osmEntity, osmNode, osmNote, osmRelation, osmWay } from '../osm';
import { utilArrayChunk, utilArrayGroupBy, utilArrayUniq, utilRebind, utilTiler, utilQsString } from '../util';
import { utilArrayChunk, utilArrayGroupBy, utilArrayUniq, utilObjectOmit, utilRebind, utilTiler, utilQsString } from '../util';
var tiler = utilTiler();
var dispatch = d3_dispatch('apiStatusChange', 'authLoading', 'authDone', 'change', 'loading', 'loaded', 'loadedNotes');
var urlroot = 'https://www.openstreetmap.org';
var redirectPath = window.location.origin + window.location.pathname;
var oauth = osmAuth({
url: urlroot,
oauth_consumer_key: '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
oauth_secret: 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL',
client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE',
scope: 'read_prefs write_prefs write_api read_gpx write_notes',
redirect_uri: redirectPath + 'land.html',
loading: authLoading,
done: authDone
});
// hardcode default block of Google Maps
var _imageryBlocklists = [/.*\.google(apis)?\..*\/(vt|kh)[\?\/].*([xyz]=.*){3}.*/];
var _tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: new RBush() };
@@ -785,7 +789,7 @@ export default {
var options = {
method: 'PUT',
path: '/api/0.6/changeset/create',
options: { header: { 'Content-Type': 'text/xml' } },
headers: { 'Content-Type': 'text/xml' },
content: JXON.stringify(changeset.asJXON())
};
_changeset.inflight = oauth.xhr(
@@ -806,7 +810,7 @@ export default {
var options = {
method: 'POST',
path: '/api/0.6/changeset/' + changesetID + '/upload',
options: { header: { 'Content-Type': 'text/xml' } },
headers: { 'Content-Type': 'text/xml' },
content: JXON.stringify(changeset.osmChangeJXON(changes))
};
_changeset.inflight = oauth.xhr(
@@ -832,7 +836,7 @@ export default {
oauth.xhr({
method: 'PUT',
path: '/api/0.6/changeset/' + changeset.id + '/close',
options: { header: { 'Content-Type': 'text/xml' } }
headers: { 'Content-Type': 'text/xml' }
}, function() { return true; });
}
}
@@ -1267,14 +1271,13 @@ export default {
},
switch: function(options) {
urlroot = options.urlroot;
switch: function(newOptions) {
urlroot = newOptions.url;
oauth.options(Object.assign({
url: urlroot,
loading: authLoading,
done: authDone
}, options));
// Copy the existing options, but omit 'access_token'.
// (if we did preauth, access_token won't work on a different server)
var oldOptions = utilObjectOmit(oauth.options(), 'access_token');
oauth.options(Object.assign(oldOptions, newOptions));
this.reset();
this.userChangesets(function() {}); // eagerly load user details/changesets
@@ -1384,7 +1387,7 @@ export default {
that.userChangesets(function() {}); // eagerly load user details/changesets
}
return oauth.authenticate(done);
oauth.authenticate(done);
},

6
package.json
View File

@@ -58,8 +58,8 @@
"fast-json-stable-stringify": "2.1.0",
"lodash-es": "~4.17.15",
"marked": "~4.0.12",
"node-diff3": "3.1.0",
"osm-auth": "1.1.1",
"node-diff3": "~3.1.0",
"osm-auth": "~2.0.0",
"pannellum": "2.5.6",
"pbf": "^3.2.1",
"polygon-clipping": "~0.15.1",
@@ -122,4 +122,4 @@
"browserslist": [
"> 0.2%, last 6 major versions, Firefox ESR, maintained node versions"
]
}
}

81
test/spec/services/osm.js
View File

@@ -4,11 +4,10 @@ describe('iD.serviceOsm', function () {
function login() {
connection.switch({
urlroot: 'http://www.openstreetmap.org',
oauth_consumer_key: '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
oauth_secret: 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL',
oauth_token: 'foo',
oauth_token_secret: 'foo'
url: 'https://www.openstreetmap.org',
client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE',
access_token: 'foo' // preauth
});
}
@@ -28,7 +27,7 @@ describe('iD.serviceOsm', function () {
serverXHR = sinon.fakeServer.create(); // authenticated calls use XHR via osm-auth
context = iD.coreContext().assetPath('../dist/').init();
connection = context.connection();
connection.switch({ urlroot: 'http://www.openstreetmap.org' });
connection.switch({ url: 'https://www.openstreetmap.org' });
connection.reset();
spy = sinon.spy();
});
@@ -54,7 +53,7 @@ describe('iD.serviceOsm', function () {
it('changes the connection id every time connection is switched', function () {
var cid1 = connection.getConnectionId();
connection.switch({ urlroot: 'https://api06.dev.openstreetmap.org' });
connection.switch({ url: 'https://api06.dev.openstreetmap.org' });
var cid2 = connection.getConnectionId();
expect(cid2).to.be.above(cid1);
});
@@ -62,11 +61,11 @@ describe('iD.serviceOsm', function () {
describe('#changesetURL', function() {
it('provides a changeset url', function() {
expect(connection.changesetURL(2)).to.eql('http://www.openstreetmap.org/changeset/2');
expect(connection.changesetURL(2)).to.eql('https://www.openstreetmap.org/changeset/2');
});
it('allows secure connections', function() {
connection.switch({ urlroot: 'https://www.openstreetmap.org' });
connection.switch({ url: 'https://www.openstreetmap.org' });
expect(connection.changesetURL(2)).to.eql('https://www.openstreetmap.org/changeset/2');
});
});
@@ -75,47 +74,47 @@ describe('iD.serviceOsm', function () {
it('provides a local changesets url', function() {
var center = [-74.65, 40.65];
var zoom = 17;
expect(connection.changesetsURL(center, zoom)).to.eql('http://www.openstreetmap.org/history#map=17/40.65000/-74.65000');
expect(connection.changesetsURL(center, zoom)).to.eql('https://www.openstreetmap.org/history#map=17/40.65000/-74.65000');
});
});
describe('#entityURL', function() {
it('provides an entity url for a node', function() {
var e = iD.osmNode({id: 'n1'});
expect(connection.entityURL(e)).to.eql('http://www.openstreetmap.org/node/1');
expect(connection.entityURL(e)).to.eql('https://www.openstreetmap.org/node/1');
});
it('provides an entity url for a way', function() {
var e = iD.osmWay({id: 'w1'});
expect(connection.entityURL(e)).to.eql('http://www.openstreetmap.org/way/1');
expect(connection.entityURL(e)).to.eql('https://www.openstreetmap.org/way/1');
});
it('provides an entity url for a relation', function() {
var e = iD.osmRelation({id: 'r1'});
expect(connection.entityURL(e)).to.eql('http://www.openstreetmap.org/relation/1');
expect(connection.entityURL(e)).to.eql('https://www.openstreetmap.org/relation/1');
});
});
describe('#historyURL', function() {
it('provides a history url for a node', function() {
var e = iD.osmNode({id: 'n1'});
expect(connection.historyURL(e)).to.eql('http://www.openstreetmap.org/node/1/history');
expect(connection.historyURL(e)).to.eql('https://www.openstreetmap.org/node/1/history');
});
it('provides a history url for a way', function() {
var e = iD.osmWay({id: 'w1'});
expect(connection.historyURL(e)).to.eql('http://www.openstreetmap.org/way/1/history');
expect(connection.historyURL(e)).to.eql('https://www.openstreetmap.org/way/1/history');
});
it('provides a history url for a relation', function() {
var e = iD.osmRelation({id: 'r1'});
expect(connection.historyURL(e)).to.eql('http://www.openstreetmap.org/relation/1/history');
expect(connection.historyURL(e)).to.eql('https://www.openstreetmap.org/relation/1/history');
});
});
describe('#userURL', function() {
it('provides a user url', function() {
expect(connection.userURL('bob')).to.eql('http://www.openstreetmap.org/user/bob');
expect(connection.userURL('bob')).to.eql('https://www.openstreetmap.org/user/bob');
});
});
@@ -127,13 +126,13 @@ describe('iD.serviceOsm', function () {
describe('#switch', function() {
it('changes the URL', function() {
connection.switch({ urlroot: 'http://example.com' });
expect(connection.changesetURL(1)).to.equal('http://example.com/changeset/1');
connection.switch({ url: 'https://example.com' });
expect(connection.changesetURL(1)).to.equal('https://example.com/changeset/1');
});
it('emits a change event', function() {
connection.on('change', spy);
connection.switch({ urlroot: 'http://example.com' });
connection.switch({ url: 'https://example.com' });
expect(spy).to.have.been.calledOnce;
});
});
@@ -152,7 +151,7 @@ describe('iD.serviceOsm', function () {
'}';
it('returns an object', function(done) {
fetchMock.mock('http://www.openstreetmap.org' + path, {
fetchMock.mock('https://www.openstreetmap.org' + path, {
body: response,
status: 200,
headers: { 'Content-Type': 'application/json' }
@@ -166,12 +165,12 @@ describe('iD.serviceOsm', function () {
});
it('retries an authenticated call unauthenticated if 400 Bad Request', function (done) {
fetchMock.mock('http://www.openstreetmap.org' + path, {
fetchMock.mock('https://www.openstreetmap.org' + path, {
body: response,
status: 200,
headers: { 'Content-Type': 'application/json' }
});
serverXHR.respondWith('GET', 'http://www.openstreetmap.org' + path,
serverXHR.respondWith('GET', 'https://www.openstreetmap.org' + path,
[400, { 'Content-Type': 'text/plain' }, 'Bad Request']);
login();
@@ -189,12 +188,12 @@ describe('iD.serviceOsm', function () {
});
it('retries an authenticated call unauthenticated if 401 Unauthorized', function (done) {
fetchMock.mock('http://www.openstreetmap.org' + path, {
fetchMock.mock('https://www.openstreetmap.org' + path, {
body: response,
status: 200,
headers: { 'Content-Type': 'application/json' }
});
serverXHR.respondWith('GET', 'http://www.openstreetmap.org' + path,
serverXHR.respondWith('GET', 'https://www.openstreetmap.org' + path,
[401, { 'Content-Type': 'text/plain' }, 'Unauthorized']);
login();
@@ -211,12 +210,12 @@ describe('iD.serviceOsm', function () {
});
it('retries an authenticated call unauthenticated if 403 Forbidden', function (done) {
fetchMock.mock('http://www.openstreetmap.org' + path, {
fetchMock.mock('https://www.openstreetmap.org' + path, {
body: response,
status: 200,
headers: { 'Content-Type': 'application/json' }
});
serverXHR.respondWith('GET', 'http://www.openstreetmap.org' + path,
serverXHR.respondWith('GET', 'https://www.openstreetmap.org' + path,
[403, { 'Content-Type': 'text/plain' }, 'Forbidden']);
login();
@@ -234,7 +233,7 @@ describe('iD.serviceOsm', function () {
it('dispatches change event if 509 Bandwidth Limit Exceeded', function (done) {
fetchMock.mock('http://www.openstreetmap.org' + path, {
fetchMock.mock('https://www.openstreetmap.org' + path, {
body: 'Bandwidth Limit Exceeded',
status: 509,
headers: { 'Content-Type': 'text/plain' }
@@ -250,7 +249,7 @@ describe('iD.serviceOsm', function () {
});
it('dispatches change event if 429 Too Many Requests', function (done) {
fetchMock.mock('http://www.openstreetmap.org' + path, {
fetchMock.mock('https://www.openstreetmap.org' + path, {
body: '429 Too Many Requests',
status: 429,
headers: { 'Content-Type': 'text/plain' }
@@ -347,7 +346,7 @@ describe('iD.serviceOsm', function () {
'}';
it('loads a node', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/0.6/node/1.json', {
fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1.json', {
body: nodeResponse,
status: 200,
headers: { 'Content-Type': 'application/json' }
@@ -362,7 +361,7 @@ describe('iD.serviceOsm', function () {
});
it('loads a way', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/0.6/way/1/full.json', {
fetchMock.mock('https://www.openstreetmap.org/api/0.6/way/1/full.json', {
body: wayResponse,
status: 200,
headers: { 'Content-Type': 'application/json' }
@@ -377,7 +376,7 @@ describe('iD.serviceOsm', function () {
});
it('does not ignore repeat requests', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/0.6/node/1.json', {
fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1.json', {
body: wayResponse,
status: 200,
headers: { 'Content-Type': 'application/json' }
@@ -416,7 +415,7 @@ describe('iD.serviceOsm', function () {
'}';
it('loads a node', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/0.6/node/1/1.json', {
fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1/1.json', {
body: nodeResponse,
status: 200,
headers: { 'Content-Type': 'application/json' }
@@ -431,7 +430,7 @@ describe('iD.serviceOsm', function () {
});
it('loads a way', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/0.6/way/1/1.json', {
fetchMock.mock('https://www.openstreetmap.org/api/0.6/way/1/1.json', {
body: wayResponse,
status: 200,
headers: { 'Content-Type': 'application/json' }
@@ -446,7 +445,7 @@ describe('iD.serviceOsm', function () {
});
it('does not ignore repeat requests', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/0.6/node/1/1.json', {
fetchMock.mock('https://www.openstreetmap.org/api/0.6/node/1/1.json', {
body: nodeResponse,
status: 200,
headers: { 'Content-Type': 'application/json' }
@@ -510,7 +509,7 @@ describe('iD.serviceOsm', function () {
done();
});
serverXHR.respondWith('GET', 'http://www.openstreetmap.org/api/0.6/changesets?user=1',
serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
[200, { 'Content-Type': 'text/xml' }, changesetsXML]);
serverXHR.respond();
});
@@ -539,7 +538,7 @@ describe('iD.serviceOsm', function () {
done();
});
serverXHR.respondWith('GET', 'http://www.openstreetmap.org/api/0.6/changesets?user=1',
serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
[200, { 'Content-Type': 'text/xml' }, changesetsXML]);
serverXHR.respond();
});
@@ -569,7 +568,7 @@ describe('iD.serviceOsm', function () {
done();
});
serverXHR.respondWith('GET', 'http://www.openstreetmap.org/api/0.6/changesets?user=1',
serverXHR.respondWith('GET', 'https://www.openstreetmap.org/api/0.6/changesets?user=1',
[200, { 'Content-Type': 'text/xml' }, changesetsXML]);
serverXHR.respond();
});
@@ -768,7 +767,7 @@ describe('iD.serviceOsm', function () {
describe('#status', function() {
it('gets API status', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/capabilities', {
fetchMock.mock('https://www.openstreetmap.org/api/capabilities', {
body: capabilitiesXML,
status: 200,
headers: { 'Content-Type': 'text/xml' }
@@ -785,7 +784,7 @@ describe('iD.serviceOsm', function () {
describe('#imageryBlocklists', function() {
it('updates imagery blocklists', function(done) {
fetchMock.mock('http://www.openstreetmap.org/api/capabilities', {
fetchMock.mock('https://www.openstreetmap.org/api/capabilities', {
body: capabilitiesXML,
status: 200,
headers: { 'Content-Type': 'text/xml' }
@@ -802,4 +801,4 @@ describe('iD.serviceOsm', function () {
});
});
});
});