tailcfg: remove ancient UserProfiles.Roles field
And add omitempty to the ProfilePicURL too while here. Plenty of users (and tagged devices) don't have profile pics. Updates #14988 Change-Id: I6534bc14edb58fe1034d2d35ae2395f09fd7dd0d Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
926a43fe51
commit
5a082fccec
+1
-15
@@ -259,11 +259,7 @@ type UserProfile struct {
|
||||
ID UserID
|
||||
LoginName string // "alice@smith.com"; for display purposes only (provider is not listed)
|
||||
DisplayName string // "Alice Smith"
|
||||
ProfilePicURL string
|
||||
|
||||
// Roles exists for legacy reasons, to keep old macOS clients
|
||||
// happy. It JSON marshals as [].
|
||||
Roles emptyStructJSONSlice
|
||||
ProfilePicURL string `json:",omitempty"`
|
||||
}
|
||||
|
||||
func (p *UserProfile) Equal(p2 *UserProfile) bool {
|
||||
@@ -279,16 +275,6 @@ func (p *UserProfile) Equal(p2 *UserProfile) bool {
|
||||
p.ProfilePicURL == p2.ProfilePicURL
|
||||
}
|
||||
|
||||
type emptyStructJSONSlice struct{}
|
||||
|
||||
var emptyJSONSliceBytes = []byte("[]")
|
||||
|
||||
func (emptyStructJSONSlice) MarshalJSON() ([]byte, error) {
|
||||
return emptyJSONSliceBytes, nil
|
||||
}
|
||||
|
||||
func (emptyStructJSONSlice) UnmarshalJSON([]byte) error { return nil }
|
||||
|
||||
// RawMessage is a raw encoded JSON value. It implements Marshaler and
|
||||
// Unmarshaler and can be used to delay JSON decoding or precompute a JSON
|
||||
// encoding.
|
||||
|
||||
Reference in New Issue
Block a user