Commit bc512462 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Fix parsing of AddClient error.

NotAuthorisedError may unwrap to os.ErrNotExist.
parent 3e5b5c30
...@@ -1424,9 +1424,7 @@ func handleClientMessage(c *webClient, m clientMessage) error { ...@@ -1424,9 +1424,7 @@ func handleClientMessage(c *webClient, m clientMessage) error {
if err != nil { if err != nil {
var e, s string var e, s string
var autherr *group.NotAuthorisedError var autherr *group.NotAuthorisedError
if errors.Is(err, os.ErrNotExist) { if errors.Is(err, token.ErrUsernameRequired) {
s = "group does not exist"
} else if errors.Is(err, token.ErrUsernameRequired) {
s = err.Error() s = err.Error()
e = "need-username" e = "need-username"
} else if errors.Is(err, group.ErrDuplicateUsername) { } else if errors.Is(err, group.ErrDuplicateUsername) {
...@@ -1436,6 +1434,8 @@ func handleClientMessage(c *webClient, m clientMessage) error { ...@@ -1436,6 +1434,8 @@ func handleClientMessage(c *webClient, m clientMessage) error {
s = "not authorised" s = "not authorised"
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
log.Printf("Join group: %v", err) log.Printf("Join group: %v", err)
} else if errors.Is(err, os.ErrNotExist) {
s = "group does not exist"
} else if _, ok := err.(group.UserError); ok { } else if _, ok := err.(group.UserError); ok {
s = err.Error() s = err.Error()
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment