Compare commits

..

2 Commits

Author SHA1 Message Date
fe48c38bc6 feat: support minio (#418)
Signed-off-by: abingcbc <abingcbc626@gmail.com>
2022-01-13 21:48:00 +08:00
1be777c08f Fix GetUserByField()'s bug for idCard. 2022-01-13 12:48:15 +08:00
3 changed files with 6 additions and 1 deletions

View File

@ -85,6 +85,7 @@ func GetJsonWebKeySet() (jose.JSONWebKeySet, error) {
var jwk jose.JSONWebKey var jwk jose.JSONWebKey
jwk.Key = x509Cert.PublicKey jwk.Key = x509Cert.PublicKey
jwk.Certificates = []*x509.Certificate{x509Cert} jwk.Certificates = []*x509.Certificate{x509Cert}
jwk.KeyID = cert.Name
var jwks jose.JSONWebKeySet var jwks jose.JSONWebKeySet
jwks.Keys = []jose.JSONWebKey{jwk} jwks.Keys = []jose.JSONWebKey{jwk}

View File

@ -26,6 +26,7 @@ import (
type Claims struct { type Claims struct {
*User *User
Nonce string `json:"nonce,omitempty"` Nonce string `json:"nonce,omitempty"`
Tag string `json:"tag,omitempty"`
jwt.RegisteredClaims jwt.RegisteredClaims
} }
@ -67,6 +68,8 @@ func generateJwtToken(application *Application, user *User, nonce string) (strin
claims := Claims{ claims := Claims{
User: user, User: user,
Nonce: nonce, Nonce: nonce,
// FIXME: A workaround for custom claim by reusing `tag` in user info
Tag: user.Tag,
RegisteredClaims: jwt.RegisteredClaims{ RegisteredClaims: jwt.RegisteredClaims{
Issuer: beego.AppConfig.String("origin"), Issuer: beego.AppConfig.String("origin"),
Subject: user.Id, Subject: user.Id,
@ -102,6 +105,7 @@ func generateJwtToken(application *Application, user *User, nonce string) (strin
return "", "", err return "", "", err
} }
token.Header["kid"] = cert.Name
tokenString, err := token.SignedString(key) tokenString, err := token.SignedString(key)
if err != nil { if err != nil {
return "", "", err return "", "", err

View File

@ -65,7 +65,7 @@ func GetUserByFields(organization string, field string) *User {
} }
// check ID card // check ID card
user = GetUserByField(organization, "idCard", field) user = GetUserByField(organization, "id_card", field)
if user != nil { if user != nil {
return user return user
} }