Bugfixes and freedback addressing
This commit is contained in:
@@ -28,8 +28,9 @@ func (wikiAuth *WikiAthenticator) Name() string {
|
||||
// Find finds a user that has logged in at least once
|
||||
func (wikiAuth *WikiAthenticator) Find(username string) *auth.User {
|
||||
db := server.Main.DB
|
||||
fullID := wikiAuth.ID() + ":" + username
|
||||
|
||||
rows, err := db.Query("SELECT id,role FROM `user` WHERE id=?", username)
|
||||
rows, err := db.Query("SELECT id,role FROM `user` WHERE id=?", fullID)
|
||||
if err != nil {
|
||||
log.Println("WikiAthenticator.Find:", err)
|
||||
return nil
|
||||
@@ -45,6 +46,7 @@ func (wikiAuth *WikiAthenticator) Find(username string) *auth.User {
|
||||
role := "member"
|
||||
rows.Scan(&user.ID, &role)
|
||||
user.Data["role"] = role
|
||||
user.ID = strings.SplitN(user.ID, ":", 2)[1]
|
||||
|
||||
return user
|
||||
}
|
||||
@@ -79,7 +81,7 @@ func (wikiAuth *WikiAthenticator) Login(username, password string) (*auth.User,
|
||||
return nil, fmt.Errorf("Login failed %v", err)
|
||||
}
|
||||
|
||||
return auth.NewUser(wikiAuth, fullID, "member", nil), nil
|
||||
return auth.NewUser(wikiAuth, username, "member", nil), nil
|
||||
}
|
||||
|
||||
// If the user was found, read it in
|
||||
|
||||
Reference in New Issue
Block a user