Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

use inmemory storage for all tests expect postgres

goenning3466e677c7c6
diff --git a/Makefile b/Makefile
index 26b91f0d9..578125a54 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,9 @@ endif
test:
godotenv -f ${ENV_FILE} go test $$(go list ./... | grep -v /vendor/) -cover -p=1
+test-watch:
+ godotenv -f .test.env goconvey
+
coverage:
rm -rf coverage.txt
for d in $$(go list ./... | grep -v vendor); do \
diff --git a/app/handlers/feedback_test.go b/app/handlers/feedback_test.go
index 8f105df37..02de86871 100644
--- a/app/handlers/feedback_test.go
+++ b/app/handlers/feedback_test.go
@@ -3,66 +3,23 @@ package handlers_test
import (
"testing"
- "github.com/WeCanHearYou/wechy/app"
+ "strconv"
+
"github.com/WeCanHearYou/wechy/app/handlers"
"github.com/WeCanHearYou/wechy/app/mock"
"github.com/WeCanHearYou/wechy/app/models"
+ "github.com/WeCanHearYou/wechy/app/storage/inmemory"
. "github.com/onsi/gomega"
)
-type mockIdeaStorage struct {
- ideas []*models.Idea
-}
-
-func NewMockIdeaStorage() *mockIdeaStorage {
- return &mockIdeaStorage{
- ideas: []*models.Idea{
- &models.Idea{ID: 1, Number: 1, Title: "Idea #1"},
- &models.Idea{ID: 2, Number: 2, Title: "Idea #2"},
- },
- }
-}
-
-func (svc mockIdeaStorage) GetByID(tenantID, ideaID int) (*models.Idea, error) {
- for _, idea := range svc.ideas {
- if idea.ID == ideaID {
- return idea, nil
- }
- }
- return nil, app.ErrNotFound
-}
-
-func (svc mockIdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {
- for _, idea := range svc.ideas {
- if idea.Number == number {
- return idea, nil
- }
- }
- return nil, app.ErrNotFound
-}
-
-func (svc mockIdeaStorage) GetAll(tenantID int) ([]*models.Idea, error) {
- return svc.ideas, nil
-}
-
-func (svc mockIdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error) {
- return make([]*models.Comment, 0), nil
-}
-
-func (svc mockIdeaStorage) Save(tenantID, userID int, title, description string) (*models.Idea, error) {
- return nil, nil
-}
-
-func (svc mockIdeaStorage) AddComment(userID, ideaID int, content string) (int, error) {
- return 0, nil
-}
-
func TestListHandler(t *testing.T) {
RegisterTestingT(t)
+ ideas := &inmemory.IdeaStorage{}
server := mock.NewServer()
- server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 2, Name: "Any Tenant"})
- code, _ := server.Execute(handlers.Handlers(NewMockIdeaStorage()).List())
+ server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 1, Name: "Any Tenant"})
+
+ code, _ := server.Execute(handlers.Handlers(ideas).List())
Expect(code).To(Equal(200))
}
@@ -70,12 +27,14 @@ func TestListHandler(t *testing.T) {
func TestDetailsHandler(t *testing.T) {
RegisterTestingT(t)
+ ideas := &inmemory.IdeaStorage{}
+ idea, _ := ideas.Save(1, 1, "My Idea", "My Idea Description")
server := mock.NewServer()
- server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 2, Name: "Any Tenant"})
+ server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetParamNames("number")
- server.Context.SetParamValues("1")
+ server.Context.SetParamValues(strconv.Itoa(idea.Number))
- code, _ := server.Execute(handlers.Handlers(NewMockIdeaStorage()).Details())
+ code, _ := server.Execute(handlers.Handlers(ideas).Details())
Expect(code).To(Equal(200))
}
@@ -83,12 +42,13 @@ func TestDetailsHandler(t *testing.T) {
func TestDetailsHandler_NotFound(t *testing.T) {
RegisterTestingT(t)
+ ideas := &inmemory.IdeaStorage{}
server := mock.NewServer()
- server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 2, Name: "Any Tenant"})
+ server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetParamNames("number")
server.Context.SetParamValues("99")
- code, _ := server.Execute(handlers.Handlers(NewMockIdeaStorage()).Details())
+ code, _ := server.Execute(handlers.Handlers(ideas).Details())
Expect(code).To(Equal(404))
}
@@ -96,36 +56,44 @@ func TestDetailsHandler_NotFound(t *testing.T) {
func TestDetailsHandler_AddIdea(t *testing.T) {
RegisterTestingT(t)
+ ideas := &inmemory.IdeaStorage{}
server := mock.NewServer()
- server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 2, Name: "Any Tenant"})
+ server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.Set("__CTX_USER", &models.User{ID: 1, Name: "Jon"})
- handler := handlers.Handlers(NewMockIdeaStorage()).PostIdea()
+ handler := handlers.Handlers(ideas).PostIdea()
code, _ := server.ExecutePost(handler, `{ "title": "My newest idea :)" }`)
+ idea, err := ideas.GetByID(1, 1)
Expect(code).To(Equal(200))
+ Expect(err).To(BeNil())
+ Expect(idea.Title).To(Equal("My newest idea :)"))
}
func TestDetailsHandler_AddIdea_WithoutTitle(t *testing.T) {
RegisterTestingT(t)
+ ideas := &inmemory.IdeaStorage{}
server := mock.NewServer()
- server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 2, Name: "Any Tenant"})
+ server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.Set("__CTX_USER", &models.User{ID: 1, Name: "Jon"})
- handler := handlers.Handlers(NewMockIdeaStorage()).PostIdea()
+ handler := handlers.Handlers(ideas).PostIdea()
code, _ := server.ExecutePost(handler, `{ "title": "" }`)
+ _, err := ideas.GetByID(1, 1)
Expect(code).To(Equal(400))
+ Expect(err).NotTo(BeNil())
}
func TestDetailsHandler_AddComment(t *testing.T) {
RegisterTestingT(t)
+ ideas := &inmemory.IdeaStorage{}
server := mock.NewServer()
- server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 2, Name: "Any Tenant"})
+ server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.Set("__CTX_USER", &models.User{ID: 1, Name: "Jon"})
server.Context.SetParamNames("id")
server.Context.SetParamValues("1")
- handler := handlers.Handlers(NewMockIdeaStorage()).PostComment()
+ handler := handlers.Handlers(ideas).PostComment()
code, _ := server.ExecutePost(handler, `{ "content": "This is a comment!" }`)
Expect(code).To(Equal(200))
@@ -134,12 +102,13 @@ func TestDetailsHandler_AddComment(t *testing.T) {
func TestDetailsHandler_AddComment_WithoutContent(t *testing.T) {
RegisterTestingT(t)
+ ideas := &inmemory.IdeaStorage{}
server := mock.NewServer()
- server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 2, Name: "Any Tenant"})
+ server.Context.Set("__CTX_TENANT", &models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.Set("__CTX_USER", &models.User{ID: 1, Name: "Jon"})
server.Context.SetParamNames("id")
server.Context.SetParamValues("1")
- handler := handlers.Handlers(NewMockIdeaStorage()).PostComment()
+ handler := handlers.Handlers(ideas).PostComment()
code, _ := server.ExecutePost(handler, `{ "content": "" }`)
Expect(code).To(Equal(400))
diff --git a/app/handlers/identity_test.go b/app/handlers/identity_test.go
index f3df755ec..e230072b6 100644
--- a/app/handlers/identity_test.go
+++ b/app/handlers/identity_test.go
@@ -16,49 +16,12 @@ import (
)
var (
- oauthService = &OAuthService{}
+ oauthService = &oauth.MockOAuthService{}
tenants = &inmemory.TenantStorage{}
users = &inmemory.UserStorage{}
oauthHandlers = handlers.OAuth(tenants, oauthService, users)
)
-//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) (*oauth.UserProfile, error) {
- if provider == "facebook" && code == "123" {
- return &oauth.UserProfile{
- ID: "FB1234",
- Name: "Jon Snow",
- Email: "[email protected]",
- }, nil
- }
-
- if provider == "google" && code == "123" {
- return &oauth.UserProfile{
- ID: "GO1234",
- Name: "Jon Snow",
- Email: "[email protected]",
- }, nil
- }
-
- if provider == "facebook" && code == "456" {
- return &oauth.UserProfile{
- ID: "FB5678",
- Name: "Some Facebook Guy",
- Email: "[email protected]",
- }, nil
- }
-
- return nil, nil
-}
-
func TestLoginHandler(t *testing.T) {
RegisterTestingT(t)
@@ -93,7 +56,9 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {
func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
RegisterTestingT(t)
- tenant, _ := tenants.GetByDomain("demo")
+ tenant := &models.Tenant{ID: 1, Name: "Demonstration", Subdomain: "demo"}
+ tenants.Add(tenant)
+
users.Register(&models.User{
ID: 300,
Name: "Jon Snow",
@@ -114,12 +79,13 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
func TestCallbackHandler_NewUser(t *testing.T) {
RegisterTestingT(t)
+ tenant := &models.Tenant{ID: 2, Name: "Orange", Subdomain: "orange"}
+ tenants.Add(tenant)
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(oauthHandlers.Callback(oauth.FacebookProvider))
- tenant, _ := tenants.GetByDomain("orange")
user, err := users.GetByEmail(tenant.ID, "[email protected]")
Expect(err).To(BeNil())
Expect(user.Name).To(Equal("Some Facebook Guy"))
diff --git a/app/models/identity.go b/app/models/identity.go
index cb5fad52a..71450b6e0 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -4,9 +4,9 @@ import jwt "github.com/dgrijalva/jwt-go"
//Tenant represents a tenant
type Tenant struct {
- ID int `json:"id"`
- Name string `json:"name"`
- Domain string `json:"domain"`
+ ID int `json:"id"`
+ Name string `json:"name"`
+ Subdomain string `json:"subdomain"`
}
//User represents an user inside our application
diff --git a/app/pkg/oauth/http.go b/app/pkg/oauth/http.go
new file mode 100644
index 000000000..58320b10e
--- /dev/null
+++ b/app/pkg/oauth/http.go
@@ -0,0 +1,103 @@
+package oauth
+
+import (
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "net/url"
+ "os"
+ "strings"
+
+ "golang.org/x/oauth2"
+ "golang.org/x/oauth2/facebook"
+ "golang.org/x/oauth2/google"
+)
+
+type providerSettings struct {
+ profileURL func(token *oauth2.Token) string
+ config *oauth2.Config
+}
+
+var (
+ authEndpoint = os.Getenv("AUTH_ENDPOINT")
+ oauthSettings = map[string]*providerSettings{
+ FacebookProvider: &providerSettings{
+ profileURL: func(token *oauth2.Token) string {
+ return "https://graph.facebook.com/me?fields=name,email&access_token=" + url.QueryEscape(token.AccessToken)
+ },
+ config: &oauth2.Config{
+ ClientID: os.Getenv("OAUTH_FACEBOOK_APPID"),
+ ClientSecret: os.Getenv("OAUTH_FACEBOOK_SECRET"),
+ RedirectURL: authEndpoint + "/oauth/facebook/callback",
+ Scopes: []string{"public_profile", "email"},
+ Endpoint: facebook.Endpoint,
+ },
+ },
+ GoogleProvider: &providerSettings{
+ profileURL: func(token *oauth2.Token) string {
+ return "https://www.googleapis.com/oauth2/v2/userinfo?access_token=" + url.QueryEscape(token.AccessToken)
+ },
+ config: &oauth2.Config{
+ ClientID: os.Getenv("OAUTH_GOOGLE_CLIENTID"),
+ ClientSecret: os.Getenv("OAUTH_GOOGLE_SECRET"),
+ RedirectURL: authEndpoint + "/oauth/google/callback",
+ Scopes: []string{
+ "https://www.googleapis.com/auth/userinfo.profile",
+ "https://www.googleapis.com/auth/userinfo.email",
+ },
+ Endpoint: google.Endpoint,
+ },
+ },
+ }
+)
+
+func doGet(url string, v interface{}) error {
+ r, err := http.Get(url)
+ if err != nil {
+ return err
+ }
+
+ defer r.Body.Close()
+
+ bytes, err := ioutil.ReadAll(r.Body)
+ if err != nil {
+ return err
+ }
+
+ return json.Unmarshal(bytes, v)
+}
+
+//HTTPService implements real OAuth operations using Golang's oauth2 package
+type HTTPService struct{}
+
+//GetAuthURL returns authentication url for given provider
+func (p *HTTPService) GetAuthURL(provider string, redirect string) string {
+ config := oauthSettings[provider].config
+
+ authURL, _ := url.Parse(config.Endpoint.AuthURL)
+ parameters := url.Values{}
+ parameters.Add("client_id", config.ClientID)
+ parameters.Add("scope", strings.Join(config.Scopes, " "))
+ parameters.Add("redirect_uri", config.RedirectURL)
+ parameters.Add("response_type", "code")
+ parameters.Add("state", redirect)
+ authURL.RawQuery = parameters.Encode()
+ return authURL.String()
+}
+
+//GetProfile returns user profile based on provider and code
+func (p *HTTPService) GetProfile(provider string, code string) (*UserProfile, error) {
+ settings := oauthSettings[provider]
+ oauthToken, err := settings.config.Exchange(oauth2.NoContext, code)
+ if err != nil {
+ return nil, fmt.Errorf("OAuth code Exchange for %s failed with %s", provider, err)
+ }
+
+ profile := &UserProfile{}
+ if err = doGet(settings.profileURL(oauthToken), profile); err != nil {
+ return nil, fmt.Errorf("HTTP Get profile for %s failed with %s", provider, err)
+ }
+
+ return profile, nil
+}
diff --git a/app/pkg/oauth/oauth_test.go b/app/pkg/oauth/http_test.go
similarity index 100%
rename from app/pkg/oauth/oauth_test.go
rename to app/pkg/oauth/http_test.go
diff --git a/app/pkg/oauth/mock.go b/app/pkg/oauth/mock.go
new file mode 100644
index 000000000..f292a82d2
--- /dev/null
+++ b/app/pkg/oauth/mock.go
@@ -0,0 +1,38 @@
+package oauth
+
+//MockOAuthService implements a mocked OAuthService
+type MockOAuthService struct{}
+
+//GetAuthURL returns authentication url for given provider
+func (p *MockOAuthService) 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 *MockOAuthService) GetProfile(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/pkg/oauth/oauth.go b/app/pkg/oauth/oauth.go
index ef931c5e8..1b1f877de 100644
--- a/app/pkg/oauth/oauth.go
+++ b/app/pkg/oauth/oauth.go
@@ -1,20 +1,5 @@
package oauth
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
- "net/url"
- "os"
- "strings"
-
- "fmt"
-
- "golang.org/x/oauth2"
- "golang.org/x/oauth2/facebook"
- "golang.org/x/oauth2/google"
-)
-
const (
//FacebookProvider is const for 'facebook'
FacebookProvider = "facebook"
@@ -22,59 +7,6 @@ const (
GoogleProvider = "google"
)
-type oauthProviderSettings struct {
- profileURL func(token *oauth2.Token) string
- config *oauth2.Config
-}
-
-var (
- authEndpoint = os.Getenv("AUTH_ENDPOINT")
- oauthSettings = map[string]*oauthProviderSettings{
- FacebookProvider: &oauthProviderSettings{
- profileURL: func(token *oauth2.Token) string {
- return "https://graph.facebook.com/me?fields=name,email&access_token=" + url.QueryEscape(token.AccessToken)
- },
- config: &oauth2.Config{
- ClientID: os.Getenv("OAUTH_FACEBOOK_APPID"),
- ClientSecret: os.Getenv("OAUTH_FACEBOOK_SECRET"),
- RedirectURL: authEndpoint + "/oauth/facebook/callback",
- Scopes: []string{"public_profile", "email"},
- Endpoint: facebook.Endpoint,
- },
- },
- GoogleProvider: &oauthProviderSettings{
- profileURL: func(token *oauth2.Token) string {
- return "https://www.googleapis.com/oauth2/v2/userinfo?access_token=" + url.QueryEscape(token.AccessToken)
- },
- config: &oauth2.Config{
- ClientID: os.Getenv("OAUTH_GOOGLE_CLIENTID"),
- ClientSecret: os.Getenv("OAUTH_GOOGLE_SECRET"),
- RedirectURL: authEndpoint + "/oauth/google/callback",
- Scopes: []string{
- "https://www.googleapis.com/auth/userinfo.profile",
- "https://www.googleapis.com/auth/userinfo.email",
- },
- Endpoint: google.Endpoint,
- },
- },
- }
-)
-
-func doGet(url string, v interface{}) error {
- r, err := http.Get(url)
- defer r.Body.Close()
- if err != nil {
- return err
- }
-
- bytes, err := ioutil.ReadAll(r.Body)
- if err != nil {
- return err
- }
-
- return json.Unmarshal(bytes, v)
-}
-
//UserProfile represents an OAuth user profile
type UserProfile struct {
ID string
@@ -87,37 +19,3 @@ type Service interface {
GetAuthURL(provider string, redirect string) string
GetProfile(provider string, code string) (*UserProfile, error)
}
-
-//HTTPService implements real OAuth operations using Golang's oauth2 package
-type HTTPService struct{}
-
-//GetAuthURL returns authentication url for given provider
-func (p *HTTPService) GetAuthURL(provider string, redirect string) string {
- config := oauthSettings[provider].config
-
- authURL, _ := url.Parse(config.Endpoint.AuthURL)
- parameters := url.Values{}
- parameters.Add("client_id", config.ClientID)
- parameters.Add("scope", strings.Join(config.Scopes, " "))
- parameters.Add("redirect_uri", config.RedirectURL)
- parameters.Add("response_type", "code")
- parameters.Add("state", redirect)
- authURL.RawQuery = parameters.Encode()
- return authURL.String()
-}
-
-//GetProfile returns user profile based on provider and code
-func (p *HTTPService) GetProfile(provider string, code string) (*UserProfile, error) {
- settings := oauthSettings[provider]
- oauthToken, err := settings.config.Exchange(oauth2.NoContext, code)
- if err != nil {
- return nil, fmt.Errorf("OAuth code Exchange for %s failed with %s", provider, err)
- }
-
- profile := &UserProfile{}
- if err = doGet(settings.profileURL(oauthToken), profile); err != nil {
- return nil, fmt.Errorf("HTTP Get profile for %s failed with %s", provider, err)
- }
-
- return profile, nil
-}
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
new file mode 100644
index 000000000..5b2d37e20
--- /dev/null
+++ b/app/storage/inmemory/idea.go
@@ -0,0 +1,60 @@
+package inmemory
+
+import (
+ "github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/models"
+)
+
+// IdeaStorage contains read and write operations for ideas
+type IdeaStorage struct {
+ lastID int
+ ideas []*models.Idea
+}
+
+// GetByID returns idea by given id
+func (s *IdeaStorage) GetByID(tenantID, ideaID int) (*models.Idea, error) {
+ for _, idea := range s.ideas {
+ if idea.ID == ideaID {
+ return idea, nil
+ }
+ }
+ return nil, app.ErrNotFound
+}
+
+// GetByNumber returns idea by tenant and number
+func (s *IdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {
+ for _, idea := range s.ideas {
+ if idea.Number == number {
+ return idea, nil
+ }
+ }
+ return nil, app.ErrNotFound
+}
+
+// GetAll returns all tenant ideas
+func (s *IdeaStorage) GetAll(tenantID int) ([]*models.Idea, error) {
+ return s.ideas, nil
+}
+
+// GetCommentsByIdeaID returns all coments from given idea
+func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error) {
+ return make([]*models.Comment, 0), nil
+}
+
+// Save a new idea in the database
+func (s *IdeaStorage) Save(tenantID, userID int, title, description string) (*models.Idea, error) {
+ s.lastID = s.lastID + 1
+ idea := &models.Idea{
+ ID: s.lastID,
+ Number: s.lastID,
+ Title: title,
+ Description: description,
+ }
+ s.ideas = append(s.ideas, idea)
+ return idea, nil
+}
+
+// AddComment places a new comment on an idea
+func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error) {
+ return 0, nil
+}
diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.go
index 4e7f9ef6d..fc4ed9243 100644
--- a/app/storage/inmemory/tenant.go
+++ b/app/storage/inmemory/tenant.go
@@ -7,20 +7,26 @@ import (
"github.com/WeCanHearYou/wechy/app/models"
)
-var demo = &models.Tenant{ID: 1, Name: "Demonstration"}
-var orange = &models.Tenant{ID: 2, Name: "The Orange Inc."}
-
// TenantStorage contains read and write operations for tenants
-type TenantStorage struct{}
+type TenantStorage struct {
+ tenants []*models.Tenant
+}
+
+// Add given tenant to tenant list
+func (s *TenantStorage) Add(tenant *models.Tenant) error {
+ s.tenants = append(s.tenants, tenant)
+ return nil
+}
// GetByDomain returns a tenant based on its domain
-func (t *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
- if extractSubdomain(domain) == "orange" {
- return orange, nil
- }
- if extractSubdomain(domain) == "demo" {
- return demo, nil
+func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
+ for _, tenant := range s.tenants {
+
+ if tenant.Subdomain == extractSubdomain(domain) {
+ return tenant, nil
+ }
}
+
return nil, app.ErrNotFound
}
diff --git a/app/storage/postgres/identity.go b/app/storage/postgres/identity.go
index be9b43eb6..57226a049 100644
--- a/app/storage/postgres/identity.go
+++ b/app/storage/postgres/identity.go
@@ -7,7 +7,6 @@ import (
"github.com/WeCanHearYou/wechy/app"
"github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/dbx"
- "github.com/WeCanHearYou/wechy/app/pkg/env"
)
// UserStorage is used for user operations using a Postgres database
@@ -105,12 +104,11 @@ 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.Domain)
+ err := row.Scan(&tenant.ID, &tenant.Name, &tenant.Subdomain)
if err != nil {
return nil, app.ErrNotFound
}
- tenant.Domain = tenant.Domain + "." + env.GetCurrentDomain()
return tenant, nil
}
diff --git a/app/storage/postgres/identity_test.go b/app/storage/postgres/identity_test.go
index 3c91a117d..4d4ff893b 100644
--- a/app/storage/postgres/identity_test.go
+++ b/app/storage/postgres/identity_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"github.com/WeCanHearYou/wechy/app/models"
- "github.com/WeCanHearYou/wechy/app/pkg/oauth"
"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"
)
@@ -159,7 +159,7 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
- Expect(tenant.Domain).To(Equal("mydomain.test.canhearyou.com"))
+ Expect(tenant.Subdomain).To(Equal("mydomain"))
Expect(err).To(BeNil())
}
@@ -175,6 +175,6 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
- Expect(tenant.Domain).To(Equal("mydomain.test.canhearyou.com"))
+ Expect(tenant.Subdomain).To(Equal("mydomain"))
Expect(err).To(BeNil())
}
diff --git a/main.go b/main.go
index 6e6fc443f..f3f5d891b 100644
--- a/main.go
+++ b/main.go
@@ -2,9 +2,9 @@ package main
import (
"github.com/WeCanHearYou/wechy/app/models"
- "github.com/WeCanHearYou/wechy/app/pkg/oauth"
"github.com/WeCanHearYou/wechy/app/pkg/dbx"
"github.com/WeCanHearYou/wechy/app/pkg/env"
+ "github.com/WeCanHearYou/wechy/app/pkg/oauth"
"github.com/WeCanHearYou/wechy/app/storage/postgres"
_ "github.com/mattes/migrate/driver/postgres"
mig "github.com/mattes/migrate/migrate"