refactor: signup

internal/usecase/interactor/user.go

@@ -80,9 +80,8 @@ func (i *User) Fetch(ctx context.Context, ids []id.UserID, operator *usecase.Ope
 func (i *User) Signup(ctx context.Context, inp interfaces.SignupParam) (u *user.User, _ *user.Team, err error) {
 	var team *user.Team
 	var tx repo.Tx
-	var encodedPass []byte
 	var email, name string
-	var auth user.Auth
+	var auth *user.Auth
 
 	if inp.Secret != nil && inp.Sub != nil {
 		// Auth0
@@ -139,7 +138,7 @@ func (i *User) Signup(ctx context.Context, inp interfaces.SignupParam) (u *user.
 		}
 		name = ui.Name
 		email = ui.Email
-		auth = user.AuthFromAuth0Sub(*inp.Sub)
+		auth = user.AuthFromAuth0Sub(*inp.Sub).Ref()
 
 	} else if inp.Name != nil && inp.Email != nil && inp.Password != nil {
 		if *inp.Name == "" {
@@ -170,14 +169,12 @@ func (i *User) Signup(ctx context.Context, inp interfaces.SignupParam) (u *user.
 		if existed != nil {
 			return nil, nil, errors.New("existed user email")
 		}
-		encodedPass, err = user.EncodePassword(*inp.Password)
 
 		if err != nil {
 			return nil, nil, err
 		}
 		name = *inp.Name
 		email = *inp.Email
-		auth = user.GenReearthSub(8)
 	}
 
 	// Check if team already exists
@@ -196,7 +193,7 @@ func (i *User) Signup(ctx context.Context, inp interfaces.SignupParam) (u *user.
 		Email:    name,
 		Name:     email,
 		Sub:      auth,
-		Password: encodedPass,
+		Password: *inp.Password,
 		Lang:     inp.Lang,
 		Theme:    inp.Theme,
 		UserID:   inp.UserID,

pkg/user/auth.go

@@ -1,7 +1,6 @@
 package user
 
 import (
-	"math/rand"
 	"strings"
 )
 
@@ -22,16 +21,14 @@ func (a Auth) IsAuth0() bool {
 	return a.Provider == "auth0"
 }
 
-func GenReearthSub(length int) Auth {
-	var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-
-	b := make([]rune, length)
-	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
-	}
+func (a Auth) Ref() *Auth {
+	a2 := a
+	return &a2
+}
 
-	return Auth{
+func GenReearthSub(userID string) *Auth {
+	return &Auth{
 		Provider: "reearth",
-		Sub:      string(b),
+		Sub:      userID,
 	}
 }

pkg/user/builder.go

@@ -7,6 +7,7 @@ import (
 
 type Builder struct {
 	u *User
+	p *string
 }
 
 func New() *Builder {
@@ -17,6 +18,12 @@ func (b *Builder) Build() (*User, error) {
 	if id.ID(b.u.id).IsNil() {
 		return nil, id.ErrInvalidID
 	}
+	if b.p != nil {
+		err := b.u.SetPassword(*b.p)
+		if err != nil {
+			return nil, ErrEncodingPass
+		}
+	}
 	return b.u, nil
 }
 
@@ -48,8 +55,8 @@ func (b *Builder) Email(email string) *Builder {
 	return b
 }
 
-func (b *Builder) Password(password []byte) *Builder {
-	b.u.password = password
+func (b *Builder) Password(password string) *Builder {
+	b.p = &password
 	return b
 }
 

pkg/user/initializer.go

@@ -8,8 +8,8 @@ import (
 type InitParams struct {
 	Email    string
 	Name     string
-	Sub      Auth
-	Password []byte
+	Sub      *Auth
+	Password string
 	Lang     *language.Tag
 	Theme    *Theme
 	UserID   *id.UserID
@@ -30,12 +30,15 @@ func Init(p InitParams) (*User, *Team, error) {
 		t := ThemeDefault
 		p.Theme = &t
 	}
+	if p.Sub == nil {
+		p.Sub = GenReearthSub(p.UserID.String())
+	}
 
 	u, err := New().
 		ID(*p.UserID).
 		Name(p.Name).
 		Email(p.Email).
-		Auths([]Auth{p.Sub}).
+		Auths([]Auth{*p.Sub}).
 		Lang(*p.Lang).
 		Password(p.Password).
 		Theme(*p.Theme).

pkg/user/initializer_test.go

@@ -107,7 +107,7 @@ func TestInit(t *testing.T) {
 			u, t, err := Init(InitParams{
 				Email:  tc.Email,
 				Name:   tc.Username,
-				Sub:    tc.Sub,
+				Sub:    &tc.Sub,
 				UserID: tc.UID,
 				TeamID: tc.TID,
 			})

pkg/user/user.go

@@ -1,11 +1,17 @@
 package user
 
 import (
+	"errors"
+
 	"github.com/matthewhartstonge/argon2"
 	"github.com/reearth/reearth-backend/pkg/id"
 	"golang.org/x/text/language"
 )
 
+var (
+	ErrEncodingPass = errors.New("error encoding password")
+)
+
 type User struct {
 	id       id.UserID
 	name     string
@@ -121,11 +127,38 @@ func (u *User) ClearAuths() {
 	u.auths = []Auth{}
 }
 
-func EncodePassword(pass string) ([]byte, error) {
+func (u *User) SetPassword(pass string) error {
+	p, err := encodePassword(pass)
+	if err != nil {
+		return err
+	}
+	u.password = p
+	return nil
+}
+
+func (u *User) MatchPassword(pass string) (bool, error) {
+	return verifyPassword(pass, u.password)
+}
+
+func encodePassword(pass string) ([]byte, error) {
 	argon := argon2.DefaultConfig()
 	encodedPass, err := argon.HashEncoded([]byte(pass))
 	if err != nil {
 		return nil, err
 	}
 	return encodedPass, nil
 }
+
+func verifyPassword(toVerify string, encoded []byte) (bool, error) {
+	raw, err := argon2.Decode(encoded)
+	if err != nil {
+		return false, err
+	}
+
+	ok, err := raw.Verify([]byte(toVerify))
+	if err != nil {
+		return false, err
+	}
+
+	return ok, nil
+}