build(oidc): use authelia maintained library (#6821)

Replaces github.com/ory/fosite with authelia.com/providers.oauth2 which is a hard fork of the former and has several major improvements.

Signed-off-by: James Elliott <james-d-elliott@users.noreply.github.com>

14 files changed, 101 insertions, 88 deletions

diff --git a/internal/mocks/duo_api.go b/internal/mocks/duo_api.go
index 655dc331b..11c1cd5a2 100644
--- a/internal/mocks/duo_api.go
+++ b/internal/mocks/duo_api.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -package mocks -destination duo_api.go -mock_names API=MockAPI github.com/authelia/authelia/v4/internal/duo API
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
diff --git a/internal/mocks/gen.go b/internal/mocks/gen.go
index 52f9cfdcc..a46071d52 100644
--- a/internal/mocks/gen.go
+++ b/internal/mocks/gen.go
@@ -11,15 +11,15 @@ package mocks
 //go:generate mockgen -package mocks -destination random.go -mock_names Provider=MockRandom github.com/authelia/authelia/v4/internal/random Provider
 
 // Fosite Mocks.
-//go:generate mockgen -package mocks -destination fosite_client_credentials_grant_storage.go -mock_names Provider=MockClientCredentialsGrantStorage github.com/ory/fosite/handler/oauth2 ClientCredentialsGrantStorage
-//go:generate mockgen -package mocks -destination fosite_token_revocation_storage.go -mock_names Provider=MockTokenRevocationStorage github.com/ory/fosite/handler/oauth2 TokenRevocationStorage
-//go:generate mockgen -package mocks -destination fosite_access_token_strategy.go -mock_names Provider=MockAccessTokenStrategy github.com/ory/fosite/handler/oauth2 AccessTokenStrategy
+//go:generate mockgen -package mocks -destination oauth2_client_credentials_grant_storage.go -mock_names Provider=MockClientCredentialsGrantStorage authelia.com/provider/oauth2/handler/oauth2 ClientCredentialsGrantStorage
+//go:generate mockgen -package mocks -destination oauth2_token_revocation_storage.go -mock_names Provider=MockTokenRevocationStorage authelia.com/provider/oauth2/handler/oauth2 TokenRevocationStorage
+//go:generate mockgen -package mocks -destination oauth2_access_token_strategy.go -mock_names Provider=MockAccessTokenStrategy authelia.com/provider/oauth2/handler/oauth2 AccessTokenStrategy
 
-//go:generate mockgen -package mocks -destination fosite_pkce_request_storage.go -mock_names Provider=MockPKCERequestStorage github.com/ory/fosite/handler/pkce PKCERequestStorage
+//go:generate mockgen -package mocks -destination oauth2_pkce_request_storage.go -mock_names Provider=MockPKCERequestStorage authelia.com/provider/oauth2/handler/pkce PKCERequestStorage
 
-//go:generate mockgen -package mocks -destination fosite_access_requester.go -mock_names Provider=MockAccessRequester github.com/ory/fosite AccessRequester
+//go:generate mockgen -package mocks -destination oauth2_access_requester.go -mock_names Provider=MockAccessRequester authelia.com/provider/oauth2 AccessRequester
 
-//go:generate mockgen -package mocks -destination fosite_transactional.go -mock_names Provider=MockTransactional github.com/ory/fosite/storage Transactional
+//go:generate mockgen -package mocks -destination oauth2_transactional.go -mock_names Provider=MockTransactional authelia.com/provider/oauth2/storage Transactional
 
-//go:generate mockgen -package mocks -destination fosite_token_introspector.go -mock_names TokenIntrospector=MockTokenIntrospector github.com/ory/fosite TokenIntrospector
-//go:generate mockgen -package mocks -destination fosite_storage.go -mock_names Storage=MockFositeStorage github.com/ory/fosite Storage
+//go:generate mockgen -package mocks -destination oauth2_token_introspector.go -mock_names TokenIntrospector=MockTokenIntrospector authelia.com/provider/oauth2 TokenIntrospector
+//go:generate mockgen -package mocks -destination oauth2_storage.go -mock_names Storage=MockOAuth2Storage authelia.com/provider/oauth2 Storage
diff --git a/internal/mocks/notifier.go b/internal/mocks/notifier.go
index 6f31b8e7a..3a5026511 100644
--- a/internal/mocks/notifier.go
+++ b/internal/mocks/notifier.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -package mocks -destination notifier.go -mock_names Notifier=MockNotifier github.com/authelia/authelia/v4/internal/notification Notifier
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
diff --git a/internal/mocks/fosite_access_requester.go b/internal/mocks/oauth2_access_requester.go
index cea0a3a64..e9b29ad49 100644
--- a/internal/mocks/fosite_access_requester.go
+++ b/internal/mocks/oauth2_access_requester.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite (interfaces: AccessRequester)
+// Source: authelia.com/provider/oauth2 (interfaces: AccessRequester)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_access_requester.go -mock_names Provider=MockAccessRequester github.com/ory/fosite AccessRequester
+//	mockgen -package mocks -destination oauth2_access_requester.go -mock_names Provider=MockAccessRequester authelia.com/provider/oauth2 AccessRequester
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -13,7 +14,7 @@ import (
 	reflect "reflect"
 	time "time"
 
-	fosite "github.com/ory/fosite"
+	oauth2 "authelia.com/provider/oauth2"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -53,10 +54,10 @@ func (mr *MockAccessRequesterMockRecorder) AppendRequestedScope(arg0 any) *gomoc
 }
 
 // GetClient mocks base method.
-func (m *MockAccessRequester) GetClient() fosite.Client {
+func (m *MockAccessRequester) GetClient() oauth2.Client {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetClient")
-	ret0, _ := ret[0].(fosite.Client)
+	ret0, _ := ret[0].(oauth2.Client)
 	return ret0
 }
 
@@ -67,10 +68,10 @@ func (mr *MockAccessRequesterMockRecorder) GetClient() *gomock.Call {
 }
 
 // GetGrantTypes mocks base method.
-func (m *MockAccessRequester) GetGrantTypes() fosite.Arguments {
+func (m *MockAccessRequester) GetGrantTypes() oauth2.Arguments {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetGrantTypes")
-	ret0, _ := ret[0].(fosite.Arguments)
+	ret0, _ := ret[0].(oauth2.Arguments)
 	return ret0
 }
 
@@ -81,10 +82,10 @@ func (mr *MockAccessRequesterMockRecorder) GetGrantTypes() *gomock.Call {
 }
 
 // GetGrantedAudience mocks base method.
-func (m *MockAccessRequester) GetGrantedAudience() fosite.Arguments {
+func (m *MockAccessRequester) GetGrantedAudience() oauth2.Arguments {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetGrantedAudience")
-	ret0, _ := ret[0].(fosite.Arguments)
+	ret0, _ := ret[0].(oauth2.Arguments)
 	return ret0
 }
 
@@ -95,10 +96,10 @@ func (mr *MockAccessRequesterMockRecorder) GetGrantedAudience() *gomock.Call {
 }
 
 // GetGrantedScopes mocks base method.
-func (m *MockAccessRequester) GetGrantedScopes() fosite.Arguments {
+func (m *MockAccessRequester) GetGrantedScopes() oauth2.Arguments {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetGrantedScopes")
-	ret0, _ := ret[0].(fosite.Arguments)
+	ret0, _ := ret[0].(oauth2.Arguments)
 	return ret0
 }
 
@@ -151,10 +152,10 @@ func (mr *MockAccessRequesterMockRecorder) GetRequestedAt() *gomock.Call {
 }
 
 // GetRequestedAudience mocks base method.
-func (m *MockAccessRequester) GetRequestedAudience() fosite.Arguments {
+func (m *MockAccessRequester) GetRequestedAudience() oauth2.Arguments {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetRequestedAudience")
-	ret0, _ := ret[0].(fosite.Arguments)
+	ret0, _ := ret[0].(oauth2.Arguments)
 	return ret0
 }
 
@@ -165,10 +166,10 @@ func (mr *MockAccessRequesterMockRecorder) GetRequestedAudience() *gomock.Call {
 }
 
 // GetRequestedScopes mocks base method.
-func (m *MockAccessRequester) GetRequestedScopes() fosite.Arguments {
+func (m *MockAccessRequester) GetRequestedScopes() oauth2.Arguments {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetRequestedScopes")
-	ret0, _ := ret[0].(fosite.Arguments)
+	ret0, _ := ret[0].(oauth2.Arguments)
 	return ret0
 }
 
@@ -179,10 +180,10 @@ func (mr *MockAccessRequesterMockRecorder) GetRequestedScopes() *gomock.Call {
 }
 
 // GetSession mocks base method.
-func (m *MockAccessRequester) GetSession() fosite.Session {
+func (m *MockAccessRequester) GetSession() oauth2.Session {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSession")
-	ret0, _ := ret[0].(fosite.Session)
+	ret0, _ := ret[0].(oauth2.Session)
 	return ret0
 }
 
@@ -217,7 +218,7 @@ func (mr *MockAccessRequesterMockRecorder) GrantScope(arg0 any) *gomock.Call {
 }
 
 // Merge mocks base method.
-func (m *MockAccessRequester) Merge(arg0 fosite.Requester) {
+func (m *MockAccessRequester) Merge(arg0 oauth2.Requester) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "Merge", arg0)
 }
@@ -229,10 +230,10 @@ func (mr *MockAccessRequesterMockRecorder) Merge(arg0 any) *gomock.Call {
 }
 
 // Sanitize mocks base method.
-func (m *MockAccessRequester) Sanitize(arg0 []string) fosite.Requester {
+func (m *MockAccessRequester) Sanitize(arg0 []string) oauth2.Requester {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Sanitize", arg0)
-	ret0, _ := ret[0].(fosite.Requester)
+	ret0, _ := ret[0].(oauth2.Requester)
 	return ret0
 }
 
@@ -255,7 +256,7 @@ func (mr *MockAccessRequesterMockRecorder) SetID(arg0 any) *gomock.Call {
 }
 
 // SetRequestedAudience mocks base method.
-func (m *MockAccessRequester) SetRequestedAudience(arg0 fosite.Arguments) {
+func (m *MockAccessRequester) SetRequestedAudience(arg0 oauth2.Arguments) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "SetRequestedAudience", arg0)
 }
@@ -267,7 +268,7 @@ func (mr *MockAccessRequesterMockRecorder) SetRequestedAudience(arg0 any) *gomoc
 }
 
 // SetRequestedScopes mocks base method.
-func (m *MockAccessRequester) SetRequestedScopes(arg0 fosite.Arguments) {
+func (m *MockAccessRequester) SetRequestedScopes(arg0 oauth2.Arguments) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "SetRequestedScopes", arg0)
 }
@@ -279,7 +280,7 @@ func (mr *MockAccessRequesterMockRecorder) SetRequestedScopes(arg0 any) *gomock.
 }
 
 // SetSession mocks base method.
-func (m *MockAccessRequester) SetSession(arg0 fosite.Session) {
+func (m *MockAccessRequester) SetSession(arg0 oauth2.Session) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "SetSession", arg0)
 }
diff --git a/internal/mocks/fosite_access_token_strategy.go b/internal/mocks/oauth2_access_token_strategy.go
index 319c5fd6c..a1ec65fb4 100644
--- a/internal/mocks/fosite_access_token_strategy.go
+++ b/internal/mocks/oauth2_access_token_strategy.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite/handler/oauth2 (interfaces: AccessTokenStrategy)
+// Source: authelia.com/provider/oauth2/handler/oauth2 (interfaces: AccessTokenStrategy)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_access_token_strategy.go -mock_names Provider=MockAccessTokenStrategy github.com/ory/fosite/handler/oauth2 AccessTokenStrategy
+//	mockgen -package mocks -destination oauth2_access_token_strategy.go -mock_names Provider=MockAccessTokenStrategy authelia.com/provider/oauth2/handler/oauth2 AccessTokenStrategy
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -12,7 +13,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	fosite "github.com/ory/fosite"
+	oauth2 "authelia.com/provider/oauth2"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -54,7 +55,7 @@ func (mr *MockAccessTokenStrategyMockRecorder) AccessTokenSignature(arg0, arg1 a
 }
 
 // GenerateAccessToken mocks base method.
-func (m *MockAccessTokenStrategy) GenerateAccessToken(arg0 context.Context, arg1 fosite.Requester) (string, string, error) {
+func (m *MockAccessTokenStrategy) GenerateAccessToken(arg0 context.Context, arg1 oauth2.Requester) (string, string, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GenerateAccessToken", arg0, arg1)
 	ret0, _ := ret[0].(string)
@@ -70,7 +71,7 @@ func (mr *MockAccessTokenStrategyMockRecorder) GenerateAccessToken(arg0, arg1 an
 }
 
 // ValidateAccessToken mocks base method.
-func (m *MockAccessTokenStrategy) ValidateAccessToken(arg0 context.Context, arg1 fosite.Requester, arg2 string) error {
+func (m *MockAccessTokenStrategy) ValidateAccessToken(arg0 context.Context, arg1 oauth2.Requester, arg2 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ValidateAccessToken", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
diff --git a/internal/mocks/fosite_client_credentials_grant_storage.go b/internal/mocks/oauth2_client_credentials_grant_storage.go
index a35d2bc52..44621eeb9 100644
--- a/internal/mocks/fosite_client_credentials_grant_storage.go
+++ b/internal/mocks/oauth2_client_credentials_grant_storage.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite/handler/oauth2 (interfaces: ClientCredentialsGrantStorage)
+// Source: authelia.com/provider/oauth2/handler/oauth2 (interfaces: ClientCredentialsGrantStorage)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_client_credentials_grant_storage.go -mock_names Provider=MockClientCredentialsGrantStorage github.com/ory/fosite/handler/oauth2 ClientCredentialsGrantStorage
+//	mockgen -package mocks -destination oauth2_client_credentials_grant_storage.go -mock_names Provider=MockClientCredentialsGrantStorage authelia.com/provider/oauth2/handler/oauth2 ClientCredentialsGrantStorage
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -12,7 +13,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	fosite "github.com/ory/fosite"
+	oauth2 "authelia.com/provider/oauth2"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -40,7 +41,7 @@ func (m *MockClientCredentialsGrantStorage) EXPECT() *MockClientCredentialsGrant
 }
 
 // CreateAccessTokenSession mocks base method.
-func (m *MockClientCredentialsGrantStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error {
+func (m *MockClientCredentialsGrantStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 oauth2.Requester) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -68,10 +69,10 @@ func (mr *MockClientCredentialsGrantStorageMockRecorder) DeleteAccessTokenSessio
 }
 
 // GetAccessTokenSession mocks base method.
-func (m *MockClientCredentialsGrantStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) {
+func (m *MockClientCredentialsGrantStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 oauth2.Session) (oauth2.Requester, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2)
-	ret0, _ := ret[0].(fosite.Requester)
+	ret0, _ := ret[0].(oauth2.Requester)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/internal/mocks/fosite_pkce_request_storage.go b/internal/mocks/oauth2_pkce_request_storage.go
index 1ada6e2d5..dcfc951f3 100644
--- a/internal/mocks/fosite_pkce_request_storage.go
+++ b/internal/mocks/oauth2_pkce_request_storage.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite/handler/pkce (interfaces: PKCERequestStorage)
+// Source: authelia.com/provider/oauth2/handler/pkce (interfaces: PKCERequestStorage)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_pkce_request_storage.go -mock_names Provider=MockPKCERequestStorage github.com/ory/fosite/handler/pkce PKCERequestStorage
+//	mockgen -package mocks -destination oauth2_pkce_request_storage.go -mock_names Provider=MockPKCERequestStorage authelia.com/provider/oauth2/handler/pkce PKCERequestStorage
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -12,7 +13,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	fosite "github.com/ory/fosite"
+	oauth2 "authelia.com/provider/oauth2"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -40,7 +41,7 @@ func (m *MockPKCERequestStorage) EXPECT() *MockPKCERequestStorageMockRecorder {
 }
 
 // CreatePKCERequestSession mocks base method.
-func (m *MockPKCERequestStorage) CreatePKCERequestSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error {
+func (m *MockPKCERequestStorage) CreatePKCERequestSession(arg0 context.Context, arg1 string, arg2 oauth2.Requester) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreatePKCERequestSession", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -68,10 +69,10 @@ func (mr *MockPKCERequestStorageMockRecorder) DeletePKCERequestSession(arg0, arg
 }
 
 // GetPKCERequestSession mocks base method.
-func (m *MockPKCERequestStorage) GetPKCERequestSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) {
+func (m *MockPKCERequestStorage) GetPKCERequestSession(arg0 context.Context, arg1 string, arg2 oauth2.Session) (oauth2.Requester, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetPKCERequestSession", arg0, arg1, arg2)
-	ret0, _ := ret[0].(fosite.Requester)
+	ret0, _ := ret[0].(oauth2.Requester)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/internal/mocks/fosite_storage.go b/internal/mocks/oauth2_storage.go
index e7b99271b..0e806db39 100644
--- a/internal/mocks/fosite_storage.go
+++ b/internal/mocks/oauth2_storage.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite (interfaces: Storage)
+// Source: authelia.com/provider/oauth2 (interfaces: Storage)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_storage.go -mock_names Storage=MockFositeStorage github.com/ory/fosite Storage
+//	mockgen -package mocks -destination oauth2_storage.go -mock_names Storage=MockOAuth2Storage authelia.com/provider/oauth2 Storage
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -13,35 +14,35 @@ import (
 	reflect "reflect"
 	time "time"
 
-	fosite "github.com/ory/fosite"
+	oauth2 "authelia.com/provider/oauth2"
 	gomock "go.uber.org/mock/gomock"
 )
 
-// MockFositeStorage is a mock of Storage interface.
-type MockFositeStorage struct {
+// MockOAuth2Storage is a mock of Storage interface.
+type MockOAuth2Storage struct {
 	ctrl     *gomock.Controller
-	recorder *MockFositeStorageMockRecorder
+	recorder *MockOAuth2StorageMockRecorder
 }
 
-// MockFositeStorageMockRecorder is the mock recorder for MockFositeStorage.
-type MockFositeStorageMockRecorder struct {
-	mock *MockFositeStorage
+// MockOAuth2StorageMockRecorder is the mock recorder for MockOAuth2Storage.
+type MockOAuth2StorageMockRecorder struct {
+	mock *MockOAuth2Storage
 }
 
-// NewMockFositeStorage creates a new mock instance.
-func NewMockFositeStorage(ctrl *gomock.Controller) *MockFositeStorage {
-	mock := &MockFositeStorage{ctrl: ctrl}
-	mock.recorder = &MockFositeStorageMockRecorder{mock}
+// NewMockOAuth2Storage creates a new mock instance.
+func NewMockOAuth2Storage(ctrl *gomock.Controller) *MockOAuth2Storage {
+	mock := &MockOAuth2Storage{ctrl: ctrl}
+	mock.recorder = &MockOAuth2StorageMockRecorder{mock}
 	return mock
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockFositeStorage) EXPECT() *MockFositeStorageMockRecorder {
+func (m *MockOAuth2Storage) EXPECT() *MockOAuth2StorageMockRecorder {
 	return m.recorder
 }
 
 // ClientAssertionJWTValid mocks base method.
-func (m *MockFositeStorage) ClientAssertionJWTValid(arg0 context.Context, arg1 string) error {
+func (m *MockOAuth2Storage) ClientAssertionJWTValid(arg0 context.Context, arg1 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ClientAssertionJWTValid", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -49,28 +50,28 @@ func (m *MockFositeStorage) ClientAssertionJWTValid(arg0 context.Context, arg1 s
 }
 
 // ClientAssertionJWTValid indicates an expected call of ClientAssertionJWTValid.
-func (mr *MockFositeStorageMockRecorder) ClientAssertionJWTValid(arg0, arg1 any) *gomock.Call {
+func (mr *MockOAuth2StorageMockRecorder) ClientAssertionJWTValid(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientAssertionJWTValid", reflect.TypeOf((*MockFositeStorage)(nil).ClientAssertionJWTValid), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientAssertionJWTValid", reflect.TypeOf((*MockOAuth2Storage)(nil).ClientAssertionJWTValid), arg0, arg1)
 }
 
 // GetClient mocks base method.
-func (m *MockFositeStorage) GetClient(arg0 context.Context, arg1 string) (fosite.Client, error) {
+func (m *MockOAuth2Storage) GetClient(arg0 context.Context, arg1 string) (oauth2.Client, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetClient", arg0, arg1)
-	ret0, _ := ret[0].(fosite.Client)
+	ret0, _ := ret[0].(oauth2.Client)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // GetClient indicates an expected call of GetClient.
-func (mr *MockFositeStorageMockRecorder) GetClient(arg0, arg1 any) *gomock.Call {
+func (mr *MockOAuth2StorageMockRecorder) GetClient(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClient", reflect.TypeOf((*MockFositeStorage)(nil).GetClient), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClient", reflect.TypeOf((*MockOAuth2Storage)(nil).GetClient), arg0, arg1)
 }
 
 // SetClientAssertionJWT mocks base method.
-func (m *MockFositeStorage) SetClientAssertionJWT(arg0 context.Context, arg1 string, arg2 time.Time) error {
+func (m *MockOAuth2Storage) SetClientAssertionJWT(arg0 context.Context, arg1 string, arg2 time.Time) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SetClientAssertionJWT", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -78,7 +79,7 @@ func (m *MockFositeStorage) SetClientAssertionJWT(arg0 context.Context, arg1 str
 }
 
 // SetClientAssertionJWT indicates an expected call of SetClientAssertionJWT.
-func (mr *MockFositeStorageMockRecorder) SetClientAssertionJWT(arg0, arg1, arg2 any) *gomock.Call {
+func (mr *MockOAuth2StorageMockRecorder) SetClientAssertionJWT(arg0, arg1, arg2 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetClientAssertionJWT", reflect.TypeOf((*MockFositeStorage)(nil).SetClientAssertionJWT), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetClientAssertionJWT", reflect.TypeOf((*MockOAuth2Storage)(nil).SetClientAssertionJWT), arg0, arg1, arg2)
 }
diff --git a/internal/mocks/fosite_token_introspector.go b/internal/mocks/oauth2_token_introspector.go
index 52760ea76..06a991c8f 100644
--- a/internal/mocks/fosite_token_introspector.go
+++ b/internal/mocks/oauth2_token_introspector.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite (interfaces: TokenIntrospector)
+// Source: authelia.com/provider/oauth2 (interfaces: TokenIntrospector)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_token_introspector.go -mock_names TokenIntrospector=MockTokenIntrospector github.com/ory/fosite TokenIntrospector
+//	mockgen -package mocks -destination oauth2_token_introspector.go -mock_names TokenIntrospector=MockTokenIntrospector authelia.com/provider/oauth2 TokenIntrospector
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -12,7 +13,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	fosite "github.com/ory/fosite"
+	oauth2 "authelia.com/provider/oauth2"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -40,10 +41,10 @@ func (m *MockTokenIntrospector) EXPECT() *MockTokenIntrospectorMockRecorder {
 }
 
 // IntrospectToken mocks base method.
-func (m *MockTokenIntrospector) IntrospectToken(arg0 context.Context, arg1 string, arg2 fosite.TokenType, arg3 fosite.AccessRequester, arg4 []string) (fosite.TokenType, error) {
+func (m *MockTokenIntrospector) IntrospectToken(arg0 context.Context, arg1 string, arg2 oauth2.TokenType, arg3 oauth2.AccessRequester, arg4 []string) (oauth2.TokenType, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "IntrospectToken", arg0, arg1, arg2, arg3, arg4)
-	ret0, _ := ret[0].(fosite.TokenType)
+	ret0, _ := ret[0].(oauth2.TokenType)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/internal/mocks/fosite_token_revocation_storage.go b/internal/mocks/oauth2_token_revocation_storage.go
index d9836c373..e9a590f9b 100644
--- a/internal/mocks/fosite_token_revocation_storage.go
+++ b/internal/mocks/oauth2_token_revocation_storage.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite/handler/oauth2 (interfaces: TokenRevocationStorage)
+// Source: authelia.com/provider/oauth2/handler/oauth2 (interfaces: TokenRevocationStorage)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_token_revocation_storage.go -mock_names Provider=MockTokenRevocationStorage github.com/ory/fosite/handler/oauth2 TokenRevocationStorage
+//	mockgen -package mocks -destination oauth2_token_revocation_storage.go -mock_names Provider=MockTokenRevocationStorage authelia.com/provider/oauth2/handler/oauth2 TokenRevocationStorage
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
@@ -12,7 +13,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	fosite "github.com/ory/fosite"
+	oauth2 "authelia.com/provider/oauth2"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -40,7 +41,7 @@ func (m *MockTokenRevocationStorage) EXPECT() *MockTokenRevocationStorageMockRec
 }
 
 // CreateAccessTokenSession mocks base method.
-func (m *MockTokenRevocationStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error {
+func (m *MockTokenRevocationStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 oauth2.Requester) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -54,7 +55,7 @@ func (mr *MockTokenRevocationStorageMockRecorder) CreateAccessTokenSession(arg0,
 }
 
 // CreateRefreshTokenSession mocks base method.
-func (m *MockTokenRevocationStorage) CreateRefreshTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error {
+func (m *MockTokenRevocationStorage) CreateRefreshTokenSession(arg0 context.Context, arg1 string, arg2 oauth2.Requester) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateRefreshTokenSession", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -96,10 +97,10 @@ func (mr *MockTokenRevocationStorageMockRecorder) DeleteRefreshTokenSession(arg0
 }
 
 // GetAccessTokenSession mocks base method.
-func (m *MockTokenRevocationStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) {
+func (m *MockTokenRevocationStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 oauth2.Session) (oauth2.Requester, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2)
-	ret0, _ := ret[0].(fosite.Requester)
+	ret0, _ := ret[0].(oauth2.Requester)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -111,10 +112,10 @@ func (mr *MockTokenRevocationStorageMockRecorder) GetAccessTokenSession(arg0, ar
 }
 
 // GetRefreshTokenSession mocks base method.
-func (m *MockTokenRevocationStorage) GetRefreshTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) {
+func (m *MockTokenRevocationStorage) GetRefreshTokenSession(arg0 context.Context, arg1 string, arg2 oauth2.Session) (oauth2.Requester, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetRefreshTokenSession", arg0, arg1, arg2)
-	ret0, _ := ret[0].(fosite.Requester)
+	ret0, _ := ret[0].(oauth2.Requester)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/internal/mocks/fosite_transactional.go b/internal/mocks/oauth2_transactional.go
index 3ff7a11aa..8de337aff 100644
--- a/internal/mocks/fosite_transactional.go
+++ b/internal/mocks/oauth2_transactional.go
@@ -1,10 +1,11 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ory/fosite/storage (interfaces: Transactional)
+// Source: authelia.com/provider/oauth2/storage (interfaces: Transactional)
 //
 // Generated by this command:
 //
-//	mockgen -package mocks -destination fosite_transactional.go -mock_names Provider=MockTransactional github.com/ory/fosite/storage Transactional
+//	mockgen -package mocks -destination oauth2_transactional.go -mock_names Provider=MockTransactional authelia.com/provider/oauth2/storage Transactional
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
diff --git a/internal/mocks/random.go b/internal/mocks/random.go
index f566c59a1..8621c6939 100644
--- a/internal/mocks/random.go
+++ b/internal/mocks/random.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -package mocks -destination random.go -mock_names Provider=MockRandom github.com/authelia/authelia/v4/internal/random Provider
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
diff --git a/internal/mocks/totp.go b/internal/mocks/totp.go
index a2dbc9d7c..b85d26abf 100644
--- a/internal/mocks/totp.go
+++ b/internal/mocks/totp.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -package mocks -destination totp.go -mock_names Provider=MockTOTP github.com/authelia/authelia/v4/internal/totp Provider
 //
+
 // Package mocks is a generated GoMock package.
 package mocks
 
diff --git a/internal/mocks/user_provider.go b/internal/mocks/user_provider.go
index 54e3e478a..e4d5715e7 100644
--- a/internal/mocks/user_provider.go
+++ b/internal/mocks/user_provider.go
@@ -5,6 +5,7 @@
 //
 //	mockgen -package mocks -destination user_provider.go -mock_names UserProvider=MockUserProvider github.com/authelia/authelia/v4/internal/authentication UserProvider
 //
+
 // Package mocks is a generated GoMock package.
 package mocks