Eliminate syncAPI option.

Use oauth protected endpoint to get upload credentials.
NoriVicJr · Mar 3, 2014 · 5a40ec6 · 5a40ec6
1 parent ff7b45b
commit 5a40ec6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/_posts/docs/reference/0204-05-01-exporting.md b/_posts/docs/reference/0204-05-01-exporting.md
@@ -110,8 +110,7 @@ Options:
 <tr><td><strong>--scale=</strong>[num]                     </td><td>Scale factor (Default: undefined)</td></tr>
 <tr><td><strong>--concurrency=</strong>[num]               </td><td>Number of exports that can be run concurrently. (Default: 4)</td></tr>
 <tr><td><strong>--files=</strong>[path]                    </td><td>Path to files directory. (Default: "/home/aj/Documents/MapBox")</td></tr>
-<tr><td><strong>--syncAPI=</strong>[URL]                   </td><td>MapBox API URL. (Default: "http://api.tiles.mapbox.com")</td></tr>
-<tr><td><strong>--syncURL=</strong>[URL]                   </td><td>MapBox sync URL. (Default: "https://tiles.mapbox.com")</td></tr>
+<tr><td><strong>--syncURL=</strong>[URL]                   </td><td>MapBox sync URL. (Default: "https://api.mapbox.com")</td></tr>
 <tr><td><strong>--syncAccount=</strong>[account]           </td><td>MapBox account name. (Default: "")</td></tr>
 <tr><td><strong>--syncAccessToken=</strong>[token]         </td><td>MapBox access token. (Default: "")</td></tr>
 <tr><td><strong>--verbose=</strong>on|off                  </td><td>verbose logging (Default: "on")</td></tr>

diff --git a/commands/export.bones b/commands/export.bones
@@ -587,13 +587,12 @@ command.prototype.upload = function (callback) {
             handle: this.opts.project,
             token: this.opts.syncAccessToken
         });
-    var hash = crypto.createHash('md5')
-        .update(+new Date + '')
-        .digest('hex')
-        .substring(0, 6);
-    var policyEndpoint = url.format(_(url.parse(this.opts.syncAPI)).extend({
-            pathname: '/v2/'+ hash + '/upload.json'
-        }));
+    var policyEndpoint = _('<%=base%>/api/upload/<%=account%>?access_token=<%=token%>')
+        .template({
+            base: this.opts.syncURL,
+            account: this.opts.syncAccount,
+            token: this.opts.syncAccessToken
+        });
 
     Step(function() {
         request.get({

diff --git a/commands/global.bones b/commands/global.bones
@@ -8,12 +8,6 @@ Bones.Command.options['files'] = {
     'default': defaults.files.replace(/^~/, process.env.HOME)
 };
 
-Bones.Command.options['syncAPI'] = {
-    'title': 'syncAPI=[URL]',
-    'description': 'MapBox API URL.',
-    'default': defaults.syncAPI || ''
-};
-
 Bones.Command.options['syncURL'] = {
     'title': 'syncURL=[URL]',
     'description': 'MapBox sync URL.',

diff --git a/lib/config.defaults.json b/lib/config.defaults.json
@@ -6,7 +6,6 @@
     "sampledata": true,
     "host": false,
     "listenHost": "127.0.0.1",
-    "syncAPI": "http://api.tiles.mapbox.com",
     "syncURL": "https://api.mapbox.com",
     "server": false,
     "verbose": "on"