Merge branch 'master' of http://208.97.141.22:3000/Matheus/go-bootstrap

config.go

@@ -8,7 +8,7 @@ const DATABASE_HOST = "208.97.141.22"
 const DATABASE_PORT = "3306"
 const DATABASE_USER = "hml"
 const DATABASE_PASS = "spr777hml"
-const DATABASE_SCHEMA = "hml_mkt_sprinta"
+const DATABASE_SCHEMA = "hml_sprinta"
 
 /* SERVICES ENDPOINTS */
 const AUTHENTICATION_SERVICE = "http://208.97.141.22/api/sign/user_data"

core/router/router.go

@@ -1,14 +1,15 @@
 package router
 
 import (
+	"context"
 	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
 )
 
-type closure func(http.ResponseWriter, *http.Request, []string)
-type Middleware func(http.ResponseWriter, *http.Request, []string) bool
+type closure func(http.ResponseWriter, *http.Request)
+type Middleware func(http.ResponseWriter, *http.Request) bool
 
 //Route struct de uma rota
 type Route struct {
@@ -31,15 +32,18 @@ func (routes Routes) Match(w http.ResponseWriter, r *http.Request) bool {
 
 		items := regexSubmatch(pattern, url)
 
+		ctx := context.WithValue(r.Context(), "parameters", items)
+		r = r.WithContext(ctx)
+
 		if items[0] == url {
 			if element.Middlewares != nil && len(element.Middlewares) > 0 {
 				for _, mid := range element.Middlewares {
-					if !mid(w, r, items) {
+					if !mid(w, r) {
 						return false
 					}
 				}
 			}
-			element.Handler(w, r, items)
+			element.Handler(w, r)
 			return true
 		}
 	}

main.go

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"context"
 	"log"
 	"net/http"
 	"strconv"
 
 	"./core/database"
-	"./core/errorHandler"
 	req "./core/request"
 	res "./core/response"
 	"./src/lib/auth"
@@ -21,9 +19,6 @@ func main() {
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		var Errors errorHandler.Errors
 
-		ctx := context.WithValue(r.Context(), "Username", "William")
-		r.WithContext(ctx)
-
 		res.SetResponseWriter(w)
 		req.SetRequest(r)
 

src/controller/Test/Test.go

@@ -17,8 +17,9 @@ type Profile struct {
 }
 
 //Inicial : Func
-func Inicial(w http.ResponseWriter, r *http.Request, vars []string) {
-	fmt.Print(r.Context().Value("Username"))
+func Inicial(w http.ResponseWriter, r *http.Request) {
+	fmt.Println(r.Context().Value("parameters").([]string))
+
 	var Errors errorHandler.Errors
 
 	user, err := auth.GetUser(r)

src/middleware/login/login.go

@@ -2,6 +2,6 @@ package login
 
 import "net/http"
 
-func Logged(w http.ResponseWriter, r *http.Request, vars []string) bool {
+func Logged(w http.ResponseWriter, r *http.Request) bool {
 	return true
 }