add users tests

pkg/domain/app/auth/handlers_local.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
 	"golang.org/x/crypto/bcrypt"
 )
@@ -40,7 +41,7 @@ func (service *Service) LocalPostLogin(w http.ResponseWriter, r *http.Request) *
 		}
 
 		// fetch the password hash from storage
-		user, err := service.local.storage.GetOneUserByName(payload.Username)
+		user, err := service.local.storage.GetOneUserByUsername(payload.Username)
 		if err != nil {
 			service.logger.Infof("client %s: login failed (bad username: %s)", r.RemoteAddr, err)
 			return output.JsonErrUnauthorized
@@ -138,7 +139,7 @@ func (service *Service) LocalChangePassword(w http.ResponseWriter, r *http.Reque
 	}
 
 	// fetch the password hash from storage
-	user, err := service.local.storage.GetOneUserByName(auth.Username)
+	user, err := service.local.storage.GetOneUserByUsername(auth.Username)
 	if err != nil {
 		// shouldn't be possible since header was valid
 		err = fmt.Errorf("client %s: password change for user '%s' failed (bad username: %s)", r.RemoteAddr, auth.UserTypeAndName(), err)
@@ -179,7 +180,7 @@ func (service *Service) LocalChangePassword(w http.ResponseWriter, r *http.Reque
 	}
 
 	// update password in storage
-	userId, err := service.local.storage.UpdateUserPassword(auth.Username, string(newPasswordHash))
+	userId, err := service.local.storage.PutUserPasswordHash(auth.Username, string(newPasswordHash), time.Now())
 	if err != nil {
 		err = fmt.Errorf("client %s: password change for user '%s' failed (storage error: %s)", r.RemoteAddr, auth.UserTypeAndName(), err)
 		service.logger.Error(err)

pkg/domain/app/auth/local.go

@@ -9,7 +9,7 @@ type localExtraFuncs struct {
 // RefreshCheck for local users just queries the DB to confirm no-error
 func (lef *localExtraFuncs) RefreshCheck() error {
 	// get user must work
-	_, err := lef.storageService.GetOneUserByName(lef.dbUsername)
+	_, err := lef.storageService.GetOneUserByUsername(lef.dbUsername)
 	if err != nil {
 		return err
 	}

pkg/domain/app/auth/service.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"sync"
+	"time"
 
 	"github.com/coreos/go-oidc/v3/oidc"
 	"go.uber.org/zap"
@@ -39,13 +40,13 @@ type User struct {
 	ID           int
 	Username     string
 	PasswordHash string
-	CreatedAt    int
-	UpdatedAt    int
+	CreatedAt    time.Time
+	UpdatedAt    time.Time
 }
 
 type Storage interface {
-	GetOneUserByName(username string) (User, error)
-	UpdateUserPassword(username string, newPasswordHash string) (userId int, err error)
+	GetOneUserByUsername(username string) (User, error)
+	PutUserPasswordHash(username string, passwordHash string, updatedAt time.Time) (userId int, err error)
 }
 
 type Config struct {

pkg/storage/accounts_delete_test.go

@@ -82,7 +82,7 @@ func TestDeleteAcmeAccount(t *testing.T) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedGetResult)
+			compareAcmeAccount(t, acct, tc.expectedGetResult)
 		})
 	}
 }

pkg/storage/accounts_get_test.go

@@ -118,7 +118,7 @@ func TestGetAllAcmeAccounts(t *testing.T) {
 				t.Errorf("incorrect result length, expected '%d' but got '%d'", tc.expectedResultLen, len(accts))
 			}
 			if tc.testIndx <= len(accts)-1 {
-				CompareAcmeAccount(t, accts[tc.testIndx], tc.expectedAcctAtIndx)
+				compareAcmeAccount(t, accts[tc.testIndx], tc.expectedAcctAtIndx)
 			} else {
 				t.Errorf("couldnt test result at index '%d' because length of result array was only '%d'", tc.testIndx, len(accts))
 			}
@@ -152,7 +152,7 @@ func TestGetOneAccountById(t *testing.T) {
 				t.Errorf("expected error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedAcct)
+			compareAcmeAccount(t, acct, tc.expectedAcct)
 		})
 	}
 }
@@ -183,7 +183,7 @@ func TestGetOneAccountByName(t *testing.T) {
 				t.Errorf("expected error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedAcct)
+			compareAcmeAccount(t, acct, tc.expectedAcct)
 		})
 	}
 }

pkg/storage/accounts_post_test.go

@@ -111,14 +111,14 @@ func TestPostNewAcmeAccount(t *testing.T) {
 				t.Errorf("expected post error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedPostErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedNew)
+			compareAcmeAccount(t, acct, tc.expectedNew)
 
 			acct, err = storage.GetOneAcmeAccountByName(acct.Name)
 			if !helpers_test.ErrorsIs(err, tc.expectedGetErr) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedNew)
+			compareAcmeAccount(t, acct, tc.expectedNew)
 		})
 	}
 }

