move signup package to domain

backend/api/signup/signup.go

@@ -11,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ses/types"
 	"github.com/mantil-io/mantil.go"
 	"github.com/mantil-io/mantil/backend/secret"
-	"github.com/mantil-io/mantil/signup"
+	"github.com/mantil-io/mantil/domain/signup"
 	"github.com/mantil-io/mantil/texts"
 )
 

backend/secret/secret.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/mantil-io/mantil/kit/token"
-	"github.com/mantil-io/mantil/signup"
+	"github.com/mantil-io/mantil/domain/signup"
 )
 
 //go:embed private_key

backend/secret/secret_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/mantil-io/mantil/backend/secret"
 	cliSecret "github.com/mantil-io/mantil/cli/secret"
-	"github.com/mantil-io/mantil/signup"
+	"github.com/mantil-io/mantil/domain/signup"
 	"github.com/stretchr/testify/require"
 )
 

backend/test/register_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/gavv/httpexpect"
 	"github.com/mantil-io/mantil/cli/secret"
 	"github.com/mantil-io/mantil/domain"
-	"github.com/mantil-io/mantil/signup"
+	"github.com/mantil-io/mantil/domain/signup"
 	"github.com/stretchr/testify/require"
 )
 

cli/controller/report.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mantil-io/mantil/cli/secret"
 	"github.com/mantil-io/mantil/cli/ui"
 	"github.com/mantil-io/mantil/domain"
-	"github.com/mantil-io/mantil/signup"
+	"github.com/mantil-io/mantil/domain/signup"
 )
 
 var reportEndpoint = apiEndpoint{url: "https://ytg5gfkg5k.execute-api.eu-central-1.amazonaws.com/report"}

cli/controller/signup.go

@@ -9,7 +9,7 @@ import (
 	"github.com/mantil-io/mantil/cli/secret"
 	"github.com/mantil-io/mantil/cli/ui"
 	"github.com/mantil-io/mantil/domain"
-	"github.com/mantil-io/mantil/signup"
+	"github.com/mantil-io/mantil/domain/signup"
 )
 
 var signupEndpoint = apiEndpoint{url: "https://ytg5gfkg5k.execute-api.eu-central-1.amazonaws.com/signup"}
@@ -27,17 +27,11 @@ func Register() error {
 }
 
 func Activate(id string) error {
-	machineID := domain.MachineID()
-	ar := signup.ActivateRequest{
-		ID:        id,
-		MachineID: machineID,
-	}
-
 	var jwt string
-	if err := signupEndpoint.Call("activate", ar, &jwt); err != nil {
+	if err := signupEndpoint.Call("activate", signup.NewActivateRequest(id), &jwt); err != nil {
 		return log.Wrap(err)
 	}
-	claims, err := signup.Validate(jwt, secret.SignupPublicKey, machineID)
+	claims, err := signup.Validate(jwt, secret.SignupPublicKey)
 	if err != nil {
 		return log.Wrap(err)
 	}
@@ -56,7 +50,7 @@ func IsActivated() bool {
 		log.Error(err)
 		return false
 	}
-	claims, err := signup.Validate(jwt, secret.SignupPublicKey, domain.MachineID())
+	claims, err := signup.Validate(jwt, secret.SignupPublicKey)
 	if err != nil {
 		log.Error(err)
 		return false

cli/log/log.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mantil-io/mantil/cli/log/net"
 	"github.com/mantil-io/mantil/cli/secret"
 	"github.com/mantil-io/mantil/domain"
-	"github.com/mantil-io/mantil/signup"
+	"github.com/mantil-io/mantil/domain/signup"
 	"github.com/pkg/errors"
 )
 

signup/signup.go → domain/signup/signup.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/mantil-io/mantil/domain"
 	"github.com/mantil-io/mantil/kit/token"
 )
 
@@ -29,14 +30,14 @@ func Decode(jwt, publicKey string) (TokenClaims, error) {
 }
 
 // Validate returns true if jwt is valid for that machine
-func Validate(jwt, publicKey, machineID string) (*TokenClaims, error) {
+func Validate(jwt, publicKey string) (*TokenClaims, error) {
 	jwt = strings.TrimSpace(jwt)
 	var ut TokenClaims
 	err := token.Decode(jwt, publicKey, &ut)
 	if err != nil {
 		return nil, err
 	}
-	if ut.MachineID != machineID {
+	if ut.MachineID != domain.MachineID() {
 		return nil, fmt.Errorf("token not valid for this machine")
 	}
 	return &ut, nil
@@ -48,6 +49,13 @@ type ActivateRequest struct {
 	MachineID string `json:"machineID,omitempty"`
 }
 
+func NewActivateRequest(id string) ActivateRequest {
+	return ActivateRequest{
+		ID:        id,
+		MachineID: domain.MachineID(),
+	}
+}
+
 func (r *ActivateRequest) Valid() bool {
 	return r.ID != "" && r.MachineID != ""
 }