WIP: Something is going on
This commit is contained in:
@ -4,36 +4,30 @@ import (
|
||||
"context"
|
||||
|
||||
"git.badhouseplants.net/softplayer/softplayer-backend/internal/controllers"
|
||||
"git.badhouseplants.net/softplayer/softplayer-backend/internal/helpers/email"
|
||||
"git.badhouseplants.net/softplayer/softplayer-go-proto/pkg/accounts"
|
||||
|
||||
// "google.golang.org/protobuf/types/known/emptypb"
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
)
|
||||
|
||||
func NewAccountRPCImpl(contoller ctrl.Manager, emailConfig email.EmailConf) *AccountsServer {
|
||||
func NewAccountRPCImpl(contoller ctrl.Manager, hashCost int16) *AccountsServer {
|
||||
return &AccountsServer{
|
||||
Controller: contoller,
|
||||
EmailConfig: emailConfig,
|
||||
Params: &controllers.AccountParams{
|
||||
HashCost: hashCost,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
type AccountsServer struct {
|
||||
accounts.UnimplementedAccountsServer
|
||||
EmailConfig email.EmailConf
|
||||
Controller ctrl.Manager
|
||||
Params *controllers.AccountParams
|
||||
}
|
||||
|
||||
func (a *AccountsServer) SignUp(ctx context.Context, in *accounts.AccountWithPassword) (*accounts.AccountFullWithToken, error) {
|
||||
data := controllers.AccountData{
|
||||
Username: in.Data.GetName(),
|
||||
Password: in.Password.GetPassword(),
|
||||
Email: in.Data.GetEmail(),
|
||||
}
|
||||
acc := controllers.Account{
|
||||
Controller: a.Controller,
|
||||
Data: &data,
|
||||
}
|
||||
data := populateData(in.Data.GetName(), in.Password.GetPassword(), in.Data.GetEmail())
|
||||
acc := populateAccount(data, a.Controller)
|
||||
|
||||
if err := acc.Create(ctx); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -51,23 +45,18 @@ func (a *AccountsServer) SignUp(ctx context.Context, in *accounts.AccountWithPas
|
||||
}
|
||||
|
||||
func (a *AccountsServer) SignIn(ctx context.Context, in *accounts.AccountWithPassword) (*accounts.AccountFullWithToken, error) {
|
||||
data := controllers.AccountData{
|
||||
Username: in.Data.GetName(),
|
||||
Password: in.Password.GetPassword(),
|
||||
Email: in.Data.GetEmail(),
|
||||
}
|
||||
acc := controllers.Account{
|
||||
Controller: a.Controller,
|
||||
Data: &data,
|
||||
}
|
||||
data := populateData(in.Data.GetName(), in.Password.GetPassword(), in.Data.GetEmail())
|
||||
acc := populateAccount(data, a.Controller)
|
||||
|
||||
if err := acc.Login(ctx); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &accounts.AccountFullWithToken{
|
||||
Id: &accounts.AccountId{
|
||||
Id: &accounts.AccountId{
|
||||
Id: acc.Data.UUID,
|
||||
},
|
||||
Data: &accounts.AccountData{
|
||||
Data: &accounts.AccountData{
|
||||
Name: acc.Data.Username,
|
||||
Email: acc.Data.Email,
|
||||
},
|
||||
@ -75,10 +64,18 @@ func (a *AccountsServer) SignIn(ctx context.Context, in *accounts.AccountWithPas
|
||||
}, nil
|
||||
}
|
||||
|
||||
//func (a *AccountsServer) ValidateEmail(ctx context.Context, in *accounts.AccountDataWithEmailCode) (*emptypb.Empty, error) {
|
||||
// data := controllers.AccountData {
|
||||
// Username: in.Data.GetName(),
|
||||
// Email: in.Data.GetEmail(),
|
||||
// }
|
||||
// acc := controllers.Account {}
|
||||
//}
|
||||
func populateData(username, password, email string) *controllers.AccountData {
|
||||
return &controllers.AccountData{
|
||||
Username: username,
|
||||
Password: password,
|
||||
Email: email,
|
||||
}
|
||||
}
|
||||
|
||||
func populateAccount(data *controllers.AccountData, controller ctrl.Manager) *controllers.Account {
|
||||
return &controllers.Account{
|
||||
Controller: controller,
|
||||
Data: data,
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user