Skip to content

Commit 044e1b8

Browse files
committed
Fix blank senderId
1 parent ad5ea49 commit 044e1b8

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

internal/core/handlers/hours/organization_request_accept_post.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"net/http"
55

66
"github.com/joinimpact/api/internal/conversations"
7+
"github.com/joinimpact/api/internal/core/middleware/auth"
78
"github.com/joinimpact/api/internal/hours"
89
"github.com/joinimpact/api/pkg/idctx"
910
"github.com/joinimpact/api/pkg/resp"
@@ -18,8 +19,8 @@ func OrganizationRequestAcceptPost(hoursService hours.Service, conversationsServ
1819
return func(w http.ResponseWriter, r *http.Request) {
1920
ctx := r.Context()
2021

21-
userID, err := idctx.Get(r, "userID")
22-
if err != nil {
22+
userID, ok := ctx.Value(auth.KeyUserID).(int64)
23+
if !ok {
2324
return
2425
}
2526

internal/core/handlers/hours/organization_request_decline_post.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"net/http"
55

66
"github.com/joinimpact/api/internal/conversations"
7+
"github.com/joinimpact/api/internal/core/middleware/auth"
78
"github.com/joinimpact/api/internal/hours"
89
"github.com/joinimpact/api/pkg/idctx"
910
"github.com/joinimpact/api/pkg/resp"
@@ -18,8 +19,8 @@ func OrganizationRequestDeclinePost(hoursService hours.Service, conversationsSer
1819
return func(w http.ResponseWriter, r *http.Request) {
1920
ctx := r.Context()
2021

21-
userID, err := idctx.Get(r, "userID")
22-
if err != nil {
22+
userID, ok := ctx.Value(auth.KeyUserID).(int64)
23+
if !ok {
2324
return
2425
}
2526

0 commit comments

Comments
 (0)