diff --git a/controllers/token.go b/controllers/token.go index 8bb3df8a..d25e6227 100644 --- a/controllers/token.go +++ b/controllers/token.go @@ -179,6 +179,20 @@ func (c *ApiController) GetOAuthToken() { if clientId == "" && clientSecret == "" { clientId, clientSecret, _ = c.Ctx.Request.BasicAuth() } + if clientId == "" { + // If clientID is empty, try to read data from RequestBody + var tokenRequest TokenRequest + if err := json.Unmarshal(c.Ctx.Input.RequestBody, &tokenRequest); err == nil { + clientId = tokenRequest.ClientId + clientSecret = tokenRequest.ClientSecret + grantType = tokenRequest.GrantType + code = tokenRequest.Code + verifier = tokenRequest.Verifier + scope = tokenRequest.Scope + username = tokenRequest.Username + password = tokenRequest.Password + } + } host := c.Ctx.Request.Host c.Data["json"] = object.GetOAuthToken(grantType, clientId, clientSecret, code, verifier, scope, username, password, host) @@ -204,6 +218,18 @@ func (c *ApiController) RefreshToken() { clientSecret := c.Input().Get("client_secret") host := c.Ctx.Request.Host + if clientId == "" { + // If clientID is empty, try to read data from RequestBody + var tokenRequest TokenRequest + if err := json.Unmarshal(c.Ctx.Input.RequestBody, &tokenRequest); err == nil { + clientId = tokenRequest.ClientId + clientSecret = tokenRequest.ClientSecret + grantType = tokenRequest.GrantType + scope = tokenRequest.Scope + + } + } + c.Data["json"] = object.RefreshToken(grantType, refreshToken, scope, clientId, clientSecret, host) c.ServeJSON() } diff --git a/controllers/types.go b/controllers/types.go new file mode 100644 index 00000000..47ab0acf --- /dev/null +++ b/controllers/types.go @@ -0,0 +1,26 @@ +// Copyright 2022 The Casdoor Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package controllers + +type TokenRequest struct { + GrantType string `json:"grant_type"` + Code string `json:"code"` + ClientId string `json:"client_id"` + ClientSecret string `json:"client_secret"` + Verifier string `json:"code_verifier"` + Scope string `json:"scope"` + Username string `json:"username"` + Password string `json:"password"` +}