88 "errors"
99 "fmt"
1010 "net"
11+ "net/mail"
1112 "path/filepath"
1213 "reflect"
1314 "regexp"
@@ -20,13 +21,12 @@ import (
2021
2122 "github.com/tinode/chat/server/auth"
2223 "github.com/tinode/chat/server/store/types"
23- "github.com/ttacon/libphonenumber "
24+ "github.com/nyaruka/phonenumbers "
2425
2526 "golang.org/x/crypto/acme/autocert"
2627)
2728
2829var tagPrefixRegexp = regexp .MustCompile (`^([a-z]\w{0,5}):\S` )
29- var emailRegexp = regexp .MustCompile ("^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\ .[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" )
3030
3131const nullValue = "\u2421 "
3232
@@ -403,20 +403,25 @@ func versionToString(vers int) string {
403403// against the email, telephone number or login patterns.
404404// On success, prepends the token with the corresponding prefix.
405405func rewriteToken (orig string ) string {
406- if orig == "" || strings . HasPrefix (orig , "basic:" ) ||
407- strings . HasPrefix ( orig , "email:" ) || strings . HasPrefix ( orig , "tel:" ) {
406+ if orig == "" || tagPrefixRegexp . MatchString (orig ) {
407+ // It either empty or already has a prefix. E.g. basic:alice.
408408 return orig
409409 }
410410 // Is it email?
411- if emailRegexp . MatchString (orig ) {
411+ if r , err := mail . ParseAddress (orig ); err == nil && r . Address == orig {
412412 return "email:" + orig
413413 }
414414 // TODO: pass region as a param.
415- if num , err := libphonenumber .Parse (orig , "US" ); err == nil {
415+ // 1. As provided by the client (e.g. as specified or inferred
416+ // from client's phone number or location).
417+ // 2. Use value from .conf file.
418+ // 3. Fallback to US as a last resort.
419+ if num , err := phonenumbers .Parse (orig , "US" ); err == nil {
416420 // It's a phone number.
417- return "tel:" + libphonenumber .Format (num , libphonenumber .E164 )
421+ return "tel:" + phonenumbers .Format (num , phonenumbers .E164 )
418422 }
419423 // Does it look like a username/login?
424+ // TODO: use configured authenticators to check if orig may a valid user name.
420425 runes := []rune (orig )
421426 if len (runes ) >= 3 && unicode .IsLetter (runes [0 ]) {
422427 // Check if the remaining chars are letters or digits.
0 commit comments