X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=cmd%2Fapp%2Fmain.go;h=63feef7952975c1db540054e8bf9f55e8cf7639a;hb=372ed7400f57355eb7dd98058b10ddeb1e1ff635;hp=4bd77bd31fed677535a22f14fb0ab979efc7c34d;hpb=adf936f66a5c59e6cc2e7a1c644148e0f119e5c8;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FFront.git

diff --git a/cmd/app/main.go b/cmd/app/main.go
index 4bd77bd..63feef7 100644
--- a/cmd/app/main.go
+++ b/cmd/app/main.go
@@ -6,12 +6,13 @@ import (
 	"strings"
 	"time"
 
-	"immae.eu/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front/api"
-	"immae.eu/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front/db"
+	"git.immae.eu/Cryptoportfolio/Front.git/api"
+	"git.immae.eu/Cryptoportfolio/Front.git/db"
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/jloup/utils"
+	"github.com/wercker/journalhook"
 )
 
 var log = utils.StandardL().WithField("module", "api")
@@ -21,14 +22,15 @@ type AppConfig struct {
 }
 
 type ApiConfig struct {
-	Domain    string `toml:"domain"`
-	JwtSecret string `toml:"jwt_secret"`
+	api.Config
 }
 
 type Config struct {
-	App AppConfig
-	Api ApiConfig
-	Db  db.DBConfig
+	App   AppConfig
+	Api   ApiConfig
+	Mail  api.MailConfig
+	Db    db.DBConfig
+	Redis db.RedisConfig
 
 	utils.LogConfiguration
 	Address string
@@ -44,9 +46,6 @@ func (c *Config) SetToDefaults() {
 		App: AppConfig{
 			PublicDir: "./public",
 		},
-		Api: ApiConfig{
-			JwtSecret: "secret",
-		},
 	}
 
 	c.LogConfiguration.SetToDefaults()
@@ -62,14 +61,17 @@ func init() {
 		panic(err)
 	}
 
-	api.SetJwtSecretKey(C.Api.JwtSecret)
-
-	db.Init(C.Db)
-
-	if C.Mode == "production" {
+	if C.Mode == "prod" {
+		gin.DisableConsoleColor()
 		gin.SetMode(gin.ReleaseMode)
+		journalhook.Enable()
 	}
 
+	api.SetConfig(C.Api.Config)
+	api.SetMailConfig(C.Mail)
+
+	db.Init(C.Db, C.Redis)
+
 	log.Infof("CONFIG:")
 	log.Infof("LISTEN: %s", strings.Join([]string{C.Address, C.Port}, ":"))
 	log.Infof("PUBLIC_DIR: %s", C.App.PublicDir)
@@ -115,7 +117,7 @@ func main() {
 
 	engine.Use(gin.Recovery())
 
-	if C.Mode == "production" {
+	if C.Mode == "prod" {
 		engine.Use(api.Logger())
 		apiGroup.Use(api.Logger())
 	} else {
@@ -141,8 +143,13 @@ func main() {
 		"/",
 		"/signup",
 		"/signin",
+		"/confirm",
+		"/reset-password",
+		"/change-password",
 		"/signout",
 		"/me",
+		"/admin",
+		"/account",
 		"/otp/enroll",
 		"/otp/validate",
 		"/not_confirmed",