Compare commits
21 Commits
multi-pool
...
sms-addres
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
341901ec83
|
||
|
|
ed416c57c7
|
||
|
|
6fc99661f7
|
||
|
|
d509477de3
|
||
|
|
4ea8fd1f04
|
||
|
|
5c0ed48e67
|
||
|
|
5ff139b649
|
||
|
|
86cfb9c020
|
||
|
|
58366274c3
|
||
|
|
b85511e436
|
||
|
|
a243fe8c29
|
||
|
|
492b101aa4
|
||
| 34957e5b6f | |||
|
|
6597d6b6a2
|
||
|
|
441e289854
|
||
|
|
5b41c8dc64
|
||
|
|
417e7f0179
|
||
|
|
2eed990921
|
||
|
|
4a5de68a8c
|
||
|
|
6c4702e2ba
|
||
|
|
7280784ee1
|
@@ -16,7 +16,9 @@ const (
|
||||
voucherTransfersPathPrefix = "/api/v1/transfers/last10"
|
||||
voucherDataPathPrefix = "/api/v1/token"
|
||||
AliasPrefix = "api/v1/alias"
|
||||
SendSMSPrefix = "api/v1/external/upsell"
|
||||
AliasEnsPrefix = "/api/v1/bypass"
|
||||
ExternalSMSPrefix = "/api/v1/external"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -24,6 +26,7 @@ var (
|
||||
dataURLBase string
|
||||
BearerToken string
|
||||
aliasEnsURLBase string
|
||||
externalSMSBase string
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -36,7 +39,9 @@ var (
|
||||
VoucherTransfersURL string
|
||||
VoucherDataURL string
|
||||
CheckAliasURL string
|
||||
SendSMSURL string
|
||||
AliasEnsURL string
|
||||
ExternalSMSURL string
|
||||
)
|
||||
|
||||
func setBase() error {
|
||||
@@ -45,6 +50,7 @@ func setBase() error {
|
||||
custodialURLBase = env.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
|
||||
dataURLBase = env.GetEnv("DATA_URL_BASE", "http://localhost:5006")
|
||||
aliasEnsURLBase = env.GetEnv("ALIAS_ENS_BASE", "http://localhost:5015")
|
||||
externalSMSBase = env.GetEnv("EXTERNAL_SMS_BASE", "http://localhost:5035")
|
||||
BearerToken = env.GetEnv("BEARER_TOKEN", "")
|
||||
|
||||
_, err = url.Parse(custodialURLBase)
|
||||
@@ -73,6 +79,9 @@ func LoadConfig() error {
|
||||
VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
|
||||
VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
|
||||
CheckAliasURL, _ = url.JoinPath(dataURLBase, AliasPrefix)
|
||||
SendSMSURL, _ = url.JoinPath(dataURLBase, SendSMSPrefix)
|
||||
AliasEnsURL, _ = url.JoinPath(aliasEnsURLBase, AliasEnsPrefix)
|
||||
ExternalSMSURL, _ = url.JoinPath(externalSMSBase, ExternalSMSPrefix)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
15
dev/api.go
15
dev/api.go
@@ -653,3 +653,18 @@ func (das *DevAccountService) RequestAlias(ctx context.Context, publicKey string
|
||||
Alias: alias,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
logg.DebugCtxf(ctx, "sent an SMS", "inviterPhone", inviterPhone, "inviteePhone", inviteePhone)
|
||||
return &models.SendSMSResponse{
|
||||
Invitee: inviteePhone,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (das *DevAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
return fmt.Errorf("unimplemented")
|
||||
}
|
||||
|
||||
func (das *DevAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
return fmt.Errorf("unimplemented")
|
||||
}
|
||||
|
||||
5
models/send_sms_response.go
Normal file
5
models/send_sms_response.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package models
|
||||
|
||||
type SendSMSResponse struct {
|
||||
Invitee string `json:"invitee"`
|
||||
}
|
||||
@@ -17,4 +17,7 @@ type AccountService interface {
|
||||
TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error)
|
||||
CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error)
|
||||
RequestAlias(ctx context.Context, hint string, publicKey string) (*models.RequestAliasResult, error)
|
||||
SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error)
|
||||
SendAddressSMS(ctx context.Context, publicKey, originPhone string) error
|
||||
SendPINResetSMS(ctx context.Context, admin, phone string) error
|
||||
}
|
||||
|
||||
@@ -313,6 +313,87 @@ func requestEnsAlias(ctx context.Context, publicKey string, hint string) (*model
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
// SendSMS calls the API to send out an SMS.
|
||||
// Parameters:
|
||||
// - inviterPhone: The user initiating the SMS.
|
||||
// - inviteePhone: The number being invited to Sarafu.
|
||||
func (as *HTTPAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
var r models.SendSMSResponse
|
||||
|
||||
// Create request payload
|
||||
payload := map[string]string{
|
||||
"inviterPhone": inviterPhone,
|
||||
"inviteePhone": inviteePhone,
|
||||
}
|
||||
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Create a new request
|
||||
req, err := http.NewRequest("POST", config.SendSMSURL, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, err = doRequest(ctx, req, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
ep, err := url.JoinPath(config.ExternalSMSURL, "address")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
logg.InfoCtxf(ctx, "sending an address sms", "endpoint", ep, "address", publicKey, "origin-phone", originPhone)
|
||||
payload := map[string]string{
|
||||
"address": publicKey,
|
||||
"originPhone": originPhone,
|
||||
}
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = doRequest(ctx, req, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (as *HTTPAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
ep, err := url.JoinPath(config.ExternalSMSURL, "pinreset")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
logg.InfoCtxf(ctx, "sending pin reset sms", "endpoint", ep, "admin", admin, "phone", phone)
|
||||
payload := map[string]string{
|
||||
"admin": admin,
|
||||
"phone": phone,
|
||||
}
|
||||
payloadBytes, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req, err := http.NewRequest("POST", ep, bytes.NewBuffer(payloadBytes))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = doRequest(ctx, req, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// TODO: remove eth-custodial api dependency
|
||||
func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
|
||||
var okResponse api.OKResponse
|
||||
|
||||
@@ -61,3 +61,7 @@ func (m MockApi) RequestAlias(ctx context.Context, publicKey string, hint string
|
||||
func (m MockApi) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m MockApi) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
@@ -53,7 +53,20 @@ func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string
|
||||
return args.Get(0).(*models.AliasAddress), args.Error(1)
|
||||
}
|
||||
|
||||
func (m MockAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
func (m *MockAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
args := m.Called(publicKey, hint)
|
||||
return args.Get(0).(*models.RequestAliasResult), args.Error(1)
|
||||
}
|
||||
|
||||
func (m *MockAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
args := m.Called(inviterPhone, inviteePhone)
|
||||
return args.Get(0).(*models.SendSMSResponse), args.Error(1)
|
||||
}
|
||||
|
||||
func (m *MockAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *MockAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -57,10 +57,22 @@ func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
func (m *TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*models.AliasAddress, error) {
|
||||
return &models.AliasAddress{}, nil
|
||||
}
|
||||
|
||||
func (m TestAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
func (m *TestAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
|
||||
return &models.RequestAliasResult{}, nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) (*models.SendSMSResponse, error) {
|
||||
return &models.SendSMSResponse{}, nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) SendAddressSMS(ctx context.Context, publicKey, originPhone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *TestAccountService) SendPINResetSMS(ctx context.Context, admin, phone string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user