Open platform to collect and prioritize feedback
some refactoring
goenninga2cf8dc257fe
diff --git a/app/handlers/identity.go b/app/handlers/identity.goindex bf5d61cb6..351acd8e7 100644--- a/app/handlers/identity.go+++ b/app/handlers/identity.go@@ -21,14 +21,14 @@ type oauthUserProfile struct {// OAuthHandlers contains multiple oauth HTTP handlerstype OAuthHandlers struct {- tenantStorage storage.Tenant- oauthService oauth.Service- userStorage storage.User+ tenants storage.Tenant+ oauth oauth.Service+ users storage.User}// OAuth creates a new OAuthHandlers-func OAuth(tenantStorage storage.Tenant, oauthService oauth.Service, userStorage storage.User) OAuthHandlers {- return OAuthHandlers{tenantStorage, oauthService, userStorage}+func OAuth(tenants storage.Tenant, oauth oauth.Service, users storage.User) OAuthHandlers {+ return OAuthHandlers{tenants, oauth, users}}// Callback handles OAuth callbacks@@ -46,17 +46,17 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {return c.Redirect(http.StatusTemporaryRedirect, redirect)}- tenant, err := h.tenantStorage.GetByDomain(stripPort(redirectURL.Host))+ tenant, err := h.tenants.GetByDomain(stripPort(redirectURL.Host))if err != nil {return c.Failure(err)}- oauthUser, err := h.oauthService.GetProfile(provider, code)+ oauthUser, err := h.oauth.GetProfile(provider, code)if err != nil {return c.Failure(err)}- user, err := h.userStorage.GetByEmail(tenant.ID, oauthUser.Email)+ user, err := h.users.GetByEmail(tenant.ID, oauthUser.Email)if err != nil {if err == app.ErrNotFound {user = &models.User{@@ -72,7 +72,7 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {},}- err = h.userStorage.Register(user)+ err = h.users.Register(user)if err != nil {return c.Failure(err)}@@ -80,7 +80,7 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {return c.Failure(err)}} else if !user.HasProvider(provider) {- err = h.userStorage.RegisterProvider(user.ID, &models.UserProvider{+ err = h.users.RegisterProvider(user.ID, &models.UserProvider{UID: oauthUser.ID,Name: provider,})@@ -111,7 +111,7 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {// Login handles OAuth loginsfunc (h OAuthHandlers) Login(provider string) web.HandlerFunc {return func(c web.Context) error {- authURL := h.oauthService.GetAuthURL(provider, c.QueryParam("redirect"))+ authURL := h.oauth.GetAuthURL(provider, c.QueryParam("redirect"))return c.Redirect(http.StatusTemporaryRedirect, authURL)}}diff --git a/app/storage/postgres/feedback.go b/app/storage/postgres/idea.gosimilarity index 100%rename from app/storage/postgres/feedback.gorename to app/storage/postgres/idea.godiff --git a/app/storage/postgres/feedback_test.go b/app/storage/postgres/idea_test.gosimilarity index 100%rename from app/storage/postgres/feedback_test.gorename to app/storage/postgres/idea_test.godiff --git a/app/storage/postgres/identity.go b/app/storage/postgres/identity.godeleted file mode 100644index 57226a049..000000000--- a/app/storage/postgres/identity.go+++ /dev/null@@ -1,120 +0,0 @@-package postgres--import (- "strings"- "time"-- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"-)--// UserStorage is used for user operations using a Postgres database-type UserStorage struct {- DB *dbx.Database-}--// GetByID returns a user based on given id-func (svc *UserStorage) GetByID(userID int) (*models.User, error) {- user := &models.User{}- user.Tenant = &models.Tenant{}- row := svc.DB.QueryRow("SELECT id, name, email, tenant_id, role FROM users WHERE id = $1", userID)-- if err := row.Scan(&user.ID, &user.Name, &user.Email, &user.Tenant.ID, &user.Role); err != nil {- return nil, app.ErrNotFound- }-- rows, err := svc.DB.Query("SELECT provider_uid, provider FROM user_providers WHERE user_id = $1", user.ID)- if err != nil {- return nil, err- }-- defer rows.Close()- for rows.Next() {- p := &models.UserProvider{}- rows.Scan(&p.UID, &p.Name)- user.Providers = append(user.Providers, p)- }-- return user, nil-}--// GetByEmail returns a user based on given email-func (svc *UserStorage) GetByEmail(tenantID int, email string) (*models.User, error) {- user := &models.User{}- user.Tenant = &models.Tenant{}- row := svc.DB.QueryRow("SELECT id, name, email, tenant_id, role FROM users WHERE email = $1 AND tenant_id = $2", email, tenantID)-- if err := row.Scan(&user.ID, &user.Name, &user.Email, &user.Tenant.ID, &user.Role); err != nil {- return nil, app.ErrNotFound- }-- rows, err := svc.DB.Query("SELECT provider_uid, provider FROM user_providers WHERE user_id = $1", user.ID)- if err != nil {- return nil, err- }-- defer rows.Close()- for rows.Next() {- p := &models.UserProvider{}- rows.Scan(&p.UID, &p.Name)- user.Providers = append(user.Providers, p)- }-- return user, nil-}--// Register creates a new user based on given information-func (svc *UserStorage) Register(user *models.User) error {- tx, err := svc.DB.Begin()- if err != nil {- return err- }-- now := time.Now()-- if err = tx.QueryRow("INSERT INTO users (name, email, created_on, tenant_id, role) VALUES ($1, $2, $3, $4, $5) RETURNING id", user.Name, user.Email, now, user.Tenant.ID, user.Role).Scan(&user.ID); err != nil {- tx.Rollback()- return err- }-- for _, provider := range user.Providers {- if _, err = tx.Exec("INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)", user.ID, provider.Name, provider.UID, now); err != nil {- tx.Rollback()- return err- }- }-- return tx.Commit()-}--// RegisterProvider adds given provider to userID-func (svc *UserStorage) RegisterProvider(userID int, provider *models.UserProvider) error {- now := time.Now()- return svc.DB.Execute("INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)", userID, provider.Name, provider.UID, now)-}--// TenantStorage contains read and write operations for tenants-type TenantStorage struct {- DB *dbx.Database-}--// GetByDomain returns a tenant based on its domain-func (svc *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {- tenant := &models.Tenant{}-- 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.Subdomain)- if err != nil {- return nil, app.ErrNotFound- }-- return tenant, nil-}--func extractSubdomain(domain string) string {- if idx := strings.Index(domain, "."); idx != -1 {- return domain[:idx]- }- return domain-}diff --git a/app/storage/postgres/identity_test.go b/app/storage/postgres/identity_test.goindex 4d4ff893b..0d7d8cc4d 100644--- a/app/storage/postgres/identity_test.go+++ b/app/storage/postgres/identity_test.go@@ -3,138 +3,11 @@ package postgres_testimport ("testing"- "github.com/WeCanHearYou/wechy/app/models""github.com/WeCanHearYou/wechy/app/pkg/dbx"- "github.com/WeCanHearYou/wechy/app/pkg/oauth""github.com/WeCanHearYou/wechy/app/storage/postgres". "github.com/onsi/gomega")-func TestUserStorage_GetByID(t *testing.T) {- RegisterTestingT(t)- db, _ := dbx.New()- defer db.Close()-- svc := &postgres.UserStorage{DB: db}- user, err := svc.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(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) {- RegisterTestingT(t)- db, _ := dbx.New()- defer db.Close()-- svc := &postgres.UserStorage{DB: db}- user, err := svc.GetByEmail(300, "[email protected]")-- Expect(user).To(BeNil())- Expect(err).NotTo(BeNil())-}--func TestUserStorage_GetByEmail(t *testing.T) {- RegisterTestingT(t)- db, _ := dbx.New()- defer db.Close()-- svc := &postgres.UserStorage{DB: db}- user, err := svc.GetByEmail(300, "[email protected]")-- 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(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) {- RegisterTestingT(t)- db, _ := dbx.New()- defer db.Close()-- svc := &postgres.UserStorage{DB: db}- user, err := svc.GetByEmail(400, "[email protected]")-- Expect(user).To(BeNil())- Expect(err).NotTo(BeNil())-}--func TestUserStorage_Register(t *testing.T) {- RegisterTestingT(t)- db, _ := dbx.New()- defer db.Close()-- svc := &postgres.UserStorage{DB: db}- user := &models.User{- Name: "Rob Stark",- Email: "[email protected]",- Tenant: &models.Tenant{- ID: 300,- },- Role: models.RoleMember,- Providers: []*models.UserProvider{- {- UID: "123123123",- Name: oauth.FacebookProvider,- },- },- }- err := svc.Register(user)- Expect(err).To(BeNil())-- user, err = svc.GetByEmail(300, "[email protected]")- Expect(err).To(BeNil())- Expect(user.ID).To(Equal(int(1)))- Expect(user.Role).To(Equal(models.RoleMember))- Expect(user.Name).To(Equal("Rob Stark"))- Expect(user.Email).To(Equal("[email protected]"))-}--func TestUserStorage_Register_MultipleProviders(t *testing.T) {- RegisterTestingT(t)- db, _ := dbx.New()- defer db.Close()-- db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")-- svc := &postgres.UserStorage{DB: db}- user := &models.User{- Name: "Jon Snow",- Email: "[email protected]",- Tenant: &models.Tenant{- ID: 1,- },- Role: models.RoleMember,- Providers: []*models.UserProvider{- {- UID: "123123123",- Name: oauth.FacebookProvider,- },- {- UID: "456456456",- Name: oauth.GoogleProvider,- },- },- }- err := svc.Register(user)-- 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]"))-}-func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.gonew file mode 100644index 000000000..46cb78068--- /dev/null+++ b/app/storage/postgres/tenant.go@@ -0,0 +1,34 @@+package postgres++import (+ "strings"++ "github.com/WeCanHearYou/wechy/app"+ "github.com/WeCanHearYou/wechy/app/models"+ "github.com/WeCanHearYou/wechy/app/pkg/dbx"+)++// TenantStorage contains read and write operations for tenants+type TenantStorage struct {+ DB *dbx.Database+}++// GetByDomain returns a tenant based on its domain+func (svc *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {+ tenant := &models.Tenant{}++ 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.Subdomain)+ if err != nil {+ return nil, app.ErrNotFound+ }++ return tenant, nil+}++func extractSubdomain(domain string) string {+ if idx := strings.Index(domain, "."); idx != -1 {+ return domain[:idx]+ }+ return domain+}diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.gonew file mode 100644index 000000000..03c33d31d--- /dev/null+++ b/app/storage/postgres/user.go@@ -0,0 +1,83 @@+package postgres++import (+ "time"++ "database/sql"++ "github.com/WeCanHearYou/wechy/app"+ "github.com/WeCanHearYou/wechy/app/models"+ "github.com/WeCanHearYou/wechy/app/pkg/dbx"+)++// UserStorage is used for user operations using a Postgres database+type UserStorage struct {+ DB *dbx.Database+}++// GetByID returns a user based on given id+func (s *UserStorage) GetByID(userID int) (*models.User, error) {+ return getUser(s.DB, "id = $1", userID)+}++// GetByEmail returns a user based on given email+func (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, error) {+ return getUser(s.DB, "email = $1 AND tenant_id = $2", email, tenantID)+}++// Register creates a new user based on given information+func (s *UserStorage) Register(user *models.User) error {+ tx, err := s.DB.Begin()+ if err != nil {+ return err+ }++ now := time.Now()+ if err = tx.QueryRow("INSERT INTO users (name, email, created_on, tenant_id, role) VALUES ($1, $2, $3, $4, $5) RETURNING id", user.Name, user.Email, now, user.Tenant.ID, user.Role).Scan(&user.ID); err != nil {+ tx.Rollback()+ return err+ }++ for _, provider := range user.Providers {+ if _, err = tx.Exec("INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)", user.ID, provider.Name, provider.UID, now); err != nil {+ tx.Rollback()+ return err+ }+ }++ return tx.Commit()+}++// RegisterProvider adds given provider to userID+func (s *UserStorage) RegisterProvider(userID int, provider *models.UserProvider) error {+ now := time.Now()+ return s.DB.Execute("INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)", userID, provider.Name, provider.UID, now)+}++// GetByID returns a user based on given id+func getUser(db *dbx.Database, filter string, args ...interface{}) (*models.User, error) {+ user := &models.User{}+ user.Tenant = &models.Tenant{}+ row := db.QueryRow("SELECT id, name, email, tenant_id, role FROM users WHERE "+filter, args...)++ if err := row.Scan(&user.ID, &user.Name, &user.Email, &user.Tenant.ID, &user.Role); err != nil {+ if err == sql.ErrNoRows {+ return nil, app.ErrNotFound+ }+ return nil, err+ }++ rows, err := db.Query("SELECT provider_uid, provider FROM user_providers WHERE user_id = $1", user.ID)+ if err != nil {+ return nil, err+ }++ defer rows.Close()+ for rows.Next() {+ p := &models.UserProvider{}+ rows.Scan(&p.UID, &p.Name)+ user.Providers = append(user.Providers, p)+ }++ return user, nil+}diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.gonew file mode 100644index 000000000..5951bf980--- /dev/null+++ b/app/storage/postgres/user_test.go@@ -0,0 +1,136 @@+package postgres_test++import (+ "testing"++ "github.com/WeCanHearYou/wechy/app/models"+ "github.com/WeCanHearYou/wechy/app/pkg/dbx"+ "github.com/WeCanHearYou/wechy/app/pkg/oauth"+ "github.com/WeCanHearYou/wechy/app/storage/postgres"+ . "github.com/onsi/gomega"+)++func TestUserStorage_GetByID(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ svc := &postgres.UserStorage{DB: db}+ user, err := svc.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(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) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ svc := &postgres.UserStorage{DB: db}+ user, err := svc.GetByEmail(300, "[email protected]")++ Expect(user).To(BeNil())+ Expect(err).NotTo(BeNil())+}++func TestUserStorage_GetByEmail(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ svc := &postgres.UserStorage{DB: db}+ user, err := svc.GetByEmail(300, "[email protected]")++ 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(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) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ svc := &postgres.UserStorage{DB: db}+ user, err := svc.GetByEmail(400, "[email protected]")++ Expect(user).To(BeNil())+ Expect(err).NotTo(BeNil())+}++func TestUserStorage_Register(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ svc := &postgres.UserStorage{DB: db}+ user := &models.User{+ Name: "Rob Stark",+ Email: "[email protected]",+ Tenant: &models.Tenant{+ ID: 300,+ },+ Role: models.RoleMember,+ Providers: []*models.UserProvider{+ {+ UID: "123123123",+ Name: oauth.FacebookProvider,+ },+ },+ }+ err := svc.Register(user)+ Expect(err).To(BeNil())++ user, err = svc.GetByEmail(300, "[email protected]")+ Expect(err).To(BeNil())+ Expect(user.ID).To(Equal(int(1)))+ Expect(user.Role).To(Equal(models.RoleMember))+ Expect(user.Name).To(Equal("Rob Stark"))+ Expect(user.Email).To(Equal("[email protected]"))+}++func TestUserStorage_Register_MultipleProviders(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")++ svc := &postgres.UserStorage{DB: db}+ user := &models.User{+ Name: "Jon Snow",+ Email: "[email protected]",+ Tenant: &models.Tenant{+ ID: 1,+ },+ Role: models.RoleMember,+ Providers: []*models.UserProvider{+ {+ UID: "123123123",+ Name: oauth.FacebookProvider,+ },+ {+ UID: "456456456",+ Name: oauth.GoogleProvider,+ },+ },+ }+ err := svc.Register(user)++ 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]"))+}