Merge 22ef638 into ddb196d

cosminrentea · Mar 20, 2017 · 5e93ffa · 5e93ffa
2 parents ddb196d + 22ef638
commit 5e93ffa
Show file tree

Hide file tree

Showing 28 changed files with 44 additions and 736 deletions.
diff --git a/scripts/generate_mocks.sh b/scripts/generate_mocks.sh
@@ -48,11 +48,6 @@ $MOCKGEN -self_package router -package router \
       github.com/cosminrentea/gobbler/server/kvstore \
       KVStore &
 
-$MOCKGEN -self_package router -package router \
-      -destination server/router/mocks_auth_gen_test.go \
-      github.com/cosminrentea/gobbler/server/auth \
-      AccessManager &
-
 $MOCKGEN -self_package router -package router \
       -destination server/router/mocks_checker_gen_test.go \
       github.com/docker/distribution/health \
@@ -113,11 +108,6 @@ $MOCKGEN -package server \
       github.com/cosminrentea/gobbler/server/router \
       Router &
 
-$MOCKGEN -self_package server -package server \
-      -destination server/mocks_auth_gen_test.go \
-      github.com/cosminrentea/gobbler/server/auth \
-      AccessManager &
-
 $MOCKGEN -self_package server -package server \
       -destination server/mocks_store_gen_test.go \
       github.com/cosminrentea/gobbler/server/store \
@@ -128,14 +118,6 @@ $MOCKGEN -package server \
       github.com/cosminrentea/gobbler/server/apns \
       Pusher &
 
-# server/auth mocks
-$MOCKGEN -self_package auth -package auth \
-      -destination server/auth/mocks_auth_gen_test.go \
-      github.com/cosminrentea/gobbler/server/auth \
-      AccessManager
-replace "server/auth/mocks_auth_gen_test.go" \
-      "auth \"github.com\/cosminrentea\/gobbler\/server\/auth\"" \
-      "auth\."
 
 # server/connector mocks
 $MOCKGEN -self_package connector -package connector \
@@ -175,11 +157,6 @@ $MOCKGEN -self_package websocket -package websocket \
       github.com/cosminrentea/gobbler/server/store \
       MessageStore &
 
-$MOCKGEN -self_package websocket -package websocket \
-      -destination server/websocket/mocks_auth_gen_test.go \
-      github.com/cosminrentea/gobbler/server/auth \
-      AccessManager &
-
 # server/rest Mocks
 $MOCKGEN -package rest \
       -destination server/rest/mocks_router_gen_test.go \

