Support hosts (e.g. notify) and auth (e.g. noauth)

Author: Steve Marx

generator/generate_routes.py

@@ -68,13 +68,13 @@ def main():
     }
     subprocess.check_output(
         (['python', '-m', 'stone.cli', 'js_types', dropbox_pkg_path] +
-         specs + ['-b', 'team'] + ['-a', 'host', '-a', 'style'] +
+         specs + ['-b', 'team'] + ['-a', 'host', '-a', 'style', '-a', 'auth'] +
          ['--', 'types.js', '-e', json.dumps(upload_arg)]),
         cwd=stone_path)
 
     subprocess.check_output(
         (['python', '-m', 'stone.cli', 'js_client', dropbox_pkg_path] +
-         specs + ['-b', 'team'] + ['-a', 'host', '-a', 'style'] +
+         specs + ['-b', 'team'] + ['-a', 'host', '-a', 'style', '-a', 'auth'] +
          ['--', 'routes.js', '-c', 'Dropbox']),
 #          '-e', json.dumps(upload_arg)]),
         cwd=stone_path)
@@ -84,7 +84,7 @@ def main():
     subprocess.check_output(
         (['python', '-m', 'stone.cli', 'js_client', dropbox_pkg_path] +
          specs + ['-w', 'team', '-f', 'style!="upload" and style!="download"'] +
-         ['-a', 'host', '-a', 'style'] + ['--', 'routes-team.js', '-c', 'DropboxTeam']),
+         ['-a', 'host', '-a', 'style', '-a', 'auth'] + ['--', 'routes-team.js', '-c', 'DropboxTeam']),
         cwd=stone_path)
 
 if __name__ == '__main__':

src/download-request.js

@@ -1,10 +1,10 @@
 var request = require('superagent');
 var Promise = require('es6-promise').Promise;
+var getBaseURL = require('./get-base-url');
 
 var buildCustomError;
 var downloadRequest;
 var nodeBinaryParser;
-var BASE_URL = 'https://content.dropboxapi.com/2/';
 
 // Register a handler that will instruct superagent how to parse the response
 request.parse['application/octect-stream'] = function (obj) {
@@ -29,7 +29,11 @@ nodeBinaryParser = function (res, done) {
   });
 };
 
-downloadRequest = function (path, args, accessToken, selectUser) {
+downloadRequest = function (path, args, auth, host, accessToken, selectUser) {
+  if (auth !== 'user') {
+    throw new Error('Unexpected auth type: ' + auth);
+  }
+
   var promiseFunction = function (resolve, reject) {
     var apiRequest;
 
@@ -62,7 +66,7 @@ downloadRequest = function (path, args, accessToken, selectUser) {
       }
     }
 
-    apiRequest = request.post(BASE_URL + path)
+    apiRequest = request.post(getBaseURL(host) + path)
       .set('Authorization', 'Bearer ' + accessToken)
       .set('Dropbox-API-Arg', JSON.stringify(args))
       .on('request', function () {

src/dropbox-base.js

@@ -88,15 +88,23 @@ DropboxBase.prototype.getAuthenticationUrl = function (redirectUri, state) {
   return authUrl;
 };
 
-DropboxBase.prototype.request = function (path, args, host, style) {
-  if (style === REQUEST_CONSTANTS.RPC) {
-    return this.getRpcRequest()(path, args, this.getAccessToken(), this.selectUser);
-  } else if (style === REQUEST_CONSTANTS.DOWNLOAD) {
-    return this.getDownloadRequest()(path, args, this.getAccessToken(), this.selectUser);
-  } else if (style === REQUEST_CONSTANTS.UPLOAD) {
-    return this.getUploadRequest()(path, args, this.getAccessToken(), this.selectUser);
+DropboxBase.prototype.request = function (path, args, auth, host, style) {
+  var request = null;
+  switch (style) {
+    case REQUEST_CONSTANTS.RPC:
+      request = this.getRpcRequest();
+      break;
+    case REQUEST_CONSTANTS.DOWNLOAD:
+      request = this.getDownloadRequest();
+      break;
+    case REQUEST_CONSTANTS.UPLOAD:
+      request = this.getUploadRequest();
+      break;
+    default:
+      throw new Error('Invalid request style: ' + style);
   }
-  throw new Error('Invalid request type');
+
+  return request(path, args, auth, host, this.getAccessToken(), this.selectUser);
 };
 
 DropboxBase.prototype.setRpcRequest = function (newRpcRequest) {

src/get-base-url.js

@@ -0,0 +1,5 @@
+function getBaseURL(host) {
+  return 'https://' + host + '.dropboxapi.com/2/';
+}
+
+module.exports = getBaseURL;