remove single case switch

remove duplicate cases Signed-off-by: SammyOina <sammyoina@gmail.com>
absmach · Jun 16, 2023 · 78b73ca · 78b73ca
1 parent 55e09c1
commit 78b73ca
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/users/clients/emailer/emailer.go b/users/clients/emailer/emailer.go
@@ -23,7 +23,7 @@ func New(url string, c *email.Config) (clients.Emailer, error) {
 	return &emailer{resetURL: url, agent: e}, err
 }
 
-func (e *emailer) SendPasswordReset(To []string, host, user, token string) error {
+func (e *emailer) SendPasswordReset(to []string, host, user, token string) error {
 	url := fmt.Sprintf("%s%s?token=%s", host, e.resetURL, token)
-	return e.agent.Send(To, "", "Password Reset Request", "", user, url, "")
+	return e.agent.Send(to, "", "Password Reset Request", "", user, url, "")
 }
diff --git a/users/clients/mocks/authn.go b/users/clients/mocks/authn.go
@@ -45,10 +45,7 @@ func (svc authServiceMock) Identify(ctx context.Context, in *policies.Token, opt
 
 func (svc authServiceMock) Issue(ctx context.Context, in *policies.IssueReq, opts ...grpc.CallOption) (*policies.Token, error) {
 	if id, ok := svc.users[in.GetEmail()]; ok {
-		switch in.Type {
-		default:
-			return &policies.Token{Value: id}, nil
-		}
+		return &policies.Token{Value: id}, nil
 	}
 	return nil, errors.ErrAuthentication
 }

diff --git a/users/clients/service.go b/users/clients/service.go
@@ -186,7 +186,7 @@ func (svc service) ListClients(ctx context.Context, token string, pm mfclients.P
 		if client.ID == id {
 			clients.Clients = append(clients.Clients[:i], clients.Clients[i+1:]...)
 			if clients.Total != 0 {
-				clients.Total = clients.Total - 1
+				clients.Total--
 			}
 		}
 	}

diff --git a/users/jwt/tokens.go b/users/jwt/tokens.go
@@ -65,8 +65,8 @@ func (repo tokenRepo) Issue(ctx context.Context, claim Claims) (Token, error) {
 	}
 
 	return Token{
-		AccessToken:  string(signedAccessToken[:]),
-		RefreshToken: string(signedRefreshToken[:]),
+		AccessToken:  string(signedAccessToken),
+		RefreshToken: string(signedRefreshToken),
 		AccessType:   "Bearer",
 	}, nil
 }

diff --git a/users/policies/api/grpc/transport.go b/users/policies/api/grpc/transport.go
@@ -179,7 +179,6 @@ func encodeError(err error) error {
 	case errors.Contains(err, errors.ErrMalformedEntity),
 		err == apiutil.ErrInvalidAuthKey,
 		err == apiutil.ErrMissingID,
-		err == apiutil.ErrBearerToken,
 		err == apiutil.ErrMissingPolicySub,
 		err == apiutil.ErrMissingPolicyObj,
 		err == apiutil.ErrMalformedPolicyAct,

diff --git a/ws/api/endpoints.go b/ws/api/endpoints.go
@@ -94,7 +94,7 @@ func parseSubTopic(subtopic string) (string, error) {
 		return "", errMalformedSubtopic
 	}
 
-	subtopic = strings.Replace(subtopic, "/", ".", -1)
+	subtopic = strings.ReplaceAll(subtopic, "/", ".")
 
 	elems := strings.Split(subtopic, ".")
 	filteredElems := []string{}