Merge pull request #834 from watson-developer-cloud/remove-cookie-code

refactor: stop using cookies in requests

Author: dpopp07

assistant/v1.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -2896,7 +2896,7 @@ namespace AssistantV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }

assistant/v2.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -249,7 +249,7 @@ namespace AssistantV2 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }

compare-comply/v1.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -819,7 +819,7 @@ namespace CompareComplyV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }

discovery/v1-generated.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -3743,7 +3743,7 @@ namespace DiscoveryV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }

index.ts

@@ -34,7 +34,7 @@ export import NaturalLanguageClassifierV1 = require('./natural-language-classifi
 
 export import NaturalLanguageUnderstandingV1 = require('./natural-language-understanding/v1-generated');
 
-export import PersonalityInsightsV3 = require('./personality-insights/v3');
+export import PersonalityInsightsV3 = require('./personality-insights/v3-generated');
 
 export import SpeechToTextV1 = require('./speech-to-text/v1');
 

language-translator/v3.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -438,7 +438,7 @@ namespace LanguageTranslatorV3 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }

lib/base_service.ts

@@ -18,7 +18,6 @@
 // `buffer-from` uses the new api when possible but falls back to the old one otherwise
 import bufferFrom = require('buffer-from');
 import extend = require('extend');
-import request = require('request');
 import semver = require('semver');
 import vcapServices = require('vcap_services');
 import { IamTokenManagerV1 } from '../iam-token-manager/v1';
@@ -50,7 +49,6 @@ export interface UserOptions {
 export interface BaseServiceOptions extends UserOptions {
   headers: HeaderOptions;
   url: string;
-  jar?: request.CookieJar;
   qs: any;
   rejectUnauthorized?: boolean;
 }
@@ -289,7 +287,6 @@ export class BaseService {
       _options = extend(_options, options);
       return _options;
     }
-    _options.jar = request.jar();
     // Get credentials from environment properties or Bluemix,
     // but prefer credentials provided programatically
     _options = extend(

natural-language-classifier/v1-generated.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -370,7 +370,7 @@ namespace NaturalLanguageClassifierV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }

natural-language-understanding/v1-generated.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -252,7 +252,7 @@ namespace NaturalLanguageUnderstandingV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }