test

saukk900 · Jun 30, 2020 · fea03d8 · fea03d8
1 parent cff21b2
commit fea03d8
Showing 1 changed file with 8 additions and 40 deletions.
diff --git a/carelink.js b/carelink.js
@@ -7,8 +7,6 @@ var _ = require('lodash'),
 
 var logger = require('./logger');
 
-process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
-
 var CARELINK_EU = process.env['MMCONNECT_SERVER'] === 'EU';
 
 var DEFAULT_MAX_RETRY_DURATION = module.exports.defaultMaxRetryDuration = 512;
@@ -34,8 +32,8 @@ function reqOptions(extra) {
     var defaults = {
         jar: true,
         followRedirect: false,
-        rejectUnauthorized: false,
-        changeOrigin: true,
+        //rejectUnauthorized: false,
+        //changeOrigin: true,
         headers: {
             //Host: carelinkServerAddress,
             Connection: 'keep-alive',
@@ -69,6 +67,11 @@ function responseAsError(response) {
 function checkResponseThen(fn) {
     return function (err, response) {
         err = err || responseAsError(response);
+
+        if (err) {
+            let x = 1;
+        }
+
         fn.apply(this, [err].concat(Array.prototype.slice.call(arguments, 1)));
     };
 }
@@ -125,10 +128,6 @@ var Client = exports.Client = function (options) {
             url,
             reqOptions({
                 jar: jar,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
                 form: {
                     j_username: options.username,
                     j_password: options.password,
@@ -146,10 +145,6 @@ var Client = exports.Client = function (options) {
             url,
             reqOptions({
                 jar: jar,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
             }),
             checkResponseThen(next)
         );
@@ -174,12 +169,9 @@ var Client = exports.Client = function (options) {
         logger.log('GET ' + url);
 
         request.get(
+            url,
             reqOptions({
                 jar: jar,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
             }),
             checkResponseThen(next)
         );
@@ -194,10 +186,6 @@ var Client = exports.Client = function (options) {
             url,
             reqOptions({
                 jar: jar,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
             }),
             checkResponseThen(next)
         );
@@ -215,10 +203,6 @@ var Client = exports.Client = function (options) {
             reqOptions({
                 jar: jar,
                 gzip: true,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
                 form: {
                     sessionID: uriParam.get('sessionID'),
                     sessionData: uriParam.get('sessionData'),
@@ -248,10 +232,6 @@ var Client = exports.Client = function (options) {
             url,
             reqOptions({
                 jar: jar,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
                 form: {
                     action: "consent",
                     sessionID: ps.sessionID,
@@ -273,10 +253,6 @@ var Client = exports.Client = function (options) {
             url,
             reqOptions({
                 jar: jar,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
             }),
             checkResponseThen(next)
         );
@@ -292,10 +268,6 @@ var Client = exports.Client = function (options) {
                 jar: jar,
                 gzip: true,
                 json: true,
-                uri: url,
-                host: getHost(url),
-                path: getPath(url),
-                port: 443,
                 headers: {
                     Authorization: "Bearer " + _.get(getCookie(CARELINKEU_TOKEN_COOKIE), 'value', ''),
                 },
@@ -321,10 +293,6 @@ var Client = exports.Client = function (options) {
         var reqO = {
             jar: jar,
             gzip: true,
-            uri: url,
-            host: getHost(url),
-            path: getPath(url),
-            port: 443,
             headers: {
             },
         };