feat: add transfer handler and input validation

* validate incoming api requests
* fix transfer ABI encoder
This commit is contained in:
2022-11-30 15:18:01 +00:00
parent 25b62a9fc6
commit 2ca0d23c3c
8 changed files with 130 additions and 14 deletions

View File

@@ -13,7 +13,7 @@ import (
type registrationResponse struct {
PublicKey string `json:"publicKey"`
JobRef string `json:"jobRef"`
TaskRef string `json:"taskRef"`
}
func RegistrationHandler(
@@ -32,31 +32,31 @@ func RegistrationHandler(
if err := keystore.WriteKeyPair(c.Request().Context(), generatedKeyPair); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, errResp{
Ok: false,
Error: INTERNAL,
Error: INTERNAL_ERROR,
})
}
jobPayload, err := json.Marshal(task.SystemPayload{
taskPayload, err := json.Marshal(task.SystemPayload{
PublicKey: generatedKeyPair.Public,
})
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, errResp{
Ok: false,
Error: JSON_MARSHAL,
Error: JSON_MARSHAL_ERROR,
})
}
job, err := taskerClient.CreateTask(
task, err := taskerClient.CreateTask(
tasker.PrepareAccountTask,
tasker.DefaultPriority,
&tasker.Task{
Payload: jobPayload,
Payload: taskPayload,
},
)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, errResp{
Ok: false,
Error: TASK_CHAIN,
Error: TASK_CHAIN_ERROR,
})
}
@@ -64,7 +64,7 @@ func RegistrationHandler(
Ok: true,
Data: registrationResponse{
PublicKey: generatedKeyPair.Public,
JobRef: job.ID,
TaskRef: task.ID,
},
})
}

69
internal/api/transfer.go Normal file
View File

@@ -0,0 +1,69 @@
package api
import (
"encoding/json"
"net/http"
"github.com/grassrootseconomics/cic-custodial/internal/tasker"
"github.com/labstack/echo/v4"
)
type (
transferRequest struct {
From string `json:"from" validate:"required,eth_addr"`
To string `json:"to" validate:"required,eth_addr"`
VoucherAddress string `json:"voucherAddress" validate:"required,eth_addr"`
Amount string `json:"amount" validate:"required,numeric"`
}
transferResponse struct {
TaskRef string `json:"taskRef"`
}
)
func TransferHandler(
taskerClient *tasker.TaskerClient,
) func(echo.Context) error {
return func(c echo.Context) error {
transferPayload := new(transferRequest)
if err := c.Bind(transferPayload); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, errResp{
Ok: false,
Error: BIND_ERROR,
})
}
if err := c.Validate(transferPayload); err != nil {
return err
}
taskPayload, err := json.Marshal(transferPayload)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, errResp{
Ok: false,
Error: JSON_MARSHAL_ERROR,
})
}
task, err := taskerClient.CreateTask(
tasker.TransferTokenTask,
tasker.DefaultPriority,
&tasker.Task{
Payload: taskPayload,
},
)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, errResp{
Ok: false,
Error: TASK_CHAIN_ERROR,
})
}
return c.JSON(http.StatusOK, okResp{
Ok: true,
Data: transferResponse{
TaskRef: task.ID,
},
})
}
}

View File

@@ -1,10 +1,12 @@
package api
const (
INTERNAL = "ERR_INTERNAL"
KEYPAIR_ERROR = "ERR_GEN_KEYPAIR"
JSON_MARSHAL = "ERR_PAYLOAD_SERIALIZATION"
TASK_CHAIN = "ERR_START_TASK_CHAIN"
INTERNAL_ERROR = "ERR_INTERNAL"
KEYPAIR_ERROR = "ERR_GEN_KEYPAIR"
JSON_MARSHAL_ERROR = "ERR_PAYLOAD_SERIALIZATION"
TASK_CHAIN_ERROR = "ERR_START_TASK_CHAIN"
VALIDATION_ERROR = "ERR_VALIDATE"
BIND_ERROR = "ERR_BIND"
)
type okResp struct {

24
internal/api/validator.go Normal file
View File

@@ -0,0 +1,24 @@
package api
import (
"fmt"
"net/http"
"github.com/go-playground/validator"
"github.com/labstack/echo/v4"
)
type CustomValidator struct {
Validator *validator.Validate
}
func (cv *CustomValidator) Validate(i interface{}) error {
if err := cv.Validator.Struct(i); err != nil {
fmt.Println(err)
return echo.NewHTTPError(http.StatusBadRequest, errResp{
Ok: false,
Error: VALIDATION_ERROR,
})
}
return nil
}