Rename internal/render to internal/response

Author: kris-runzer

auth/auth.go

@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 	"gopkg.in/authboss.v0"
-	"gopkg.in/authboss.v0/internal/render"
+	"gopkg.in/authboss.v0/internal/response"
 )
 
 const (
@@ -24,7 +24,7 @@ func init() {
 
 // Auth module
 type Auth struct {
-	templates render.Templates
+	templates response.Templates
 }
 
 // Initialize module
@@ -41,7 +41,7 @@ func (a *Auth) Initialize() (err error) {
 		return errors.New("auth: XSRFMaker must be defined")
 	}
 
-	a.templates, err = render.LoadTemplates(authboss.Cfg.Layout, authboss.Cfg.ViewsPath, tplLogin)
+	a.templates, err = response.LoadTemplates(authboss.Cfg.Layout, authboss.Cfg.ViewsPath, tplLogin)
 	if err != nil {
 		return err
 	}
@@ -71,7 +71,7 @@ func (a *Auth) loginHandlerFunc(ctx *authboss.Context, w http.ResponseWriter, r
 		if _, ok := ctx.SessionStorer.Get(authboss.SessionKey); ok {
 			if halfAuthed, ok := ctx.SessionStorer.Get(authboss.SessionHalfAuthKey); !ok || halfAuthed == "false" {
 				//http.Redirect(w, r, authboss.Cfg.AuthLoginOKPath, http.StatusFound, true)
-				render.Redirect(ctx, w, r, authboss.Cfg.AuthLoginOKPath, "", "", true)
+				response.Redirect(ctx, w, r, authboss.Cfg.AuthLoginOKPath, "", "", true)
 				return nil
 			}
 		}
@@ -115,7 +115,7 @@ func (a *Auth) loginHandlerFunc(ctx *authboss.Context, w http.ResponseWriter, r
 			case authboss.InterruptAccountNotConfirmed:
 				reason = "Your account has not been confirmed."
 			}
-			render.Redirect(ctx, w, r, authboss.Cfg.AuthLoginFailPath, "", reason, false)
+			response.Redirect(ctx, w, r, authboss.Cfg.AuthLoginFailPath, "", reason, false)
 			return nil
 		}
 
@@ -125,7 +125,7 @@ func (a *Auth) loginHandlerFunc(ctx *authboss.Context, w http.ResponseWriter, r
 		if err := authboss.Cfg.Callbacks.FireAfter(authboss.EventAuth, ctx); err != nil {
 			return err
 		}
-		render.Redirect(ctx, w, r, authboss.Cfg.AuthLoginOKPath, "", "", true)
+		response.Redirect(ctx, w, r, authboss.Cfg.AuthLoginOKPath, "", "", true)
 	default:
 		w.WriteHeader(http.StatusMethodNotAllowed)
 	}
@@ -157,7 +157,7 @@ func (a *Auth) logoutHandlerFunc(ctx *authboss.Context, w http.ResponseWriter, r
 		ctx.CookieStorer.Del(authboss.CookieRemember)
 		ctx.SessionStorer.Del(authboss.SessionLastAction)
 
-		render.Redirect(ctx, w, r, authboss.Cfg.AuthLogoutOKPath, "", "", true)
+		response.Redirect(ctx, w, r, authboss.Cfg.AuthLogoutOKPath, "You have logged out", "", true)
 	default:
 		w.WriteHeader(http.StatusMethodNotAllowed)
 	}

confirm/confirm.go

@@ -12,7 +12,7 @@ import (
 	"path"
 
 	"gopkg.in/authboss.v0"
-	"gopkg.in/authboss.v0/internal/render"
+	"gopkg.in/authboss.v0/internal/response"
 )
 
 // Storer and FormValue constants
@@ -46,8 +46,8 @@ func init() {
 
 // Confirm module
 type Confirm struct {
-	emailHTMLTemplates render.Templates
-	emailTextTemplates render.Templates
+	emailHTMLTemplates response.Templates
+	emailTextTemplates response.Templates
 }
 
 // Initialize the module
@@ -58,11 +58,11 @@ func (c *Confirm) Initialize() (err error) {
 		return errors.New("confirm: Need a ConfirmStorer")
 	}
 
-	c.emailHTMLTemplates, err = render.LoadTemplates(authboss.Cfg.LayoutHTMLEmail, authboss.Cfg.ViewsPath, tplConfirmHTML)
+	c.emailHTMLTemplates, err = response.LoadTemplates(authboss.Cfg.LayoutHTMLEmail, authboss.Cfg.ViewsPath, tplConfirmHTML)
 	if err != nil {
 		return err
 	}
-	c.emailTextTemplates, err = render.LoadTemplates(authboss.Cfg.LayoutTextEmail, authboss.Cfg.ViewsPath, tplConfirmText)
+	c.emailTextTemplates, err = response.LoadTemplates(authboss.Cfg.LayoutTextEmail, authboss.Cfg.ViewsPath, tplConfirmText)
 	if err != nil {
 		return err
 	}
@@ -144,7 +144,7 @@ func (c *Confirm) confirmEmail(to, token string) {
 		Subject: authboss.Cfg.EmailSubjectPrefix + "Confirm New Account",
 	}
 
-	err := render.RenderEmail(email, c.emailHTMLTemplates, tplConfirmHTML, c.emailTextTemplates, tplConfirmText, url)
+	err := response.Email(email, c.emailHTMLTemplates, tplConfirmHTML, c.emailTextTemplates, tplConfirmText, url)
 	if err != nil {
 		fmt.Fprintf(authboss.Cfg.LogWriter, "confirm: Failed to send e-mail: %v", err)
 	}
@@ -188,7 +188,7 @@ func (c *Confirm) confirmHandler(ctx *authboss.Context, w http.ResponseWriter, r
 	}
 
 	ctx.SessionStorer.Put(authboss.SessionKey, key)
-	render.Redirect(ctx, w, r, authboss.Cfg.RegisterOKPath, "You have successfully confirmed your account.", "", true)
+	response.Redirect(ctx, w, r, authboss.Cfg.RegisterOKPath, "You have successfully confirmed your account.", "", true)
 
 	return nil
 }