fix: openid address format (#1157)

This commit is contained in:
Taoning Ge
2022-09-24 15:34:11 +08:00
committed by GitHub
parent 4116b1d305
commit a447d64bf2

View File

@ -16,6 +16,7 @@ package object
import (
"fmt"
"strings"
"time"
"github.com/casdoor/casdoor/util"
@ -24,12 +25,17 @@ import (
type Claims struct {
*User
Nonce string `json:"nonce,omitempty"`
Tag string `json:"tag,omitempty"`
Scope string `json:"scope,omitempty"`
Address Address `json:"address"`
Nonce string `json:"nonce,omitempty"`
Tag string `json:"tag,omitempty"`
Scope string `json:"scope,omitempty"`
jwt.RegisteredClaims
}
type Address struct {
Formatted string `json:"formatted"`
}
type UserShort struct {
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
Name string `xorm:"varchar(100) notnull pk" json:"name"`
@ -72,8 +78,9 @@ func generateJwtToken(application *Application, user *User, nonce string, scope
jti := fmt.Sprintf("%s/%s", application.Owner, name)
claims := Claims{
User: user,
Nonce: nonce,
User: user,
Address: Address{Formatted: strings.Join(user.Address, ",")},
Nonce: nonce,
// FIXME: A workaround for custom claim by reusing `tag` in user info
Tag: user.Tag,
Scope: scope,