From f249f3e26ff3d1717f5ddb055db9c15cde1300e3 Mon Sep 17 00:00:00 2001
From: mteodor <mirko.teodorovic@gmail.com>
Date: Fri, 22 Oct 2021 12:18:26 +0200
Subject: [PATCH] some refactor of cases for authorization switch

Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
---
 readers/api/transport.go | 17 ++++++++---------
 readers/messages.go      |  4 +---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/readers/api/transport.go b/readers/api/transport.go
index af8ca446574..3d4bb5415fb 100644
--- a/readers/api/transport.go
+++ b/readers/api/transport.go
@@ -223,16 +223,15 @@ func authorize(ctx context.Context, r *http.Request, chanID string) (err error)
 	if token == "" {
 		return errUnauthorizedAccess
 	}
-	if strings.HasPrefix(token, thingToken) {
-		token = strings.ReplaceAll(token, thingToken, "")
+	switch {
+	case strings.HasPrefix(token, thingToken):
+		token = strings.TrimPrefix(token, thingToken)
 		if _, err := thingsAuth.CanAccessByKey(ctx, &mainflux.AccessByKeyReq{Token: token, ChanID: chanID}); err != nil {
 			return errors.Wrap(errUnauthorizedAccess, errThingAccess)
 		}
 		return nil
-	}
-
-	if strings.HasPrefix(token, userToken) {
-		token = strings.ReplaceAll(token, userToken, "")
+	case strings.HasPrefix(token, userToken):
+		token = strings.TrimPrefix(token, userToken)
 		user, err := usersAuth.Identify(ctx, &mainflux.Token{Value: token})
 		if err != nil {
 			e, ok := status.FromError(err)
@@ -250,10 +249,10 @@ func authorize(ctx context.Context, r *http.Request, chanID string) (err error)
 			return err
 		}
 		return nil
-	}
-
-	return errors.Wrap(errUnauthorizedAccess, errWrongToken)
+	default:
+		return errors.Wrap(errUnauthorizedAccess, errWrongToken)
 
+	}
 }
 
 func readBoolValueQuery(r *http.Request, key string) (bool, error) {
diff --git a/readers/messages.go b/readers/messages.go
index af0638a4c30..c5170b82d5d 100644
--- a/readers/messages.go
+++ b/readers/messages.go
@@ -3,9 +3,7 @@
 
 package readers
 
-import (
-	"errors"
-)
+import "errors"
 
 const (
 	// EqualKey represents the equal comparison operator key.