Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

using inmemory storage on some tests

goenning742b941da1f5
diff --git a/app/handlers/identity_test.go b/app/handlers/identity_test.go
index c32855d38..f3df755ec 100644
--- a/app/handlers/identity_test.go
+++ b/app/handlers/identity_test.go
@@ -9,27 +9,19 @@ import (
"github.com/WeCanHearYou/wechy/app/handlers"
"github.com/WeCanHearYou/wechy/app/mock"
- "github.com/WeCanHearYou/wechy/app/pkg/dbx"
+ "github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/oauth"
- "github.com/WeCanHearYou/wechy/app/storage/postgres"
+ "github.com/WeCanHearYou/wechy/app/storage/inmemory"
. "github.com/onsi/gomega"
)
var (
- db *dbx.Database
- oauthService oauth.Service
- TenantStorage *postgres.TenantStorage
- UserStorage *postgres.UserStorage
+ oauthService = &OAuthService{}
+ tenants = &inmemory.TenantStorage{}
+ users = &inmemory.UserStorage{}
+ oauthHandlers = handlers.OAuth(tenants, oauthService, users)
)
-func setup() {
- db, _ = dbx.New()
-
- oauthService = &OAuthService{}
- TenantStorage = &postgres.TenantStorage{DB: db}
- UserStorage = &postgres.UserStorage{DB: db}
-}
-
//OAuthService implements a mocked OAuthService
type OAuthService struct{}
@@ -67,16 +59,11 @@ func (p *OAuthService) GetProfile(provider string, code string) (*oauth.UserProf
return nil, nil
}
-func getHandlers() handlers.OAuthHandlers {
- setup()
- return handlers.OAuth(TenantStorage, oauthService, UserStorage)
-}
-
func TestLoginHandler(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- code, response := server.ExecuteRaw(getHandlers().Login(oauth.FacebookProvider))
+ code, response := server.ExecuteRaw(oauthHandlers.Login(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canherayou.com/oauth/token?provider=facebook&redirect="))
@@ -87,7 +74,7 @@ func TestCallbackHandler_InvalidState(t *testing.T) {
server := mock.NewServer()
server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=abc")
- code, _ := server.ExecuteRaw(getHandlers().Callback(oauth.FacebookProvider))
+ code, _ := server.ExecuteRaw(oauthHandlers.Callback(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusInternalServerError))
}
@@ -97,7 +84,7 @@ func TestCallbackHandler_InvalidCode(t *testing.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(getHandlers().Callback(oauth.FacebookProvider))
+ code, response := server.ExecuteRaw(oauthHandlers.Callback(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canhearyou.com"))
@@ -106,11 +93,20 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {
func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
RegisterTestingT(t)
+ tenant, _ := tenants.GetByDomain("demo")
+ users.Register(&models.User{
+ ID: 300,
+ Name: "Jon Snow",
+ Email: "[email protected]",
+ Tenant: tenant,
+ Providers: []*models.UserProvider{
+ &models.UserProvider{UID: "FB1234", Name: oauth.FacebookProvider},
+ },
+ })
+
server := mock.NewServer()
server.Context.Request().URL, _ = url.Parse("http://demo.test.canherayou.com/oauth/callback?state=http://demo.test.canhearyou.com&code=123")
- code, response := server.ExecuteRaw(getHandlers().Callback(oauth.FacebookProvider))
-
- Expect(db.Count("SELECT id FROM users WHERE email = '[email protected]'")).To(Equal(1))
+ code, response := server.ExecuteRaw(oauthHandlers.Callback(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
Expect(response.Header.Get("Location")).To(Equal("http://demo.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))
@@ -121,10 +117,12 @@ func TestCallbackHandler_NewUser(t *testing.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(getHandlers().Callback(oauth.FacebookProvider))
+ code, response := server.ExecuteRaw(oauthHandlers.Callback(oauth.FacebookProvider))
- Expect(db.QueryInt("SELECT tenant_id FROM users WHERE email = '[email protected]'")).To(Equal(400))
- Expect(db.Exists("SELECT * FROM user_providers WHERE provider_uid = 'FB5678'")).To(BeTrue())
+ tenant, _ := tenants.GetByDomain("orange")
+ user, err := users.GetByEmail(tenant.ID, "[email protected]")
+ Expect(err).To(BeNil())
+ Expect(user.Name).To(Equal("Some Facebook Guy"))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.PGavs5a6HRotRozfXfNP39JPb0vSus_8LL9MAOeLGDs"))
@@ -135,11 +133,12 @@ func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {
server := mock.NewServer()
server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.canhearyou.com&code=123")
- code, response := server.ExecuteRaw(getHandlers().Callback(oauth.GoogleProvider))
+ code, response := server.ExecuteRaw(oauthHandlers.Callback(oauth.GoogleProvider))
- Expect(db.Count("SELECT id FROM users WHERE email = '[email protected]'")).To(Equal(1))
- Expect(db.QueryString("SELECT provider_uid FROM user_providers WHERE user_id = 300 and provider = 'facebook'")).To(Equal("FB1234"))
- Expect(db.QueryString("SELECT provider_uid FROM user_providers WHERE user_id = 300 and provider = 'google'")).To(Equal("GO1234"))
+ tenant, _ := tenants.GetByDomain("demo")
+ user, err := users.GetByEmail(tenant.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.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))
diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.go
new file mode 100644
index 000000000..4e7f9ef6d
--- /dev/null
+++ b/app/storage/inmemory/tenant.go
@@ -0,0 +1,32 @@
+package inmemory
+
+import (
+ "strings"
+
+ "github.com/WeCanHearYou/wechy/app"
+ "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{}
+
+// 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
+ }
+ return nil, app.ErrNotFound
+}
+
+func extractSubdomain(domain string) string {
+ if idx := strings.Index(domain, "."); idx != -1 {
+ return domain[:idx]
+ }
+ return domain
+}
diff --git a/app/storage/inmemory/user.go b/app/storage/inmemory/user.go
new file mode 100644
index 000000000..4db85fbc7
--- /dev/null
+++ b/app/storage/inmemory/user.go
@@ -0,0 +1,54 @@
+package inmemory
+
+import (
+ "github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/models"
+)
+
+var users = []*models.User{}
+var lastID = 0
+
+// UserStorage is used for user operations
+type UserStorage struct {
+}
+
+// GetByID returns a user based on given id
+func (u *UserStorage) GetByID(userID int) (*models.User, error) {
+ for _, user := range users {
+ if user.ID == userID {
+ return user, nil
+ }
+ }
+ return nil, app.ErrNotFound
+}
+
+// GetByEmail returns a user based on given email
+func (u *UserStorage) GetByEmail(tenantID int, email string) (*models.User, error) {
+ for _, user := range users {
+ if user.Email == email && user.Tenant.ID == tenantID {
+ return user, nil
+ }
+ }
+ return nil, app.ErrNotFound
+}
+
+// Register creates a new user based on given information
+func (u *UserStorage) Register(user *models.User) error {
+ if user.ID == 0 {
+ lastID = lastID + 1
+ user.ID = lastID
+ }
+ users = append(users, user)
+ return nil
+}
+
+// RegisterProvider adds given provider to userID
+func (u *UserStorage) RegisterProvider(userID int, provider *models.UserProvider) error {
+ for _, user := range users {
+ if user.ID == userID {
+ user.Providers = append(user.Providers, provider)
+ return nil
+ }
+ }
+ return app.ErrNotFound
+}