pkg/storage/accounts_put_test.go

@@ -250,14 +250,14 @@ func TestPutAcmeAccountUpdate(t *testing.T) {
 				t.Errorf("expected put error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedPutErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedPutResult)
+			compareAcmeAccount(t, acct, tc.expectedPutResult)
 
 			acct, err = storage.GetOneAcmeAccountById(tc.getId)
 			if !helpers_test.ErrorsIs(err, tc.expectedGetErr) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedGetResult)
+			compareAcmeAccount(t, acct, tc.expectedGetResult)
 		})
 	}
 }
@@ -380,14 +380,14 @@ func TestPutAcmeAccountNewKey(t *testing.T) {
 				t.Errorf("expected put error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedPutErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedPutResult)
+			compareAcmeAccount(t, acct, tc.expectedPutResult)
 
 			acct, err = storage.GetOneAcmeAccountById(tc.getId)
 			if !helpers_test.ErrorsIs(err, tc.expectedGetErr) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeAccount(t, acct, tc.expectedGetResult)
+			compareAcmeAccount(t, acct, tc.expectedGetResult)
 		})
 	}
 }

pkg/storage/accounts_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 )
 
-// CompareAcmeAccount compares acct to expectedAcct and throws appropriate errors for any differences
-func CompareAcmeAccount(t *testing.T, acct, expectedAcct acme_accounts.Account) {
+// compareAcmeAccount compares acct to expectedAcct and throws appropriate errors for any differences
+func compareAcmeAccount(t *testing.T, acct, expectedAcct acme_accounts.Account) {
 	if acct.ID != expectedAcct.ID {
 		t.Errorf("acme account: id expected '%d' but got '%d'", expectedAcct.ID, acct.ID)
 	}
@@ -19,9 +19,9 @@ func CompareAcmeAccount(t *testing.T, acct, expectedAcct acme_accounts.Account)
 		t.Errorf("acme account: description expected '%s' but got '%s'", expectedAcct.Description, acct.Description)
 	}
 
-	CompareAcmeServer(t, acct.AcmeServer, expectedAcct.AcmeServer)
+	compareAcmeServer(t, acct.AcmeServer, expectedAcct.AcmeServer)
 
-	CompareKey(t, acct.AccountKey, expectedAcct.AccountKey)
+	compareKey(t, acct.AccountKey, expectedAcct.AccountKey)
 
 	if acct.Status != expectedAcct.Status {
 		t.Errorf("acme account: status expected '%s' but got '%s'", expectedAcct.Status, acct.Status)

pkg/storage/acme_servers_delete_test.go

@@ -78,7 +78,7 @@ func TestDeleteServer(t *testing.T) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeServer(t, server, tc.expectedGetResult)
+			compareAcmeServer(t, server, tc.expectedGetResult)
 		})
 	}
 }

pkg/storage/acme_servers_get_test.go

@@ -86,7 +86,7 @@ func TestGetAllAcmeServers(t *testing.T) {
 				t.Errorf("incorrect result length, expected '%d' but got '%d'", tc.expectedResultLen, len(servers))
 			}
 			if tc.testIndx <= len(servers)-1 {
-				CompareAcmeServer(t, servers[tc.testIndx], tc.expectedServerAtIndx)
+				compareAcmeServer(t, servers[tc.testIndx], tc.expectedServerAtIndx)
 			} else {
 				t.Errorf("couldnt test result at index '%d' because length of result array was only '%d'", tc.testIndx, len(servers))
 			}
@@ -120,7 +120,7 @@ func TestGetOneServerById(t *testing.T) {
 				t.Errorf("expected error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeServer(t, serv, tc.expectedServer)
+			compareAcmeServer(t, serv, tc.expectedServer)
 		})
 	}
 }
@@ -151,7 +151,7 @@ func TestGetOneServerByName(t *testing.T) {
 				t.Errorf("expected error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeServer(t, serv, tc.expectedServer)
+			compareAcmeServer(t, serv, tc.expectedServer)
 		})
 	}
 }

pkg/storage/acme_servers_post_test.go

@@ -78,14 +78,14 @@ func TestPostNewServer(t *testing.T) {
 				t.Errorf("expected post error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedPostErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeServer(t, server, tc.expectedNew)
+			compareAcmeServer(t, server, tc.expectedNew)
 
 			server, err = storage.GetOneServerByName(server.Name)
 			if !helpers_test.ErrorsIs(err, tc.expectedGetErr) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeServer(t, server, tc.expectedNew)
+			compareAcmeServer(t, server, tc.expectedNew)
 		})
 	}
 }

pkg/storage/acme_servers_put_test.go

