fix: add id_token and support auth header (#338)

casdoor · Nov 28, 2021 · e888ff8 · e888ff8
1 parent 7923bff
commit e888ff8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/controllers/token.go b/controllers/token.go
@@ -150,6 +150,10 @@ func (c *ApiController) GetOAuthToken() {
 	clientSecret := c.Input().Get("client_secret")
 	code := c.Input().Get("code")
 
+	if clientId == "" && clientSecret == "" {
+		clientId, clientSecret, _ = c.Ctx.Request.BasicAuth()
+	}
+
 	c.Data["json"] = object.GetOAuthToken(grantType, clientId, clientSecret, code)
 	c.ServeJSON()
 }
diff --git a/object/token.go b/object/token.go
@@ -44,6 +44,7 @@ type Token struct {
 
 type TokenWrapper struct {
 	AccessToken string `json:"access_token"`
+	IdToken     string `json:"id_token"`
 	TokenType   string `json:"token_type"`
 	ExpiresIn   int    `json:"expires_in"`
 	Scope       string `json:"scope"`
@@ -275,6 +276,7 @@ func GetOAuthToken(grantType string, clientId string, clientSecret string, code
 
 	tokenWrapper := &TokenWrapper{
 		AccessToken: token.AccessToken,
+		IdToken:     token.AccessToken,
 		TokenType:   token.TokenType,
 		ExpiresIn:   token.ExpiresIn,
 		Scope:       token.Scope,