From 825f9bcdd428010171ab44931b3497a7b17fd88f Mon Sep 17 00:00:00 2001
From: Omar Elazhary <omar.elazhary@sap.com>
Date: Wed, 10 Feb 2016 13:27:04 +0000
Subject: [PATCH] Remove workaround for bug
 https://github.com/cloudfoundry/uaa/issues/308

* UAA 3.0.0 and later (contained in Cloudfoundry 229 and later)
  implements the fix (https://github.com/cloudfoundry/uaa/commit/8cb166e4d8b699ea73444f45d9c87cf09f462bdb)
  that solves this problem, making our workaround obsolete.
---
 providers/provider_default.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/providers/provider_default.go b/providers/provider_default.go
index 9b9cca2bc..60d115e56 100644
--- a/providers/provider_default.go
+++ b/providers/provider_default.go
@@ -35,11 +35,6 @@ func (p *ProviderData) Redeem(redirectURL, code string) (s *SessionState, err er
 		return
 	}
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	// workaround for Cloudfoundry UAA bug https://github.com/cloudfoundry/uaa/issues/308
-	if (p.ProviderName == "CloudFoundry") {
-		req.SetBasicAuth(p.ClientID, p.ClientSecret)
-	}
-
 	var resp *http.Response
 	resp, err = http.DefaultClient.Do(req)
 	if err != nil {