diff --git a/server/apns/mocks_router_gen_test.go b/server/apns/mocks_router_gen_test.go
@@ -5,7 +5,6 @@ package apns
 
 import (
 	protocol "github.com/cosminrentea/gobbler/protocol"
-	auth "github.com/cosminrentea/gobbler/server/auth"
 	cluster "github.com/cosminrentea/gobbler/server/cluster"
 	kvstore "github.com/cosminrentea/gobbler/server/kvstore"
 	router "github.com/cosminrentea/gobbler/server/router"
@@ -34,17 +33,6 @@ func (_m *MockRouter) EXPECT() *_MockRouterRecorder {
 	return _m.recorder
 }
 
-func (_m *MockRouter) AccessManager() (auth.AccessManager, error) {
-	ret := _m.ctrl.Call(_m, "AccessManager")
-	ret0, _ := ret[0].(auth.AccessManager)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockRouterRecorder) AccessManager() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "AccessManager")
-}
-
 func (_m *MockRouter) Cluster() *cluster.Cluster {
 	ret := _m.ctrl.Call(_m, "Cluster")
 	ret0, _ := ret[0].(*cluster.Cluster)

diff --git a/server/auth/accessmanager.go b/server/auth/accessmanager.go
diff --git a/server/auth/accessmanager_test.go b/server/auth/accessmanager_test.go
diff --git a/server/auth/allow_all_accessmanager.go b/server/auth/allow_all_accessmanager.go
diff --git a/server/auth/logger.go b/server/auth/logger.go
diff --git a/server/auth/mocks_auth_gen_test.go b/server/auth/mocks_auth_gen_test.go
diff --git a/server/auth/rest_accessmanager.go b/server/auth/rest_accessmanager.go
diff --git a/server/connector/mocks_router_gen_test.go b/server/connector/mocks_router_gen_test.go
@@ -5,7 +5,6 @@ package connector
 
 import (
 	protocol "github.com/cosminrentea/gobbler/protocol"
-	auth "github.com/cosminrentea/gobbler/server/auth"
 	cluster "github.com/cosminrentea/gobbler/server/cluster"
 	kvstore "github.com/cosminrentea/gobbler/server/kvstore"
 	router "github.com/cosminrentea/gobbler/server/router"
@@ -34,17 +33,6 @@ func (_m *MockRouter) EXPECT() *_MockRouterRecorder {
 	return _m.recorder
 }
 
-func (_m *MockRouter) AccessManager() (auth.AccessManager, error) {
-	ret := _m.ctrl.Call(_m, "AccessManager")
-	ret0, _ := ret[0].(auth.AccessManager)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockRouterRecorder) AccessManager() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "AccessManager")
-}
-
 func (_m *MockRouter) Cluster() *cluster.Cluster {
 	ret := _m.ctrl.Call(_m, "Cluster")
 	ret0, _ := ret[0].(*cluster.Cluster)

diff --git a/server/fcm/mocks_router_gen_test.go b/server/fcm/mocks_router_gen_test.go
@@ -5,7 +5,6 @@ package fcm
 
 import (
 	protocol "github.com/cosminrentea/gobbler/protocol"
-	auth "github.com/cosminrentea/gobbler/server/auth"
 	cluster "github.com/cosminrentea/gobbler/server/cluster"
 	kvstore "github.com/cosminrentea/gobbler/server/kvstore"
 	router "github.com/cosminrentea/gobbler/server/router"
@@ -34,17 +33,6 @@ func (_m *MockRouter) EXPECT() *_MockRouterRecorder {
 	return _m.recorder
 }
 
-func (_m *MockRouter) AccessManager() (auth.AccessManager, error) {
-	ret := _m.ctrl.Call(_m, "AccessManager")
-	ret0, _ := ret[0].(auth.AccessManager)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockRouterRecorder) AccessManager() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "AccessManager")
-}
-
 func (_m *MockRouter) Cluster() *cluster.Cluster {
 	ret := _m.ctrl.Call(_m, "Cluster")
 	ret0, _ := ret[0].(*cluster.Cluster)

diff --git a/server/gobbler.go b/server/gobbler.go
@@ -6,7 +6,6 @@ import (
 	"github.com/cosminrentea/gobbler/logformatter"
 	"github.com/cosminrentea/gobbler/protocol"
 	"github.com/cosminrentea/gobbler/server/apns"
-	"github.com/cosminrentea/gobbler/server/auth"
 	"github.com/cosminrentea/gobbler/server/cluster"
 	"github.com/cosminrentea/gobbler/server/fcm"
 	"github.com/cosminrentea/gobbler/server/kvstore"
@@ -59,12 +58,6 @@ var ValidateStoragePath = func() error {
 	return nil
 }
 
-// CreateAccessManager is a func which returns a auth.AccessManager implementation
-// (currently: AllowAllAccessManager).
-var CreateAccessManager = func() auth.AccessManager {
-	return auth.NewAllowAllAccessManager(true)
-}
-
 // CreateKVStore is a func which returns a kvstore.KVStore implementation
 // (currently, based on guble configuration).
 var CreateKVStore = func() kvstore.KVStore {
@@ -255,7 +248,6 @@ func Main() {
 func StartService() *service.Service {
 	//TODO StartService could return an error in case it fails to start
 
-	accessManager := CreateAccessManager()
 	messageStore := CreateMessageStore()
 	kvStore := CreateKVStore()
 
@@ -277,7 +269,7 @@ func StartService() *service.Service {
 		logger.Info("Starting in standalone-mode")
 	}
 
-	r := router.New(accessManager, messageStore, kvStore, cl)
+	r := router.New(messageStore, kvStore, cl)
 	websrv := webserver.New(*Config.HttpListen)
 
 	srv := service.New(r, websrv).

diff --git a/server/gobbler_test.go b/server/gobbler_test.go
@@ -138,10 +138,8 @@ func TestStartServiceModules(t *testing.T) {
 func initRouterMock() *MockRouter {
 	routerMock := NewMockRouter(testutil.MockCtrl)
 	routerMock.EXPECT().Cluster().Return(nil).AnyTimes()
-	amMock := NewMockAccessManager(testutil.MockCtrl)
 	msMock := NewMockMessageStore(testutil.MockCtrl)
 
-	routerMock.EXPECT().AccessManager().Return(amMock, nil).AnyTimes()
 	routerMock.EXPECT().MessageStore().Return(msMock, nil).AnyTimes()
 
 	return routerMock