feat(warden): updated error handling

goto · Oct 5, 2023 · 6a235a1 · 6a235a1
1 parent 84f99ab
commit 6a235a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/server/v1/warden/handler.go b/internal/server/v1/warden/handler.go
@@ -1,6 +1,7 @@
 package warden
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/goto/dex/internal/server/utils"
@@ -17,11 +18,11 @@ func NewHandler(service *Service) *Handler {
 func (h *Handler) teamList(w http.ResponseWriter, r *http.Request) {
 	teamListResp, err := h.service.TeamList(r.Context())
 
-	if err == ErrUserNotFound {
+	if errors.Is(err, ErrUserNotFound) {
 		utils.WriteErrMsg(w, http.StatusUnauthorized, ErrUserNotFound.Error())
 		return
 	}
-	if err == ErrTeamNotFound {
+	if errors.Is(err, ErrTeamNotFound) {
 		utils.WriteErrMsg(w, http.StatusNotFound, ErrTeamNotFound.Error())
 		return
 	}

diff --git a/internal/server/v1/warden/service.go b/internal/server/v1/warden/service.go
@@ -32,7 +32,7 @@ func (c *Service) TeamList(ctx context.Context) (*TeamData, error) {
 
 	url := baseURL + endpoint + userPath + reqCtx.UserEmail + teamsEndpoint
 
-	resp, err := http.Get(url)
+	resp, err := http.Get(url) //nolint
 
 	if err != nil {
 		return nil, err