From 2c0f961c59ea31d9086ab4fce64559e4b9603ac1 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Fri, 17 Dec 2021 11:34:16 +0300 Subject: [PATCH] OAuth: Fix forwarding id token to the data source (#43204) --- pkg/services/query/query.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go index de8c4cc7033..ba1918515ef 100644 --- a/pkg/services/query/query.go +++ b/pkg/services/query/query.go @@ -127,6 +127,11 @@ func (s *Service) handleQueryData(ctx context.Context, user *models.SignedInUser if s.oAuthTokenService.IsOAuthPassThruEnabled(ds) { if token := s.oAuthTokenService.GetCurrentOAuthToken(ctx, user); token != nil { req.Headers["Authorization"] = fmt.Sprintf("%s %s", token.Type(), token.AccessToken) + + idToken, ok := token.Extra("id_token").(string) + if ok && idToken != "" { + req.Headers["X-ID-Token"] = idToken + } } }