refactor(api): replace APIKeyGet methods with unified APIKeyResolve

- Replace APIKeyGet and APIKeyGetByName with APIKeyResolve method
- Add APIKeyResolver enum with IDResolver and NameResolver options
- Update all service calls to use new resolver pattern
- Consolidate API key lookup logic into single method with resolver
  strategy
- Fix syntax error in CreateAPIKey method

BREAKING CHANGE: removes APIKeyGet and APIKeyGetByName methods from
APIKeyStore interface

Author: heiytor

api/services/api-key.go

@@ -41,7 +41,7 @@ func (s *service) CreateAPIKey(ctx context.Context, req *requests.CreateAPIKey)
 	case 30, 60, 90:
 		expiresIn = clock.Now().AddDate(0, 0, req.ExpiresAt).Unix()
 	case 365:
-		expiresIn = clock.Now().AddDate(1, 0, 0).Unix()
+		expiresIn = clock.Now().AddDate(1, 0, 0).Unix(Get)
 	case -1:
 		expiresIn = -1
 	default:
@@ -87,7 +87,7 @@ func (s *service) CreateAPIKey(ctx context.Context, req *requests.CreateAPIKey)
 
 	// As we need to return the plain key in the create service, we temporarily set
 	// the apiKey.ID to the plain key here.
-	apiKey, _ := s.store.APIKeyGet(ctx, hashedKey)
+	apiKey, _ := s.store.APIKeyResolve(ctx, store.APIKeyIDResolver, hashedKey)
 	apiKey.ID = req.Key
 
 	return responses.CreateAPIKeyFromModel(apiKey), nil

api/services/api-key_test.go

