refactor: remove token names and jwt readme

mamoonraja · mamoonraja · commit f68f00c819f9 · 2019-06-25T11:42:08.000-04:00
diff --git a/Authentication/IamTokenManager.cs b/Authentication/IamTokenManager.cs
@@ -38,7 +38,6 @@ public class IamTokenManager : JwtTokenManager
 
         public IamTokenManager(IamTokenOptions options) : base(options)
         {
-			tokenName = "access_token";
             if (string.IsNullOrEmpty(url))
             {
                 if (!string.IsNullOrEmpty(options.IamUrl))
@@ -157,7 +156,6 @@ private void OnRequestIamTokenResponse(RESTConnector.Request req, RESTConnector.
     public class IamTokenOptions : JwtTokenOptions
     {
         private string iamApiKey;
-        [JsonProperty("iamApiKey", NullValueHandling = NullValueHandling.Ignore)]
         public string IamApiKey
         {
             get
@@ -176,9 +174,7 @@ public string IamApiKey
                 }
             }
         }
-        [JsonProperty("iamAcessToken", NullValueHandling = NullValueHandling.Ignore)]
         public string IamAccessToken { get; set; }
-        [JsonProperty("iamUrl", NullValueHandling = NullValueHandling.Ignore)]
         public string IamUrl { get; set; }
         public string IamClientId { get; set; }
         public string IamClientSecret { get; set; }
diff --git a/Authentication/Icp4dTokenManager.cs b/Authentication/Icp4dTokenManager.cs
@@ -35,7 +35,6 @@ public class Icp4dTokenManager : JwtTokenManager
 
         public Icp4dTokenManager(Icp4dTokenOptions options) : base(options)
         {
-            tokenName = "accessToken";
 
             if (!string.IsNullOrEmpty(options.Url))
             {
diff --git a/Authentication/JwtTokenManager.cs b/Authentication/JwtTokenManager.cs
@@ -44,7 +44,6 @@ public class JwtTokenManager
         public JwtTokenManager(JwtTokenOptions options)
         {
             tokenData = new TokenData();
-            tokenName = "access_token";
 
             if (!string.IsNullOrEmpty(options.Url))
             {
diff --git a/Connection/WSConnector.cs b/Connection/WSConnector.cs
@@ -303,7 +303,7 @@ public static WSConnector CreateConnector(Credentials credentials, string functi
             WSConnector connector = new WSConnector();
             if (credentials.HasCredentials())
             {
-                    connector.Authentication = credentials;
+                connector.Authentication = credentials;
             }
             else if (credentials.HasIamTokenData())
             {
diff --git a/ThirdParty/Jwt/README.md b/ThirdParty/Jwt/README.md

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ public class IamTokenManager : JwtTokenManager`
`38`	`38`
`39`	`39`	`public IamTokenManager(IamTokenOptions options) : base(options)`
`40`	`40`	`{`
`41`		`- tokenName = "access_token";`
`42`	`41`	`if (string.IsNullOrEmpty(url))`
`43`	`42`	`{`
`44`	`43`	`if (!string.IsNullOrEmpty(options.IamUrl))`
`@@ -157,7 +156,6 @@ private void OnRequestIamTokenResponse(RESTConnector.Request req, RESTConnector.`
`157`	`156`	`public class IamTokenOptions : JwtTokenOptions`
`158`	`157`	`{`
`159`	`158`	`private string iamApiKey;`
`160`		`- [JsonProperty("iamApiKey", NullValueHandling = NullValueHandling.Ignore)]`
`161`	`159`	`public string IamApiKey`
`162`	`160`	`{`
`163`	`161`	`get`
`@@ -176,9 +174,7 @@ public string IamApiKey`
`176`	`174`	`}`
`177`	`175`	`}`
`178`	`176`	`}`
`179`		`- [JsonProperty("iamAcessToken", NullValueHandling = NullValueHandling.Ignore)]`
`180`	`177`	`public string IamAccessToken { get; set; }`
`181`		`- [JsonProperty("iamUrl", NullValueHandling = NullValueHandling.Ignore)]`
`182`	`178`	`public string IamUrl { get; set; }`
`183`	`179`	`public string IamClientId { get; set; }`
`184`	`180`	`public string IamClientSecret { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public class Icp4dTokenManager : JwtTokenManager`
`35`	`35`
`36`	`36`	`public Icp4dTokenManager(Icp4dTokenOptions options) : base(options)`
`37`	`37`	`{`
`38`		`- tokenName = "accessToken";`
`39`	`38`
`40`	`39`	`if (!string.IsNullOrEmpty(options.Url))`
`41`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ public class JwtTokenManager`
`44`	`44`	`public JwtTokenManager(JwtTokenOptions options)`
`45`	`45`	`{`
`46`	`46`	`tokenData = new TokenData();`
`47`		`- tokenName = "access_token";`
`48`	`47`
`49`	`48`	`if (!string.IsNullOrEmpty(options.Url))`
`50`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ public static WSConnector CreateConnector(Credentials credentials, string functi`
`303`	`303`	`WSConnector connector = new WSConnector();`
`304`	`304`	`if (credentials.HasCredentials())`
`305`	`305`	`{`
`306`		`- connector.Authentication = credentials;`
	`306`	`+ connector.Authentication = credentials;`
`307`	`307`	`}`
`308`	`308`	`else if (credentials.HasIamTokenData())`
`309`	`309`	`{`