From 0c11f4d4fc6db309f666e85d77849c3751949276 Mon Sep 17 00:00:00 2001 From: FatShotty Date: Fri, 6 May 2016 12:44:28 +0200 Subject: [PATCH] return request object --- lib/index.js | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/lib/index.js b/lib/index.js index 2c1fa16..9db75c3 100644 --- a/lib/index.js +++ b/lib/index.js @@ -48,7 +48,7 @@ Box.prototype.refreshAccessToken = function (callback) { throw new Error('You need to provide a client id and client secret '); } else { - request + return request .post(this.options.refresh_url + '/oauth2/token') .field('grant_type', "refresh_token") .field('client_id', this.options.client_id) @@ -95,7 +95,7 @@ Search.prototype.new = function (query, params, callback) { } } - request + return request .get(uri) .set('Authorization', this.options.auth) .end(function (res) { @@ -129,7 +129,7 @@ function addMethod (object, name, fn) { // Uploads a file to a given folder... no custom filename addMethod(Files.prototype, 'upload', function (filepath, folder, callback) { - request + return request .post(this.options.upload_url+'/'+this.resource+'/content') .set('Authorization', this.options.auth) .field('parent_id', folder) @@ -145,7 +145,7 @@ addMethod(Files.prototype, 'upload', function (filepath, folder, callback) { // Uploads a file to a given folder a with custom filename addMethod(Files.prototype, 'upload', function (filepath, filename, folder, callback) { - request + return request .post(this.options.upload_url+'/'+this.resource+'/content') .set('Authorization', this.options.auth) .field('attributes', JSON.stringify({ @@ -166,7 +166,7 @@ addMethod(Files.prototype, 'upload', function (filepath, filename, folder, callb // Retrieves a download link for the given file addMethod(Files.prototype, 'download', function (file, callback) { - request + return request .get(this.options.base_url+'/'+this.resource+ '/' +file+ '/content') .set('Authorization', this.options.auth) .redirects(0) @@ -193,6 +193,7 @@ addMethod(Files.prototype, 'download', function (file, shareLink, callback) { callback(null, res.headers.location); }); + return req; }); Files.prototype.info = function (file, fields, callback) { @@ -206,7 +207,7 @@ Files.prototype.info = function (file, fields, callback) { uri += '?fields=' + fields; } - request + return request .get(uri) .set('Authorization', this.options.auth) .end(function (res) { @@ -220,7 +221,7 @@ Files.prototype.info = function (file, fields, callback) { // Creates metadata for a given file Files.prototype.createMetadata = function (file, metadata, callback) { - request + return request .post(this.options.base_url+'/'+this.resource+'/'+file+'/metadata/properties') .set('Authorization', this.options.auth) .send(metadata) @@ -234,7 +235,7 @@ Files.prototype.createMetadata = function (file, metadata, callback) { // Retrieves metadata for a given file Files.prototype.getAllMetadata = function(file, callback){ - request + return request .get(this.options.base_url+'/'+this.resource+'/'+file+'/metadata/') .set('Authorization', this.options.auth) .end(function(res){ @@ -247,7 +248,7 @@ Files.prototype.getAllMetadata = function(file, callback){ // Retrieves specific metadata (defined by ) for a given file Files.prototype.getMetadata = function(file, path, callback){ - request + return request .get(this.options.base_url+'/'+this.resource+'/'+file+'/metadata/'+path) .set('Authorization', this.options.auth) .end(function(res){ @@ -264,7 +265,7 @@ Files.prototype.createSharedLink = function(file, sharedLinkSettings, callback) sharedLinkSettings = {"shared_link": {}}; } - request + return request .put(this.options.base_url+'/'+this.resource+'/'+file) .set('Authorization', this.options.auth) .send(sharedLinkSettings) @@ -289,7 +290,7 @@ Folders.prototype.createSharedLink = function(folder, sharedLinkSettings, callba sharedLinkSettings = {"shared_link": {}}; } - request + return request .put(this.options.base_url+'/'+this.resource+'/'+folder) .set('Authorization', this.options.auth) .send(sharedLinkSettings) @@ -304,7 +305,7 @@ Folders.prototype.createSharedLink = function(folder, sharedLinkSettings, callba // Retrieves info and lists contents of the root folder Folders.prototype.root = function (callback) { - request + return request .get(this.options.base_url+'/'+this.resource+'/0') .set('Authorization', this.options.auth) .end(function (res) { @@ -318,7 +319,7 @@ Folders.prototype.root = function (callback) { // Retrieves info and lists contents of the given folder Folders.prototype.info = function (folder, callback) { - request + return request .get(this.options.base_url+'/'+this.resource+'/'+folder) .set('Authorization', this.options.auth) .end(function (res) { @@ -352,6 +353,7 @@ addMethod(Folders.prototype, 'items', function (folder, limit, offset, fields, c callback(null, res.body); }); + return req; }); // Get items in shared folder @@ -378,11 +380,12 @@ addMethod(Folders.prototype, 'items', function (folder, limit, offset, shareLink callback(null, res.body); }); + return req; }); // Creates a new folder given the parent Folders.prototype.create = function (name, parent, callback) { - request + return request .post(this.options.base_url+'/'+this.resource) .set('Authorization', this.options.auth) .send({ @@ -407,7 +410,7 @@ Folders.prototype.delete = function (folder, recursive, callback) { var url = this.options.base_url+'/'+this.resource+'/'+folder+'?recursive='+recursive; - request + return request .del(url) .set('Authorization', this.options.auth) .end(function (res) { @@ -426,7 +429,7 @@ function SharedItems (options) { } SharedItems.prototype.info = function (shareLink, callback) { - request + return request .get(this.options.base_url+'/'+this.resource) .set('Authorization', this.options.auth) .set('BoxApi', 'shared_link='+shareLink) @@ -446,7 +449,7 @@ function Events (options) { } Events.prototype.get = function (stream_position, callback) { - request + return request .get(this.options.base_url+'/'+this.resource+'/?stream_position=' + stream_position) .set('Authorization', this.options.auth) .end(function (res) {