diff --git a/backend/app/rest/api/rest.go b/backend/app/rest/api/rest.go index 59101517..25fbfa0d 100644 --- a/backend/app/rest/api/rest.go +++ b/backend/app/rest/api/rest.go @@ -312,7 +312,7 @@ func (s *Rest) alterComments(comments []store.Comment, r *http.Request) (res []s // prepare vote info for client view vote := func(c store.Comment, r *http.Request) store.Comment { - c.Vote = 0 //default is "none" (not voted) + c.Vote = 0 // default is "none" (not voted) user, err := rest.GetUserInfo(r) if err != nil { diff --git a/backend/app/rest/api/rest_private_test.go b/backend/app/rest/api/rest_private_test.go index ccb26f2a..be42276d 100644 --- a/backend/app/rest/api/rest_private_test.go +++ b/backend/app/rest/api/rest_private_test.go @@ -405,6 +405,19 @@ func TestRest_Vote(t *testing.T) { assert.Equal(t, 0, cr.Vote, "no vote info for not authed user") assert.Equal(t, map[string]bool(nil), cr.Votes) + req, err := http.NewRequest("GET", + fmt.Sprintf("%s/api/v1/id/%s?site=radio-t&url=https://radio-t.com/blah", ts.URL, id1), nil) + assert.NoError(t, err) + resp, err := sendReq(t, req, adminUmputunToken) + assert.NoError(t, err) + assert.Equal(t, 200, resp.StatusCode) + cr = store.Comment{} + err = json.NewDecoder(resp.Body).Decode(&cr) + assert.Nil(t, err) + assert.Equal(t, -1, cr.Score) + assert.Equal(t, 0, cr.Vote, "no vote info for different user") + assert.Equal(t, map[string]bool(nil), cr.Votes) + assert.Equal(t, map[string]bool(nil), cr.Votes) } diff --git a/backend/app/rest/api/rest_test.go b/backend/app/rest/api/rest_test.go index ef5108d7..d2ac686f 100644 --- a/backend/app/rest/api/rest_test.go +++ b/backend/app/rest/api/rest_test.go @@ -38,6 +38,8 @@ var getStartedHTML = "/tmp/getstarted.html" var devToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJyZW1hcms0MiIsImV4cCI6Mzc4OTE5MTgyMiwianRpIjoicmFuZG9tIGlkIiwiaXNzIjoicmVtYXJrNDIiLCJuYmYiOjE1MjE4ODQyMjIsInVzZXIiOnsibmFtZSI6ImRldmVsb3BlciBvbmUiLCJpZCI6ImRldiIsInBpY3R1cmUiOiJodHRwOi8vZXhhbXBsZS5jb20vcGljLnBuZyIsImlwIjoiMTI3LjAuMC4xIiwiZW1haWwiOiJtZUBleGFtcGxlLmNvbSJ9fQ.aKUAXiZxXypgV7m1wEOgUcyPOvUDXHDi3A06YWKbcLg" +var adminUmputunToken = "eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJyYWRpb3QiLCJleHAiOjE5NTQ1OTc5ODAsImp0aSI6Ijk3YTJlMGFjNGRjN2Q1ZjY5MjZkNWU4NjIwYWNlZjlhNDBjMCIsImlhdCI6MTQ1NDU5NzY4MCwiaXNzIjoicmVtYXJrNDIiLCJ1c2VyIjp7Im5hbWUiOiJVbXB1dHVuIiwiaWQiOiJnaXRodWJfZWYwZjcwNmE3IiwicGljdHVyZSI6Imh0dHBzOi8vcmVtYXJrNDIucmFkaW8tdC5jb20vYXBpL3YxL2F2YXRhci9jYjQyZmY0OTNhZGU2OTZkODhhM2E1OTBmMTM2YWU5ZTM0ZGU3YzFiLmltYWdlIiwiYXR0cnMiOnsiYWRtaW4iOnRydWUsImJsb2NrZWQiOmZhbHNlfX19.I5a8EHbUJy8mApuYCPDRThbC-1jP0sbPh1qwNyY1V4E" + func TestRest_FileServer(t *testing.T) { ts, _, teardown := startupT(t) defer teardown() @@ -296,6 +298,14 @@ func get(t *testing.T, url string) (string, int) { return string(body), r.StatusCode } +func sendReq(t *testing.T, r *http.Request, token string) (*http.Response, error) { + client := http.Client{Timeout: 5 * time.Second} + if token != "" { + r.Header.Set("X-JWT", token) + } + return client.Do(r) +} + func getWithDevAuth(t *testing.T, url string) (body string, code int) { client := &http.Client{Timeout: 5 * time.Second} req, err := http.NewRequest("GET", url, nil)