diff --git a/index.html b/index.html index 69f83f76b..e66ca6be6 100644 --- a/index.html +++ b/index.html @@ -117,8 +117,12 @@
diff --git a/js/id/connection.js b/js/id/connection.js index 7b9f98a27..48740224b 100644 --- a/js/id/connection.js +++ b/js/id/connection.js @@ -5,9 +5,10 @@ iD.Connection = function() { connection = {}, refNodes = {}, user = {}, + keys, inflight = {}, loadedTiles = {}, - oauth = iD.OAuth(); + oauth = iD.OAuth().url(url); function bboxUrl(b) { return url + '/api/0.6/map?bbox=' + [b[0][0],b[1][1],b[1][0],b[0][1]]; @@ -259,6 +260,13 @@ iD.Connection = function() { return connection; }; + connection.keys = function(_) { + if (!arguments.length) return keys; + keys = _; + oauth.keys(keys); + return connection; + }; + connection.authenticate = function(callback) { function done(err, res) { event.auth(); diff --git a/js/id/oauth.js b/js/id/oauth.js index 56a7f4001..5573f6518 100644 --- a/js/id/oauth.js +++ b/js/id/oauth.js @@ -1,13 +1,9 @@ iD.OAuth = function() { - var baseurl = 'https://www.openstreetmap.org', + var baseurl = 'http://www.openstreetmap.org', oauth_secret = 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p', + o, keys, oauth = {}; - var o = { - oauth_consumer_key: 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R', - oauth_signature_method: 'HMAC-SHA1' - }; - function keyclean(x) { return x.replace(/\W/g, ''); } if (token('oauth_token')) { @@ -135,6 +131,14 @@ iD.OAuth = function() { oauth.url = function(_) { if (!arguments.length) return baseurl; baseurl = _; + if (keys && keys[baseurl]) o = keys[baseurl]; + return oauth; + }; + + oauth.keys = function(_) { + if (!arguments.length) return keys; + keys = _; + if (baseurl && keys[baseurl]) o = keys[baseurl]; return oauth; }; diff --git a/keys.json b/keys.json new file mode 100644 index 000000000..98159a654 --- /dev/null +++ b/keys.json @@ -0,0 +1,10 @@ +{ + "http://api06.dev.openstreetmap.org": { + "oauth_consumer_key": "zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R", + "oauth_signature_method": "HMAC-SHA1" + }, + "http://www.openstreetmap.org": { + "oauth_consumer_key": "5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT", + "oauth_signature_method": "HMAC-SHA1" + } +}