implement request alias based on dev implementation

This commit is contained in:
Carlosokumu 2025-01-20 20:12:56 +03:00
parent ed549cba70
commit 99c704f6ff
Signed by: carlos
GPG Key ID: 7BD6BC8160A5C953

View File

@ -5,7 +5,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"io" "io"
"log" "log"
"net/http" "net/http"
@ -13,14 +12,15 @@ import (
"regexp" "regexp"
"git.grassecon.net/grassrootseconomics/sarafu-api/config" "git.grassecon.net/grassrootseconomics/sarafu-api/config"
"git.grassecon.net/grassrootseconomics/sarafu-api/dev"
"git.grassecon.net/grassrootseconomics/sarafu-api/models" "git.grassecon.net/grassrootseconomics/sarafu-api/models"
"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
"github.com/grassrootseconomics/eth-custodial/pkg/api" "github.com/grassrootseconomics/eth-custodial/pkg/api"
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
) )
var ( var (
aliasRegex = regexp.MustCompile("^\\+?[a-zA-Z0-9\\-_]+$") aliasRegex = regexp.MustCompile("^\\+?[a-zA-Z0-9\\-_]+$")
searchDomain = ".sarafu.eth"
) )
type HTTPAccountService struct { type HTTPAccountService struct {
@ -228,15 +228,9 @@ func (as *HTTPAccountService) CheckAliasAddress(ctx context.Context, alias strin
// TODO: Use actual custodial api to request available alias // TODO: Use actual custodial api to request available alias
func (as *HTTPAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) { func (as *HTTPAccountService) RequestAlias(ctx context.Context, publicKey string, hint string) (*models.RequestAliasResult, error) {
var alias string storageService := mocks.NewMemStorageService(ctx)
if !aliasRegex.MatchString(hint) { svc := dev.NewDevAccountService(ctx, storageService)
return nil, fmt.Errorf("alias hint does not match: %s", publicKey) return svc.RequestAlias(ctx, publicKey, hint)
}
alias = hint
alias = alias + searchDomain
return &models.RequestAliasResult{
Alias: alias,
}, nil
} }
// TODO: remove eth-custodial api dependency // TODO: remove eth-custodial api dependency