Skip to content

Added option for https #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added option for https #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dc4a2b
Added option for https
Feb 15, 2016
282c6b0
Wrap json.parse in try {} catch()
lowi Nov 10, 2017
994c35c
Update version number
lowi Nov 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

var assert = require('assert');

var http = require('http'),
jayson = require('jayson'),
var jayson = require('jayson'),
_ = require('lodash');

var http; // set on connect depending on the option given by the user

var Odoo = function (config) {
config = config || {};

Expand All @@ -14,6 +15,7 @@ var Odoo = function (config) {
this.database = config.database;
this.username = config.username;
this.password = config.password;
this.protocol = config.protocol || "http"
};

// Connect
Expand All @@ -40,6 +42,8 @@ Odoo.prototype.connect = function (cb) {

var self = this;

http = require(this.protocol)

var req = http.request(options, function (res) {
var response = '';

Expand All @@ -50,7 +54,12 @@ Odoo.prototype.connect = function (cb) {
});

res.on('end', function () {
response = JSON.parse(response);
try {
response = JSON.parse(response);
}
catch(err) {
return cb(err, null);
}

if (response.error) {
return cb(response.error, null);
Expand Down Expand Up @@ -203,7 +212,7 @@ Odoo.prototype._request = function (path, params, callback) {
}
};

var client = jayson.client.http(options);
var client = jayson.client[this.protocol](options);

client.request('call', params, function (e, err, res) {
if (e || err) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "odoo",
"version": "0.4.0",
"version": "0.4.2",
"description": "Node.js client library for Odoo using JSON-RPC",
"main": "./lib/index.js",
"directories": {
Expand Down