Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactor + more test

goenning330ee224e53e
diff --git a/app/middlewares/domain.go b/app/middlewares/domain.go
index 3cf99fb03..ce324d36f 100644
--- a/app/middlewares/domain.go
+++ b/app/middlewares/domain.go
@@ -13,7 +13,7 @@ import (
// Tenant adds either SingleTenant or MultiTenant to the pipeline
func Tenant(tenants storage.Tenant) web.MiddlewareFunc {
- if env.HostMode() == "single" {
+ if env.IsSingleHostMode() {
return SingleTenant(tenants)
}
return MultiTenant(tenants)
diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.go
index 1cd73f5e8..ba41f5f75 100644
--- a/app/middlewares/jwt.go
+++ b/app/middlewares/jwt.go
@@ -47,14 +47,9 @@ func JwtSetter() web.MiddlewareFunc {
Path: "/",
})
- scheme := "http"
- if c.Request().TLS != nil {
- scheme = "https"
- }
-
query.Del("jwt")
- url := scheme + "://" + c.Request().Host + c.Request().URL.Path
+ url := c.BaseURL() + c.Request().URL.Path
querystring := query.Encode()
if querystring != "" {
url += "?" + querystring
diff --git a/app/models/identity.go b/app/models/identity.go
index d7a7b1a5b..9e22d89af 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -1,12 +1,14 @@
package models
import jwt "github.com/dgrijalva/jwt-go"
+import "database/sql"
//Tenant represents a tenant
type Tenant struct {
- ID int `json:"id" db:"id"`
- Name string `json:"name" db:"name"`
- Subdomain string `json:"subdomain" db:"subdomain"`
+ ID int `json:"id" db:"id"`
+ Name string `json:"name" db:"name"`
+ Subdomain string `json:"subdomain" db:"subdomain"`
+ CNAME sql.NullString `json:"cname" db:"cname"`
}
//User represents an user inside our application
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 6f84b2f88..04fa3b919 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -103,10 +103,10 @@ func (db Database) Begin() (*sql.Tx, error) {
// Get first row and bind to given data
func (db Database) Get(data interface{}, command string, args ...interface{}) error {
rows, err := db.Query(command, args...)
- defer rows.Close()
if err != nil {
return err
}
+ defer rows.Close()
if rows.Next() {
return scan(rows, data)
@@ -118,10 +118,10 @@ func (db Database) Get(data interface{}, command string, args ...interface{}) er
//Select all matched rows bind to given data
func (db Database) Select(data interface{}, command string, args ...interface{}) error {
rows, err := db.Query(command, args...)
- defer rows.Close()
if err != nil {
return err
}
+ defer rows.Close()
sliceType := reflect.TypeOf(data).Elem()
items := reflect.New(sliceType).Elem()
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index a15449a37..b97dcca49 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -26,9 +26,9 @@ func MustGet(name string) string {
return value
}
-// HostMode returns current host mode
-func HostMode() string {
- return GetEnvOrDefault("HOST_MODE", "single")
+// IsSingleHostMode returns true if host mode is set to single tenant
+func IsSingleHostMode() bool {
+ return GetEnvOrDefault("HOST_MODE", "single") == "single"
}
// CurrentDomain returns Wechy domain based on current environment variables
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index a6924654c..4aa165c52 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -69,17 +69,21 @@ func (ctx *Context) SetUser(claims *models.User) {
ctx.Set(userContextKey, claims)
}
+//BaseURL returns base URL as string
+func (ctx *Context) BaseURL() string {
+ protocol := "http"
+ if ctx.Request().TLS != nil {
+ protocol = "https"
+ }
+ return protocol + "://" + ctx.Request().Host
+}
+
//AuthEndpoint auth endpoint
func (ctx *Context) AuthEndpoint() string {
endpoint, ok := ctx.Get(authEndpointContextKey).(string)
if !ok {
- mode := env.HostMode()
- if mode == "single" {
- protocol := "http"
- if ctx.Request().TLS != nil {
- protocol = "https"
- }
- endpoint = protocol + "://" + ctx.Request().Host
+ if env.IsSingleHostMode() {
+ endpoint = ctx.BaseURL()
} else {
endpoint = env.MustGet("AUTH_ENDPOINT")
}
diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.go
index d78a5da45..04eb6d7d7 100644
--- a/app/storage/postgres/tenant.go
+++ b/app/storage/postgres/tenant.go
@@ -18,9 +18,9 @@ type TenantStorage struct {
// Add given tenant to tenant list
func (s *TenantStorage) Add(tenant *models.Tenant) error {
- row := s.DB.QueryRow(`INSERT INTO tenants (name, subdomain, created_on)
- VALUES ($1, $2, $3)
- RETURNING id`, tenant.Name, tenant.Subdomain, time.Now())
+ row := s.DB.QueryRow(`INSERT INTO tenants (name, subdomain, cname, created_on)
+ VALUES ($1, $2, $3, $4)
+ RETURNING id`, tenant.Name, tenant.Subdomain, tenant.CNAME, time.Now())
if err := row.Scan(&tenant.ID); err != nil {
return err
}
@@ -32,7 +32,7 @@ func (s *TenantStorage) Add(tenant *models.Tenant) error {
func (s *TenantStorage) First() (*models.Tenant, error) {
tenant := models.Tenant{}
- err := s.DB.Get(&tenant, "SELECT id, name, subdomain FROM tenants LIMIT 1")
+ err := s.DB.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants LIMIT 1")
if err == sql.ErrNoRows {
return nil, app.ErrNotFound
} else if err != nil {
@@ -46,7 +46,7 @@ func (s *TenantStorage) First() (*models.Tenant, error) {
func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
tenant := models.Tenant{}
- err := s.DB.Get(&tenant, "SELECT id, name, subdomain FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)
+ err := s.DB.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)
if err == sql.ErrNoRows {
return nil, app.ErrNotFound
} else if err != nil {
diff --git a/app/storage/postgres/identity_test.go b/app/storage/postgres/tenant_test.go
similarity index 53%
rename from app/storage/postgres/identity_test.go
rename to app/storage/postgres/tenant_test.go
index a8f5fb3a0..be91293ec 100644
--- a/app/storage/postgres/identity_test.go
+++ b/app/storage/postgres/tenant_test.go
@@ -3,11 +3,41 @@ package postgres_test
import (
"testing"
+ "database/sql"
+
+ "github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/dbx"
"github.com/WeCanHearYou/wechy/app/storage/postgres"
. "github.com/onsi/gomega"
)
+func TestTenantStorage_First(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ tenants := &postgres.TenantStorage{DB: db}
+ tenant, err := tenants.First()
+
+ Expect(err).To(BeNil())
+ Expect(tenant.ID).To(Equal(300))
+}
+
+func TestTenantStorage_Empty_First(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ db.Execute("TRUNCATE tenants CASCADE")
+
+ tenants := &postgres.TenantStorage{DB: db}
+ tenant, err := tenants.First()
+
+ Expect(err).To(Equal(app.ErrNotFound))
+ Expect(tenant).To(BeNil())
+}
+
func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
@@ -25,14 +55,18 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
-
tenants := &postgres.TenantStorage{DB: db}
+ tenants.Add(&models.Tenant{
+ Name: "My Domain Inc.",
+ Subdomain: "mydomain",
+ })
+
tenant, err := tenants.GetByDomain("mydomain")
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
Expect(tenant.Subdomain).To(Equal("mydomain"))
+ Expect(tenant.CNAME.Valid).To(BeFalse())
Expect(err).To(BeNil())
}
@@ -41,13 +75,19 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- db.Execute("INSERT INTO tenants (name, subdomain, cname, created_on) VALUES ('My Domain Inc.','mydomain', 'mydomain.anydomain.com', now())")
-
tenants := &postgres.TenantStorage{DB: db}
+ tenants.Add(&models.Tenant{
+ Name: "My Domain Inc.",
+ Subdomain: "mydomain",
+ CNAME: sql.NullString{String: "mydomain.anydomain.com", Valid: true},
+ })
+
tenant, err := tenants.GetByDomain("mydomain.anydomain.com")
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
Expect(tenant.Subdomain).To(Equal("mydomain"))
+ Expect(tenant.CNAME.String).To(Equal("mydomain.anydomain.com"))
+ Expect(tenant.CNAME.Valid).To(BeTrue())
Expect(err).To(BeNil())
}
diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.go
index 5aa938d53..657e724f2 100644
--- a/app/storage/postgres/user_test.go
+++ b/app/storage/postgres/user_test.go
@@ -20,12 +20,12 @@ func TestUserStorage_GetByID(t *testing.T) {
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(300)))
+ Expect(user.Tenant.ID).To(Equal(300))
Expect(user.Name).To(Equal("Jon Snow"))
Expect(user.Email).To(Equal("[email protected]"))
Expect(len(user.Providers)).To(Equal(1))
Expect(user.Providers[0].UID).To(Equal("FB1234"))
Expect(user.Providers[0].Name).To(Equal("facebook"))
- Expect(user.Tenant.ID).To(Equal(300))
}
func TestUserStorage_GetByEmail_Error(t *testing.T) {
@@ -50,12 +50,12 @@ func TestUserStorage_GetByEmail(t *testing.T) {
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(300)))
+ Expect(user.Tenant.ID).To(Equal(300))
Expect(user.Name).To(Equal("Jon Snow"))
Expect(user.Email).To(Equal("[email protected]"))
Expect(len(user.Providers)).To(Equal(1))
Expect(user.Providers[0].UID).To(Equal("FB1234"))
Expect(user.Providers[0].Name).To(Equal("facebook"))
- Expect(user.Tenant.ID).To(Equal(300))
}
func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {
@@ -134,3 +134,28 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {
Expect(user.Name).To(Equal("Jon Snow"))
Expect(user.Email).To(Equal("[email protected]"))
}
+
+func TestUserStorage_RegisterProvider(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ users := &postgres.UserStorage{DB: db}
+ users.RegisterProvider(300, &models.UserProvider{
+ UID: "GO1234",
+ Name: "google",
+ })
+ user, err := users.GetByID(300)
+
+ Expect(err).To(BeNil())
+ Expect(user.ID).To(Equal(int(300)))
+ Expect(user.Name).To(Equal("Jon Snow"))
+ Expect(user.Email).To(Equal("[email protected]"))
+ Expect(user.Tenant.ID).To(Equal(300))
+
+ Expect(len(user.Providers)).To(Equal(2))
+ Expect(user.Providers[0].UID).To(Equal("FB1234"))
+ Expect(user.Providers[0].Name).To(Equal("facebook"))
+ Expect(user.Providers[1].UID).To(Equal("GO1234"))
+ Expect(user.Providers[1].Name).To(Equal("google"))
+}
diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml
new file mode 100644
index 000000000..c5ce33208
--- /dev/null
+++ b/docs/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '2'
+services:
+ db:
+ restart: always
+ image: postgres:9.6
+ environment:
+ POSTGRES_USER: wechy
+ POSTGRES_PASSWORD: s0m3g00dp4ssw0rd
+ app:
+ restart: always
+ image: wecanhearyou/wechy:latest
+ ports:
+ - "9999:8080"
+ environment:
+ PORT: 8080
+ GO_ENV: production
+ DATABASE_URL: postgres://wechy:s0m3g00dp4ssw0rd@db:5432/wechy?sslmode=disable
+ JWT_SECRET: Ml_1%vQwv]lchqm5;>y2(xKbU@Q@Lybwb(COx+d.o3&|5>)y;~G[KuWWYvR--6_g
+ # You can generate a new salt here: https://api.wordpress.org/secret-key/1.1/salt/
+ depends_on:
+ - db
\ No newline at end of file