From 221b599b082f9fa7e06c85764260775a4411390e Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Fri, 10 Jun 2022 00:16:19 -0700 Subject: [PATCH] receiving remote contact notifications --- net/server/internal/api_setArticleRevision.go | 2 +- net/server/internal/api_setChannelRevision.go | 2 +- net/server/internal/api_setProfileRevision.go | 2 +- net/server/internal/api_setViewRevision.go | 2 +- net/server/internal/authUtil.go | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net/server/internal/api_setArticleRevision.go b/net/server/internal/api_setArticleRevision.go index dbff352b..8cac7534 100644 --- a/net/server/internal/api_setArticleRevision.go +++ b/net/server/internal/api_setArticleRevision.go @@ -8,7 +8,7 @@ import ( func SetArticleRevision(w http.ResponseWriter, r *http.Request) { - card, code, err := BearerContactToken(r, false) + card, code, err := ParamContactToken(r, false) if err != nil { ErrResponse(w, code, err) return diff --git a/net/server/internal/api_setChannelRevision.go b/net/server/internal/api_setChannelRevision.go index 1fd9ca93..099eaf7c 100644 --- a/net/server/internal/api_setChannelRevision.go +++ b/net/server/internal/api_setChannelRevision.go @@ -8,7 +8,7 @@ import ( func SetChannelRevision(w http.ResponseWriter, r *http.Request) { - card, code, err := BearerContactToken(r, false) + card, code, err := ParamContactToken(r, false) if err != nil { ErrResponse(w, code, err) return diff --git a/net/server/internal/api_setProfileRevision.go b/net/server/internal/api_setProfileRevision.go index dca916a8..c3fa8ed1 100644 --- a/net/server/internal/api_setProfileRevision.go +++ b/net/server/internal/api_setProfileRevision.go @@ -8,7 +8,7 @@ import ( func SetProfileRevision(w http.ResponseWriter, r *http.Request) { - card, code, err := BearerContactToken(r, false) + card, code, err := ParamContactToken(r, false) if err != nil { ErrResponse(w, code, err) return diff --git a/net/server/internal/api_setViewRevision.go b/net/server/internal/api_setViewRevision.go index d6791729..1bdb6ab9 100644 --- a/net/server/internal/api_setViewRevision.go +++ b/net/server/internal/api_setViewRevision.go @@ -8,7 +8,7 @@ import ( func SetViewRevision(w http.ResponseWriter, r *http.Request) { - card, code, err := BearerContactToken(r, false) + card, code, err := ParamContactToken(r, false) if err != nil { ErrResponse(w, code, err) return diff --git a/net/server/internal/authUtil.go b/net/server/internal/authUtil.go index c84bca85..5fe07202 100644 --- a/net/server/internal/authUtil.go +++ b/net/server/internal/authUtil.go @@ -162,6 +162,7 @@ func BearerAppToken(r *http.Request, detail bool) (*store.Account, int, error) { } func ParseToken(token string) (string, string, error) { + split := strings.Split(token, ".") if len(split) != 2 { return "", "", errors.New("invalid token format") @@ -199,7 +200,7 @@ func ParamContactToken(r *http.Request, detail bool) (*store.Card, int, error) { // find token record var card store.Card if detail { - if err := store.DB.Preload("Account.AccountDetail").Where("account_id = ? AND in_token = ?", target, access).First(&card).Error; err != nil { + if err := store.DB.Preload("CardSlot").Preload("Account.AccountDetail").Where("account_id = ? AND in_token = ?", target, access).First(&card).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return nil, http.StatusNotFound, err } else { @@ -207,7 +208,7 @@ func ParamContactToken(r *http.Request, detail bool) (*store.Card, int, error) { } } } else { - if err := store.DB.Preload("Account").Where("account_id = ? AND in_token = ?", target, access).First(&card).Error; err != nil { + if err := store.DB.Preload("CardSlot").Preload("Account").Where("account_id = ? AND in_token = ?", target, access).First(&card).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return nil, http.StatusNotFound, err } else {