diff options
Diffstat (limited to 'server/admin/store.go')
| -rw-r--r-- | server/admin/store.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/server/admin/store.go b/server/admin/store.go index 3322b35..9a7f639 100644 --- a/server/admin/store.go +++ b/server/admin/store.go @@ -19,14 +19,13 @@ func NewStore(database *pgxpool.Pool) *Store { } } -func (store Store) Find(requestAdmin Admin) (Admin, error) { - adminRows, err := store.database.Query(context.Background(), - "select * from admin") +func (s *Store) Find(requestAdmin Admin) (Admin, error) { + adminRows, err := s.database.Query(context.Background(), "select * from admin") if err != nil { return Admin{}, err } defer adminRows.Close() - admin, found := createAdmin(requestAdmin, adminRows) + admin, found := s.newAdmin(requestAdmin, adminRows) if found { return admin, nil @@ -34,7 +33,7 @@ func (store Store) Find(requestAdmin Admin) (Admin, error) { return Admin{}, errors.New("invalid username or password") } -func createAdmin(requestAdmin Admin, adminRows pgx.Rows) (Admin, bool) { +func (s *Store) newAdmin(requestAdmin Admin, adminRows pgx.Rows) (Admin, bool) { var databaseAdmin Admin for adminRows.Next() { err := adminRows.Scan(&databaseAdmin.Id, &databaseAdmin.Username, &databaseAdmin.Password) @@ -42,13 +41,13 @@ func createAdmin(requestAdmin Admin, adminRows pgx.Rows) (Admin, bool) { return Admin{}, false } if databaseAdmin.Username == requestAdmin.Username && - verifyPassword(databaseAdmin.Password, requestAdmin.Password) { + s.verifyPassword(databaseAdmin.Password, requestAdmin.Password) { return databaseAdmin, true } } return Admin{}, false } -func verifyPassword(hashedPassword string, password string) bool { - return bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password)) == nil +func (s *Store) verifyPassword(hash string, password string) bool { + return bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)) == nil } |