Merge pull request #4 from insighio/CNSL-12-support-api-keys

CNSL-12 support api keys
insighio · Dec 11, 2023 · f5b5c65 · f5b5c65
2 parents b00d321 + f87e8cf
commit f5b5c65
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/auth/api/http/keys/endpoint.go b/auth/api/http/keys/endpoint.go
@@ -30,7 +30,7 @@ func issueEndpoint(svc auth.Service) endpoint.Endpoint {
 			newKey.ExpiresAt = exp
 		}
 
-		key, secret, err := svc.Issue(ctx, req.token, newKey)
+		key, secret, err := svc.Issue(ctx, req.Token, newKey)
 		if err != nil {
 			return nil, err
 		}

diff --git a/auth/api/http/keys/requests.go b/auth/api/http/keys/requests.go
@@ -10,7 +10,7 @@ import (
 )
 
 type issueKeyReq struct {
-	token    string
+	Token    string        `json:"token,omitempty"`
 	Type     uint32        `json:"type,omitempty"`
 	Duration time.Duration `json:"duration,omitempty"`
 }
@@ -20,7 +20,7 @@ func (req issueKeyReq) validate() error {
 	if req.Type == auth.UserKey {
 		return nil
 	}
-	if req.token == "" || (req.Type != auth.APIKey) {
+	if req.Token == "" || (req.Type != auth.APIKey) {
 		return auth.ErrMalformedEntity
 	}
 	return nil

diff --git a/auth/api/http/keys/transport.go b/auth/api/http/keys/transport.go
@@ -56,7 +56,7 @@ func decodeIssue(_ context.Context, r *http.Request) (interface{}, error) {
 		return nil, errUnsupportedContentType
 	}
 	req := issueKeyReq{
-		token: r.Header.Get("Authorization"),
+		Token: r.Header.Get("Authorization"),
 	}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		return nil, errors.Wrap(auth.ErrMalformedEntity, err)

diff --git a/auth/api/logging.go b/auth/api/logging.go
@@ -1,6 +1,7 @@
 // Copyright (c) Mainflux
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build !test
 // +build !test
 
 package api

diff --git a/auth/service.go b/auth/service.go
@@ -166,7 +166,13 @@ func (svc service) Identify(ctx context.Context, token string) (Identity, error)
 	}
 
 	switch key.Type {
-	case APIKey, RecoveryKey, UserKey, EmailVerificationKey:
+	case RecoveryKey, UserKey, EmailVerificationKey:
+		return Identity{ID: key.IssuerID, Email: key.Subject}, nil
+	case APIKey:
+		_, err := svc.keys.Retrieve(context.TODO(), key.IssuerID, key.ID)
+		if err != nil {
+			return Identity{}, ErrUnauthorizedAccess
+		}
 		return Identity{ID: key.IssuerID, Email: key.Subject}, nil
 	default:
 		return Identity{}, ErrUnauthorizedAccess