@@ -35,6 +35,7 @@ public class Credentials
35
35
private IamTokenData _iamTokenData ;
36
36
private string _iamApiKey ;
37
37
private string _userAcessToken ;
38
+ private const string APIKEY_AS_USERNAME = "apikey" ;
38
39
#endregion
39
40
40
41
#region Public Fields
@@ -118,10 +119,7 @@ public Credentials(string url = null)
118
119
/// <param name="url">The service endpoint.</param>
119
120
public Credentials ( string username , string password , string url = null )
120
121
{
121
- Username = username ;
122
- Password = password ;
123
- if ( ! string . IsNullOrEmpty ( url ) )
124
- Url = url ;
122
+ SetCredentials ( username , password , url ) ;
125
123
}
126
124
127
125
/// <summary>
@@ -141,7 +139,35 @@ public Credentials(string apiKey, string url = null)
141
139
/// <param name="iamTokenOptions"></param>
142
140
public Credentials ( TokenOptions iamTokenOptions , string serviceUrl = null )
143
141
{
144
- if ( ! string . IsNullOrEmpty ( serviceUrl ) )
142
+ SetCredentials ( iamTokenOptions , serviceUrl ) ;
143
+ }
144
+ #endregion
145
+
146
+ #region SetCredentials
147
+ private void SetCredentials ( string username , string password , string url = null )
148
+ {
149
+ if ( username == APIKEY_AS_USERNAME )
150
+ {
151
+ TokenOptions tokenOptions = new TokenOptions ( )
152
+ {
153
+ IamApiKey = password
154
+ } ;
155
+
156
+ SetCredentials ( tokenOptions , url ) ;
157
+ }
158
+ else
159
+ {
160
+ Username = username ;
161
+ Password = password ;
162
+ }
163
+
164
+ if ( ! string . IsNullOrEmpty ( url ) )
165
+ Url = url ;
166
+ }
167
+
168
+ private void SetCredentials ( TokenOptions iamTokenOptions , string serviceUrl = null )
169
+ {
170
+ if ( ! string . IsNullOrEmpty ( serviceUrl ) )
145
171
Url = serviceUrl ;
146
172
_iamUrl = ! string . IsNullOrEmpty ( iamTokenOptions . IamUrl ) ? iamTokenOptions . IamUrl : "https://iam.bluemix.net/identity/token" ;
147
173
_iamTokenData = new IamTokenData ( ) ;
@@ -155,7 +181,7 @@ public Credentials(TokenOptions iamTokenOptions, string serviceUrl = null)
155
181
GetToken ( ) ;
156
182
}
157
183
#endregion
158
-
184
+
159
185
#region Get Token
160
186
/// <summary>
161
187
/// This function sends an access token back through a callback. The source of the token
@@ -536,9 +562,9 @@ public class VcapCredentials
536
562
public List < VcapCredential > GetCredentialByname ( string name )
537
563
{
538
564
List < VcapCredential > credentialsList = new List < VcapCredential > ( ) ;
539
- foreach ( KeyValuePair < string , List < VcapCredential > > kvp in VCAP_SERVICES )
565
+ foreach ( KeyValuePair < string , List < VcapCredential > > kvp in VCAP_SERVICES )
540
566
{
541
- foreach ( VcapCredential credential in kvp . Value )
567
+ foreach ( VcapCredential credential in kvp . Value )
542
568
{
543
569
if ( credential . Name == name )
544
570
credentialsList . Add ( credential ) ;
0 commit comments