@@ -140,14 +140,14 @@ func TestPutServerUpdate(t *testing.T) {
 				t.Errorf("expected put error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedPutErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeServer(t, server, tc.expectedPutResult)
+			compareAcmeServer(t, server, tc.expectedPutResult)
 
 			server, err = storage.GetOneServerById(tc.getId)
 			if !helpers_test.ErrorsIs(err, tc.expectedGetErr) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareAcmeServer(t, server, tc.expectedGetResult)
+			compareAcmeServer(t, server, tc.expectedGetResult)
 		})
 	}
 }

pkg/storage/acme_servers_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 )
 
-// CompareAcmeServers compares server to expectedServer and throws appropriate errors for any differences
-func CompareAcmeServer(t *testing.T, server, expectedServer acme_servers.Server) {
+// compareAcmeServer compares server to expectedServer and throws appropriate errors for any differences
+func compareAcmeServer(t *testing.T, server, expectedServer acme_servers.Server) {
 	if server.ID != expectedServer.ID {
 		t.Errorf("acme server: id expected '%d' but got '%d'", expectedServer.ID, server.ID)
 	}

pkg/storage/certificates_delete_test.go

@@ -41,7 +41,7 @@ func TestDeleteCert(t *testing.T) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, cert, tc.expectedGetResult)
+			compareCertificate(t, cert, tc.expectedGetResult)
 		})
 	}
 }

pkg/storage/certificates_get_test.go

@@ -142,7 +142,7 @@ func TestGetAllCerts(t *testing.T) {
 				t.Errorf("incorrect result length, expected '%d' but got '%d'", tc.expectedResultLen, len(certs))
 			}
 			if tc.testIndx <= len(certs)-1 {
-				CompareCertificate(t, certs[tc.testIndx], tc.expectedAtIndx)
+				compareCertificate(t, certs[tc.testIndx], tc.expectedAtIndx)
 			} else {
 				t.Errorf("couldnt test result at index '%d' because length of result array was only '%d'", tc.testIndx, len(certs))
 			}
@@ -176,7 +176,7 @@ func TestGetOneCertById(t *testing.T) {
 				t.Errorf("expected error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, serv, tc.expectedCert)
+			compareCertificate(t, serv, tc.expectedCert)
 		})
 	}
 }
@@ -207,7 +207,7 @@ func TestGetOneCertByName(t *testing.T) {
 				t.Errorf("expected error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, serv, tc.expectedCert)
+			compareCertificate(t, serv, tc.expectedCert)
 		})
 	}
 }

pkg/storage/certificates_post_test.go

@@ -215,14 +215,14 @@ func TestPostNewCert(t *testing.T) {
 				t.Errorf("expected post error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedPostErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, record, tc.expectedNew)
+			compareCertificate(t, record, tc.expectedNew)
 
 			record, err = storage.GetOneCertByName(record.Name)
 			if !helpers_test.ErrorsIs(err, tc.expectedGetErr) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, record, tc.expectedNew)
+			compareCertificate(t, record, tc.expectedNew)
 		})
 	}
 }

pkg/storage/certificates_put_test.go

@@ -297,14 +297,14 @@ func TestPutDetailsCert(t *testing.T) {
 				t.Errorf("expected put error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedPutErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, c, tc.expectedPutResult)
+			compareCertificate(t, c, tc.expectedPutResult)
 
 			c, err = storage.GetOneCertById(tc.getId)
 			if !helpers_test.ErrorsIs(err, tc.expectedGetErr) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, c, tc.expectedGetResult)
+			compareCertificate(t, c, tc.expectedGetResult)
 		})
 	}
 }
@@ -433,7 +433,7 @@ func TestPutCertApiKey(t *testing.T) {
 				t.Errorf("expected get cert error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, cert, tc.expectedCert)
+			compareCertificate(t, cert, tc.expectedCert)
 		})
 	}
 }
@@ -562,7 +562,7 @@ func TestCertApiKeyNew(t *testing.T) {
 				t.Errorf("expected cert get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, cert, tc.expectedCert)
+			compareCertificate(t, cert, tc.expectedCert)
 		})
 	}
 
@@ -696,7 +696,7 @@ func TestPutCertUpdatedAt(t *testing.T) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, record, tc.expectedCert)
+			compareCertificate(t, record, tc.expectedCert)
 		})
 	}
 
@@ -791,7 +791,7 @@ func TestPutCertClientKey(t *testing.T) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, record, tc.expectedCert)
+			compareCertificate(t, record, tc.expectedCert)
 		})
 	}
 }
@@ -924,7 +924,7 @@ func TestPutCertLastAccess(t *testing.T) {
 				t.Errorf("expected get error '%s' but got '%s'", helpers_test.ErrorToVal(tc.expectedGetErr), helpers_test.ErrorToVal(err))
 			}
 
-			CompareCertificate(t, record, tc.expectedCert)
+			compareCertificate(t, record, tc.expectedCert)
 		})
 	}
 }