hlfw.ca

webbing

Download patch

ref: 120e6d47e8c644977694f2f97abeb982bdeaf423
parent: 573163518a071af68870b9f91593634d7e186ead
author: Halfwit <halfwit@MacBook-Pro.hitronhub.home>
date: Wed Oct 23 02:03:00 PDT 2019 

Just gofmt things


--- a/db/tmp.go
+++ b/db/tmp.go
@@ -4,6 +4,7 @@
 	"errors"
 	"log"
 )
+
 type Access uint8
 
 const (
@@ -28,7 +29,7 @@
 	tmpdata = make(map[string]*entry)
 	data = make(map[string]*entry)
 	// NOTE: Dummy entry for testing. This goes away when we have a real db
-	data["foo"] = &entry {
+	data["foo"] = &entry{
 		first: "foo",
 		last:  "bar",
 		email: "foo@bar.com",
@@ -35,12 +36,12 @@
 		pass:  "1234567890",
 		role:  PatientAuth,
 	}
-	data["bar"] = &entry {
+	data["bar"] = &entry{
 		first: "foo",
-		last: "bar",
+		last:  "bar",
 		email: "doc@bar.com",
-		pass: "1234567890",
-		role: DoctorAuth,
+		pass:  "1234567890",
+		role:  DoctorAuth,
 	}
 }
 
@@ -68,7 +69,7 @@
 func CreateEntry(token string) {
 	log.Println(data)
 	if ent, ok := tmpdata[token]; ok {
-		data[token] = &entry {
+		data[token] = &entry{
 			first: ent.first,
 			last:  ent.last,
 			email: ent.email,
@@ -142,7 +143,7 @@
 }
 
 func UpdateUserPassword(token, pass string) {
-	if _, ok := data[token]; ! ok {
+	if _, ok := data[token]; !ok {
 		return
 	}
 	data[token].pass = pass
--- a/session/data.go
+++ b/session/data.go
@@ -2,16 +2,16 @@
 
 import (
 	"container/list"
-	"time"
 	"sync"
+	"time"
 )
 
-var pder = &Default {
+var pder = &Default{
 	list: list.New(),
 }
 
 type SessionStore struct {
-	sid string
+	sid   string
 	atime time.Time
 	value map[interface{}]interface{}
 }
@@ -46,25 +46,25 @@
 }
 
 type Default struct {
-	lock sync.Mutex
+	lock     sync.Mutex
 	sessions map[string]*list.Element
-	list *list.List
+	list     *list.List
 }
 
 func (pder *Default) SessionInit(sid string) (Session, error) {
-        pder.lock.Lock()
-        defer pder.lock.Unlock()
-        v := make(map[interface{}]interface{}, 0)
-        newsess := &SessionStore{sid: sid, atime: time.Now(), value: v}
-        element := pder.list.PushBack(newsess)
-        pder.sessions[sid] = element
-        return newsess, nil
+	pder.lock.Lock()
+	defer pder.lock.Unlock()
+	v := make(map[interface{}]interface{}, 0)
+	newsess := &SessionStore{sid: sid, atime: time.Now(), value: v}
+	element := pder.list.PushBack(newsess)
+	pder.sessions[sid] = element
+	return newsess, nil
 }
 
 func (pder *Default) SessionRead(sid string) (Session, error) {
 	if element, ok := pder.sessions[sid]; ok {
 		return element.Value.(*SessionStore), nil
-	} 
+	}
 	return pder.SessionInit(sid)
 }
 
@@ -72,7 +72,7 @@
 	if element, ok := pder.sessions[sid]; ok {
 		delete(pder.sessions, sid)
 		pder.list.Remove(element)
-    }
+	}
 	return nil
 }
 
--- a/session/manager.go
+++ b/session/manager.go
@@ -5,8 +5,8 @@
 	"log"
 	"net/http"
 	"net/url"
-	"time"
 	"sync"
+	"time"
 
 	"github.com/google/uuid"
 )
@@ -14,9 +14,9 @@
 var provides = make(map[string]Provider)
 
 type Manager struct {
-	cookieName string
-	lock sync.Mutex
-	provider Provider
+	cookieName  string
+	lock        sync.Mutex
+	provider    Provider
 	maxlifetime int64
 }
 
@@ -23,8 +23,8 @@
 func NewManager(provideName, cookieName string, maxlifetime int64) (*Manager, error) {
 	if provider, ok := provides[provideName]; ok {
 		m := &Manager{
-			provider: provider,
-			cookieName: cookieName,
+			provider:    provider,
+			cookieName:  cookieName,
 			maxlifetime: maxlifetime,
 		}
 		return m, nil
@@ -67,11 +67,11 @@
 	manager.provider.SessionDestroy(cookie.Value)
 	expiration := time.Now()
 	c := http.Cookie{
-		Name: manager.cookieName,
-		Path: "/",
+		Name:     manager.cookieName,
+		Path:     "/",
 		HttpOnly: true,
-		Expires: expiration,
-		MaxAge: -1,
+		Expires:  expiration,
+		MaxAge:   -1,
 	}
 	http.SetCookie(w, &c)
 }
@@ -84,11 +84,11 @@
 		sid := manager.sessionId()
 		session, _ = manager.provider.SessionInit(sid)
 		cookie := http.Cookie{
-			Name: manager.cookieName,
-			Value: url.QueryEscape(sid),
-			Path: "/",
+			Name:     manager.cookieName,
+			Value:    url.QueryEscape(sid),
+			Path:     "/",
 			HttpOnly: true,
-			MaxAge: int(manager.maxlifetime),
+			MaxAge:   int(manager.maxlifetime),
 		}
 		http.SetCookie(w, &cookie)
 		return