From df7979c430b8fedf66484338f8ff7d4b8a7b00d0 Mon Sep 17 00:00:00 2001
From: Mukhtar Akere <akeremukhtar10@gmail.com>
Date: Mon, 13 Oct 2025 20:12:17 +0100
Subject: [PATCH] Fix some minor issues with authentication and qbit auth

---
 pkg/qbit/context.go  |  3 +--
 pkg/server/server.go | 11 +++++++----
 pkg/webdav/webdav.go |  4 +---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/qbit/context.go b/pkg/qbit/context.go
index 5baba1b..61e4891 100644
--- a/pkg/qbit/context.go
+++ b/pkg/qbit/context.go
@@ -147,10 +147,9 @@ func (q *QBit) authenticate(category, username, password string) (*arr.Arr, erro
 	a.Host = username
 	a.Token = password
 	arrValidated := false // This is a flag to indicate if arr validation was successful
-	if a.Host == "" || a.Token == "" && cfg.UseAuth {
+	if (a.Host == "" || a.Token == "") && cfg.UseAuth {
 		return nil, fmt.Errorf("unauthorized: Host and token are required for authentication(you've enabled authentication)")
 	}
-
 	if err := a.Validate(); err == nil {
 		arrValidated = true
 	}
diff --git a/pkg/server/server.go b/pkg/server/server.go
index de3c3fc..8af87e9 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -4,15 +4,16 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/rs/zerolog"
 	"github.com/sirrobot01/decypharr/internal/config"
 	"github.com/sirrobot01/decypharr/internal/logger"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
 )
 
 type Server struct {
@@ -24,6 +25,8 @@ func New(handlers map[string]http.Handler) *Server {
 	l := logger.New("http")
 	r := chi.NewRouter()
 	r.Use(middleware.Recoverer)
+	r.Use(middleware.StripSlashes)
+	r.Use(middleware.RedirectSlashes)
 
 	cfg := config.Get()
 
diff --git a/pkg/webdav/webdav.go b/pkg/webdav/webdav.go
index 57c9934..75046c3 100644
--- a/pkg/webdav/webdav.go
+++ b/pkg/webdav/webdav.go
@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/chi/v5/middleware"
 	"github.com/sirrobot01/decypharr/internal/config"
 	"github.com/sirrobot01/decypharr/internal/utils"
 	"github.com/sirrobot01/decypharr/pkg/wire"
@@ -74,9 +73,8 @@ func New() *WebDav {
 
 func (wd *WebDav) Routes() http.Handler {
 	wr := chi.NewRouter()
-	wr.Use(middleware.StripSlashes)
 	wr.Use(wd.commonMiddleware)
-	// wr.Use(wd.authMiddleware) Disable auth for now
+	//wr.Use(wd.authMiddleware) Disable auth for now
 
 	wd.setupRootHandler(wr)
 	wd.mountHandlers(wr)