Remove last internal package

This commit is contained in:
lash
2025-01-11 21:47:57 +00:00
parent c93a07832d
commit 2e0e854c4b
4 changed files with 18 additions and 72 deletions

View File

@@ -5,7 +5,7 @@ import (
"io/ioutil"
"net/http"
"git.grassecon.net/grassrootseconomics/visedriver/internal/handlers"
"git.grassecon.net/grassrootseconomics/visedriver/errors"
)
type DefaultRequestParser struct {
@@ -14,11 +14,11 @@ type DefaultRequestParser struct {
func (rp *DefaultRequestParser) GetSessionId(ctx context.Context, rq any) (string, error) {
rqv, ok := rq.(*http.Request)
if !ok {
return "", handlers.ErrInvalidRequest
return "", errors.ErrInvalidRequest
}
v := rqv.Header.Get("X-Vise-Session")
if v == "" {
return "", handlers.ErrSessionMissing
return "", errors.ErrSessionMissing
}
return v, nil
}
@@ -26,7 +26,7 @@ func (rp *DefaultRequestParser) GetSessionId(ctx context.Context, rq any) (strin
func (rp *DefaultRequestParser) GetInput(rq any) ([]byte, error) {
rqv, ok := rq.(*http.Request)
if !ok {
return nil, handlers.ErrInvalidRequest
return nil, errors.ErrInvalidRequest
}
defer rqv.Body.Close()
v, err := ioutil.ReadAll(rqv.Body)

View File

@@ -9,7 +9,7 @@ import (
"testing"
"git.defalsify.org/vise.git/engine"
"git.grassecon.net/grassrootseconomics/visedriver/internal/handlers"
viseerrors "git.grassecon.net/grassrootseconomics/visedriver/errors"
"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks/httpmocks"
"git.grassecon.net/grassrootseconomics/visedriver/request"
)
@@ -44,14 +44,14 @@ func TestSessionHandler_ServeHTTP(t *testing.T) {
{
name: "Missing Session ID",
sessionID: "",
parserErr: handlers.ErrSessionMissing,
parserErr: viseerrors.ErrSessionMissing,
expectedStatus: http.StatusBadRequest,
},
{
name: "Process Error",
sessionID: "123",
input: []byte("test input"),
processErr: handlers.ErrStorage,
processErr: viseerrors.ErrStorage,
expectedStatus: http.StatusInternalServerError,
},
{
@@ -151,13 +151,13 @@ func TestDefaultRequestParser_GetSessionId(t *testing.T) {
name: "Missing Session ID",
request: httptest.NewRequest(http.MethodPost, "/", nil),
expectedID: "",
expectedError: handlers.ErrSessionMissing,
expectedError: viseerrors.ErrSessionMissing,
},
{
name: "Invalid Request Type",
request: invalidRequestType{},
expectedID: "",
expectedError: handlers.ErrInvalidRequest,
expectedError: viseerrors.ErrInvalidRequest,
},
}
@@ -203,7 +203,7 @@ func TestDefaultRequestParser_GetInput(t *testing.T) {
name: "Invalid Request Type",
request: invalidRequestType{},
expectedInput: nil,
expectedError: handlers.ErrInvalidRequest,
expectedError: viseerrors.ErrInvalidRequest,
},
{
name: "Read Error",