ami/tl-vikunja
1
0
Fork 0
Code

fix(openid): make sure usernames with spaces work

Browse Source
This commit is contained in:
kolaente 2023-11-13 11:38:15 +01:00
parent 225d65268d
commit ab2eda4bd5
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/modules/auth/openid/openid.go
View File

@ -21,6 +21,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"net/http" "net/http"
"strings"
"code.vikunja.io/web/handler" "code.vikunja.io/web/handler"
@ -216,7 +217,7 @@ func getOrCreateUser(s *xorm.Session, cl *claims, issuer, subject string) (u *us
// If no user exists, create one with the preferred username if it is not already taken // If no user exists, create one with the preferred username if it is not already taken
if user.IsErrUserDoesNotExist(err) { if user.IsErrUserDoesNotExist(err) {
uu := &user.User{ uu := &user.User{
Username: cl.PreferredUsername, Username: strings.ReplaceAll(cl.PreferredUsername, " ", "-"),
Email: cl.Email, Email: cl.Email,
Name: cl.Name, Name: cl.Name,
Status: user.StatusActive, Status: user.StatusActive,
@ -234,7 +235,7 @@ func getOrCreateUser(s *xorm.Session, cl *claims, issuer, subject string) (u *us
return nil, err return nil, err
} }
// If their preferred username is already taken, create some random one from the email and subject // If their preferred username is already taken, generate a random one
if user.IsErrUsernameExists(err) { if user.IsErrUsernameExists(err) {
uu.Username = petname.Generate(3, "-") uu.Username = petname.Generate(3, "-")
u, err = user.CreateUser(s, uu) u, err = user.CreateUser(s, uu)