index.go

@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-const IndexPageTemplate = `<html>
+var indexPageTemplate = `<html>
 <head>
     <meta charset="UTF-8">
     <meta name="viewport"
@@ -106,6 +106,7 @@ const IndexPageTemplate = `<html>
 </html>
 		`
 
+
 type indexHandler struct {
 	DB *bbolt.DB
 }
@@ -113,7 +114,6 @@ type indexHandler struct {
 func (h *indexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	sess, err := NewSession(w, r)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
 		log.Printf("Error loading session: %s", err)
 		return
 	}
@@ -126,9 +126,7 @@ func (h *indexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	moments, err := loadMoments(h.DB, time.Now().Format("2006-01-02"))
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
 		log.Println(err)
-		return
 	}
 
 	type indexPageInfo struct {
@@ -141,21 +139,23 @@ func (h *indexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	indexPage.Me = sess.Me
 
 	if len(moments) > 0 {
-		Reverse(moments)
+		a := moments
+		for i := len(a)/2 - 1; i >= 0; i-- {
+			opp := len(a) - 1 - i
+			a[i], a[opp] = a[opp], a[i]
+		}
 		lastMoment := moments[0]
 		indexPage.LastMomentSeconds = lastMoment.Time.Unix()
 	}
 
-	t, err := template.New("index").Parse(IndexPageTemplate)
+	t, err := template.New("index").Parse(indexPageTemplate)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
 		log.Println(err)
 		return
 	}
 
 	err = t.Execute(w, indexPage)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
 		log.Println(err)
 		return
 	}

indieauth.go

@@ -21,20 +21,20 @@ func performIndieauthCallback(state, code string, sess *Session) (bool, *indieau
 }
 
 func (h *IndieAuthHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	log.Println(r.URL.Path)
+
 	sess, err := NewSession(w, r)
 	if err != nil {
 		http.Error(w, err.Error(), 500)
 		return
 	}
-
 	defer sess.Flush()
 
-	if sess.LoggedIn {
-		http.Redirect(w, r, "/", 302)
-		return
-	}
-
 	if r.Method == http.MethodGet {
+		if sess.LoggedIn {
+			http.Redirect(w, r, "/", 302)
+			return
+		}
 		if r.URL.Path == "" {
 			fmt.Fprint(w, `<!doctype html>
 <html>

main.go

@@ -9,10 +9,6 @@ import (
 	bolt "go.etcd.io/bbolt"
 )
 
-func init() {
-	log.SetFlags(log.LstdFlags|log.Lshortfile)
-}
-
 const DBFilename = "./moments.db"
 
 // Moment is the main information this servers remembers

session.go

@@ -78,7 +78,6 @@ func getSessionCookie(w http.ResponseWriter, r *http.Request) (string, error) {
 				Name:    "session",
 				Value:   sessionVar,
 				Expires: time.Now().Add(24 * time.Hour),
-				Path:    "/",
 			}
 
 			http.SetCookie(w, newCookie)

session_test.go

@@ -24,9 +24,6 @@ func TestGetSessionCookieMissingCookie(t *testing.T) {
 			if c.Value != sessionKey {
 				t.Errorf("Wrong sessionKey %q != %q", c.Value, sessionKey)
 			}
-			if c.Path != "/" {
-				t.Errorf("Wrong cookiepath %q != %q", c.Path, "/")
-			}
 			break
 		}
 	}
@@ -36,7 +33,7 @@ func TestGetSessionCookieCookieSet(t *testing.T) {
 	mySessionKey := "12341234"
 
 	r, _ := http.NewRequest("GET", "/", nil)
-	cookie := &http.Cookie{Name: "session", Value: mySessionKey, Path: r.URL.Path}
+	cookie := &http.Cookie{Name: "session", Value: mySessionKey}
 	r.AddCookie(cookie)
 
 	w := httptest.NewRecorder()
@@ -48,48 +45,4 @@ func TestGetSessionCookieCookieSet(t *testing.T) {
 	if mySessionKey != sessionKey {
 		t.Errorf("getSessionKey didn't fetch sessionKey from \"session\" cookie")
 	}
-
-	cookies := w.Result().Cookies()
-	for _, c := range cookies {
-		if c.Name == "session" {
-			if c.Value != sessionKey {
-				t.Errorf("Wrong sessionKey %q != %q", c.Value, sessionKey)
-			}
-			if c.Path != "" {
-				t.Errorf("Wrong cookiepath %q != %q", c.Path, "")
-			}
-			break
-		}
-	}
-}
-
-func TestGetSessionCookieCookieSetAuth(t *testing.T) {
-	mySessionKey := "12341234"
-
-	r, _ := http.NewRequest("GET", "/auth/", nil)
-	cookie := &http.Cookie{Name: "session", Value: mySessionKey, Path: r.URL.Path}
-	r.AddCookie(cookie)
-
-	w := httptest.NewRecorder()
-	sessionKey, err := getSessionCookie(w, r)
-	if err != nil {
-		t.Errorf("err != nil in getSessionCookie")
-	}
-
-	if mySessionKey != sessionKey {
-		t.Errorf("getSessionKey didn't fetch sessionKey from \"session\" cookie")
-	}
-
-	cookies := w.Result().Cookies()
-	for _, c := range cookies {
-		if c.Name == "session" {
-			if c.Value != sessionKey {
-				t.Errorf("Wrong sessionKey %q != %q", c.Value, sessionKey)
-			}
-			if c.Path != "" {
-				t.Errorf("Wrong cookiepath %q != %q", c.Path, "")
-			}
-			break
-		}
-	}
 }

util.go

@@ -12,13 +12,4 @@ func RandStringBytes(n int) string {
 		b[i] = letterBytes[rand.Intn(len(letterBytes))]
 	}
 	return string(b)
-}
+}
-
-func Reverse(moments []Moment) {
-	a := moments
-
-	for i := len(a)/2 - 1; i >= 0; i-- {
-		opp := len(a) - 1 - i
-		a[i], a[opp] = a[opp], a[i]
-	}
-}

util_test.go

@@ -1,35 +0,0 @@
-package main
-
-import (
-	"testing"
-	"time"
-)
-
-func TestReverseEmpty(t *testing.T) {
-	var moments []Moment
-	Reverse(moments)
-}
-
-func TestReverse(t *testing.T) {
-	moments := []Moment{
-		{Key: "2018-01-01", Memo: "test", Time: time.Now()},
-		{Key: "2018-01-02", Memo: "test2", Time: time.Now()},
-		{Key: "2018-01-03", Memo: "test3", Time: time.Now()},
-		{Key: "2018-01-04", Memo: "test4", Time: time.Now()},
-	}
-
-	Reverse(moments)
-
-	if moments[0].Key != "2018-01-04" {
-		t.Errorf("wrong 1st key %q != %q", moments[0].Key, "2018-01-04")
-	}
-	if moments[1].Key != "2018-01-03" {
-		t.Errorf("wrong 2nd key %q != %q", moments[1].Key, "2018-01-03")
-	}
-	if moments[2].Key != "2018-01-02" {
-		t.Errorf("wrong 3rd key %q != %q", moments[2].Key, "2018-01-02")
-	}
-	if moments[3].Key != "2018-01-01" {
-		t.Errorf("wrong 4th key %q != %q", moments[3].Key, "2018-01-01")
-	}
-}