src-d
diff --git a/‎server/handler/assignments.go‎
Lines changed: 6 additions & 6 deletions b/‎server/handler/assignments.go‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎server/handler/user.go‎
Lines changed: 4 additions & 5 deletions b/‎server/handler/user.go‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎server/service/jwt.go‎
Lines changed: 15 additions & 4 deletions b/‎server/service/jwt.go‎
Lines changed: 15 additions & 4 deletions
@@ -21,9 +21,9 @@ func GetAssignmentsForUserExperiment(repo *repository.Assignments) RequestProces
 			return nil, err
 		}
 
-		userID := service.GetUserID(r.Context())
-		if userID == 0 {
-			return nil, fmt.Errorf("no user id in context")
+		userID, err := service.GetUserID(r.Context())
+		if err != nil {
+			return nil, err
 		}
 
 		assignments, err := repo.GetAll(userID, experimentID)
@@ -50,9 +50,9 @@ func SaveAssignment(repo *repository.Assignments) RequestProcessFunc {
 			return nil, err
 		}
 
-		userID := service.GetUserID(r.Context())
-		if userID == 0 {
-			return nil, fmt.Errorf("no user id in context")
+		userID, err := service.GetUserID(r.Context())
+		if err != nil {
+			return nil, err
 		}
 
 		var assignmentRequest assignmentRequest
 
@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/src-d/code-annotation/server/repository"
@@ -13,12 +12,12 @@ import (
 // with the information about the current user
 func Me(usersRepo *repository.Users) RequestProcessFunc {
 	return func(r *http.Request) (*serializer.Response, error) {
-		uID := service.GetUserID(r.Context())
-		if uID == 0 {
-			return nil, fmt.Errorf("no user id in context")
+		userID, err := service.GetUserID(r.Context())
+		if err != nil {
+			return nil, err
 		}
 
-		u, err := usersRepo.GetByID(uID)
+		u, err := usersRepo.GetByID(userID)
 		if err != nil || u == nil {
 			return nil, serializer.NewHTTPError(http.StatusNotFound, "user not found")
 		}
 
@@ -77,8 +77,19 @@ func (j *JWT) Middleware(next http.Handler) http.Handler {
 	})
 }
 
-// GetUserID gets user ID set by the JWT middleware, or 0 if was not set
-func GetUserID(ctx context.Context) int {
-	id, _ := ctx.Value(userIDKey).(int)
-	return id
+// getUserInt gets the value stored in the Context for the key userIDKey, bool
+// is true on success
+func getUserInt(ctx context.Context) (int, bool) {
+	i, ok := ctx.Value(userIDKey).(int)
+	return i, ok
+}
+
+// GetUserID gets the user ID set by the JWT middleware in the Context
+func GetUserID(ctx context.Context) (int, error) {
+	id, ok := getUserInt(ctx)
+	if !ok {
+		return 0, fmt.Errorf("User ID is not set in the context")
+	}
+
+	return id, nil
 }
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ func GetAssignmentsForUserExperiment(repo *repository.Assignments) RequestProces`
`21`	`21`	`return nil, err`
`22`	`22`	`}`
`23`	`23`
`24`		`- userID := service.GetUserID(r.Context())`
`25`		`- if userID == 0 {`
`26`		`- return nil, fmt.Errorf("no user id in context")`
	`24`	`+ userID, err := service.GetUserID(r.Context())`
	`25`	`+ if err != nil {`
	`26`	`+ return nil, err`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`assignments, err := repo.GetAll(userID, experimentID)`
`@@ -50,9 +50,9 @@ func SaveAssignment(repo *repository.Assignments) RequestProcessFunc {`
`50`	`50`	`return nil, err`
`51`	`51`	`}`
`52`	`52`
`53`		`- userID := service.GetUserID(r.Context())`
`54`		`- if userID == 0 {`
`55`		`- return nil, fmt.Errorf("no user id in context")`
	`53`	`+ userID, err := service.GetUserID(r.Context())`
	`54`	`+ if err != nil {`
	`55`	`+ return nil, err`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`var assignmentRequest assignmentRequest`