adjusted session store to only require library and returnable session object

1 files changed, 2 insertions, 10 deletions

diff --git a/src/user/routes.go b/src/user/routes.go
index 636daa6..f82cbdc 100644
--- a/src/user/routes.go
+++ b/src/user/routes.go
@@ -41,6 +41,7 @@ var Routes = server.Routes{
 		Path:         "/u/me",
 		AuthRequired: true,
 		HandlerFunc:  Show,
+		Middlewares:  server.NewMiddlewares(sessions.AuthSession),
 	},
 }
 
@@ -80,7 +81,7 @@ func Store(s *server.Server) http.HandlerFunc {
 		}
 		// Send email validation
 		// Create cookie session
-		sessions.Store(w, user.Username)
+		sessions.NewSession(w, map[string]interface{}{"uid": user.Id, "username": user.Username})
 		// Redirect to user profile
 		http.Redirect(w, r, "/u/me", http.StatusSeeOther)
 	}
@@ -98,15 +99,6 @@ func Authenticate(s *server.Server) http.HandlerFunc {
 
 func Show(s *server.Server) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		token, err := r.Cookie("session_token")
-		if err != nil {
-			s.Ui.Render(w, "user/login", &struct{ Message string }{"You are not logged in! Missing Cookie"})
-		}
-		session, ok := sessions.NewSession(w, r, token.Value)
-		if !ok {
-			s.Ui.Render(w, "user/login", &struct{ Message string }{"You are not logged in! With Session."})
-		}
-
 		s.Ui.Render(w, "user/me", &struct{ Message, Username string }{"Congrats on getting this far!", session.Username()})
 	}
 }