fix team API key seeding

Author: dobrac

packages/api/internal/auth/constants.go

@@ -2,6 +2,3 @@ package auth
 
 const TeamContextKey string = "team"
 const UserIDContextKey string = "user_id"
-
-const ApiKeyPrefix = "e2b_"
-const AccessTokenPrefix = "sk_e2b_"

packages/api/internal/handlers/accesstoken.go

@@ -9,8 +9,8 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/e2b-dev/infra/packages/api/internal/api"
-	"github.com/e2b-dev/infra/packages/api/internal/auth"
 	"github.com/e2b-dev/infra/packages/api/internal/utils"
+	"github.com/e2b-dev/infra/packages/shared/pkg/keys"
 	"github.com/e2b-dev/infra/packages/shared/pkg/models/accesstoken"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
 )
@@ -30,7 +30,7 @@ func (a *APIStore) PostAccesstokens(c *gin.Context) {
 		return
 	}
 
-	accessToken, err := auth.GenerateKey(auth.AccessTokenPrefix)
+	accessToken, err := keys.GenerateKey(keys.AccessTokenPrefix)
 	if err != nil {
 		a.sendAPIStoreError(c, http.StatusInternalServerError, fmt.Sprintf("Error when generating access token: %s", err))
 

packages/api/internal/handlers/apikey.go

@@ -11,9 +11,9 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/e2b-dev/infra/packages/api/internal/api"
-	"github.com/e2b-dev/infra/packages/api/internal/auth"
 	"github.com/e2b-dev/infra/packages/api/internal/team"
 	"github.com/e2b-dev/infra/packages/api/internal/utils"
+	"github.com/e2b-dev/infra/packages/shared/pkg/keys"
 	"github.com/e2b-dev/infra/packages/shared/pkg/models/teamapikey"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
 )
@@ -78,10 +78,10 @@ func (a *APIStore) GetApikeys(c *gin.Context) {
 			}
 		}
 
-		keyValue := strings.Split(apiKey.APIKey, auth.ApiKeyPrefix)[1]
+		keyValue := strings.Split(apiKey.APIKey, keys.ApiKeyPrefix)[1]
 
 		// TODO: remove this once we migrate to hashed API keys
-		KeyMask, err := auth.MaskKey(auth.ApiKeyPrefix, keyValue)
+		KeyMask, err := keys.MaskKey(keys.ApiKeyPrefix, keyValue)
 		if err != nil {
 			fmt.Printf("masking API key failed %d: %v", apiKey.ID, err)
 			continue

packages/api/internal/team/apikeys.go

@@ -7,14 +7,14 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/e2b-dev/infra/packages/api/internal/auth"
 	"github.com/e2b-dev/infra/packages/shared/pkg/db"
+	"github.com/e2b-dev/infra/packages/shared/pkg/keys"
 	"github.com/e2b-dev/infra/packages/shared/pkg/models"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
 )
 
 func CreateAPIKey(ctx context.Context, db *db.DB, teamID uuid.UUID, userID uuid.UUID, name string) (*models.TeamAPIKey, error) {
-	teamApiKey, err := auth.GenerateKey(auth.ApiKeyPrefix)
+	teamApiKey, err := keys.GenerateKey(keys.ApiKeyPrefix)
 	if err != nil {
 		errMsg := fmt.Errorf("error when generating team API key: %w", err)
 		telemetry.ReportCriticalError(ctx, errMsg)

packages/shared/pkg/keys/constants.go

@@ -0,0 +1,4 @@
+package keys
+
+const ApiKeyPrefix = "e2b_"
+const AccessTokenPrefix = "sk_e2b_"

packages/api/internal/auth/hashing.go packages/shared/pkg/keys/hashing.gopackages/api/internal/auth/hashing.go renamed to packages/shared/pkg/keys/hashing.go

@@ -1,4 +1,4 @@
-package auth
+package keys
 
 type Hasher interface {
 	Hash(key []byte) string

packages/api/internal/auth/key.go packages/shared/pkg/keys/key.gopackages/api/internal/auth/key.go renamed to packages/shared/pkg/keys/key.go

@@ -1,4 +1,4 @@
-package auth
+package keys
 
 import (
 	"crypto/rand"

packages/api/internal/auth/sha256.go packages/shared/pkg/keys/sha256.gopackages/api/internal/auth/sha256.go renamed to packages/shared/pkg/keys/sha256.go

@@ -1,19 +1,19 @@
-package auth
+package keys
 
 import (
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
 )
 
-type sha256Hashing struct {
+type Sha256Hashing struct {
 }
 
-func NewSHA256Hashing() *sha256Hashing {
-	return &sha256Hashing{}
+func NewSHA256Hashing() *Sha256Hashing {
+	return &Sha256Hashing{}
 }
 
-func (h *sha256Hashing) Hash(key []byte) string {
+func (h *Sha256Hashing) Hash(key []byte) string {
 	hashBytes := sha256.Sum256(key)
 
 	hash64 := base64.RawStdEncoding.EncodeToString(hashBytes[:])

tests/integration/seed.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"encoding/hex"
 	"fmt"
 	"log"
 	"os"
@@ -10,6 +11,7 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/e2b-dev/infra/packages/shared/pkg/db"
+	"github.com/e2b-dev/infra/packages/shared/pkg/keys"
 	"github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild"
 )
 
@@ -83,9 +85,21 @@ func seed(db *db.DB, data SeedData) error {
 	}
 
 	// Team API Key
+	hasher := keys.NewSHA256Hashing()
+	apiKeyBytes, err := hex.DecodeString(data.APIKey)
+	if err != nil {
+		return fmt.Errorf("failed to decode api key: %w", err)
+	}
+	hash := hasher.Hash(apiKeyBytes)
+	mask, err := keys.MaskKey(keys.ApiKeyPrefix, data.APIKey)
+	if err != nil {
+		return fmt.Errorf("failed to mask api key: %w", err)
+	}
 	_, err = db.Client.TeamAPIKey.Create().
 		SetTeam(t).
 		SetAPIKey(data.APIKey).
+		SetAPIKeyHash(hash).
+		SetAPIKeyMask(mask).
 		SetName("Integration Tests API Key").
 		Save(ctx)
 	if err != nil {