LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

refactor: switch to GetUserFromContext

This commit is contained in:
Derrick Hammer 2024-02-13 23:29:48 -05:00
parent 634a285ea8
commit 8b9471aa04
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api/s5/http.go
View File

@ -124,6 +124,7 @@ func (h *HttpHandler) smallFileUpload(jc jape.Context) {
r := jc.Request r := jc.Request
contentType := r.Header.Get("Content-Type") contentType := r.Header.Get("Content-Type")
user := middleware.GetUserFromContext(jc.Request.Context())
if strings.HasPrefix(contentType, "multipart/form-data") { if strings.HasPrefix(contentType, "multipart/form-data") {
// Parse the multipart form // Parse the multipart form
@ -189,7 +190,7 @@ func (h *HttpHandler) smallFileUpload(jc jape.Context) {
return return
} }
err = h.accounts.PinByID(upload.ID, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64))) err = h.accounts.PinByID(upload.ID, user)
if err != nil { if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError) _ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
h.logger.Error(errUploadingFile, zap.Error(err)) h.logger.Error(errUploadingFile, zap.Error(err))
@ -249,13 +250,13 @@ func (h *HttpHandler) smallFileUpload(jc jape.Context) {
mimeType := http.DetectContentType(mimeBytes[:]) mimeType := http.DetectContentType(mimeBytes[:])
upload, err := h.storage.CreateUpload(hash.Hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(bufferSize), "s5") upload, err := h.storage.CreateUpload(hash.Hash, mimeType, user, jc.Request.RemoteAddr, uint64(bufferSize), "s5")
if err != nil { if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError) _ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
h.logger.Error(errUploadingFile, zap.Error(err)) h.logger.Error(errUploadingFile, zap.Error(err))
} }
err = h.accounts.PinByID(upload.ID, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64))) err = h.accounts.PinByID(upload.ID, user)
if err != nil { if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError) _ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
h.logger.Error(errUploadingFile, zap.Error(err)) h.logger.Error(errUploadingFile, zap.Error(err))
@ -583,7 +584,8 @@ func (h *HttpHandler) accountLogin(jc jape.Context) {
} }
func (h *HttpHandler) accountInfo(jc jape.Context) { func (h *HttpHandler) accountInfo(jc jape.Context) {
_, user, _ := h.accounts.AccountExists(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint)) userID := middleware.GetUserFromContext(jc.Request.Context())
_, user, _ := h.accounts.AccountExists(userID)
info := &AccountInfoResponse{ info := &AccountInfoResponse{
Email: user.Email, Email: user.Email,
@ -603,7 +605,8 @@ func (h *HttpHandler) accountInfo(jc jape.Context) {
} }
func (h *HttpHandler) accountStats(jc jape.Context) { func (h *HttpHandler) accountStats(jc jape.Context) {
_, user, _ := h.accounts.AccountExists(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint)) userID := middleware.GetUserFromContext(jc.Request.Context())
_, user, _ := h.accounts.AccountExists(userID)
info := &AccountStatsResponse{ info := &AccountStatsResponse{
AccountInfoResponse: AccountInfoResponse{ AccountInfoResponse: AccountInfoResponse{
@ -636,12 +639,14 @@ func (h *HttpHandler) accountPins(jc jape.Context) {
return return
} }
userID := middleware.GetUserFromContext(jc.Request.Context())
errored := func(err error) { errored := func(err error) {
_ = jc.Error(errFailedToGetPinsErr, http.StatusInternalServerError) _ = jc.Error(errFailedToGetPinsErr, http.StatusInternalServerError)
h.logger.Error(errFailedToGetPins, zap.Error(err)) h.logger.Error(errFailedToGetPins, zap.Error(err))
} }
pins, err := h.accounts.AccountPins(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64), cursor) pins, err := h.accounts.AccountPins(userID, cursor)
if err != nil { if err != nil {
errored(err) errored(err)
@ -669,6 +674,8 @@ func (h *HttpHandler) accountPinDelete(jc jape.Context) {
return return
} }
user := middleware.GetUserFromContext(jc.Request.Context())
errored := func(err error) { errored := func(err error) {
_ = jc.Error(errFailedToDelPinErr, http.StatusInternalServerError) _ = jc.Error(errFailedToDelPinErr, http.StatusInternalServerError)
h.logger.Error(errFailedToDelPin, zap.Error(err)) h.logger.Error(errFailedToDelPin, zap.Error(err))
@ -683,7 +690,7 @@ func (h *HttpHandler) accountPinDelete(jc jape.Context) {
hash := hex.EncodeToString(decodedCid.Hash.HashBytes()) hash := hex.EncodeToString(decodedCid.Hash.HashBytes())
err = h.accounts.DeletePinByHash(hash, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64))) err = h.accounts.DeletePinByHash(hash, user)
if err != nil { if err != nil {
errored(err) errored(err)
@ -698,6 +705,8 @@ func (h *HttpHandler) accountPin(jc jape.Context) {
return return
} }
userID := middleware.GetUserFromContext(jc.Request.Context())
errored := func(err error) { errored := func(err error) {
_ = jc.Error(errFailedToAddPinErr, http.StatusInternalServerError) _ = jc.Error(errFailedToAddPinErr, http.StatusInternalServerError)
h.logger.Error(errFailedToAddPin, zap.Error(err)) h.logger.Error(errFailedToAddPin, zap.Error(err))
@ -715,7 +724,7 @@ func (h *HttpHandler) accountPin(jc jape.Context) {
hash := hex.EncodeToString(decodedCid.Hash.HashBytes()) hash := hex.EncodeToString(decodedCid.Hash.HashBytes())
err = h.accounts.PinByHash(hash, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64))) err = h.accounts.PinByHash(hash, userID)
if err != nil { if err != nil {
errored(err) errored(err)
@ -744,6 +753,7 @@ func (h *HttpHandler) directoryUpload(jc jape.Context) {
r := jc.Request r := jc.Request
contentType := r.Header.Get("Content-Type") contentType := r.Header.Get("Content-Type")
user := middleware.GetUserFromContext(jc.Request.Context())
errored := func(err error) { errored := func(err error) {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError) _ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
@ -821,7 +831,7 @@ func (h *HttpHandler) directoryUpload(jc jape.Context) {
} }
mimeType := http.DetectContentType(mimeBytes[:]) mimeType := http.DetectContentType(mimeBytes[:])
upload, err := h.storage.CreateUpload(hash.Hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(fileHeader.Size), "s5") upload, err := h.storage.CreateUpload(hash.Hash, mimeType, user, jc.Request.RemoteAddr, uint64(fileHeader.Size), "s5")
if err != nil { if err != nil {
errored(err) errored(err)