Merge branch 'development' into 4609-iam-url

Author: mediumTaj

.gitignore

@@ -239,3 +239,7 @@ _Pvt_Extensions
 .fake/
 /src/IBM.WatsonDeveloperCloud.LanguageTranslator.Test/appsettings.json
 /test/IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests/appsettings.json
+
+**/.swagger-codegen-ignore
+**/.swagger-codegen
+src/tests/

README.md

@@ -72,15 +72,16 @@ void Example()
 ```
 
 ## IAM Authentication
-You can authenticate using IAM rather than username and password. You can either allow the SDK to manage the token by providing your IAM apikey or manage the token yourself by providing an access token.
+You can authenticate using IAM rather than username and password or apikey. You can either allow the SDK to manage the token by providing your IAM apikey or manage the token yourself by providing an access token.
 ```cs
 void Example()
 {
     //  Provide either an iamApiKey or iamAccessToken to authenticate the service.
     TokenOptions iamAssistantTokenOptions = new TokenOptions()
     {
         IamApiKey = "<iam-apikey>",
-        IamAccessToken = "<iam-access-token>"
+        IamAccessToken = "<iam-access-token>",
+        IamUrl = "<service-endpoint>"
     };
 
     _assistant = new AssistantService(iamAssistantTokenOptions, "<version-date>");

src/IBM.WatsonDeveloperCloud.VisualRecognition.v3/README.md

@@ -18,20 +18,21 @@ PM > Install-Package IBM.WatsonDeveloperCloud.VisualRecognition.v3
 </ItemGroup>
 
 ```
+
 ### Usage
 The IBM Watson™ [Visual Recognition][visual-recognition] service uses deep learning algorithms to identify scenes, objects, and faces in images you upload to the service. You can create and train a custom classifier to identify subjects that suit your needs. You can create and add images to a collection and then search that collection with your own image to find similar images. A valid API Key from IBM Cloud is required for all calls.
 
 #### Instantiating and authenticating the service
-Before you can send requests to the service it must be instantiated and api key must be set.
+Before you can send requests to the service it must be instantiated and api key or access token must be set.
 ```cs
-// create a Tone Analyzer Service instance
-VisualRecognitionService _visualRecognition = new VisualRecognitionService();
-
-// set the credentials
-_visualRecognition.SetCredential("<apikey>");
+TokenOptions tokenOptions = new TokenOptions()
+{
+    IamApiKey = "<iam-apikey>",
+    IamAccessToken = "<iam-access-token>",
+    IamUrl = "<service-endpoint>"
+};
 
-// set the VersionDate
-_visualRecognition.VersionDate = "version-date";
+var _visualRecognition = new VisualRecognitionService(tokenOptions, "<version-date>");
 ```
 
 #### Classify an image

src/IBM.WatsonDeveloperCloud.VisualRecognition.v3/VisualRecognitionService.cs

@@ -32,7 +32,6 @@ public partial class VisualRecognitionService : WatsonService, IVisualRecognitio
     {
         const string SERVICE_NAME = "visual_recognition";
         const string URL = "https://gateway.watsonplatform.net/visual-recognition/api";
-        private TokenManager _tokenManager = null;
         private string _versionDate;
         public string VersionDate
         {

src/IBM.WatsonDeveloperCloud/Service/WatsonService.cs

@@ -17,6 +17,7 @@
 
 using System;
 using IBM.WatsonDeveloperCloud.Http;
+using IBM.WatsonDeveloperCloud.Util;
 
 namespace IBM.WatsonDeveloperCloud.Service
 {
@@ -43,6 +44,7 @@ public string Endpoint { get
         }
         public string UserName { get; set; }
         public string Password { get; set; }
+        protected TokenManager _tokenManager = null;
 
         protected WatsonService(string serviceName)
         {
@@ -88,6 +90,13 @@ public void SetCredential(string userName, string password)
         public void SetCredential(string apikey)
         {
             this.ApiKey = apikey;
+            this.Endpoint = "https://gateway-a.watsonplatform.net/visual-recognition/api";
+        }
+
+        public void SetCredential(TokenOptions options)
+        {
+            this.Endpoint = options.IamUrl;
+            _tokenManager = new TokenManager(options);
         }
     }
 }