Skip to content

Commit 32c7e8e

Browse files
committed
fix: coderabbit suggestions
1 parent dc733a7 commit 32c7e8e

4 files changed

Lines changed: 16 additions & 4 deletions

File tree

internal/controller/oauth_controller.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,18 @@ func (controller *OAuthController) oauthCallbackHandler(c *gin.Context) {
169169
name = fmt.Sprintf("%s (%s)", utils.Capitalize(strings.Split(user.Email, "@")[0]), strings.Split(user.Email, "@")[1])
170170
}
171171

172+
var usename string
173+
174+
if user.PreferredUsername != "" {
175+
log.Debug().Msg("Using preferred username from OAuth provider")
176+
usename = user.PreferredUsername
177+
} else {
178+
log.Debug().Msg("No preferred username from OAuth provider, using pseudo username")
179+
usename = strings.Replace(user.Email, "@", "_", -1)
180+
}
181+
172182
controller.Auth.CreateSessionCookie(c, &config.SessionCookie{
173-
Username: user.PreferredUsername,
183+
Username: usename,
174184
Name: name,
175185
Email: user.Email,
176186
Provider: req.Provider,

internal/model/session_model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package model
22

33
type Session struct {
4-
UUID string `gorm:"column:uuid"`
4+
UUID string `gorm:"column:uuid;primaryKey"`
55
Username string `gorm:"column:username"`
66
Email string `gorm:"column:email"`
77
Name string `gorm:"column:name"`

internal/service/auth_service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,13 @@ func (auth *AuthService) CreateSessionCookie(c *gin.Context, data *config.Sessio
222222
}
223223

224224
func (auth *AuthService) DeleteSessionCookie(c *gin.Context) error {
225-
session, err := auth.GetSessionCookie(c)
225+
cookie, err := c.Cookie(auth.Config.SessionCookieName)
226226

227227
if err != nil {
228228
return err
229229
}
230230

231-
res := auth.Database.Unscoped().Where("uuid = ?", session.UUID).Delete(&model.Session{})
231+
res := auth.Database.Unscoped().Where("uuid = ?", cookie).Delete(&model.Session{})
232232

233233
if res.Error != nil {
234234
return res.Error

internal/service/database_service.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ func (ds *DatabaseService) Init() error {
3939
return err
4040
}
4141

42+
sqlDB.SetMaxOpenConns(1)
43+
4244
err = ds.migrateDatabase(sqlDB)
4345

4446
if err != nil && err != migrate.ErrNoChange {

0 commit comments

Comments
 (0)