extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-24 05:51:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove TODOs for adding data to context that I think is actually fine to keep in the request as-is

Browse Source
This commit is contained in:
David Dworken 2023-10-22 11:17:06 -07:00
parent 956ac736f2
commit 53580d40e9
No known key found for this signature in database
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/server/internal/server/api_handlers.go
View File

@ -27,10 +27,8 @@ func (s *Server) apiSubmitHandler(w http.ResponseWriter, r *http.Request) {
} }
userId := entries[0].UserId userId := entries[0].UserId
// TODO: add these to the context in a middleware
version := getHishtoryVersion(r) version := getHishtoryVersion(r)
remoteIPAddr := getRemoteAddr(r) remoteIPAddr := getRemoteAddr(r)
s.handleNonCriticalError(s.updateUsageData(r.Context(), version, remoteIPAddr, entries[0].UserId, entries[0].DeviceId, len(entries), false)) s.handleNonCriticalError(s.updateUsageData(r.Context(), version, remoteIPAddr, entries[0].UserId, entries[0].DeviceId, len(entries), false))
devices, err := s.db.DevicesForUser(r.Context(), entries[0].UserId) devices, err := s.db.DevicesForUser(r.Context(), entries[0].UserId)
@ -77,8 +75,6 @@ func (s *Server) apiSubmitHandler(w http.ResponseWriter, r *http.Request) {
func (s *Server) apiBootstrapHandler(w http.ResponseWriter, r *http.Request) { func (s *Server) apiBootstrapHandler(w http.ResponseWriter, r *http.Request) {
userId := getRequiredQueryParam(r, "user_id") userId := getRequiredQueryParam(r, "user_id")
deviceId := getRequiredQueryParam(r, "device_id") deviceId := getRequiredQueryParam(r, "device_id")
// TODO: add these to the context in a middleware
version := getHishtoryVersion(r) version := getHishtoryVersion(r)
remoteIPAddr := getRemoteAddr(r) remoteIPAddr := getRemoteAddr(r)
@ -97,8 +93,6 @@ func (s *Server) apiQueryHandler(w http.ResponseWriter, r *http.Request) {
deviceId := getRequiredQueryParam(r, "device_id") deviceId := getRequiredQueryParam(r, "device_id")
queryReason := getOptionalQueryParam(r, "queryReason", s.isTestEnvironment) queryReason := getOptionalQueryParam(r, "queryReason", s.isTestEnvironment)
isBackgroundQuery := queryReason == "preload" || queryReason == "newclient" isBackgroundQuery := queryReason == "preload" || queryReason == "newclient"
// TODO: add these to the context in a middleware
version := getHishtoryVersion(r) version := getHishtoryVersion(r)
remoteIPAddr := getRemoteAddr(r) remoteIPAddr := getRemoteAddr(r)
@ -167,10 +161,8 @@ func (s *Server) apiSubmitDumpHandler(w http.ResponseWriter, r *http.Request) {
err = s.db.DumpRequestDeleteForUserAndDevice(r.Context(), userId, requestingDeviceId) err = s.db.DumpRequestDeleteForUserAndDevice(r.Context(), userId, requestingDeviceId)
checkGormError(err) checkGormError(err)
// TODO: add these to the context in a middleware
version := getHishtoryVersion(r) version := getHishtoryVersion(r)
remoteIPAddr := getRemoteAddr(r) remoteIPAddr := getRemoteAddr(r)
s.handleNonCriticalError(s.updateUsageData(r.Context(), version, remoteIPAddr, userId, srcDeviceId, len(entries), false)) s.handleNonCriticalError(s.updateUsageData(r.Context(), version, remoteIPAddr, userId, srcDeviceId, len(entries), false))
w.Header().Set("Content-Length", "0") w.Header().Set("Content-Length", "0")
@ -234,10 +226,8 @@ func (s *Server) apiRegisterHandler(w http.ResponseWriter, r *http.Request) {
checkGormError(err) checkGormError(err)
} }
// TODO: add these to the context in a middleware
version := getHishtoryVersion(r) version := getHishtoryVersion(r)
remoteIPAddr := getRemoteAddr(r) remoteIPAddr := getRemoteAddr(r)
s.handleNonCriticalError(s.updateUsageData(r.Context(), version, remoteIPAddr, userId, deviceId, 0, false)) s.handleNonCriticalError(s.updateUsageData(r.Context(), version, remoteIPAddr, userId, deviceId, 0, false))
if s.statsd != nil && !isIntegrationTestDevice { if s.statsd != nil && !isIntegrationTestDevice {