gabehf/Koito
1
0
Fork 0
mirror of https://github.com/gabehf/Koito.git synced 2026-03-07 13:38:15 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: invalid json response when login gate is disabled (#184)

Browse source
This commit is contained in:
Gabe Farrell 2026-01-26 14:49:30 -05:00 • committed by GitHub
parent 42b32c7920
commit 64236c99c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engine/long_test.go
View file

@ -367,6 +367,16 @@ func TestLoginGate(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 204, resp.StatusCode) assert.Equal(t, 204, resp.StatusCode)
req, err = http.NewRequest("GET", host()+"/apis/web/v1/artist?id=3", nil)
require.NoError(t, err)
resp, err = http.DefaultClient.Do(req)
assert.NoError(t, err)
assert.Equal(t, 200, resp.StatusCode)
var artist models.Artist
err = json.NewDecoder(resp.Body).Decode(&artist)
require.NoError(t, err)
assert.Equal(t, "ネクライトーキー", artist.Name)
cfg.SetLoginGate(true) cfg.SetLoginGate(true)
req, err = http.NewRequest("GET", host()+"/apis/web/v1/artist?id=3", nil) req, err = http.NewRequest("GET", host()+"/apis/web/v1/artist?id=3", nil)
@ -382,6 +392,9 @@ func TestLoginGate(t *testing.T) {
resp, err = http.DefaultClient.Do(req) resp, err = http.DefaultClient.Do(req)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 200, resp.StatusCode) assert.Equal(t, 200, resp.StatusCode)
err = json.NewDecoder(resp.Body).Decode(&artist)
require.NoError(t, err)
assert.Equal(t, "ネクライトーキー", artist.Name)
cfg.SetLoginGate(false) cfg.SetLoginGate(false)

7
engine/middleware/authenticate.go
View file

@ -62,6 +62,7 @@ func Authenticate(store db.DB, mode AuthMode) func(http.Handler) http.Handler {
} }
} else { } else {
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
return
} }
} }
@ -76,10 +77,8 @@ func Authenticate(store db.DB, mode AuthMode) func(http.Handler) http.Handler {
return return
} }
if user != nil { ctx = context.WithValue(ctx, UserContextKey, user)
ctx = context.WithValue(ctx, UserContextKey, user) r = r.WithContext(ctx)
r = r.WithContext(ctx)
}
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
}) })