provide apikey high precednece than tokens

IBM-Cloud · Sep 27, 2019 · 53685ad · 53685ad
1 parent 4865325
commit 53685ad
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ibm/config.go b/ibm/config.go
@@ -323,7 +323,7 @@ func (c *Config) ClientSession() (interface{}, error) {
 		return session, nil
 	}
 
-	if sess.BluemixSession.Config.BluemixAPIKey != "" && (sess.BluemixSession.Config.IAMAccessToken == "" && sess.BluemixSession.Config.IAMRefreshToken == "") {
+	if sess.BluemixSession.Config.BluemixAPIKey != "" {
 		err = authenticateAPIKey(sess.BluemixSession)
 		if err != nil {
 			session.bmxUserFetchErr = fmt.Errorf("Error occured while fetching account user details: %q", err)
@@ -332,7 +332,7 @@ func (c *Config) ClientSession() (interface{}, error) {
 		}
 	}
 
-	if sess.BluemixSession.Config.IAMAccessToken != "" {
+	if sess.BluemixSession.Config.IAMAccessToken != "" && sess.BluemixSession.Config.BluemixAPIKey == "" {
 		err := refreshToken(sess.BluemixSession)
 		if err != nil {
 			return nil, err