diff --git a/models/auth.go b/models/auth.go deleted file mode 100644 index 0e584f1..0000000 --- a/models/auth.go +++ /dev/null @@ -1,8 +0,0 @@ -package models - -import "time" - -type Token struct { - User string - Expiration time.Time -} diff --git a/models/user.go b/models/user.go deleted file mode 100644 index 8841f56..0000000 --- a/models/user.go +++ /dev/null @@ -1,6 +0,0 @@ -package models - -type User struct { - Password string - Salt string -} diff --git a/server/server.go b/server/server.go index 03f5266..9b594dd 100644 --- a/server/server.go +++ b/server/server.go @@ -22,6 +22,7 @@ type route struct { } func (h *Server) Close() { + h.Close() } //go:embed static/* diff --git a/store/migrations/1.sql b/store/migrations/1.sql index 0dfda75..610fa11 100644 --- a/store/migrations/1.sql +++ b/store/migrations/1.sql @@ -24,16 +24,3 @@ create table ordered_cake ( amount integer not null, primary key (customer_order, cake) ); - -create table user ( - login text primary key, - password text, - role text, - salt text -); - -create table session ( - token text primary key, - user text, - expiration text -); diff --git a/store/session.go b/store/session.go deleted file mode 100644 index 587c2a0..0000000 --- a/store/session.go +++ /dev/null @@ -1,58 +0,0 @@ -package store - -import ( - "time" - - "git.bronku.xyz/bronku/cake-order-tracker/models" -) - -func (s *Store) AddSession(token, userName string, expiration time.Time) error { - query := "insert into session (token, user, expiration) values(?, ?, ?)" - _, err := s.db.Exec(query, token, userName, expiration.Format("2006-01-02 15:04")) - return err -} - -func (s *Store) RevokeSession(token string) error { - query := "delete from session where token = ?;" - _, err := s.db.Exec(query, token) - return err -} - -func (s *Store) CleanSessions() error { - now := time.Now().Format("2006-01-02 15:04") - query := "delete from session where expiration < ?;" - _, err := s.db.Exec(query, now) - return err -} - -func (s *Store) GetSessions() (map[string]models.Token, error) { - out := make(map[string]models.Token) - err := s.CleanSessions() - if err != nil { - return out, err - } - query := "select token, user, expiration from session;" - rows, err := s.db.Query(query) - if err != nil { - return out, err - } - defer rows.Close() - for rows.Next() { - var current models.Token - var token string - var expiration string - err = rows.Scan(&token, ¤t.User, &expiration) - if err != nil { - continue - } - current.Expiration, err = time.Parse("2006-01-02 15:04", expiration) - if err != nil { - continue - } - if token == "" { - continue - } - out[token] = current - } - return out, nil -} diff --git a/store/store.go b/store/store.go index 6220440..a4e12d7 100644 --- a/store/store.go +++ b/store/store.go @@ -11,7 +11,6 @@ import ( type Store struct { db *sql.DB cakes []models.Cake - users map[string]models.User } func OpenStore(filename string) *Store {