From 8691f3bca92bcc06ddbd2aa3c7f4d785a9cd7a2a Mon Sep 17 00:00:00 2001
From: Aaron L <aaron@bettercoder.net>
Date: Sun, 2 Aug 2015 13:02:31 -0700
Subject: [PATCH] register: Context+Request separation ripple

---
 register/register.go      | 6 +++---
 register/register_test.go | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/register/register.go b/register/register.go
index 7fc7f4b..a8e2da6 100644
--- a/register/register.go
+++ b/register/register.go
@@ -85,7 +85,7 @@ func (reg *Register) registerPostHandler(ctx *authboss.Context, w http.ResponseW
 	key := r.FormValue(reg.PrimaryID)
 	password := r.FormValue(authboss.StorePassword)
 
-	validationErrs := ctx.Validate(req, reg.Policies, reg.ConfirmFields...)
+	validationErrs := authboss.Validate(r, reg.Policies, reg.ConfirmFields...)
 
 	if user, err := ctx.Storer.Get(key); err != nil && err != authboss.ErrUserNotFound {
 		return err
@@ -107,7 +107,7 @@ func (reg *Register) registerPostHandler(ctx *authboss.Context, w http.ResponseW
 		return reg.templates.Render(ctx, w, r, tplRegister, data)
 	}
 
-	attr, err := ctx.Attributes() // Attributes from overriden forms
+	attr, err := authboss.AttributesFromRequest(r) // Attributes from overriden forms
 	if err != nil {
 		return err
 	}
@@ -129,7 +129,7 @@ func (reg *Register) registerPostHandler(ctx *authboss.Context, w http.ResponseW
 		}
 
 		for _, f := range reg.PreserveFields {
-			data[f], _ = ctx.FirstFormValue(f)
+			data[f] = r.FormValue(f)
 		}
 
 		return reg.templates.Render(ctx, w, r, tplRegister, data)
diff --git a/register/register_test.go b/register/register_test.go
index 424d2f9..dbd0a68 100644
--- a/register/register_test.go
+++ b/register/register_test.go
@@ -58,7 +58,7 @@ func TestRegisterGet(t *testing.T) {
 
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest("GET", "/register", nil)
-	ctx, _ := reg.ContextFromRequest(r)
+	ctx := reg.NewContext()
 	ctx.SessionStorer = mocks.NewMockClientStorer()
 
 	if err := reg.registerHandler(ctx, w, r); err != nil {
@@ -93,7 +93,7 @@ func TestRegisterPostValidationErrs(t *testing.T) {
 
 	r, _ := http.NewRequest("POST", "/register", bytes.NewBufferString(vals.Encode()))
 	r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	ctx, _ := reg.ContextFromRequest(r)
+	ctx := reg.NewContext()
 	ctx.SessionStorer = mocks.NewMockClientStorer()
 
 	if err := reg.registerHandler(ctx, w, r); err != nil {
@@ -131,7 +131,7 @@ func TestRegisterPostSuccess(t *testing.T) {
 
 	r, _ := http.NewRequest("POST", "/register", bytes.NewBufferString(vals.Encode()))
 	r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	ctx, _ := reg.ContextFromRequest(r)
+	ctx := reg.NewContext()
 	ctx.SessionStorer = mocks.NewMockClientStorer()
 
 	if err := reg.registerHandler(ctx, w, r); err != nil {