Open platform to collect and prioritize feedback
add oauth endpoint
goenninge5dadd87fdd2
diff --git a/.env b/.envindex 882ffab4e..f849531c1 100644--- a/.env+++ b/.env@@ -1,2 +1,3 @@DATABASE_URL=postgres://wchy:wchy-pw@localhost:5555/wchy?sslmode=disable-GO_ENV=development\ No newline at end of file+GO_ENV=development+AUTH_ENDPOINT=http://login.dev.canhearyou.com:3000\ No newline at end of filediff --git a/.gitignore b/.gitignoreindex 9b8e7bac9..ffd991d4d 100644--- a/.gitignore+++ b/.gitignore@@ -7,4 +7,5 @@ node_modules/wchywchy.exegin-bin-gin-bin.exe\ No newline at end of file+gin-bin.exe+.env\ No newline at end of filediff --git a/context/wchy.go b/context/wchy.goindex 83be99a6f..a370d84da 100644--- a/context/wchy.go+++ b/context/wchy.go@@ -4,7 +4,8 @@ import "github.com/WeCanHearYou/wchy/service"// WchySettings is an application-wide settingstype WchySettings struct {- BuildTime string+ BuildTime string+ AuthEndpoint string}// WchyContext is an application-wide contextdiff --git a/env/env.go b/env/env.goindex 17b910570..0c5709598 100644--- a/env/env.go+++ b/env/env.go@@ -1,6 +1,7 @@package envimport "os"+import "fmt"// GetEnvOrDefault retrieves the value of the environment variable named by the key.// It returns the value if available, otherwise returns defaultValue@@ -12,6 +13,15 @@ func GetEnvOrDefault(name string, defaultValue string) string {return value}+// MustGet returns environment variable or panic+func MustGet(name string) string {+ value := os.Getenv(name)+ if value == "" {+ panic(fmt.Errorf("Could not find environment variable named '%s'", name))+ }+ return value+}+// GetCurrentDomain returns WCHY domain based on current environment variablesfunc GetCurrentDomain() string {env := os.Getenv("GO_ENV")diff --git a/main.go b/main.goindex 8e81e26bc..1b8a37325 100644--- a/main.go+++ b/main.go@@ -2,7 +2,6 @@ package mainimport ("database/sql"- "os"_ "github.com/lib/pq"@@ -22,7 +21,7 @@ func init() {fmt.Printf("Application is starting...\n")fmt.Printf("GO_ENV: %s\n", env.Current())- db, err := sql.Open("postgres", os.Getenv("DATABASE_URL"))+ db, err := sql.Open("postgres", env.MustGet("DATABASE_URL"))if err != nil {panic(err)}@@ -32,7 +31,8 @@ func init() {Idea: &service.PostgresIdeaService{DB: db},Tenant: &service.PostgresTenantService{DB: db},Settings: context.WchySettings{- BuildTime: buildtime,+ BuildTime: buildtime,+ AuthEndpoint: env.MustGet("AUTH_ENDPOINT"),},}}diff --git a/router/renderer.go b/router/renderer.goindex 0289c8c15..876ccb659 100644--- a/router/renderer.go+++ b/router/renderer.go@@ -9,19 +9,19 @@ import ("github.com/WeCanHearYou/wchy/env""github.com/labstack/echo"- "github.com/labstack/gommon/log")//HTMLRenderer renderertype HTMLRenderer struct {templates map[string]*template.Template+ logger echo.Logger}var path string// NewHTMLRenderer creates a new HTMLRenderer-func NewHTMLRenderer() *HTMLRenderer {- renderer := &HTMLRenderer{}+func NewHTMLRenderer(logger echo.Logger) *HTMLRenderer {+ renderer := &HTMLRenderer{nil, logger}renderer.templates = make(map[string]*template.Template)path = "views/"@@ -38,7 +38,7 @@ func NewHTMLRenderer() *HTMLRenderer {func (r *HTMLRenderer) add(name string) {tpl, err := template.ParseFiles(path+"base.html", path+name)if err != nil {- log.Error(err)+ r.logger.Error(err)}r.templates[name] = tpldiff --git a/router/router.go b/router/router.goindex a5f24f640..c97a595f7 100644--- a/router/router.go+++ b/router/router.go@@ -22,10 +22,7 @@ func errorHandler(e error, c echo.Context) {}}-// GetMainEngine returns main HTTP engine-func GetMainEngine(ctx *context.WchyContext) *echo.Echo {- router := echo.New()-+func createLogger() echo.Logger {logger := log.New("")logger.SetHeader(`${level} [${time_rfc3339}] ${short_file}:${line}`)@@ -35,8 +32,15 @@ func GetMainEngine(ctx *context.WchyContext) *echo.Echo {logger.SetLevel(log.DEBUG)}- router.Logger = logger- router.Renderer = NewHTMLRenderer()+ return logger+}++// GetMainEngine returns main HTTP engine+func GetMainEngine(ctx *context.WchyContext) *echo.Echo {+ router := echo.New()++ router.Logger = createLogger()+ router.Renderer = NewHTMLRenderer(router.Logger)router.HTTPErrorHandler = errorHandlerrouter.Static("/favicon.ico", "public/imgs/favicon.ico")