Open platform to collect and prioritize feedback
Allow users to login via social sign in without sharing email (#79)
Guilherme Oenninge7e48b8b6b8f
diff --git a/app/handlers/handlers_test.go b/app/handlers/handlers_test.gonew file mode 100644index 000000000..77d2009e8--- /dev/null+++ b/app/handlers/handlers_test.go@@ -0,0 +1,85 @@+package handlers_test++import (+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/storage/inmemory"+)++var demoTenant *models.Tenant+var orangeTenant *models.Tenant++func getEmptyServices() *app.Services {+ return &app.Services{+ Tenants: &inmemory.TenantStorage{},+ Users: &inmemory.UserStorage{},+ OAuth: &MockOAuthService{},+ }+}++func getServices() *app.Services {+ services := &app.Services{+ Tenants: &inmemory.TenantStorage{},+ Users: &inmemory.UserStorage{},+ OAuth: &MockOAuthService{},+ }++ demoTenant, _ = services.Tenants.Add("Demonstration", "demo")+ orangeTenant, _ = services.Tenants.Add("Orange Inc.", "orange")++ return services+}++//MockOAuthService implements a mocked OAuthService+type MockOAuthService struct{}++//GetAuthURL returns authentication url for given provider+func (p *MockOAuthService) GetAuthURL(authEndpoint string, 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 *MockOAuthService) GetProfile(authEndpoint string, provider string, code string) (*oauth.UserProfile, error) {+ if provider == "facebook" && code == "123" {+ return &oauth.UserProfile{+ ID: "FB123",+ Name: "Jon Snow",+ Email: "[email protected]",+ }, nil+ }++ if provider == "facebook" && code == "456" {+ return &oauth.UserProfile{+ ID: "FB456",+ Name: "Some Facebook Guy",+ Email: "[email protected]",+ }, nil+ }++ if provider == "facebook" && code == "798" {+ return &oauth.UserProfile{+ ID: "FB798",+ Name: "Mark",+ Email: "",+ }, nil+ }++ if provider == "google" && code == "123" {+ return &oauth.UserProfile{+ ID: "GO123",+ Name: "Jon Snow",+ Email: "[email protected]",+ }, nil+ }++ if provider == "google" && code == "456" {+ return &oauth.UserProfile{+ ID: "GO456",+ Name: "Bob",+ Email: "",+ }, nil+ }++ return nil, nil+}diff --git a/app/handlers/oauth.go b/app/handlers/oauth.goindex f2e3833f3..ba29a0b1f 100644--- a/app/handlers/oauth.go+++ b/app/handlers/oauth.go@@ -58,7 +58,13 @@ func OAuthCallback(provider string) web.HandlerFunc {}users := c.Services().Users- user, err := users.GetByEmail(tenant.ID, oauthUser.Email)++ var user *models.User+ if oauthUser.Email == "" {+ user, err = users.GetByProvider(tenant.ID, provider, oauthUser.ID)+ } else {+ user, err = users.GetByEmail(tenant.ID, oauthUser.Email)+ }if err != nil {if err == app.ErrNotFound {user = &models.User{diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.goindex af3b89064..733cd1676 100644--- a/app/handlers/oauth_test.go+++ b/app/handlers/oauth_test.go@@ -7,26 +7,18 @@ import ("net/url"- "github.com/getfider/fider/app""github.com/getfider/fider/app/handlers"- "github.com/getfider/fider/app/pkg/mock""github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/mock""github.com/getfider/fider/app/pkg/oauth"- "github.com/getfider/fider/app/storage/inmemory". "github.com/onsi/gomega")-var services = &app.Services{- Tenants: &inmemory.TenantStorage{},- Users: &inmemory.UserStorage{},- OAuth: &oauth.MockOAuthService{},-}-func TestLoginHandler(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.SetServices(services)+ server.Context.SetServices(getServices())code, response := server.Execute(handlers.Login(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))@@ -37,7 +29,7 @@ func TestCallbackHandler_InvalidState(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.SetServices(services)+ server.Context.SetServices(getServices())server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=abc")code, _ := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))@@ -48,7 +40,7 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.SetServices(services)+ server.Context.SetServices(getServices())server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io")code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))@@ -58,14 +50,12 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {RegisterTestingT(t)-- tenant, _ := services.Tenants.Add("Demonstration", "demo")+ services := getServices()services.Users.Register(&models.User{- ID: 300,Name: "Jon Snow",Email: "[email protected]",- Tenant: tenant,+ Tenant: demoTenant,Providers: []*models.UserProvider{{UID: "FB1234", Name: oauth.FacebookProvider},},@@ -77,19 +67,19 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.n73-Qqhb_6lIALS_H3UzrEuzLTHgtS6nCkG_Ua95v7s"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vd0Bnb3QuY29tIn0.S7P8zTU0rVovmchNbwamBewYbO96GdJcOygn7tbsikw"))}func TestCallbackHandler_NewUser(t *testing.T) {RegisterTestingT(t)- tenant, _ := services.Tenants.Add("Orange", "orange")+ services := getServices()server := mock.NewServer()server.Context.SetServices(services)server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io&code=456")code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))- user, err := services.Users.GetByEmail(tenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail(orangeTenant.ID, "[email protected]")Expect(err).To(BeNil())Expect(user.Name).To(Equal("Some Facebook Guy"))@@ -97,19 +87,58 @@ func TestCallbackHandler_NewUser(t *testing.T) {Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.QklasoVtsMu_urLZsJv0CDu0VuMFI2CNC78ckx0nSfQ"))}+func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {+ RegisterTestingT(t)+ services := getServices()+ services.Users.Register(&models.User{+ Name: "Some Guy",+ Email: "",+ Tenant: demoTenant,+ Providers: []*models.UserProvider{+ &models.UserProvider{UID: "GO999", Name: oauth.GoogleProvider},+ },+ })++ server := mock.NewServer()+ server.Context.SetServices(services)+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=798")+ code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))++ user, err := services.Users.GetByID(1)+ Expect(err).To(BeNil())+ Expect(user.Name).To(Equal("Some Guy"))+ Expect(len(user.Providers)).To(Equal(1))++ user, err = services.Users.GetByID(2)+ Expect(err).To(BeNil())+ Expect(user.Name).To(Equal("Mark"))+ Expect(len(user.Providers)).To(Equal(1))++ Expect(code).To(Equal(http.StatusTemporaryRedirect))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoyLCJ1c2VyL25hbWUiOiJNYXJrIiwidXNlci9lbWFpbCI6IiJ9.NKMh8HaRud9wOtFznIWZuJabsYFm8UWy3jPykJ7U79E"))+}+func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {RegisterTestingT(t)+ services := getServices()+ services.Users.Register(&models.User{+ Name: "Jon Snow",+ Email: "[email protected]",+ Tenant: demoTenant,+ Providers: []*models.UserProvider{+ &models.UserProvider{UID: "FB123", Name: oauth.FacebookProvider},+ },+ })server := mock.NewServer()server.Context.SetServices(services)server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=123")code, response := server.Execute(handlers.OAuthCallback(oauth.GoogleProvider))- tenant, _ := services.Tenants.GetByDomain("demo")- user, err := services.Users.GetByEmail(tenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail(demoTenant.ID, "[email protected]")Expect(err).To(BeNil())Expect(len(user.Providers)).To(Equal(2))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.n73-Qqhb_6lIALS_H3UzrEuzLTHgtS6nCkG_Ua95v7s"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vd0Bnb3QuY29tIn0.S7P8zTU0rVovmchNbwamBewYbO96GdJcOygn7tbsikw"))}diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.goindex c081889c9..e0ba70250 100644--- a/app/pkg/dbx/dbx.go+++ b/app/pkg/dbx/dbx.go@@ -184,6 +184,12 @@ func formatCommand(cmd string) string {return cmd}+// Scalar returns first row and first column+func (trx Trx) Scalar(data interface{}, command string, args ...interface{}) error {+ row := trx.QueryRow(command, args...)+ return row.Scan(data)+}+// Get first row and bind to given datafunc (trx Trx) Get(data interface{}, command string, args ...interface{}) error {rows, err := trx.Query(command, args...)diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.goindex 1dc16bccd..9904431bb 100644--- a/app/pkg/dbx/dbx_test.go+++ b/app/pkg/dbx/dbx_test.go@@ -51,7 +51,7 @@ func TestBind_SimpleStruct(t *testing.T) {err := trx.Get(&u, "SELECT id, name FROM users LIMIT 1")Expect(err).To(BeNil())- Expect(u.ID).To(Equal(300))+ Expect(u.ID).To(Equal(1))Expect(u.Name).To(Equal("Jon Snow"))Expect(u.IgnoreThis).To(Equal(""))}@@ -74,8 +74,8 @@ func TestBind_DeepNestedStruct(t *testing.T) {WHERE provider_uid = 'FB2222'`)Expect(err).To(BeNil())Expect(u.Provider).To(Equal("facebook"))- Expect(u.User.ID).To(Equal(400))- Expect(u.User.Tenant.ID).To(Equal(400))+ Expect(u.User.ID).To(Equal(3))+ Expect(u.User.Tenant.ID).To(Equal(2))}func TestBind_SimpleStruct_SingleField(t *testing.T) {@@ -102,7 +102,7 @@ func TestBind_SimpleStruct_Multiple(t *testing.T) {defer trx.Rollback()u := []*user{}- err := trx.Select(&u, "SELECT name FROM users WHERE tenant_id = 300")+ err := trx.Select(&u, "SELECT name FROM users WHERE tenant_id = 1")Expect(err).To(BeNil())Expect(len(u)).To(Equal(2))@@ -125,14 +125,14 @@ func TestBind_NestedStruct(t *testing.T) {FROM users uINNER JOIN tenants tON t.id = u.tenant_id- WHERE u.id = 300+ WHERE u.id = 1LIMIT 1`)Expect(err).To(BeNil())- Expect(u.ID).To(Equal(300))+ Expect(u.ID).To(Equal(1))Expect(u.Name).To(Equal("Jon Snow"))Expect(u.Tenant).NotTo(BeNil())- Expect(u.Tenant.ID).To(Equal(300))+ Expect(u.Tenant.ID).To(Equal(1))Expect(*u.Tenant.Name).To(Equal("Demonstration"))}@@ -151,7 +151,7 @@ func TestBind_NestedStruct_Multiple(t *testing.T) {FROM users uINNER JOIN tenants tON t.id = u.tenant_id- WHERE u.tenant_id = 300+ WHERE u.tenant_id = 1`)Expect(err).To(BeNil())Expect(len(u)).To(Equal(2))@@ -170,7 +170,7 @@ func TestExists_True(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- exists, err := trx.Exists("SELECT 1 FROM users WHERE id = 300")+ exists, err := trx.Exists("SELECT 1 FROM users WHERE id = 1")Expect(err).To(BeNil())Expect(exists).To(BeTrue())}@@ -196,7 +196,7 @@ func TestCount(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- count, err := trx.Count("SELECT 1 FROM users WHERE id = 300")+ count, err := trx.Count("SELECT 1 FROM users WHERE id = 1")Expect(err).To(BeNil())Expect(count).To(Equal(1))}@@ -213,3 +213,17 @@ func TestCount_Empty(t *testing.T) {Expect(err).To(BeNil())Expect(count).To(Equal(0))}++func TestScalar(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ trx, _ := db.Begin()+ defer trx.Rollback()++ var value int+ err := trx.Scalar(&value, "SELECT id FROM users WHERE id = 1")+ Expect(err).To(BeNil())+ Expect(value).To(Equal(1))+}diff --git a/app/pkg/dbx/setup.sql b/app/pkg/dbx/setup.sqlindex 10b11cb6d..2ccecc810 100644--- a/app/pkg/dbx/setup.sql+++ b/app/pkg/dbx/setup.sql@@ -1,17 +1,17 @@TRUNCATE TABLE tenants RESTART IDENTITY CASCADE;-INSERT INTO tenants (id, name, subdomain, created_on) VALUES (300, 'Demonstration', 'demo', now());+INSERT INTO tenants (name, subdomain, created_on, cname) VALUES ('Demonstration', 'demo', now(), '');-INSERT INTO users (id, name, email, tenant_id, created_on, role) VALUES (300, 'Jon Snow', '[email protected]', 300, now(), 3);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (300, 'facebook', 'FB1234', now());+INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Jon Snow', '[email protected]', 1, now(), 3);+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (1, 'facebook', 'FB1234', now());-INSERT INTO users (id, name, email, tenant_id, created_on, role) VALUES (301, 'Arya Stark', '[email protected]', 300, now(), 1);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (301, 'google', 'GO5678', now());+INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Arya Stark', '[email protected]', 1, now(), 1);+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (2, 'google', 'GO5678', now());-INSERT INTO tenants (id, name, subdomain, created_on, cname) VALUES (400, 'Orange Inc.', 'orange', now(), 'feedback.orangeinc.com');+INSERT INTO tenants (name, subdomain, created_on, cname) VALUES ('Orange Inc.', 'orange', now(), 'feedback.orangeinc.com');-INSERT INTO users (id, name, email, tenant_id, created_on, role) VALUES (400, 'Tony Stark', '[email protected]', 400, now(), 3);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (400, 'facebook', 'FB2222', now());+INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Tony Stark', '[email protected]', 2, now(), 3);+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (3, 'facebook', 'FB2222', now());-INSERT INTO users (id, name, email, tenant_id, created_on, role) VALUES (401, 'The Hulk', '[email protected]', 400, now(), 1);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (401, 'google', 'GO1111', now());+INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('The Hulk', '[email protected]', 2, now(), 1);+INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (4, 'google', 'GO1111', now());diff --git a/app/pkg/oauth/mock.go b/app/pkg/oauth/mock.godeleted file mode 100644index 1f57ccd29..000000000--- a/app/pkg/oauth/mock.go+++ /dev/null@@ -1,38 +0,0 @@-package oauth--//MockOAuthService implements a mocked OAuthService-type MockOAuthService struct{}--//GetAuthURL returns authentication url for given provider-func (p *MockOAuthService) GetAuthURL(authEndpoint string, 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 *MockOAuthService) GetProfile(authEndpoint string, provider string, code string) (*UserProfile, error) {- if provider == "facebook" && code == "123" {- return &UserProfile{- ID: "FB1234",- Name: "Jon Snow",- Email: "[email protected]",- }, nil- }-- if provider == "google" && code == "123" {- return &UserProfile{- ID: "GO1234",- Name: "Jon Snow",- Email: "[email protected]",- }, nil- }-- if provider == "facebook" && code == "456" {- return &UserProfile{- ID: "FB5678",- Name: "Some Facebook Guy",- Email: "[email protected]",- }, nil- }-- return nil, nil-}diff --git a/app/storage/identity.go b/app/storage/identity.goindex 4e311ccd2..9621ace9c 100644--- a/app/storage/identity.go+++ b/app/storage/identity.go@@ -6,6 +6,7 @@ import "github.com/getfider/fider/app/models"type User interface {GetByID(userID int) (*models.User, error)GetByEmail(tenantID int, email string) (*models.User, error)+ GetByProvider(tenantID int, provider string, uid string) (*models.User, error)Register(user *models.User) errorRegisterProvider(userID int, provider *models.UserProvider) error}diff --git a/app/storage/inmemory/user.go b/app/storage/inmemory/user.goindex 94e5b53c7..bbeac2444 100644--- a/app/storage/inmemory/user.go+++ b/app/storage/inmemory/user.go@@ -31,6 +31,18 @@ func (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, erroreturn nil, app.ErrNotFound}+// GetByProvider returns a user based on provider details+func (s *UserStorage) GetByProvider(tenantID int, provider string, uid string) (*models.User, error) {+ for _, user := range s.users {+ for _, item := range user.Providers {+ if item.Name == provider && item.UID == uid {+ return user, nil+ }+ }+ }+ return nil, app.ErrNotFound+}+// Register creates a new user based on given informationfunc (s *UserStorage) Register(user *models.User) error {if user.ID == 0 {diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex aacc682c0..2c376a1c4 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -11,14 +11,14 @@ import (. "github.com/onsi/gomega")-var demoTenant = &models.Tenant{- ID: 300,- Name: "Demonstration",+func orangeTenant(tenants *postgres.TenantStorage) *models.Tenant {+ tenant, _ := tenants.GetByDomain("orange")+ return tenant}-var orangeTenant = &models.Tenant{- ID: 400,- Name: "Orange Inc.",+func demoTenant(tenants *postgres.TenantStorage) *models.Tenant {+ tenant, _ := tenants.GetByDomain("demo")+ return tenant}func TestIdeaStorage_GetAll(t *testing.T) {@@ -32,10 +32,11 @@ func TestIdeaStorage_GetAll(t *testing.T) {now := time.Now()- trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #1', 'idea-1', 1, 'Description #1', $1, 300, 300, 0, 1)", now)- trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #2', 'idea-2', 2, 'Description #2', $1, 300, 301, 5, 2)", now)+ trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #1', 'idea-1', 1, 'Description #1', $1, 1, 1, 0, 1)", now)+ trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #2', 'idea-2', 2, 'Description #2', $1, 1, 2, 5, 2)", now)- ideas := postgres.NewIdeaStorage(demoTenant, trx)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)dbIdeas, err := ideas.GetAll()Expect(err).To(BeNil())@@ -67,8 +68,9 @@ func TestIdeaStorage_AddAndGet(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, err := ideas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())Expect(idea.ID).To(Equal(1))@@ -81,7 +83,7 @@ func TestIdeaStorage_AddAndGet(t *testing.T) {Expect(dbIdea.Status).To(Equal(models.IdeaNew))Expect(dbIdea.Title).To(Equal("My new idea"))Expect(dbIdea.Description).To(Equal("with this description"))- Expect(dbIdea.User.ID).To(Equal(300))+ Expect(dbIdea.User.ID).To(Equal(1))Expect(dbIdea.User.Name).To(Equal("Jon Snow"))Expect(dbIdea.User.Email).To(Equal("[email protected]"))}@@ -95,7 +97,8 @@ func TestIdeaStorage_GetInvalid(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)dbIdea, err := ideas.GetByID(1)Expect(err).To(Equal(app.ErrNotFound))@@ -111,12 +114,13 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, err := ideas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())- ideas.AddComment(idea.Number, "Comment #1", 300)- ideas.AddComment(idea.Number, "Comment #2", 301)+ ideas.AddComment(idea.Number, "Comment #1", 1)+ ideas.AddComment(idea.Number, "Comment #2", 2)comments, err := ideas.GetCommentsByIdea(idea.Number)Expect(err).To(BeNil())@@ -137,11 +141,12 @@ func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- demoIdeas := postgres.NewIdeaStorage(demoTenant, trx)- demoIdeas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ demoIdeas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ demoIdeas.Add("My new idea", "with this description", 1)- orangeIdeas := postgres.NewIdeaStorage(orangeTenant, trx)- orangeIdeas.Add("My other idea", "with other description", 400)+ orangeIdeas := postgres.NewIdeaStorage(orangeTenant(tenants), trx)+ orangeIdeas.Add("My other idea", "with other description", 3)dbIdea, err := demoIdeas.GetByNumber(1)@@ -169,8 +174,9 @@ func TestIdeaStorage_Update(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, err := ideas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())idea, err = ideas.Update(idea.Number, "The new comment", "With the new description")@@ -190,13 +196,14 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, _ := ideas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, _ := ideas.Add("My new idea", "with this description", 1)- err := ideas.AddSupporter(idea.Number, 300)+ err := ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())- err = ideas.AddSupporter(idea.Number, 301)+ err = ideas.AddSupporter(idea.Number, 2)Expect(err).To(BeNil())dbIdea, err := ideas.GetByNumber(1)@@ -213,13 +220,14 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, _ := ideas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, _ := ideas.Add("My new idea", "with this description", 1)- err := ideas.AddSupporter(idea.Number, 300)+ err := ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())- err = ideas.AddSupporter(idea.Number, 300)+ err = ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())dbIdea, err := ideas.GetByNumber(1)@@ -236,13 +244,14 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, _ := ideas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, _ := ideas.Add("My new idea", "with this description", 1)- err := ideas.AddSupporter(idea.Number, 300)+ err := ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())- err = ideas.RemoveSupporter(idea.Number, 300)+ err = ideas.RemoveSupporter(idea.Number, 1)Expect(err).To(BeNil())dbIdea, err := ideas.GetByNumber(1)@@ -259,16 +268,17 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, _ := ideas.Add("My new idea", "with this description", 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, _ := ideas.Add("My new idea", "with this description", 1)- err := ideas.AddSupporter(idea.Number, 300)+ err := ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())- err = ideas.RemoveSupporter(idea.Number, 300)+ err = ideas.RemoveSupporter(idea.Number, 1)Expect(err).To(BeNil())- err = ideas.RemoveSupporter(idea.Number, 300)+ err = ideas.RemoveSupporter(idea.Number, 1)Expect(err).To(BeNil())dbIdea, err := ideas.GetByNumber(1)@@ -285,16 +295,17 @@ func TestIdeaStorage_SetResponse(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, _ := ideas.Add("My new idea", "with this description", 300)- err := ideas.SetResponse(idea.Number, "We liked this idea", 300, models.IdeaStarted)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, _ := ideas.Add("My new idea", "with this description", 1)+ err := ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaStarted)Expect(err).To(BeNil())idea, _ = ideas.GetByID(idea.ID)Expect(idea.Response.Text).To(Equal("We liked this idea"))Expect(idea.Status).To(Equal(models.IdeaStarted))- Expect(idea.Response.User.ID).To(Equal(300))+ Expect(idea.Response.User.ID).To(Equal(1))}func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {@@ -306,10 +317,11 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, _ := ideas.Add("My new idea", "with this description", 300)- ideas.SetResponse(idea.Number, "We liked this idea", 300, models.IdeaCompleted)- ideas.AddSupporter(idea.Number, 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, _ := ideas.Add("My new idea", "with this description", 1)+ ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaCompleted)+ ideas.AddSupporter(idea.Number, 1)dbIdea, err := ideas.GetByNumber(1)Expect(err).To(BeNil())@@ -325,11 +337,12 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := postgres.NewIdeaStorage(demoTenant, trx)- idea, _ := ideas.Add("My new idea", "with this description", 300)- ideas.AddSupporter(idea.Number, 300)- ideas.SetResponse(idea.Number, "We liked this idea", 300, models.IdeaCompleted)- ideas.RemoveSupporter(idea.Number, 300)+ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ idea, _ := ideas.Add("My new idea", "with this description", 1)+ ideas.AddSupporter(idea.Number, 1)+ ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaCompleted)+ ideas.RemoveSupporter(idea.Number, 1)dbIdea, err := ideas.GetByNumber(1)Expect(err).To(BeNil())diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 203f16a6d..f6b2b1560 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -22,10 +22,10 @@ func NewTenantStorage(trx *dbx.Trx) *TenantStorage {}type dbTenant struct {- ID int `db:"id"`- Name string `db:"name"`- Subdomain string `db:"subdomain"`- CNAME sql.NullString `db:"cname"`+ ID int `db:"id"`+ Name string `db:"name"`+ Subdomain string `db:"subdomain"`+ CNAME string `db:"cname"`}func (t *dbTenant) toModel() *models.Tenant {@@ -33,15 +33,15 @@ func (t *dbTenant) toModel() *models.Tenant {ID: t.ID,Name: t.Name,Subdomain: t.Subdomain,- CNAME: t.CNAME.String,+ CNAME: t.CNAME,}}// Add given tenant to tenant listfunc (s *TenantStorage) Add(name string, subdomain string) (*models.Tenant, error) {var id int- row := s.trx.QueryRow(`INSERT INTO tenants (name, subdomain, created_on)- VALUES ($1, $2, $3)+ row := s.trx.QueryRow(`INSERT INTO tenants (name, subdomain, created_on, cname)+ VALUES ($1, $2, $3, '')RETURNING id`, name, subdomain, time.Now())if err := row.Scan(&id); err != nil {return nil, errdiff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex 08563860d..b45b8e1fd 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -22,7 +22,7 @@ func TestTenantStorage_First(t *testing.T) {tenant, err := tenants.First()Expect(err).To(BeNil())- Expect(tenant.ID).To(Equal(300))+ Expect(tenant.ID).To(Equal(1))}func TestTenantStorage_Empty_First(t *testing.T) {@@ -69,13 +69,13 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {defer trx.Rollback()tenants := postgres.NewTenantStorage(trx)- tenants.Add("My Domain Inc.", "mydomain")+ tenant, err := tenants.Add("My Domain Inc.", "mydomain")+ Expect(err).To(BeNil())- tenant, err := tenants.GetByDomain("mydomain")+ tenant, err = tenants.GetByDomain("mydomain")- //Expect(trx.Count("SELECT * FROM tenants WHERE subdomain = 'mydomain' AND CNAME IS NULL")).To(Equal(1))Expect(err).To(BeNil())- Expect(tenant.ID).To(Equal(int(1)))+ Expect(tenant.ID).To(Equal(int(3)))Expect(tenant.Name).To(Equal("My Domain Inc."))Expect(tenant.Subdomain).To(Equal("mydomain"))Expect(tenant.CNAME).To(Equal(""))diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex a2e9ea893..a17a767cb 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -68,6 +68,20 @@ func (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, erroreturn getUser(s.trx, "email = $1 AND tenant_id = $2", email, tenantID)}+// GetByProvider returns a user based on provider details+func (s *UserStorage) GetByProvider(tenantID int, provider string, uid string) (*models.User, error) {+ var userID int+ query := "SELECT user_id FROM user_providers up INNER JOIN users u ON u.id = up.user_id WHERE up.provider = $1 AND up.provider_uid = $2 AND u.tenant_id = $3"+ if err := s.trx.Scalar(&userID, query, provider, uid, tenantID); err != nil {+ if err == sql.ErrNoRows {+ return nil, app.ErrNotFound+ } else if err != nil {+ return nil, err+ }+ }+ return s.GetByID(userID)+}+// Register creates a new user based on given informationfunc (s *UserStorage) Register(user *models.User) error {now := time.Now()diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex 83dd27c4b..6b6a4a642 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -3,6 +3,7 @@ package postgres_testimport ("testing"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx""github.com/getfider/fider/app/pkg/oauth"@@ -20,11 +21,11 @@ func TestUserStorage_GetByID(t *testing.T) {defer trx.Rollback()users := postgres.NewUserStorage(trx)- user, err := users.GetByID(300)+ user, err := users.GetByID(1)Expect(err).To(BeNil())- Expect(user.ID).To(Equal(int(300)))- Expect(user.Tenant.ID).To(Equal(300))+ Expect(user.ID).To(Equal(int(1)))+ Expect(user.Tenant.ID).To(Equal(1))Expect(user.Name).To(Equal("Jon Snow"))Expect(user.Email).To(Equal("[email protected]"))Expect(len(user.Providers)).To(Equal(1))@@ -42,7 +43,7 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {defer trx.Rollback()users := postgres.NewUserStorage(trx)- user, err := users.GetByEmail(300, "[email protected]")+ user, err := users.GetByEmail(1, "[email protected]")Expect(user).To(BeNil())Expect(err).NotTo(BeNil())@@ -58,11 +59,11 @@ func TestUserStorage_GetByEmail(t *testing.T) {defer trx.Rollback()users := postgres.NewUserStorage(trx)- user, err := users.GetByEmail(300, "[email protected]")+ user, err := users.GetByEmail(1, "[email protected]")Expect(err).To(BeNil())- Expect(user.ID).To(Equal(int(300)))- Expect(user.Tenant.ID).To(Equal(300))+ Expect(user.ID).To(Equal(int(1)))+ Expect(user.Tenant.ID).To(Equal(1))Expect(user.Name).To(Equal("Jon Snow"))Expect(user.Email).To(Equal("[email protected]"))Expect(len(user.Providers)).To(Equal(1))@@ -70,6 +71,44 @@ func TestUserStorage_GetByEmail(t *testing.T) {Expect(user.Providers[0].Name).To(Equal("facebook"))}+func TestUserStorage_GetByProvider(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ db.Seed()+ defer db.Close()++ trx, _ := db.Begin()+ defer trx.Rollback()++ users := postgres.NewUserStorage(trx)+ user, err := users.GetByProvider(1, "facebook", "FB1234")++ Expect(err).To(BeNil())+ Expect(user.ID).To(Equal(int(1)))+ Expect(user.Tenant.ID).To(Equal(1))+ 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"))+}++func TestUserStorage_GetByProvider_WrongTenant(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ db.Seed()+ defer db.Close()++ trx, _ := db.Begin()+ defer trx.Rollback()++ users := postgres.NewUserStorage(trx)+ user, err := users.GetByProvider(2, "facebook", "FB1234")++ Expect(user).To(BeNil())+ Expect(err).To(Equal(app.ErrNotFound))+}+func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()@@ -80,7 +119,7 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {defer trx.Rollback()users := postgres.NewUserStorage(trx)- user, err := users.GetByEmail(400, "[email protected]")+ user, err := users.GetByEmail(2, "[email protected]")Expect(user).To(BeNil())Expect(err).NotTo(BeNil())@@ -100,7 +139,7 @@ func TestUserStorage_Register(t *testing.T) {Name: "Rob Stark",Email: "[email protected]",Tenant: &models.Tenant{- ID: 300,+ ID: 1,},Role: models.RoleMember,Providers: []*models.UserProvider{@@ -113,9 +152,9 @@ func TestUserStorage_Register(t *testing.T) {err := users.Register(user)Expect(err).To(BeNil())- user, err = users.GetByEmail(300, "[email protected]")+ user, err = users.GetByEmail(1, "[email protected]")Expect(err).To(BeNil())- Expect(user.ID).To(Equal(int(1)))+ Expect(user.ID).To(Equal(int(5)))Expect(user.Role).To(Equal(models.RoleMember))Expect(user.Name).To(Equal("Rob Stark"))Expect(user.Email).To(Equal("[email protected]"))@@ -137,7 +176,7 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {Name: "Jon Snow",Email: "[email protected]",Tenant: &models.Tenant{- ID: 1,+ ID: 3,},Role: models.RoleMember,Providers: []*models.UserProvider{@@ -154,7 +193,7 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {err := users.Register(user)Expect(err).To(BeNil())- Expect(user.ID).To(Equal(int(1)))+ Expect(user.ID).To(Equal(int(5)))Expect(user.Name).To(Equal("Jon Snow"))Expect(user.Email).To(Equal("[email protected]"))}@@ -169,17 +208,17 @@ func TestUserStorage_RegisterProvider(t *testing.T) {defer trx.Rollback()users := postgres.NewUserStorage(trx)- users.RegisterProvider(300, &models.UserProvider{+ users.RegisterProvider(1, &models.UserProvider{UID: "GO1234",Name: "google",})- user, err := users.GetByID(300)+ user, err := users.GetByID(1)Expect(err).To(BeNil())- Expect(user.ID).To(Equal(int(300)))+ Expect(user.ID).To(Equal(int(1)))Expect(user.Name).To(Equal("Jon Snow"))Expect(user.Email).To(Equal("[email protected]"))- Expect(user.Tenant.ID).To(Equal(300))+ Expect(user.Tenant.ID).To(Equal(1))Expect(len(user.Providers)).To(Equal(2))Expect(user.Providers[0].UID).To(Equal("FB1234"))diff --git a/migrations/201707261949_set_cname_empty.up.sql b/migrations/201707261949_set_cname_empty.up.sqlnew file mode 100644index 000000000..4bd09aa48--- /dev/null+++ b/migrations/201707261949_set_cname_empty.up.sql@@ -0,0 +1 @@+UPDATE tenants SET cname = '' WHERE cname IS NULL;\ No newline at end of file