aclindsa/moneygo
1
0
Fork 0
mirror of https://github.com/aclindsa/moneygo.git synced 2025-07-14 16:21:57 -04:00
Code Issues Releases Wiki Activity

Remove duplicate *Tx versions of database access methods

Browse Source 
Simplify naming to remove "Tx" now that all handlers only have access to
transactions anyway, and always use "tx" as the name of the variable
representing the SQL transactions (to make it less likely to cause
confusion with monetary transactions).
This commit is contained in:
Aaron Lindsay
2017-10-14 19:41:13 -04:00
parent 4e53a5e59c
commit 2ff1f47432
8 changed files with 67 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/handlers/sessions.go
View File

@ -44,24 +44,8 @@ func GetSession(tx *Tx, r *http.Request) (*Session, error) {
return &s, nil
}
func GetSessionTx(tx *Tx, r *http.Request) (*Session, error) {
var s Session
cookie, err := r.Cookie("moneygo-session")
if err != nil {
return nil, fmt.Errorf("moneygo-session cookie not set")
}
s.SessionSecret = cookie.Value
err = tx.SelectOne(&s, "SELECT * from sessions where SessionSecret=?", s.SessionSecret)
if err != nil {
return nil, err
}
return &s, nil
}
func DeleteSessionIfExists(tx *Tx, r *http.Request) error {
session, err := GetSessionTx(tx, r)
session, err := GetSession(tx, r)
if err == nil {
_, err := tx.Delete(session)
if err != nil {
@ -153,7 +137,7 @@ func SessionHandler(r *http.Request, tx *Tx) ResponseWriterWriter {
}
return sessionwriter
} else if r.Method == "GET" {
s, err := GetSessionTx(tx, r)
s, err := GetSession(tx, r)
if err != nil {
return NewError(1 /*Not Signed In*/)
}