From ecf30bb43cbe40b5c58ca00ece5425f17a8aadaa Mon Sep 17 00:00:00 2001 From: Houssem Ben Mabrouk Date: Thu, 19 Oct 2023 15:07:41 +0200 Subject: [PATCH] restore missed code due to rebase Signed-off-by: Houssem Ben Mabrouk --- server/handlers.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/handlers.go b/server/handlers.go index c8906911259..8202a11af9f 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -829,8 +829,12 @@ func (s *Server) handleToken(w http.ResponseWriter, r *http.Request) { return } - grantType := r.PostFormValue("grant_type") + if !contains(s.supportedGrantTypes, grantType) { + s.logger.Errorf("unsupported grant type: %v", grantType) + s.tokenErrHelper(w, errUnsupportedGrantType, "", http.StatusBadRequest) + return + } switch grantType { case grantTypeDeviceCode: s.handleDeviceToken(w, r) @@ -1147,7 +1151,7 @@ func (s *Server) handlePasswordGrant(w http.ResponseWriter, r *http.Request, cli // Get the connector connID := q.Get("connector_id") - if connID == "" && s.defaultPasswordConnector != "" { + if connID == "" && s.defaultPasswordConnector != "" { connID = s.defaultPasswordConnector }