cool

Author: jaybeecave

router.go

@@ -18,8 +18,9 @@ import (
 // CustomRouter wraps gorilla mux with database, redis and renderer
 type CustomRouter struct {
 	// Router *mux.Router
-	Mux   *bone.Mux
-	Store *datastore.Datastore
+	Mux         *bone.Mux
+	Store       *datastore.Datastore
+	AuthHandler func(store *datastore.Datastore, fn http.HandlerFunc, authMethod string) http.HandlerFunc
 }
 
 func New(store *datastore.Datastore) *CustomRouter {
@@ -31,6 +32,20 @@ func New(store *datastore.Datastore) *CustomRouter {
 	// r.Handle("/attachments/", http.StripPrefix("/attachments/", http.FileServer(http.Dir(store.Settings.AttachmentsFolder))))
 	customRouter.Mux = r
 	customRouter.Store = store
+	customRouter.AuthHandler = authenticate
+	return customRouter
+}
+
+func CustomAuth(store *datastore.Datastore, authFn func(store *datastore.Datastore, fn http.HandlerFunc, authMethod string) http.HandlerFunc) *CustomRouter {
+	customRouter := &CustomRouter{}
+	r := bone.New()
+	r.CaseSensitive = false
+	// r.Handle("/public/", http.StripPrefix("/public/", http.FileServer(http.Dir("./public/"))))
+	// r.Handle("/assets/", http.StripPrefix("/assets/", http.FileServer(http.Dir("./assets/"))))
+	// r.Handle("/attachments/", http.StripPrefix("/attachments/", http.FileServer(http.Dir(store.Settings.AttachmentsFolder))))
+	customRouter.Mux = r
+	customRouter.Store = store
+	customRouter.AuthHandler = authFn
 	return customRouter
 }
 
@@ -42,63 +57,63 @@ func (customRouter *CustomRouter) Application(route string, path string) *bone.R
 
 func (customRouter *CustomRouter) GET(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.GetFunc(route, CustomHandler("GET", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.GetFunc(route, customRouter.customHandler("GET", customRouter.Store, routeFunc, securityType))
 }
 
 // POST - Post handler
 func (customRouter *CustomRouter) POST(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.PostFunc(route, CustomHandler("POST", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.PostFunc(route, customRouter.customHandler("POST", customRouter.Store, routeFunc, securityType))
 }
 
 // PST - Post handler with pst for tidier lines
 func (customRouter *CustomRouter) PST(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.PostFunc(route, CustomHandler("POST", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.PostFunc(route, customRouter.customHandler("POST", customRouter.Store, routeFunc, securityType))
 }
 
 // PUT - Put handler
 func (customRouter *CustomRouter) PUT(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.PutFunc(route, CustomHandler("PUT", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.PutFunc(route, customRouter.customHandler("PUT", customRouter.Store, routeFunc, securityType))
 }
 
 // PATCH - Patch handler
 func (customRouter *CustomRouter) PATCH(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.PatchFunc(route, CustomHandler("PATCH", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.PatchFunc(route, customRouter.customHandler("PATCH", customRouter.Store, routeFunc, securityType))
 }
 
 // OPTIONS - Options handler
 func (customRouter *CustomRouter) OPTIONS(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.OptionsFunc(route, CustomHandler("OPTIONS", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.OptionsFunc(route, customRouter.customHandler("OPTIONS", customRouter.Store, routeFunc, securityType))
 }
 
 // DELETE - Delete handler
 func (customRouter *CustomRouter) DELETE(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.DeleteFunc(route, CustomHandler("DELETE", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.DeleteFunc(route, customRouter.customHandler("DELETE", customRouter.Store, routeFunc, securityType))
 }
 
 // DEL - Delete handler
 func (customRouter *CustomRouter) DEL(route string, routeFunc CustomHandlerFunc, securityType string) *bone.Route {
 	//route = strings.ToLower(route)
-	return customRouter.Mux.DeleteFunc(route, CustomHandler("DELETE", customRouter.Store, routeFunc, securityType))
+	return customRouter.Mux.DeleteFunc(route, customRouter.customHandler("DELETE", customRouter.Store, routeFunc, securityType))
 }
 
-func CustomHandler(reqType string, store *datastore.Datastore, fn CustomHandlerFunc, authMethod string) http.HandlerFunc {
-	return authenticate(store, func(w http.ResponseWriter, req *http.Request) {
+func (customRouter *CustomRouter) customHandler(reqType string, store *datastore.Datastore, fn CustomHandlerFunc, authMethod string) http.HandlerFunc {
+	return customRouter.AuthHandler(store, func(w http.ResponseWriter, req *http.Request) {
 		fn(flow.New(w, req, store))
 	}, authMethod)
 }
 
-// DefaultHandler wraps default http functions in auth it does not pass the data store to them
-func DefaultHandler(store *datastore.Datastore, fn http.HandlerFunc, authMethod string) http.HandlerFunc {
-	return authenticate(store, func(w http.ResponseWriter, req *http.Request) {
-		fn(w, req)
-	}, authMethod)
-}
+// // DefaultHandler wraps default http functions in auth it does not pass the data store to them
+// func DefaultHandler(store *datastore.Datastore, fn http.HandlerFunc, authMethod string) http.HandlerFunc {
+// 	return authenticate(store, func(w http.ResponseWriter, req *http.Request) {
+// 		fn(w, req)
+// 	}, authMethod)
+// }
 
 func authenticate(store *datastore.Datastore, fn http.HandlerFunc, authMethod string) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
@@ -170,11 +185,6 @@ func authenticate(store *datastore.Datastore, fn http.HandlerFunc, authMethod st
 			fn(w, req)
 			return
 		}
-		// else if err != nil { // we dont care about the error
-		// 	// WE ONLY check the error after the above because if we aren't authenticating then we will get an error
-		// 	view.JSON(w, http.StatusForbidden, err.Error())
-		// 	return
-		// }
 
 		// if we have reached this point then the user doesn't have access
 		if authMethod == security.Disallow {