Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

allow name + oauth setup

goenningd3ac4e7f5835
diff --git a/handler/oauth.go b/handler/oauth.go
new file mode 100644
index 000000000..c5f1cf486
--- /dev/null
+++ b/handler/oauth.go
@@ -0,0 +1,26 @@
+package handler
+
+import (
+ "net/http"
+ "time"
+
+ "github.com/WeCanHearYou/wchy/context"
+ "github.com/labstack/echo"
+)
+
+type oauthHandler struct {
+ ctx *context.WchyContext
+}
+
+// OAuth creates a new OAuth HTTP handler
+func OAuth(ctx *context.WchyContext) echo.HandlerFunc {
+ return oauthHandler{ctx: ctx}.get()
+}
+
+func (h oauthHandler) get() echo.HandlerFunc {
+ return func(c echo.Context) error {
+ return c.JSON(http.StatusOK, echo.Map{
+ "now": time.Now().Format("2006.01.02.150405"),
+ })
+ }
+}
diff --git a/main.go b/main.go
index a8e1e511e..8e81e26bc 100644
--- a/main.go
+++ b/main.go
@@ -22,7 +22,10 @@ func init() {
fmt.Printf("Application is starting...\n")
fmt.Printf("GO_ENV: %s\n", env.Current())
- db, _ = sql.Open("postgres", os.Getenv("DATABASE_URL"))
+ db, err := sql.Open("postgres", os.Getenv("DATABASE_URL"))
+ if err != nil {
+ panic(err)
+ }
ctx = &context.WchyContext{
Health: &service.PostgresHealthCheckService{DB: db},
diff --git a/migrations/201702251213_create_users.up.sql b/migrations/201702251213_create_users.up.sql
new file mode 100644
index 000000000..a32a6c5f1
--- /dev/null
+++ b/migrations/201702251213_create_users.up.sql
@@ -0,0 +1,17 @@
+create table if not exists users (
+ id serial primary key,
+ name varchar(100) null,
+ email varchar(200) not null,
+ created_on timestamptz not null default now(),
+ modified_on timestamptz not null default now()
+);
+
+create table if not exists user_providers (
+ user_id int not null,
+ provider varchar(40) not null,
+ provider_uid varchar(100) not null,
+ created_on timestamptz not null default now(),
+ modified_on timestamptz not null default now(),
+ primary key (user_id, provider),
+ foreign key (user_id) references users(id)
+);
\ No newline at end of file
diff --git a/migrations/201702251620_add_tenant_cname.up.sql b/migrations/201702251620_add_tenant_cname.up.sql
new file mode 100644
index 000000000..a603dfc3d
--- /dev/null
+++ b/migrations/201702251620_add_tenant_cname.up.sql
@@ -0,0 +1 @@
+alter table tenants add cname varchar(100) null
\ No newline at end of file
diff --git a/router/multitenant.go b/router/multitenant.go
index 73e7f75a3..c5fd6209e 100644
--- a/router/multitenant.go
+++ b/router/multitenant.go
@@ -4,6 +4,8 @@ import (
"net/http"
"strings"
+ "fmt"
+
"github.com/WeCanHearYou/wchy/context"
"github.com/labstack/echo"
)
@@ -19,6 +21,7 @@ func MultiTenant(ctx *context.WchyContext) echo.MiddlewareFunc {
return next(c)
}
+ fmt.Printf("Tenant not found for %s.\n", hostname)
return c.NoContent(http.StatusNotFound)
}
}
diff --git a/router/router.go b/router/router.go
index e367decd9..b5cd7d335 100644
--- a/router/router.go
+++ b/router/router.go
@@ -10,27 +10,34 @@ import (
"github.com/labstack/echo"
)
+func errorHandler(e error, c echo.Context) {
+ fmt.Println(e)
+ c.NoContent(http.StatusInternalServerError)
+}
+
// GetMainEngine returns main HTTP engine
func GetMainEngine(ctx *context.WchyContext) *echo.Echo {
router := echo.New()
router.Renderer = NewHTMLRenderer()
+ router.HTTPErrorHandler = errorHandler
- router.HTTPErrorHandler = func(e error, c echo.Context) {
- fmt.Println(e)
- c.NoContent(http.StatusInternalServerError)
- }
- router.Use(MultiTenant(ctx))
+ router.Static("/favicon.ico", "public/imgs/favicon.ico")
router.Static("/public", "public")
- router.GET("/", handler.Index(ctx))
+ router.Static("/assets", "node_modules") //TODO: Don't expose node_modules
- api := router.Group("/api")
+ router.GET("/oauth", handler.OAuth(ctx))
+
+ app := router.Group("", MultiTenant(ctx))
{
- api.GET("/status", handler.Status(ctx))
- api.GET("/tenants/:domain", handler.TenantByDomain(ctx))
- }
+ app.GET("/", handler.Index(ctx))
- router.Static("/assets", "node_modules")
+ api := app.Group("/api")
+ {
+ api.GET("/status", handler.Status(ctx))
+ api.GET("/tenants/:domain", handler.TenantByDomain(ctx))
+ }
+ }
return router
}
diff --git a/service/tenant.go b/service/tenant.go
index fdcb8fbf9..33a17a8c0 100644
--- a/service/tenant.go
+++ b/service/tenant.go
@@ -22,7 +22,7 @@ type PostgresTenantService struct {
func (svc PostgresTenantService) GetByDomain(domain string) (*model.Tenant, error) {
tenant := &model.Tenant{}
- row := svc.DB.QueryRow("SELECT id, name, subdomain FROM tenants WHERE subdomain = $1", extractSubdomain(domain))
+ row := svc.DB.QueryRow("SELECT id, name, subdomain FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)
err := row.Scan(&tenant.ID, &tenant.Name, &tenant.Domain)
if err != nil {
return nil, ErrNotFound
diff --git a/service/tenant_test.go b/service/tenant_test.go
index 58606c3e1..2420fc52a 100644
--- a/service/tenant_test.go
+++ b/service/tenant_test.go
@@ -32,7 +32,7 @@ func TestTenantService_GetByDomain_Subdomain(t *testing.T) {
defer db.Close()
rows := sqlmock.NewRows([]string{"id", "name", "subdomain"}).AddRow(234, "My Domain Inc.", "mydomain")
- mock.ExpectQuery("SELECT id, name, subdomain FROM tenants WHERE subdomain = \\$1").WithArgs("mydomain").WillReturnRows(rows)
+ mock.ExpectQuery("SELECT id, name, subdomain FROM tenants WHERE subdomain = \\$1 OR cname = \\$2").WithArgs("mydomain", "mydomain").WillReturnRows(rows)
svc := &service.PostgresTenantService{DB: db}
tenant, err := svc.GetByDomain("mydomain")
@@ -50,7 +50,7 @@ func TestTenantService_GetByDomain_FullDomain(t *testing.T) {
defer db.Close()
rows := sqlmock.NewRows([]string{"id", "name", "subdomain"}).AddRow(234, "My Domain Inc.", "mydomain")
- mock.ExpectQuery("SELECT id, name, subdomain FROM tenants WHERE subdomain = \\$1").WithArgs("mydomain").WillReturnRows(rows)
+ mock.ExpectQuery("SELECT id, name, subdomain FROM tenants WHERE subdomain = \\$1 OR cname = \\$2").WithArgs("mydomain", "mydomain.anydomain.com").WillReturnRows(rows)
svc := &service.PostgresTenantService{DB: db}
tenant, err := svc.GetByDomain("mydomain.anydomain.com")
diff --git a/vendor/vendor.json b/vendor/vendor.json
index b207664cf..0590689f0 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -24,6 +24,14 @@
"path": "appengine/urlfetch",
"revision": ""
},
+ {
+ "path": "appengine_internal",
+ "revision": ""
+ },
+ {
+ "path": "appengine_internal/base",
+ "revision": ""
+ },
{
"checksumSHA1": "rf4401a4BPVpHkdJ1Dfzx3onamo=",
"path": "github.com/codegangsta/envy/lib",
@@ -522,6 +530,24 @@
"revision": "61557ac0112b576429a0df080e1c2cef5dfbb642",
"revisionTime": "2017-01-26T11:54:58Z"
},
+ {
+ "checksumSHA1": "Zt7DIRCaUg5qfhfxyR1wCA+EjCE=",
+ "path": "golang.org/x/oauth2",
+ "revision": "b9780ec78894ab900c062d58ee3076cd9b2a4501",
+ "revisionTime": "2017-02-14T22:24:16Z"
+ },
+ {
+ "checksumSHA1": "9fgYIPOCIRhAuQBg65mFoZ2vpMY=",
+ "path": "golang.org/x/oauth2/facebook",
+ "revision": "b9780ec78894ab900c062d58ee3076cd9b2a4501",
+ "revisionTime": "2017-02-14T22:24:16Z"
+ },
+ {
+ "checksumSHA1": "gChvVZYdb6Bw/vjIpfYJfNvXPoU=",
+ "path": "golang.org/x/oauth2/internal",
+ "revision": "b9780ec78894ab900c062d58ee3076cd9b2a4501",
+ "revisionTime": "2017-02-14T22:24:16Z"
+ },
{
"checksumSHA1": "uTQtOqR0ePMMcvuvAIksiIZxhqU=",
"path": "golang.org/x/sys/unix",
@@ -534,6 +560,48 @@
"revision": "1a60337c22bc70e65519850cdb17b96fde550e8d",
"revisionTime": "2017-02-04T03:16:49Z"
},
+ {
+ "checksumSHA1": "R8rc2A/LgT4IRS6TzUZfhkUVQzQ=",
+ "path": "google.golang.org/appengine/internal",
+ "revision": "3a452f9e00122ead39586d68ffdb9c6e1326af3c",
+ "revisionTime": "2017-02-22T22:47:31Z"
+ },
+ {
+ "checksumSHA1": "TsNO8P0xUlLNyh3Ic/tzSp/fDWM=",
+ "path": "google.golang.org/appengine/internal/base",
+ "revision": "3a452f9e00122ead39586d68ffdb9c6e1326af3c",
+ "revisionTime": "2017-02-22T22:47:31Z"
+ },
+ {
+ "checksumSHA1": "5QsV5oLGSfKZqTCVXP6NRz5T4Tw=",
+ "path": "google.golang.org/appengine/internal/datastore",
+ "revision": "3a452f9e00122ead39586d68ffdb9c6e1326af3c",
+ "revisionTime": "2017-02-22T22:47:31Z"
+ },
+ {
+ "checksumSHA1": "Gep2T9zmVYV8qZfK2gu3zrmG6QE=",
+ "path": "google.golang.org/appengine/internal/log",
+ "revision": "3a452f9e00122ead39586d68ffdb9c6e1326af3c",
+ "revisionTime": "2017-02-22T22:47:31Z"
+ },
+ {
+ "checksumSHA1": "a1XY7rz3BieOVqVI2Et6rKiwQCk=",
+ "path": "google.golang.org/appengine/internal/remote_api",
+ "revision": "3a452f9e00122ead39586d68ffdb9c6e1326af3c",
+ "revisionTime": "2017-02-22T22:47:31Z"
+ },
+ {
+ "checksumSHA1": "QtAbHtHmDzcf6vOV9eqlCpKgjiw=",
+ "path": "google.golang.org/appengine/internal/urlfetch",
+ "revision": "3a452f9e00122ead39586d68ffdb9c6e1326af3c",
+ "revisionTime": "2017-02-22T22:47:31Z"
+ },
+ {
+ "checksumSHA1": "akOV9pYnCbcPA8wJUutSQVibdyg=",
+ "path": "google.golang.org/appengine/urlfetch",
+ "revision": "3a452f9e00122ead39586d68ffdb9c6e1326af3c",
+ "revisionTime": "2017-02-22T22:47:31Z"
+ },
{
"checksumSHA1": "MeXzn+OFdrU9/TGeMVz0GsRX+dM=",
"path": "gopkg.in/DATA-DOG/go-sqlmock.v1",
diff --git a/views/base.html b/views/base.html
index c8aa3f9b8..dc0c3a06d 100644
--- a/views/base.html
+++ b/views/base.html
@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" type="text/css" href="/assets/semantic-ui-css/semantic.min.css">
<link rel="ico" type="text/css" href="/assets/semantic-ui-css/semantic.min.css">
- <link rel="icon" type="image/x-icon" href="/public/imgs/favicon.ico">
+ <link rel="icon" type="image/x-icon" href="/favicon.ico">
<link rel="stylesheet" type="text/css" href="/public/css/main.css">
<script type="text/javascript" src="/public/js/main.js"></script>
<title>{{template "title" .}}</title>