Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

wip for more testing

goenningd89ab6872ff5
diff --git a/Makefile b/Makefile
index 8a15e2eab..59ce188b6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ define tag_docker
endef
test:
- godotenv -f .test.env go test $$(go list ./... | grep -v /vendor/) -cover
+ godotenv -f .test.env go test $$(go list ./... | grep -v /vendor/) -cover -p=1
dockerize:
ifeq ($(TRAVIS_PULL_REQUEST), false)
diff --git a/app/dbx/dbx.go b/app/dbx/dbx.go
index fb50def18..ab15151b0 100644
--- a/app/dbx/dbx.go
+++ b/app/dbx/dbx.go
@@ -2,6 +2,7 @@ package dbx
import (
"database/sql"
+ "io/ioutil"
"github.com/WeCanHearYou/wechy/app/toolbox/env"
@@ -18,7 +19,7 @@ func New() (*Database, error) {
db := &Database{conn}
if env.IsTest() {
- setup(*db)
+ db.load("/app/dbx/setup.sql")
}
return db, nil
}
@@ -47,6 +48,27 @@ func (db Database) QueryRow(command string, args ...interface{}) *sql.Row {
return db.conn.QueryRow(command, args...)
}
+// Exists returns true if at least one record is found
+func (db Database) Exists(command string, args ...interface{}) (bool, error) {
+ rows, err := db.conn.Query(command, args...)
+ if rows != nil {
+ rows.Close()
+ return true, nil
+ }
+ return false, err
+}
+
+// Count returns number of rows
+func (db Database) Count(command string, args ...interface{}) (int, error) {
+ rows, err := db.conn.Query(command, args...)
+ defer rows.Close()
+ count := 0
+ for rows != nil && rows.Next() {
+ count++
+ }
+ return count, err
+}
+
// Begin returns a new SQL transaction
func (db Database) Begin() (*sql.Tx, error) {
return db.conn.Begin()
@@ -54,13 +76,23 @@ func (db Database) Begin() (*sql.Tx, error) {
// Close connection to database
func (db Database) Close() {
- teardown(db)
-
if db.conn != nil {
throw(db.conn.Close())
}
}
+func (db Database) load(path string) {
+ content, err := ioutil.ReadFile(env.Path(path))
+ if err != nil {
+ panic(err)
+ }
+
+ err = db.Execute(string(content))
+ if err != nil {
+ panic(err)
+ }
+}
+
func throw(err error) error {
if err != nil && env.IsTest() {
panic(err)
diff --git a/app/dbx/setup.sql b/app/dbx/setup.sql
new file mode 100644
index 000000000..f64beb5ac
--- /dev/null
+++ b/app/dbx/setup.sql
@@ -0,0 +1,17 @@
+TRUNCATE TABLE tenants RESTART IDENTITY CASCADE;
+
+INSERT INTO tenants (id, name, subdomain, created_on) VALUES (300, 'Demonstration', 'demo', now());
+
+INSERT INTO users (id, name, email, tenant_id, created_on) VALUES (300, 'Jon Snow', '[email protected]', 300, now());
+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (300, 'facebook', 'FB1234', now());
+
+INSERT INTO users (id, name, email, tenant_id, created_on) VALUES (301, 'Arya Stark', '[email protected]', 300, now());
+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (301, 'google', 'GO5678', now());
+
+INSERT INTO tenants (id, name, subdomain, created_on, cname) VALUES (400, 'Orange Inc.', 'orange', now(), 'feedback.orangeinc.com');
+
+INSERT INTO users (id, name, email, tenant_id, created_on) VALUES (400, 'Tony Stark', '[email protected]', 400, now());
+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (400, 'facebook', 'FB2222', now());
+
+INSERT INTO users (id, name, email, tenant_id, created_on) VALUES (401, 'The Hulk', '[email protected]', 400, now());
+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (401, 'google', 'GO1111', now());
diff --git a/app/dbx/teardown.sql b/app/dbx/teardown.sql
deleted file mode 100644
index 534ab35af..000000000
--- a/app/dbx/teardown.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-TRUNCATE TABLE users RESTART IDENTITY CASCADE;
-TRUNCATE TABLE tenants RESTART IDENTITY CASCADE;
\ No newline at end of file
diff --git a/app/dbx/test.go b/app/dbx/test.go
deleted file mode 100644
index 0fa4273b4..000000000
--- a/app/dbx/test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package dbx
-
-import (
- "io/ioutil"
-
- "github.com/WeCanHearYou/wechy/app/toolbox/env"
-)
-
-func setup(db Database) {
-}
-
-func teardown(db Database) {
- if !env.IsTest() {
- return
- }
-
- bytes, err := ioutil.ReadFile(env.Path("/app/dbx/teardown.sql"))
- if err != nil {
- panic(err)
- }
-
- db.Execute(string(bytes))
-}
diff --git a/app/identity/handler.go b/app/identity/handler.go
index 45fad9f11..d67963b48 100644
--- a/app/identity/handler.go
+++ b/app/identity/handler.go
@@ -33,28 +33,28 @@ func (h OAuthHandlers) Callback(provider string) app.HandlerFunc {
return func(c app.Context) error {
redirect := c.QueryParam("state")
- code := c.QueryParam("code")
- redirectURL, err := url.Parse(redirect)
-
+ redirectURL, err := url.ParseRequestURI(redirect)
if err != nil {
- c.Logger().Errorf("Could not parse url %s", redirect)
return c.Failure(err)
}
+ code := c.QueryParam("code")
+ if code == "" {
+ return c.Redirect(http.StatusTemporaryRedirect, redirect)
+ }
+
tenant, err := h.tenantService.GetByDomain(stripPort(redirectURL.Host))
if err != nil {
return c.Failure(err)
}
- //TODO: Check if code is empty (or other querystring parameter)
- //Because the user can deny access to it
oauthUser, err := h.oauthService.GetProfile(provider, code)
if err != nil {
- c.Logger().Error(err)
return c.Failure(err)
}
user, err := h.userService.GetByEmail(oauthUser.Email)
+
if err != nil {
if err == app.ErrNotFound {
user = &app.User{
diff --git a/app/identity/handler_test.go b/app/identity/handler_test.go
index e72a4a0ab..988cd25d9 100644
--- a/app/identity/handler_test.go
+++ b/app/identity/handler_test.go
@@ -7,15 +7,48 @@ import (
"net/url"
+ "github.com/WeCanHearYou/wechy/app/dbx"
"github.com/WeCanHearYou/wechy/app/identity"
"github.com/WeCanHearYou/wechy/app/mock"
+ "github.com/WeCanHearYou/wechy/app/postgres"
. "github.com/onsi/gomega"
)
+//OAuthService implements a mocked OAuthService
+type OAuthService struct{}
+
+//GetAuthURL returns authentication url for given provider
+func (p OAuthService) GetAuthURL(provider string, redirect string) string {
+ return "http://orange.test.canherayou.com/oauth/token?provider=" + provider + "&redirect=" + redirect
+}
+
+//GetProfile returns user profile based on provider and code
+func (p OAuthService) GetProfile(provider string, code string) (*identity.OAuthUserProfile, error) {
+ if provider == "facebook" && code == "123" {
+ return &identity.OAuthUserProfile{
+ ID: "FB1234",
+ Name: "Jon Snow",
+ Email: "[email protected]",
+ }, nil
+ }
+
+ if provider == "facebook" && code == "456" {
+ return &identity.OAuthUserProfile{
+ ID: "FB5678",
+ Name: "Some Facebook Guy",
+ Email: "[email protected]",
+ }, nil
+ }
+
+ return nil, nil
+}
+
func handlers() identity.OAuthHandlers {
- oauth := &mock.OAuthService{}
- tenant := &mock.TenantService{}
- user := &mock.UserService{}
+ db, _ := dbx.New()
+
+ oauth := &OAuthService{}
+ tenant := &postgres.TenantService{DB: db}
+ user := &postgres.UserService{DB: db}
return identity.OAuth(tenant, oauth, user)
}
@@ -38,3 +71,36 @@ func TestCallbackHandler_InvalidState(t *testing.T) {
Expect(code).To(Equal(http.StatusInternalServerError))
}
+
+func TestCallbackHandler_InvalidCode(t *testing.T) {
+ RegisterTestingT(t)
+
+ server := mock.NewServer()
+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.canhearyou.com")
+ code, response := server.ExecuteRaw(handlers().Callback(identity.OAuthFacebookProvider))
+
+ Expect(code).To(Equal(http.StatusTemporaryRedirect))
+ Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canhearyou.com"))
+}
+
+func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
+ RegisterTestingT(t)
+
+ server := mock.NewServer()
+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.canhearyou.com&code=123")
+ code, response := server.ExecuteRaw(handlers().Callback(identity.OAuthFacebookProvider))
+
+ Expect(code).To(Equal(http.StatusTemporaryRedirect))
+ Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vQGdvdC5jb20iLCJ0ZW5hbnQvaWQiOjQwMH0.nxu7QHFXTeYh_ObpKYV6e3p0kk1mkGbNGplITZImSs8"))
+}
+
+func TestCallbackHandler_NewUser(t *testing.T) {
+ RegisterTestingT(t)
+
+ server := mock.NewServer()
+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.canhearyou.com&code=456")
+ code, response := server.ExecuteRaw(handlers().Callback(identity.OAuthFacebookProvider))
+
+ Expect(code).To(Equal(http.StatusTemporaryRedirect))
+ Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20iLCJ0ZW5hbnQvaWQiOjQwMH0.iWkpvh11QrUDJQnTk9PtqW6m48DnaHbsj-lbl6feK-Q"))
+}
diff --git a/app/mock/identity.go b/app/mock/identity.go
deleted file mode 100644
index 939bfeb88..000000000
--- a/app/mock/identity.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package mock
-
-import (
- "github.com/WeCanHearYou/wechy/app"
- "github.com/WeCanHearYou/wechy/app/identity"
-)
-
-// TenantService implements a mocked TenantService
-type TenantService struct {
-}
-
-// GetByDomain returns a tenant based on its domain
-func (svc TenantService) GetByDomain(domain string) (*app.Tenant, error) {
- tenant := &app.Tenant{}
-
- switch domain {
- case "demo":
- tenant.ID = 1
- tenant.Name = "Demonstration"
- tenant.Domain = "demo"
- return tenant, nil
- case "orange.test.canherayou.com":
- tenant.ID = 2
- tenant.Name = "Orange Inc."
- tenant.Domain = "orange."
- return tenant, nil
- }
- return nil, app.ErrNotFound
-}
-
-//OAuthService implements a mocked OAuthService
-type OAuthService struct{}
-
-//GetAuthURL returns authentication url for given provider
-func (p OAuthService) GetAuthURL(provider string, redirect string) string {
- return "http://orange.test.canherayou.com/oauth/token?provider=" + provider + "&redirect=" + redirect
-}
-
-//GetProfile returns user profile based on provider and code
-func (p OAuthService) GetProfile(provider string, code string) (*identity.OAuthUserProfile, error) {
- return nil, nil
-}
-
-// UserService implements a mocked UserService
-type UserService struct {
-}
-
-// GetByEmail returns a user based on given email
-func (svc UserService) GetByEmail(email string) (*app.User, error) {
- user := &app.User{}
- return user, nil
-}
-
-// Register creates a new user based on given information
-func (svc UserService) Register(user *app.User) error {
- return nil
-}
diff --git a/app/postgres/feedback.go b/app/postgres/feedback.go
index 230044195..12202ca7b 100644
--- a/app/postgres/feedback.go
+++ b/app/postgres/feedback.go
@@ -25,6 +25,7 @@ func (svc IdeaService) GetAll(tenantID int) ([]*feedback.Idea, error) {
return nil, err
}
+ defer rows.Close()
var ideas []*feedback.Idea
for rows.Next() {
idea := &feedback.Idea{}
@@ -48,6 +49,7 @@ func (svc IdeaService) GetByID(tenantID, ideaID int) (*feedback.Idea, error) {
return nil, err
}
+ defer rows.Close()
if rows.Next() {
idea := &feedback.Idea{}
rows.Scan(&idea.ID, &idea.Title, &idea.Description, &idea.CreatedOn, &idea.User.ID, &idea.User.Name, &idea.User.Email)
@@ -71,6 +73,7 @@ func (svc IdeaService) GetCommentsByIdeaID(tenantID, ideaID int) ([]*feedback.Co
return nil, err
}
+ defer rows.Close()
var comments []*feedback.Comment
for rows.Next() {
c := &feedback.Comment{}
diff --git a/app/postgres/feedback_test.go b/app/postgres/feedback_test.go
index 6dbe74acc..425d0000c 100644
--- a/app/postgres/feedback_test.go
+++ b/app/postgres/feedback_test.go
@@ -17,14 +17,11 @@ func TestIdeaService_GetAll(t *testing.T) {
now := time.Now()
- db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
- db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
- db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Arya Start','[email protected]', now())")
- db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #1','Description #1', $1, 1, 1)", now)
- db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #2','Description #2', $1, 1, 2)", now)
+ db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #1','Description #1', $1, 300, 300)", now)
+ db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #2','Description #2', $1, 300, 301)", now)
svc := &postgres.IdeaService{DB: db}
- ideas, err := svc.GetAll(1)
+ ideas, err := svc.GetAll(300)
Expect(err).To(BeNil())
Expect(ideas).To(HaveLen(2))
@@ -35,7 +32,7 @@ func TestIdeaService_GetAll(t *testing.T) {
Expect(ideas[1].Title).To(Equal("Idea #2"))
Expect(ideas[1].Description).To(Equal("Description #2"))
- Expect(ideas[1].User.Name).To(Equal("Arya Start"))
+ Expect(ideas[1].User.Name).To(Equal("Arya Stark"))
}
func TestIdeaService_SaveAndGet(t *testing.T) {
diff --git a/app/postgres/identity_test.go b/app/postgres/identity_test.go
index e12ae919b..95c78d0c6 100644
--- a/app/postgres/identity_test.go
+++ b/app/postgres/identity_test.go
@@ -16,7 +16,7 @@ func TestUserService_GetByEmail_Error(t *testing.T) {
defer db.Close()
svc := &postgres.UserService{DB: db}
- user, err := svc.GetByEmail("[email protected]")
+ user, err := svc.GetByEmail("[email protected]")
Expect(user).To(BeNil())
Expect(err).NotTo(BeNil())
@@ -27,13 +27,11 @@ func TestUserService_GetByEmail(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
-
svc := &postgres.UserService{DB: db}
user, err := svc.GetByEmail("[email protected]")
Expect(err).To(BeNil())
- Expect(user.ID).To(Equal(int(1)))
+ Expect(user.ID).To(Equal(int(300)))
Expect(user.Name).To(Equal("Jon Snow"))
Expect(user.Email).To(Equal("[email protected]"))
}
@@ -43,14 +41,12 @@ func TestUserService_Register(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
-
svc := &postgres.UserService{DB: db}
user := &app.User{
- Name: "Jon Snow",
- Email: "[email protected]",
+ Name: "Rob Stark",
+ Email: "[email protected]",
Tenant: &app.Tenant{
- ID: 1,
+ ID: 300,
},
Providers: []*app.UserProvider{
{
@@ -60,11 +56,13 @@ func TestUserService_Register(t *testing.T) {
},
}
err := svc.Register(user)
+ Expect(err).To(BeNil())
+ user, err = svc.GetByEmail("[email protected]")
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(1)))
- Expect(user.Name).To(Equal("Jon Snow"))
- Expect(user.Email).To(Equal("[email protected]"))
+ Expect(user.Name).To(Equal("Rob Stark"))
+ Expect(user.Email).To(Equal("[email protected]"))
}
func TestUserService_Register_MultipleProviders(t *testing.T) {
diff --git a/app/postgres/infra.go b/app/postgres/infra.go
index 38b367dfa..c7d3452d1 100644
--- a/app/postgres/infra.go
+++ b/app/postgres/infra.go
@@ -9,10 +9,11 @@ type HealthCheckService struct {
// IsDatabaseOnline checks if database is online
func (svc HealthCheckService) IsDatabaseOnline() bool {
- _, err := svc.DB.Query("SELECT now()")
+ rows, err := svc.DB.Query("SELECT now()")
if err != nil {
return false
}
+ defer rows.Close()
return true
}
diff --git a/app/toolbox/env/env.go b/app/toolbox/env/env.go
index 2428d30ce..a4859befa 100644
--- a/app/toolbox/env/env.go
+++ b/app/toolbox/env/env.go
@@ -60,12 +60,12 @@ func IsProduction() bool {
return Current() == "production"
}
-// IsStaging returns true on Wechy production environment
+// IsStaging returns true on Wechy staging environment
func IsStaging() bool {
return Current() == "staging"
}
-// IsTest returns true on Wechy production environment
+// IsTest returns true on Wechy test environment
func IsTest() bool {
return Current() == "test"
}