refactor(authentication): authenticate inside connectors

Author: mamoonraja

BaseService.cs

@@ -26,7 +26,11 @@ namespace IBM.Cloud.SDK
 {
     public class BaseService
     {
-        protected Authenticator authenticator;
+        #region Authenticator
+        /// <summary>
+        /// Gets and sets the authenticator of the service.
+        public Authenticator Authenticator { get; set; }
+        #endregion
         protected string serviceUrl;
         public string ServiceId { get; set; }
         protected Dictionary<string, string> customRequestHeaders = new Dictionary<string, string>();
@@ -39,8 +43,7 @@ public BaseService(string versionDate, Authenticator authenticator, string servi
         public BaseService(Authenticator authenticator, string serviceId) {
             ServiceId = serviceId;
 
-            this.authenticator = authenticator ?? throw new ArgumentNullException(ErrorMessageNoAuthenticator);
-
+            Authenticator = authenticator ?? throw new ArgumentNullException(ErrorMessageNoAuthenticator);
             // Try to retrieve the service URL from either a credential file, environment, or VCAP_SERVICES.
             Dictionary<string, string> props = CredentialUtils.GetServiceProperties(serviceId);
             props.TryGetValue(PropNameServiceUrl, out string url);
@@ -50,18 +53,6 @@ public BaseService(Authenticator authenticator, string serviceId) {
             }
         }
 
-        protected void SetAuthentication(RESTConnector connector)
-        {
-            if (authenticator != null)
-            {
-                authenticator.Authenticate(connector);
-            }
-            else
-            {
-                throw new ArgumentException("Authentication information was not properly configured.");
-            }
-        }
-
         public void SetServiceUrl(string url)
         {
             serviceUrl = url;
@@ -72,7 +63,7 @@ public void SetServiceUrl(string url)
         /// </summary>
         public Authenticator GetAuthenticator()
         {
-            return authenticator;
+            return Authenticator;
         }
 
         public void WithHeader(string name, string value)

Connection/RESTConnector.cs

@@ -274,6 +274,8 @@ public static RESTConnector GetConnector(Authenticator authenticator, string fun
                 URL = url + function,
                 Authentication = authenticator
             };
+
+            authenticator.Authenticate(connector);
             return connector;
         }
 

Connection/WSConnector.cs

@@ -339,6 +339,7 @@ public static WSConnector CreateConnector(Authenticator authenticator, string fu
             connector.Authentication = authenticator;
 
             connector.URL = FixupURL(url) + function + args;
+            authenticator.Authenticate(connector);
 
             return connector;
         }