refactor: Using bcrypt from httputils

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Mar 12, 2023 · 6ba9ace · 6ba9ace
1 parent 3189a7d
commit 6ba9ace
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/pkg/crud/bcrypt.go b/pkg/crud/bcrypt.go
diff --git a/pkg/crud/crud.go b/pkg/crud/crud.go
@@ -15,10 +15,10 @@ import (
 	"github.com/ViBiOh/fibr/pkg/search"
 	"github.com/ViBiOh/fibr/pkg/thumbnail"
 	"github.com/ViBiOh/flags"
+	"github.com/ViBiOh/httputils/v4/pkg/bcrypt"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
 	"go.opentelemetry.io/otel/trace"
-	"golang.org/x/crypto/bcrypt"
 )
 
 type Items []absto.Item
@@ -102,10 +102,9 @@ func New(config Config, storageApp absto.Storage, filteredStorage absto.Storage,
 		return app, fmt.Errorf("parse bcrypt duration: %w", err)
 	}
 
-	bcryptCost, err := findBcryptBestCost(bcryptDuration)
+	bcryptCost, err := bcrypt.FindBestCost(bcryptDuration)
 	if err != nil {
 		logger.Error("find best bcrypt cost: %s", err)
-		bcryptCost = bcrypt.DefaultCost
 	}
 	logger.Info("Best bcrypt cost is %d", bcryptCost)
 

diff --git a/pkg/crud/webhook.go b/pkg/crud/webhook.go
@@ -39,6 +39,7 @@ func (a App) createWebhook(w http.ResponseWriter, r *http.Request, request provi
 		} else {
 			a.error(w, r, request, model.WrapInternal(err))
 		}
+
 		return
 	}