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

main.go

@@ -9,18 +9,13 @@ import (
 	"./core/errors"
 	req "./core/request"
 	res "./core/response"
+	"./src/lib/auth"
 )
 
 func main() {
-	dbConfig := database.Config{
-		config.DATABASE_HOST,
-		config.DATABASE_PORT,
-		config.DATABASE_USER,
-		config.DATABASE_PASS,
-		config.DATABASE_SCHEMA,
-	}
 
-	database.Init(dbConfig)
+	initDatabase()
+	initAuthService()
 
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 
@@ -36,5 +31,25 @@ func main() {
 		Routes.Match(w, r)
 	})
 
-	log.Fatal(http.ListenAndServe(":"+strconv.Itoa(config.SERVER_PORT), nil))
+	log.Fatal(http.ListenAndServe(":"+strconv.Itoa(SERVER_PORT), nil))
+}
+
+func initDatabase() {
+
+	database.Init(
+		database.Config{
+			DATABASE_HOST,
+			DATABASE_PORT,
+			DATABASE_USER,
+			DATABASE_PASS,
+			DATABASE_SCHEMA,
+		})
+}
+
+func initAuthService() {
+
+	auth.Config(
+		auth.ServiceConfig{
+			AUTHENTICATION_SERVICE,
+		})
 }

src/lib/auth/auth.go

@@ -7,10 +7,15 @@ import (
 	"net/http"
 	"strconv"
 
-	"../../../config"
 	"../curl"
 )
 
+type ServiceConfig struct {
+	Endpoint string
+}
+
+var serviceConfig ServiceConfig
+
 type UserData struct {
 	UserId   string     `json:"id_user"`
 	Email    string     `json:"email"`
@@ -78,7 +83,7 @@ func curlRequest(request *http.Request) (*curl.Request, error) {
 		headers["Auth"] = authToken
 
 		curlReq := &curl.Request{
-			Url:     config.AUTHENTICATION_SERVICE,
+			Url:     serviceConfig.Endpoint,
 			Method:  "POST",
 			Headers: headers,
 		}
@@ -88,3 +93,7 @@ func curlRequest(request *http.Request) (*curl.Request, error) {
 
 	return nil, errors.New("No auth token found in http request")
 }
+
+func Config(config ServiceConfig) {
+	serviceConfig = config
+}