eliott/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis synced 2026-04-26 01:35:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(proxy): fix build after rebase

Browse Source 
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2024-07-12 09:12:58 +02:00
parent 7005cbc0fc
commit 3b3d30159d
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/proxy/pkg/command/server.go
View File

@@ -247,14 +247,10 @@ func Server(cfg *config.Config) *cli.Command {
}
}
<<<<<<< HEAD
func loadMiddlewares(logger log.Logger, cfg *config.Config,
userInfoCache, signingKeyStore microstore.Store, traceProvider trace.TracerProvider, metrics metrics.Metrics,
userProvider backend.UserBackend, gatewaySelector pool.Selectable[gateway.GatewayAPIClient]) alice.Chain {
=======
func loadMiddlewares(logger log.Logger, cfg *config.Config, userInfoCache, signingKeyStore microstore.Store, traceProvider trace.TracerProvider, metrics metrics.Metrics) alice.Chain {
>>>>>>> a9df2a66b1 (feat: reva app auth)
rolesClient := settingssvc.NewRoleService("com.owncloud.api.settings", cfg.GrpcClient)
policiesProviderClient := policiessvc.NewPoliciesProviderService("com.owncloud.api.policies", cfg.GrpcClient)
@@ -298,8 +294,6 @@ func loadMiddlewares(logger log.Logger, cfg *config.Config, userInfoCache, signi
})
}
<<<<<<< HEAD
=======
authenticators = append(authenticators, middleware.AppAuthAuthenticator{
Logger: logger,
RevaGatewaySelector: gatewaySelector,
@@ -308,7 +302,6 @@ func loadMiddlewares(logger log.Logger, cfg *config.Config, userInfoCache, signi
Logger: logger,
RevaGatewaySelector: gatewaySelector,
})
>>>>>>> a9df2a66b1 (feat: reva app auth)
authenticators = append(authenticators, middleware.NewOIDCAuthenticator(
middleware.Logger(logger),
middleware.UserInfoCache(userInfoCache),