⚡ Fixes #16.

Author: matthewhartstonge

CHANGELOG.md

@@ -8,8 +8,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 - mongo: Added New to re-support custom mongo configuration and hashers.  
+- Store: Added top level function override to enable `Store` to conform to 
+	the required `fosite` interfaces.
+- Store: Added interface tests to `Store` to ensure the functions are available 
+	at the top level!
 
 ### Changed
+- Storer: Changed `storage.Storer` to `Storage.Store` to be more idiomatic.
+- Storer: Changed from named interfaces to a struct composition to enable the 
+	required fosite interface functions to be raised to the top level.
 - mongo: Changed `MongoStore` to `Store` to be more idiomatic.
 - mongo: Changed `ConnectToMongo` to `Connect` to be more idiomatic.
 - mongo: Changed `NewDefaultMongoStore` to `NewDefaultStore` to be more idiomatic.

cache_manager.go

@@ -14,7 +14,7 @@ type CacheManager interface {
 	CacheStorer
 }
 
-// Storer provides a way to create cache based objects in mongo
+// CacheStorer provides a way to create cache based objects in mongo
 type CacheStorer interface {
 	Create(ctx context.Context, entityName string, cacheObject SessionCache) (SessionCache, error)
 	Get(ctx context.Context, entityName string, key string) (SessionCache, error)

mongo/mongo.go

@@ -39,7 +39,7 @@ type Store struct {
 
 	// Public API
 	Hasher fosite.Hasher
-	storage.Storer
+	storage.Store
 }
 
 // NewSession returns a mongo session.
@@ -200,11 +200,11 @@ func New(cfg *Config, hashee fosite.Hasher) (*Store, error) {
 	return &Store{
 		DB:     database,
 		Hasher: hashee,
-		Storer: storage.Storer{
-			Cache:    mongoCache,
-			Clients:  mongoClients,
-			Requests: mongoRequests,
-			Users:    mongoUsers,
+		Store: storage.Store{
+			CacheManager:   mongoCache,
+			ClientManager:  mongoClients,
+			RequestManager: mongoRequests,
+			UserManager:    mongoUsers,
 		},
 	}, nil
 }

storage.go

@@ -2,13 +2,26 @@ package storage
 
 import "context"
 
-// Storer brings all the interfaces together as a way to be composable into
+// Store brings all the interfaces together as a way to be composable into
 // storage backend implementations
-type Storer struct {
-	Cache    CacheStorer
-	Clients  ClientManager
-	Requests RequestManager
-	Users    UserManager
+type Store struct {
+	CacheManager
+	ClientManager
+	RequestManager
+	UserManager
+}
+
+// Authenticate provides a top level pointer to UserManager to implement
+// fosite.ResourceOwnerPasswordCredentialsGrantStorage at the top level.
+//
+// You can still access either the RequestManager API, or UserManager API by
+// calling the methods on store direct depending on if you want the User
+// resource returned as well via:
+// - `store.RequestManager.Authenticate(ctx, username, secret) error`
+// - `store.UserManager.Authenticate(ctx, username, secret) (User, error)`
+func (s *Store) Authenticate(ctx context.Context, username string, secret string) error {
+	_, err := s.UserManager.Authenticate(ctx, username, secret)
+	return err
 }
 
 // AuthClientFunc enables developers to supply their own authentication

storage_internal_test.go

@@ -0,0 +1,93 @@
+package storage
+
+import (
+	// Standard Library Imports
+	"testing"
+
+	// External Imports
+	"github.com/ory/fosite"
+	"github.com/ory/fosite/handler/oauth2"
+	"github.com/ory/fosite/handler/openid"
+	"github.com/ory/fosite/handler/pkce"
+)
+
+func TestStore_ImplementsFositeStorage(t *testing.T) {
+	c := &Store{}
+
+	var i interface{} = c
+	if _, ok := i.(fosite.Storage); !ok {
+		t.Error("Store does not implement interface fosite.Storage")
+	}
+}
+
+func TestStore_ImplementsFositeClientManager(t *testing.T) {
+	c := &Store{}
+
+	var i interface{} = c
+	if _, ok := i.(fosite.ClientManager); !ok {
+		t.Error("Store does not implement interface fosite.ClientManager")
+	}
+}
+
+func TestStore_ImplementsFositeAccessTokenStorageInterface(t *testing.T) {
+	r := &Store{}
+
+	var i interface{} = r
+	if _, ok := i.(oauth2.AccessTokenStorage); !ok {
+		t.Error("Store does not implement interface oauth2.AccessTokenStorage")
+	}
+}
+
+func TestStore_ImplementsFositeAuthorizeCodeStorageInterface(t *testing.T) {
+	r := &Store{}
+
+	var i interface{} = r
+	if _, ok := i.(oauth2.AuthorizeCodeStorage); !ok {
+		t.Error("Store does not implement interface oauth2.AuthorizeCodeStorage")
+	}
+}
+
+func TestStore_ImplementsFositeClientCredentialsGrantStorageInterface(t *testing.T) {
+	r := &Store{}
+
+	var i interface{} = r
+	if _, ok := i.(oauth2.ClientCredentialsGrantStorage); !ok {
+		t.Error("Store does not implement interface oauth2.ClientCredentialsGrantStorage")
+	}
+}
+
+func TestStore_ImplementsFositeRefreshTokenStorageInterface(t *testing.T) {
+	r := &Store{}
+
+	var i interface{} = r
+	if _, ok := i.(oauth2.RefreshTokenStorage); !ok {
+		t.Error("Store does not implement interface oauth2.RefreshTokenStorage")
+	}
+}
+
+func TestStore_ImplementsFositeResourceOwnerPasswordCredentialsGrantStorageInterface(t *testing.T) {
+	r := &Store{}
+
+	var i interface{} = r
+	if _, ok := i.(oauth2.ResourceOwnerPasswordCredentialsGrantStorage); !ok {
+		t.Error("Store does not implement interface oauth2.ResourceOwnerPasswordCredentialsGrantStorage")
+	}
+}
+
+func TestStore_ImplementsFositeOpenidOpenIDConnectRequestStorageInterface(t *testing.T) {
+	r := &Store{}
+
+	var i interface{} = r
+	if _, ok := i.(openid.OpenIDConnectRequestStorage); !ok {
+		t.Error("Store does not implement interface openid.OpenIDConnectRequestStorage")
+	}
+}
+
+func TestStore_ImplementsFositePkcePKCERequestStorageInterface(t *testing.T) {
+	r := &Store{}
+
+	var i interface{} = r
+	if _, ok := i.(pkce.PKCERequestStorage); !ok {
+		t.Error("Store does not implement interface pkce.PKCERequestStorage")
+	}
+}