Merge pull request #32 from sirosfoundation/fix/correct-fields-in-mongodb-indexes

fix: make sure tenant_id is present in verifiers and issuers mongodb collection instances

Author: leifj

internal/api/admin_handlers.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -666,6 +667,10 @@ func (h *AdminHandlers) CreateVerifier(c *gin.Context) {
 	}
 
 	if err := h.store.Verifiers().Create(c.Request.Context(), verifier); err != nil {
+		if errors.Is(err, storage.ErrAlreadyExists) {
+			c.JSON(http.StatusConflict, gin.H{"error": "Verifier with this URL already exists in tenant"})
+			return
+		}
 		h.logger.Error("Failed to create verifier", zap.Error(err))
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create verifier"})
 		return

internal/storage/mongodb/mongodb.go

@@ -115,18 +115,30 @@ func (s *Store) createIndexes(ctx context.Context) error {
 		return fmt.Errorf("failed to create challenge indexes: %w", err)
 	}
 
+	// Drop old incorrect issuers collection indexes
+	_, _ = s.issuers.collection.Indexes().DropOne(ctx, "identifier_1")
+
 	// Issuers collection indexes
 	_, err = s.issuers.collection.Indexes().CreateOne(ctx, mongo.IndexModel{
-		Keys:    bson.D{{Key: "identifier", Value: 1}},
+		Keys: bson.D{
+			{Key: "credential_issuer_identifier", Value: 1},
+			{Key: "tenant_id", Value: 1},
+		},
 		Options: options.Index().SetUnique(true),
 	})
 	if err != nil {
 		return fmt.Errorf("failed to create issuer indexes: %w", err)
 	}
 
+	// Drop old incorrect verifiers collection indexes
+	_, _ = s.verifiers.collection.Indexes().DropOne(ctx, "did_1")
+
 	// Verifiers collection indexes
 	_, err = s.verifiers.collection.Indexes().CreateOne(ctx, mongo.IndexModel{
-		Keys:    bson.D{{Key: "did", Value: 1}},
+		Keys: bson.D{
+			{Key: "url", Value: 1},
+			{Key: "tenant_id", Value: 1},
+		},
 		Options: options.Index().SetUnique(true),
 	})
 	if err != nil {