OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-05-06 19:29:15 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #146 from mainflux/issue-145

Browse Source 
Fix 403 errors handling
This commit is contained in:
Drasko DRASKOVIC 2018-01-26 20:56:05 +01:00 committed by GitHub
commit 411cbf575a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http/api/transport.go
View File

@ -130,7 +130,7 @@ func encodeError(_ context.Context, err error, w http.ResponseWriter) {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
case errUnknownType: case errUnknownType:
w.WriteHeader(http.StatusUnsupportedMediaType) w.WriteHeader(http.StatusUnsupportedMediaType)
case errUnauthorizedAccess: case manager.ErrUnauthorizedAccess:
w.WriteHeader(http.StatusForbidden) w.WriteHeader(http.StatusForbidden)
default: default:
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)

12
manager/client/client.go
View File

@ -18,8 +18,14 @@ const (
maxFailureRatio = 0.6 maxFailureRatio = 0.6
) )
// ErrServiceUnreachable indicates that the service instance is not available. var (
var ErrServiceUnreachable = errors.New("manager service unavailable") // ErrServiceUnreachable indicates that the service instance is not available.
ErrServiceUnreachable = errors.New("manager service unavailable")
// ErrUnauthorizedAccess indicates missing or invalid credentials provided
// when accessing a protected resource.
ErrUnauthorizedAccess = manager.ErrUnauthorizedAccess
)
// ManagerClient provides an access to the manager service authorization // ManagerClient provides an access to the manager service authorization
// endpoints. // endpoints.
@ -79,7 +85,7 @@ func (mc ManagerClient) makeRequest(url, token string) (string, error) {
defer res.Body.Close() defer res.Body.Close()
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
return manager.ErrUnauthorizedAccess, nil return ErrUnauthorizedAccess, nil
} }
return res.Header.Get("X-client-id"), nil return res.Header.Get("X-client-id"), nil