diff --git a/accessHandler.go b/accessHandler.go index b1497aa..fb69d49 100644 --- a/accessHandler.go +++ b/accessHandler.go @@ -35,7 +35,7 @@ type AccessHandler struct { // - Default role(s) // // Parameters: -// - dbPath: The file path or connection string for the database. +// - dbPath: The file path to the database. // - logger: Optional pointer to a logging.Logger instance. If nil, a new one is created. // // Returns: @@ -48,7 +48,7 @@ type AccessHandler struct { // log.Fatal(err) // } // -func NewAccessHandler(dbPath string, logger *logging.Logger) (aH *AccessHandler, err error) { +func NewAccessHandler(path string, logger *logging.Logger) (aH *AccessHandler, err error) { if logger == nil { logger, err = logging.NewLogger("accessHandler.log", nil) if err != nil { @@ -65,7 +65,7 @@ func NewAccessHandler(dbPath string, logger *logging.Logger) (aH *AccessHandler, logger.Debug("NewAccessHandler", "initialize db handler") // Create a new DB handler instance - aH.dbHandler, err = NewDBHandler(dbPath, logger) + aH.dbHandler, err = NewDBHandler(path, logger) if err != nil { aH.logger.Error("NewAccessHandler", err) return diff --git a/dbHandler.go b/dbHandler.go index 35330de..63079f9 100644 --- a/dbHandler.go +++ b/dbHandler.go @@ -3,6 +3,7 @@ package AccessHandler import ( "errors" "fmt" + "path/filepath" "reflect" "strings" @@ -43,8 +44,9 @@ type DBHandler struct { // Returns: // - dH: A pointer to the initialized `DBHandler`. // - err: Any error encountered during database connection. -func NewDBHandler(dbPath string, logger *logging.Logger) (dH *DBHandler, err error) { +func NewDBHandler(path string, logger *logging.Logger) (dH *DBHandler, err error) { dH = &DBHandler{logger: logger} + dbPath := filepath.Join(path, "user.db") logger.Debug("NewDBHandler", "open database "+dbPath) dH.db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{}) return diff --git a/db_test.go b/db_test.go index c8e320b..c37ab52 100644 --- a/db_test.go +++ b/db_test.go @@ -17,7 +17,7 @@ func TestAccesshandlerLogin(t *testing.T) { t.Log("start access handler test") t.Log("initialize accessHandler") - accessHandler, err := NewAccessHandler("test.db", nil) + accessHandler, err := NewAccessHandler(".", nil) if err != nil { t.Fatal(err) } @@ -99,7 +99,7 @@ func TestLoginHandler(t *testing.T) { gin.SetMode(gin.TestMode) // Setup your AccessHandler and router - aH, err := NewAccessHandler("test.db", nil) + aH, err := NewAccessHandler(".", nil) if err != nil { t.Fatal(err) }