Adding backward compatibility with old JiraApi constructor

Author: zoraceslap

lib/jira.js

@@ -144,7 +144,7 @@ var url = require('url'),
     logger = console,
     OAuth = require("oauth");
 
-var JiraApi = exports.JiraApi = function(protocol, host, port, apiVersion, verbose, base, requestOptions) {
+var JiraApiWithOptions = exports.JiraApiWithOptions = function(protocol, host, port, apiVersion, verbose, base, requestOptions) {
     this.protocol = protocol;
     this.host = host;
     this.port = port;
@@ -187,15 +187,34 @@ var JiraApi = exports.JiraApi = function(protocol, host, port, apiVersion, verbo
 	    }
 	    return obj;
     }
-    
     this.doRequest = function(options, callback) {
     	clonedOptions = require('lodash.clonedeep')(this.requestOptions)
     	this.request(this.extend(options,clonedOptions), callback);
     };
 
 };
 
-(function() {
+var JiraApi = exports.JiraApi = function(protocol, host, port, username, password, apiVersion, verbose, strictSSL, oauth, base) {
+	options = {
+		    rejectUnauthorized: strictSSL == null?true:strictSSL
+	};
+    if(oauth && oauth.consumer_key && oauth.consumer_secret) {
+        options.oauth = {
+          consumer_key: oauth.consumer_key,
+          consumer_secret: oauth.consumer_secret,
+          token: oauth.access_token,
+          token_secret: oauth.access_token_secret
+        };
+    } else if(username && password) {
+        options.auth = {
+          'user': username,
+          'pass': password
+        };
+    }
+    JiraApiWithOptions.call(this, protocol, host, port, apiVersion, verbose, base, options)
+};
+
+_jiraMethods=(function() {
     // ## Find an issue in jira ##
     // ### Takes ###
     //
@@ -2101,4 +2120,6 @@ var JiraApi = exports.JiraApi = function(protocol, host, port, apiVersion, verbo
         });
     };
 
-}).call(JiraApi.prototype);
+});
+_jiraMethods.call(JiraApiWithOptions.prototype);
+_jiraMethods.call(JiraApi.prototype);

spec/jira.spec.coffee

@@ -24,10 +24,39 @@ describe "Node Jira Tests", ->
         options =
             rejectUnauthorized: true 
             headers: 'Authorization': 'Basic ' + bufferFrom('test:test').toString('base64')
-        @jira = new nodeJira.JiraApi 'http', 'localhost', 80, 2, false, null, options 
+        @jira = new nodeJira.JiraApiWithOptions 'http', 'localhost', 80, 2, false, null, options 
         spyOn @jira, 'request'
         @cb = jasmine.createSpy 'callback'
 
+    it "Sets basic auth if oauth is not passed in with JiraApi old method", ->
+        options =
+            rejectUnauthorized: false,
+            auth :
+              user: 'test'
+              pass: 'test'
+        @jira = new nodeJira.JiraApi 'http', 'localhost', 80, 'test', 'test', 2
+        spyOn @jira, 'request'
+
+        @jira.doRequest options, @cb
+        expect(@jira.request)
+            .toHaveBeenCalledWith(options, jasmine.any(Function))
+
+    it "Sets OAuth oauth for the requests if oauth is passed in with JiraApi old method", ->
+        options = 
+            rejectUnauthorized: false,
+            oauth : 
+              consumer_key: 'ck'
+              consumer_secret: 'cs'
+              access_token: 'ac'
+              access_token_secret: 'acs'
+        # oauth = new OAuth.OAuth(null, null, oauth.consumer_key, oauth.consumer_secret, null, null, "RSA-SHA1")
+        @jira = new nodeJira.JiraApi 'http', 'localhost', 80, 'test', 'test', 2, false, false, options.oauth
+        spyOn @jira, 'request'
+
+        @jira.doRequest options, @cb
+        expect(@jira.request)
+            .toHaveBeenCalledWith(options, jasmine.any(Function))
+
     it "Sets basic auth if oauth is not passed in", ->
         options =
             rejectUnauthorized: false 
@@ -44,7 +73,7 @@ describe "Node Jira Tests", ->
               access_token: 'ac'
               access_token_secret: 'acs'
         # oauth = new OAuth.OAuth(null, null, oauth.consumer_key, oauth.consumer_secret, null, null, "RSA-SHA1")
-        @jira = new nodeJira.JiraApi 'http', 'localhost', 80, 2, false, null, options
+        @jira = new nodeJira.JiraApiWithOptions 'http', 'localhost', 80, 2, false, null, options
         spyOn @jira, 'request'
 
         @jira.doRequest options, @cb