mirror of
https://github.com/steveiliop56/tinyauth.git
synced 2025-10-28 12:45:47 +00:00
fix: coderabbit suggestions
This commit is contained in:
@@ -169,8 +169,18 @@ func (controller *OAuthController) oauthCallbackHandler(c *gin.Context) {
|
|||||||
name = fmt.Sprintf("%s (%s)", utils.Capitalize(strings.Split(user.Email, "@")[0]), strings.Split(user.Email, "@")[1])
|
name = fmt.Sprintf("%s (%s)", utils.Capitalize(strings.Split(user.Email, "@")[0]), strings.Split(user.Email, "@")[1])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var usename string
|
||||||
|
|
||||||
|
if user.PreferredUsername != "" {
|
||||||
|
log.Debug().Msg("Using preferred username from OAuth provider")
|
||||||
|
usename = user.PreferredUsername
|
||||||
|
} else {
|
||||||
|
log.Debug().Msg("No preferred username from OAuth provider, using pseudo username")
|
||||||
|
usename = strings.Replace(user.Email, "@", "_", -1)
|
||||||
|
}
|
||||||
|
|
||||||
controller.Auth.CreateSessionCookie(c, &config.SessionCookie{
|
controller.Auth.CreateSessionCookie(c, &config.SessionCookie{
|
||||||
Username: user.PreferredUsername,
|
Username: usename,
|
||||||
Name: name,
|
Name: name,
|
||||||
Email: user.Email,
|
Email: user.Email,
|
||||||
Provider: req.Provider,
|
Provider: req.Provider,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package model
|
package model
|
||||||
|
|
||||||
type Session struct {
|
type Session struct {
|
||||||
UUID string `gorm:"column:uuid"`
|
UUID string `gorm:"column:uuid;primaryKey"`
|
||||||
Username string `gorm:"column:username"`
|
Username string `gorm:"column:username"`
|
||||||
Email string `gorm:"column:email"`
|
Email string `gorm:"column:email"`
|
||||||
Name string `gorm:"column:name"`
|
Name string `gorm:"column:name"`
|
||||||
|
|||||||
@@ -222,13 +222,13 @@ func (auth *AuthService) CreateSessionCookie(c *gin.Context, data *config.Sessio
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (auth *AuthService) DeleteSessionCookie(c *gin.Context) error {
|
func (auth *AuthService) DeleteSessionCookie(c *gin.Context) error {
|
||||||
session, err := auth.GetSessionCookie(c)
|
cookie, err := c.Cookie(auth.Config.SessionCookieName)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
res := auth.Database.Unscoped().Where("uuid = ?", session.UUID).Delete(&model.Session{})
|
res := auth.Database.Unscoped().Where("uuid = ?", cookie).Delete(&model.Session{})
|
||||||
|
|
||||||
if res.Error != nil {
|
if res.Error != nil {
|
||||||
return res.Error
|
return res.Error
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ func (ds *DatabaseService) Init() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sqlDB.SetMaxOpenConns(1)
|
||||||
|
|
||||||
err = ds.migrateDatabase(sqlDB)
|
err = ds.migrateDatabase(sqlDB)
|
||||||
|
|
||||||
if err != nil && err != migrate.ErrNoChange {
|
if err != nil && err != migrate.ErrNoChange {
|
||||||
|
|||||||
Reference in New Issue
Block a user