@@ -275,7 +275,7 @@ func TestCreateAPIKey(t *testing.T) {
 					Return(hashedKey, nil).
 					Once()
 				storeMock.
-					On("APIKeyGet", ctx, hashedKey).
+					On("APIKeyResolve", ctx, store.APIKeyIDResolver, hashedKey).
 					Return(&models.APIKey{
 						ID:        hashedKey,
 						Name:      "dev",
@@ -353,7 +353,7 @@ func TestCreateAPIKey(t *testing.T) {
 					Return(hashedKey, nil).
 					Once()
 				storeMock.
-					On("APIKeyGet", ctx, hashedKey).
+					On("APIKeyResolve", ctx, store.APIKeyIDResolver, hashedKey).
 					Return(&models.APIKey{
 						ID:        hashedKey,
 						Name:      "dev",

api/services/auth.go

@@ -431,7 +431,7 @@ func (s *service) AuthAPIKey(ctx context.Context, key string) (*models.APIKey, e
 		hashedKey := hex.EncodeToString(keySum[:])
 
 		var err error
-		if apiKey, err = s.store.APIKeyGet(ctx, hashedKey); err != nil {
+		if apiKey, err = s.store.APIKeyResolve(ctx, store.APIKeyIDResolver, hashedKey); err != nil {
 			return nil, NewErrAPIKeyNotFound("", err)
 		}
 	}

api/services/auth_test.go

@@ -2424,7 +2424,7 @@ func TestAuthAPIKey(t *testing.T) {
 				keySum := sha256.Sum256([]byte("00000000-0000-4000-0000-000000000000"))
 				hashedKey := hex.EncodeToString(keySum[:])
 				storeMock.
-					On("APIKeyGet", ctx, hashedKey).
+					On("APIKeyResolve", ctx, store.APIKeyIDResolver, hashedKey).
 					Return(nil, errors.New("error", "", 0)).
 					Once()
 			},
@@ -2444,7 +2444,7 @@ func TestAuthAPIKey(t *testing.T) {
 				keySum := sha256.Sum256([]byte("00000000-0000-4000-0000-000000000000"))
 				hashedKey := hex.EncodeToString(keySum[:])
 				storeMock.
-					On("APIKeyGet", ctx, hashedKey).
+					On("APIKeyResolve", ctx, store.APIKeyIDResolver, hashedKey).
 					Return(
 						&models.APIKey{
 							Name:      "dev",
@@ -2470,7 +2470,7 @@ func TestAuthAPIKey(t *testing.T) {
 				keySum := sha256.Sum256([]byte("00000000-0000-4000-0000-000000000000"))
 				hashedKey := hex.EncodeToString(keySum[:])
 				storeMock.
-					On("APIKeyGet", ctx, hashedKey).
+					On("APIKeyResolve", ctx, store.APIKeyIDResolver, hashedKey).
 					Return(
 						&models.APIKey{
 							Name:      "dev",

api/store/api_key.go

@@ -7,15 +7,21 @@ import (
 	"github.com/shellhub-io/shellhub/pkg/models"
 )
 
+type APIKeyResolver uint
+
+const (
+	APIKeyIDResolver APIKeyResolver = iota + 1
+	APIKeyNameResolver
+)
+
 type APIKeyStore interface {
 	// APIKeyCreate creates an API key with the provided data. Returns the inserted ID and an error if any.
 	APIKeyCreate(ctx context.Context, APIKey *models.APIKey) (insertedID string, err error)
 
-	// APIKeyGet retrieves an API key based on its ID. Returns the API key and an error if any.
-	APIKeyGet(ctx context.Context, id string) (apiKey *models.APIKey, err error)
-
-	// APIKeyGetByName retrieves an API key based on its name and tenant ID. Returns the API key and an error if any.
-	APIKeyGetByName(ctx context.Context, tenantID string, name string) (apiKey *models.APIKey, err error)
+	// APIKeyResolve fetches an API key using a specific resolver within a given tenant ID.
+	//
+	// It returns the resolved API key if found and an error, if any.
+	APIKeyResolve(ctx context.Context, resolver APIKeyResolver, value string, opts ...QueryOption) (*models.APIKey, error)
 
 	// APIKeyConflicts reports whether the target contains conflicting attributes with the database. Pass zero values for
 	// attributes you do not wish to match on.  It returns an array of conflicting attribute fields and an error, if any.

api/store/mocks/store.go

@@ -24,24 +24,6 @@ func (s *Store) APIKeyCreate(ctx context.Context, apiKey *models.APIKey) (string
 	return res.InsertedID.(string), nil
 }
 
-func (s *Store) APIKeyGet(ctx context.Context, id string) (*models.APIKey, error) {
-	apiKey := new(models.APIKey)
-	if err := s.db.Collection("api_keys").FindOne(ctx, bson.M{"_id": id}).Decode(apiKey); err != nil {
-		return nil, FromMongoError(err)
-	}
-
-	return apiKey, nil
-}
-
-func (s *Store) APIKeyGetByName(ctx context.Context, tenantID string, name string) (*models.APIKey, error) {
-	apiKey := new(models.APIKey)
-	if err := s.db.Collection("api_keys").FindOne(ctx, bson.M{"tenant_id": tenantID, "name": name}).Decode(&apiKey); err != nil {
-		return nil, FromMongoError(err)
-	}
-
-	return apiKey, nil
-}
-
 func (s *Store) APIKeyConflicts(ctx context.Context, tenantID string, target *models.APIKeyConflicts) ([]string, bool, error) {
 	pipeline := []bson.M{
 		{
@@ -80,6 +62,37 @@ func (s *Store) APIKeyConflicts(ctx context.Context, tenantID string, target *mo
 	return conflicts, len(conflicts) > 0, nil
 }
 
+func (s *Store) APIKeyResolve(ctx context.Context, resolver store.APIKeyResolver, value string, opts ...store.QueryOption) (*models.APIKey, error) {
+	matchStage := bson.M{}
+	switch resolver {
+	case store.APIKeyIDResolver:
+		matchStage["_id"] = value
+	case store.APIKeyNameResolver:
+		matchStage["name"] = value
+	}
+
+	for _, opt := range opts {
+		if err := opt(context.WithValue(ctx, "query", &matchStage)); err != nil {
+			return nil, err
+		}
+	}
+
+	cursor, err := s.db.Collection("api_keys").Aggregate(ctx, []bson.M{{"$match": matchStage}})
+	if err != nil {
+		return nil, FromMongoError(err)
+	}
+	defer cursor.Close(ctx)
+
+	cursor.Next(ctx)
+
+	apiKey := new(models.APIKey)
+	if err := cursor.Decode(&apiKey); err != nil {
+		return nil, FromMongoError(err)
+	}
+
+	return apiKey, nil
+}
+
 func (s *Store) APIKeyList(ctx context.Context, tenantID string, paginator query.Paginator, sorter query.Sorter) ([]models.APIKey, int, error) {
 	query := []bson.M{
 		{