Skip to content

Z
zimbra-admin-api-js
Commit 0b89d61d authored by Patricio Bruna's avatar Patricio Bruna
Browse files
Options

Refactor makeRequest with performRequest and using data_request object instead of function params

parent 4258de2a
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 90 deletions
lib/zimbra-admin-api.js
View file @ 0b89d61d
......@@ -19211,22 +19211,40 @@ var ZimbraAdminApi =
}
}, {
key: 'makeRequest',
value: function makeRequest(request, resource, params, parse_response, callback) {
value: function makeRequest(request_data) {
var that = this;
var request_object = that.buildRequest();
request_object.addRequest(params, function (err) {
request_object.addRequest(request_data.params, function (err) {
if (err) {
return that.handleError(err);
}
var obj = new Object(self);
obj.response_name = request + 'Response';
obj.param_object_name = resource.toLocaleLowerCase();
obj.response_name = request_data.request_name + 'Response';
obj.param_object_name = request_data.resource.toLocaleLowerCase();
that.client.send(request_object, function (err, data) {
if (err) return callback(that.handleError(err));
parse_response(data, obj, callback);
if (err) return request_data.callback(that.handleError(err));
request_data.parse_response(data, obj, request_data.callback);
});
});
}
}, {
key: 'performRequest',
value: function performRequest(request_data) {
var _this = this;
if (this.client.token) {
this.makeRequest(request_data);
} else {
(function () {
var that = _this;
var getCallback = function getCallback(err, response) {
if (err) return this.handleError(err);
that.makeRequest(request_data);
};
_this.login(getCallback);
})();
}
}
}, {
key: 'parseResponse',
value: function parseResponse(data, obj, callback) {
......@@ -19254,49 +19272,31 @@ var ZimbraAdminApi =
}, {
key: 'get',
value: function get(resource, name_or_id, callback) {
var _this = this;
var params = this.requestParams();
var request_name = 'Get' + resource;
params.name = request_name + 'Request';
var request_data = {};
request_data.params = this.requestParams();
request_data.request_name = 'Get' + resource;
request_data.params.name = request_data.request_name + 'Request';
request_data.resource = resource;
request_data.callback = callback;
request_data.parse_response = this.parseResponse;
var resource_name = this.dictionary.resourceResponseName(resource);
params.params[resource_name] = {
request_data.params.params[resource_name] = {
'by': 'name',
'_content': name_or_id
};
if (this.client.token) {
this.makeRequest(request_name, resource, params, this.parseResponse, callback);
} else {
(function () {
var that = _this;
var getCallback = function getCallback(err, response) {
if (err) return this.handleError(err);
that.makeRequest(request_name, resource, params, that.parseResponse, callback);
};
_this.login(getCallback);
})();
}
this.performRequest(request_data);
}
}, {
key: 'getAll',
value: function getAll(resource, callback) {
var _this2 = this;
var params = this.requestParams();
var request_name = 'GetAll' + resource + 's';
params.name = request_name + 'Request';
if (this.client.token) {
this.makeRequest(request_name, resource, params, this.parseAllResponse, callback);
} else {
(function () {
var that = _this2;
var getAllCallback = function getAllCallback(err, response) {
if (err) return this.handleError(err);
that.makeRequest(request_name, resource, params, that.parseAllResponse, callback);
};
_this2.login(getAllCallback);
})();
}
var request_data = {};
request_data.params = this.requestParams();
request_data.request_name = 'GetAll' + resource + 's';
request_data.params.name = request_data.request_name + 'Request';
request_data.resource = resource;
request_data.callback = callback;
request_data.parse_response = this.parseAllResponse;
this.performRequest(request_data);
}
}, {
key: 'getAccount',
lib/zimbra-admin-api.js.map
View file @ 0b89d61d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/index.js
View file @ 0b89d61d
......@@ -87,23 +87,37 @@ class ZimbraAdminApi {
return request;
}
makeRequest(request, resource, params, parse_response, callback) {
makeRequest(request_data) {
const that = this;
let request_object = that.buildRequest();
request_object.addRequest(params, function(err){
request_object.addRequest(request_data.params, function(err){
if (err) {
return that.handleError(err);
}
let obj = new Object(self);
obj.response_name = `${request}Response`;
obj.param_object_name = resource.toLocaleLowerCase();
obj.response_name = `${request_data.request_name}Response`;
obj.param_object_name = request_data.resource.toLocaleLowerCase();
that.client.send(request_object, function(err, data){
if (err) return callback(that.handleError(err));
parse_response(data, obj, callback);
if (err) return request_data.callback(that.handleError(err));
request_data.parse_response(data, obj, request_data.callback);
});
});
}
performRequest(request_data) {
if (this.client.token) {
this.makeRequest(request_data);
} else {
const that = this;
let getCallback = function(err, response){
if (err) return this.handleError(err);
that.makeRequest(request_data);
};
this.login(getCallback);
}
}
parseResponse(data, obj, callback) {
const resource = obj.param_object_name.toLowerCase();
const that = this;
......@@ -128,40 +142,30 @@ class ZimbraAdminApi {
}
get(resource, name_or_id, callback){
let params = this.requestParams();
let request_name = `Get${resource}`;
params.name = `${request_name}Request`;
let request_data = { }
request_data.params = this.requestParams();
request_data.request_name = `Get${resource}`;
request_data.params.name = `${request_data.request_name}Request`;
request_data.resource = resource;
request_data.callback = callback;
request_data.parse_response = this.parseResponse;
let resource_name = this.dictionary.resourceResponseName(resource);
params.params[resource_name] = {
request_data.params.params[resource_name] = {
'by': 'name',
'_content': name_or_id
};
if (this.client.token) {
this.makeRequest(request_name, resource, params, this.parseResponse, callback);
} else {
const that = this;
let getCallback = function(err, response){
if (err) return this.handleError(err);
that.makeRequest(request_name, resource, params, that.parseResponse, callback);
};
this.login(getCallback);
}
this.performRequest(request_data);
}
getAll(resource, callback) {
let params = this.requestParams();
let request_name = `GetAll${resource}s`;
params.name = `${request_name}Request`;
if (this.client.token) {
this.makeRequest(request_name, resource, params, this.parseAllResponse, callback);
} else {
const that = this;
let getAllCallback = function(err, response){
if (err) return this.handleError(err);
that.makeRequest(request_name, resource, params, that.parseAllResponse, callback);
};
this.login(getAllCallback);
}
let request_data = { }
request_data.params = this.requestParams();
request_data.request_name = `GetAll${resource}s`;
request_data.params.name = `${request_data.request_name}Request`;
request_data.resource = resource;
request_data.callback = callback;
request_data.parse_response = this.parseAllResponse;
this.performRequest(request_data);
}
getAccount(identifier, callback) {
......
test/js/spec/test.js
View file @ 0b89d61d
......@@ -126,27 +126,23 @@
it('should return the DL', function(done){
let api = new ZimbraAdminApi(auth_data);
console.log(api);
api.getDistributionList('abierta@customer.dev', function(err, data){
console.log(data);
expect(data.name).to.equal('abierta@customer.dev');
done();
});
});
// it('should get and return with name or id', function(done){
// let api = new ZimbraAdminApi(auth_data);
// let account_id = null;
// api.getAccount('admin@zboxapp.dev', function(err, data){
// expect(data.constructor.name).to.equal('Account');
// expect(data.name).to.equal('admin@zboxapp.dev');
// account_id = data.id;
// });
// api.getAccount(account_id, function(err, data){
// expect(data.name).to.equal('admin@zboxapp.dev');
// done();
// });
// });
it('should get and return with name or id', function(done){
let api = new ZimbraAdminApi(auth_data);
let resource_id = null;
api.getDomain('zboxapp.dev', function(err, data){
resource_id = data.id;
});
api.getDomain(resource_id, function(err, data){
expect(data.name).to.equal('zboxapp.dev');
done();
});
});
});
})();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment