@@ -203,7 +203,10 @@ func (l *LegacyHeaders) getResponseHeaders() []Header {
203203 responseHeaders := []Header{}
204204
205205 if l.SetXAuthRequest {
206− responseHeaders = append(responseHeaders, getXAuthRequestHeaders(l.PassAccessToken)...)
206+ responseHeaders = append(responseHeaders, getXAuthRequestHeaders()...)
207+ if l.PassAccessToken {
208+ responseHeaders = append(responseHeaders, getXAuthRequestAccessTokenHeader())
209+ }
207210 }
208211
209212 if l.SetBasicAuth {
@@ -331,7 +334,7 @@ func getPreferredUsernameHeader() Header {
331334 }
332335}
333336
334−func getXAuthRequestHeaders(passAccessToken bool) []Header {
337+func getXAuthRequestHeaders() []Header {
335338 headers := []Header{
336339 {
337340 Name: "X-Auth-Request-User",
@@ -353,31 +356,40 @@ func getXAuthRequestHeaders(passAccessToken bool) []Header {
353356 },
354357 },
355358 },
356− getPreferredUsernameHeader(),
357359 {
358− Name: "X-Auth-Request-Groups",
360+ Name: "X-Auth-Request-Preferred-Username",
359361 Values: []HeaderValue{
360362 {
361363 ClaimSource: &ClaimSource{
362− Claim: "groups",
364+ Claim: "preferred_username",
363365 },
364366 },
365367 },
366368 },
367− }
368−
369− if passAccessToken {
370− headers = append(headers, Header{
371− Name: "X-Auth-Request-Access-Token",
369+ {
370+ Name: "X-Auth-Request-Groups",
372371 Values: []HeaderValue{
373372 {
374373 ClaimSource: &ClaimSource{
375− Claim: "access_token",
374+ Claim: "groups",
376375 },
377376 },
378377 },
379− })
378+ },
380379 }
381380
382381 return headers
383382}
383+
384+func getXAuthRequestAccessTokenHeader() Header {
385+ return Header{
386+ Name: "X-Auth-Request-Access-Token",
387+ Values: []HeaderValue{
388+ {
389+ ClaimSource: &ClaimSource{
390+ Claim: "access_token",
391+ },
392+ },
393+ },
394+ }
395+}