From 475f53900a73bdb7b55d95037f26d3229405566b Mon Sep 17 00:00:00 2001 From: Guillaume Horel Date: Tue, 27 Jun 2017 22:28:40 -0400 Subject: more progress --- modern.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'modern.go') diff --git a/modern.go b/modern.go index 83feb5d..47b3a1d 100644 --- a/modern.go +++ b/modern.go @@ -1,6 +1,7 @@ package main import ( + "database/sql" "database/sql/driver" "encoding/json" "encoding/xml" @@ -34,10 +35,10 @@ type Name struct { } type Token struct { - XMLName xml.Name `xml:"token" json:"-"` - Val string `xml:",innerxml" json:"token"` - Created time.Time `xml:"-" json:"-"` - UserId int `xml:"-" json:"-"` + XMLName xml.Name `xml:"token" json:"-"` + Val string `xml:",innerxml" json:"token"` + Created time.Time `xml:"-" json:"-"` + UserId sql.NullInt64 `xml:"-" json:"-"` } type LFMResponse struct { @@ -120,8 +121,8 @@ func (store *SqlStore) AuthGetSession(r *http.Request) (ApiResponse, error) { // FIXME: error 15 return nil, errors.New("This token has expired") } else { - if token.UserId != 0 { - user := &User{Id: token.UserId} + if token.UserId.Valid { + user := &User{Id: int(token.UserId.Int64)} if err := store.GetUser(user); err != nil { return nil, err } else { -- cgit v1.2.3-70-g09d2