Skip to content

Commit 2536a96

Browse files
authored
fix: remove oidc groups in token (#254)
Signed-off-by: Zzde <zhangxh1997@gmail.com>
1 parent 0eb1ff7 commit 2536a96

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

pkg/auth/oauth_manager.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,8 @@ func (om *OAuthManager) GenerateJWT(user *model.User, refreshToken string) (stri
7979
claims := Claims{
8080
UserID: user.ID,
8181
Username: user.Username,
82-
Name: user.Name,
83-
AvatarURL: user.AvatarURL,
8482
Provider: user.Provider,
8583
RefreshToken: refreshToken,
86-
OIDCGroups: user.OIDCGroups,
8784
RegisteredClaims: jwt.RegisteredClaims{
8885
ExpiresAt: jwt.NewNumericDate(expirationTime),
8986
IssuedAt: jwt.NewNumericDate(now),
@@ -175,11 +172,8 @@ func (om *OAuthManager) RefreshJWT(c *gin.Context, tokenString string) (string,
175172
Model: model.Model{
176173
ID: claims.UserID,
177174
},
178-
Username: claims.Username,
179-
Name: claims.Name,
180-
AvatarURL: claims.AvatarURL,
181-
Provider: claims.Provider,
182-
OIDCGroups: claims.OIDCGroups,
175+
Username: claims.Username,
176+
Provider: claims.Provider,
183177
}
184178

185179
return om.GenerateJWT(user, "")

pkg/auth/oauth_provider.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,10 @@ type TokenResponse struct {
4141

4242
// Claims represents JWT claims with refresh token support
4343
type Claims struct {
44-
UserID uint `json:"user_id"`
45-
Username string `json:"username"`
46-
Name string `json:"name"`
47-
AvatarURL string `json:"avatar_url"`
48-
Provider string `json:"provider"`
49-
RefreshToken string `json:"refresh_token,omitempty"`
50-
OIDCGroups []string `json:"oidc_groups,omitempty"`
44+
UserID uint `json:"user_id"`
45+
Username string `json:"username"`
46+
Provider string `json:"provider"`
47+
RefreshToken string `json:"refresh_token,omitempty"`
5148
jwt.RegisteredClaims
5249
}
5350

0 commit comments

Comments
 (0)