From e13f3a0f4609171f2f6279a8a1b72a9afbd1109e Mon Sep 17 00:00:00 2001
From: Fabiennne <fabienne.gerschwiler@gmail.com>
Date: Wed, 28 Oct 2020 13:53:04 +0100
Subject: [PATCH] fix: mocks and tests

---
 example/internal/mock/storage.go |  4 ++++
 pkg/op/mock/client.go            |  2 +-
 pkg/op/mock/client.mock.go       | 28 ++++++++++++++--------------
 pkg/op/mock/storage.mock.impl.go |  3 +++
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/example/internal/mock/storage.go b/example/internal/mock/storage.go
index 9671ec7..2c5988b 100644
--- a/example/internal/mock/storage.go
+++ b/example/internal/mock/storage.go
@@ -291,3 +291,7 @@ func (c *ConfClient) AssertAdditionalIdTokenScopes() bool {
 func (c *ConfClient) AssertAdditionalAccessTokenScopes() bool {
 	return false
 }
+
+func (c *ConfClient) IsScopeAllowed(scope string) bool {
+	return false
+}
diff --git a/pkg/op/mock/client.go b/pkg/op/mock/client.go
index 12c00cc..b7ac3e8 100644
--- a/pkg/op/mock/client.go
+++ b/pkg/op/mock/client.go
@@ -26,7 +26,7 @@ func NewClientExpectAny(t *testing.T, appType op.ApplicationType) op.Client {
 		func(id string) string {
 			return "login?id=" + id
 		})
-	m.EXPECT().AllowedScopes().AnyTimes().Return(nil)
+	m.EXPECT().IsScopeAllowed(gomock.Any()).AnyTimes().Return(false)
 	return c
 }
 
diff --git a/pkg/op/mock/client.mock.go b/pkg/op/mock/client.mock.go
index 0780623..606b278 100644
--- a/pkg/op/mock/client.mock.go
+++ b/pkg/op/mock/client.mock.go
@@ -49,20 +49,6 @@ func (mr *MockClientMockRecorder) AccessTokenType() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessTokenType", reflect.TypeOf((*MockClient)(nil).AccessTokenType))
 }
 
-// AllowedScopes mocks base method
-func (m *MockClient) AllowedScopes() []string {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AllowedScopes")
-	ret0, _ := ret[0].([]string)
-	return ret0
-}
-
-// AllowedScopes indicates an expected call of AllowedScopes
-func (mr *MockClientMockRecorder) AllowedScopes() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllowedScopes", reflect.TypeOf((*MockClient)(nil).AllowedScopes))
-}
-
 // ApplicationType mocks base method
 func (m *MockClient) ApplicationType() op.ApplicationType {
 	m.ctrl.T.Helper()
@@ -161,6 +147,20 @@ func (mr *MockClientMockRecorder) IDTokenLifetime() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IDTokenLifetime", reflect.TypeOf((*MockClient)(nil).IDTokenLifetime))
 }
 
+// IsScopeAllowed mocks base method
+func (m *MockClient) IsScopeAllowed(arg0 string) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IsScopeAllowed", arg0)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// IsScopeAllowed indicates an expected call of IsScopeAllowed
+func (mr *MockClientMockRecorder) IsScopeAllowed(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsScopeAllowed", reflect.TypeOf((*MockClient)(nil).IsScopeAllowed), arg0)
+}
+
 // LoginURL mocks base method
 func (m *MockClient) LoginURL(arg0 string) string {
 	m.ctrl.T.Helper()
diff --git a/pkg/op/mock/storage.mock.impl.go b/pkg/op/mock/storage.mock.impl.go
index de9dee9..693e489 100644
--- a/pkg/op/mock/storage.mock.impl.go
+++ b/pkg/op/mock/storage.mock.impl.go
@@ -177,3 +177,6 @@ func (c *ConfClient) AssertAdditionalIdTokenScopes() bool {
 func (c *ConfClient) AssertAdditionalAccessTokenScopes() bool {
 	return false
 }
+func (c *ConfClient) IsScopeAllowed(scope string) bool {
+	return false
+}