Patch 2025 10 18 01

.gitignore

@@ -1,6 +1,8 @@
 # Directories
 # -----------
 /.idea/
+/backend/tmp/
+/storage/tmp/
 
 # Files
 # -----

auth.go

@@ -17,16 +17,16 @@ const (
 func Authenticate(headers map[string]string) error {
 	headerVal := GetHeader(headers, authHeader)
 	if headerVal == "" {
-		return fmt.Errorf(Stderr.AuthHeaderMissing)
+		return fmt.Errorf("%v", Stderr.AuthHeaderMissing)
 	}
 
 	envVal, ok := os.LookupEnv(authHeader)
 	if !ok {
-		return fmt.Errorf(Stderr.AuthCodeNotSet)
+		return fmt.Errorf("%v", Stderr.AuthCodeNotSet)
 	}
 
 	if headerVal != envVal {
-		return fmt.Errorf(Stderr.AuthCodeInvalid)
+		return fmt.Errorf("%v", Stderr.AuthCodeInvalid)
 	}
 
 	return nil

awslambda/lambda.go

@@ -50,7 +50,7 @@ func PreliminaryChecks(event *events.LambdaFunctionURLRequest) *events.LambdaFun
 
 	doIt, e1 := www.ShouldRedirect(host)
 	if e1 != nil {
-		Log.Errf(e1.Error())
+		Log.Errf("%v", e1.Error())
 		return www.Respond500().ToLambdaResponse()
 	}
 
@@ -75,7 +75,7 @@ func PreliminaryChecks(event *events.LambdaFunctionURLRequest) *events.LambdaFun
 		return www.Respond401().ToLambdaResponse()
 	}
 
-	Log.Infof(stdout.PreChecks)
+	Log.Infof("%v", stdout.PreChecks)
 
 	return nil
 }

backend/account.go

@@ -0,0 +1,81 @@
+package backend
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/google/uuid"
+	"github.com/kohirens/www/storage"
+)
+
+type Account struct {
+	AppleID  string `json:"apple_id"`
+	Email    string `json:"email"`
+	FistName string `json:"fist_name"`
+	GoogleId string `json:"google_id"`
+	ID       string `json:"id"`
+	LastName string `json:"last_name"`
+}
+
+type AccountManager interface {
+	AddWithProvider(providerID, providerName string) (*Account, error)
+	Lookup(id string) (*Account, error)
+	// Location The generated filename/key/path where the account
+	// should be located in storage.
+	Location(id string) string
+}
+
+// AccountExec Short for account executive, is an implementation of
+// AccountManager.
+type AccountExec struct {
+	store storage.Storage
+}
+
+// AddWithProvider Make a new account using an OIDC provider.
+func (am *AccountExec) AddWithProvider(clientID, providerName string) (*Account, error) {
+	// Generate an account ID.
+	id, e1 := uuid.NewV7()
+	if e1 != nil {
+		return nil, fmt.Errorf(stderr.UUID, e1.Error())
+	}
+
+	account := &Account{
+		ID: id.String(), //TODO: generate a guid
+	}
+
+	switch providerName {
+	case "apple":
+		account.AppleID = clientID
+	case "google":
+		account.GoogleId = clientID
+	}
+
+	accountBytes, e2 := json.Marshal(account)
+	if e2 != nil {
+		return nil, fmt.Errorf(stderr.DecodeJSON, e2.Error())
+	}
+
+	if e := am.store.Save(am.Location(account.ID), accountBytes); e != nil {
+		return nil, e
+	}
+
+	return account, nil
+}
+
+func (am *AccountExec) Location(id string) string {
+	return fmt.Sprintf(PrefixAccounts+"/%v.json", id)
+}
+
+// Lookup Search for an account in storage.
+func (am *AccountExec) Lookup(id string) (*Account, error) {
+	aData, e1 := am.store.Load(am.Location(id))
+	if e1 != nil {
+		return nil, &AccountNotFoundError{id}
+	}
+
+	account := &Account{}
+	if e2 := json.Unmarshal(aData, &account); e2 != nil {
+		return nil, fmt.Errorf(stderr.DecodeJSON, e2.Error())
+	}
+
+	return account, nil
+}

backend/account_test.go

@@ -0,0 +1,89 @@
+package backend
+
+import (
+	"github.com/kohirens/www/storage"
+	"testing"
+)
+
+func TestAccountExec_Lookup(t *testing.T) {
+	fixedStore, _ := storage.NewLocalStorage(fixtureDir)
+
+	tests := []struct {
+		name    string
+		store   storage.Storage
+		id      string
+		wantErr bool
+	}{
+		{
+			"pull_account",
+			fixedStore,
+			"1234",
+			false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			am := &AccountExec{
+				store: tt.store,
+			}
+			got, err := am.Lookup(tt.id)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Lookup() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			if got.ID != tt.id {
+				t.Errorf("Lookup() got = %v, want %v", got, tt.id)
+				return
+			}
+		})
+	}
+}
+
+func TestAccountExec_Add(t *testing.T) {
+	fixedStore, _ := storage.NewLocalStorage(tmpDir)
+
+	tests := []struct {
+		name,
+		providerID,
+		providerName string
+		store   storage.Storage
+		wantErr bool
+	}{
+		{
+			"add_account",
+			"1234",
+			"google",
+			fixedStore,
+			false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			am := &AccountExec{
+				store: tt.store,
+			}
+			got, err := am.AddWithProvider(tt.providerID, tt.providerName)
+
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Add() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			if got.GoogleId != tt.providerID {
+				t.Errorf("Add() got = %v, want %v", got.GoogleId, tt.providerID)
+				return
+			}
+
+			got2, err2 := am.Lookup(got.ID)
+			if (err2 != nil) != tt.wantErr {
+				t.Errorf("Add() error = %v, wantErr %v", err2, tt.wantErr)
+				return
+			}
+			if got2.ID != got.ID {
+				t.Errorf("Add() error, newly added account could not be loaded")
+				return
+			}
+		})
+	}
+}