diff --git a/errors/list.go b/errors/list.go index 4d9d2ad34..06c483f29 100644 --- a/errors/list.go +++ b/errors/list.go @@ -126,7 +126,6 @@ var ( SessionDriverExtensionFailed = New("session failed to extend session [%s] driver [%v]") SessionDriverIsNotSet = New("session driver is not set") SessionDriverNotSupported = New("session driver [%s] not supported") - SessionNotFound = New("session [%s] not found") UnknownFileExtension = New("unknown file extension") diff --git a/session/driver/file.go b/session/driver/file.go index 817739dbb..e153121ef 100644 --- a/session/driver/file.go +++ b/session/driver/file.go @@ -5,7 +5,6 @@ import ( "path/filepath" "sync" - "github.com/goravel/framework/errors" "github.com/goravel/framework/support/carbon" "github.com/goravel/framework/support/file" ) @@ -80,7 +79,7 @@ func (f *File) Read(id string) (string, error) { } } - return "", errors.SessionNotFound.Args(id) + return "", nil } func (f *File) Write(id string, data string) error { diff --git a/session/driver/file_test.go b/session/driver/file_test.go index 1261e5cb7..3de55aa6c 100644 --- a/session/driver/file_test.go +++ b/session/driver/file_test.go @@ -39,7 +39,7 @@ func (f *FileTestSuite) TestDestroy() { f.Nil(driver.Destroy("foo")) value, err = driver.Read("foo") - f.NotNil(err) + f.Nil(err) f.Equal("", value) } @@ -58,7 +58,7 @@ func (f *FileTestSuite) TestGc() { f.Nil(driver.Gc(300)) value, err = driver.Read("foo") - f.NotNil(err) + f.Nil(err) f.Equal("", value) carbon.UnsetTestNow() @@ -88,7 +88,7 @@ func (f *FileTestSuite) TestRead() { carbon.SetTestNow(carbon.Now(carbon.UTC).AddMinutes(f.getMinutes()).AddSecond()) value, err = driver.Read("foo") - f.NotNil(err) + f.Nil(err) f.Equal("", value) carbon.UnsetTestNow() } diff --git a/session/session.go b/session/session.go index 3339cb1b3..cd75f460f 100644 --- a/session/session.go +++ b/session/session.go @@ -244,10 +244,13 @@ func (s *Session) readFromHandler() map[string]any { return nil } var data map[string]any - if err := s.json.Unmarshal([]byte(value), &data); err != nil { - color.Errorln(err) - return nil + if value != "" { + if err := s.json.Unmarshal([]byte(value), &data); err != nil { + color.Errorln(err) + return nil + } } + return data }