mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into remake-traces

Browse Source
This commit is contained in:
A.Unger
2021-08-17 13:29:05 +02:00
parent e62a9b6a36 e4cab1e781
commit aac45a46f4
19 changed files with 103 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/pkg/command/server.go
View File

@@ -8,7 +8,7 @@ import (
"strings"
"time"
"github.com/coreos/go-oidc"
"github.com/coreos/go-oidc/v3/oidc"
chimiddleware "github.com/go-chi/chi/middleware"
"github.com/justinas/alice"
"github.com/micro/cli/v2"

2
proxy/pkg/middleware/oidc_auth.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/golang-jwt/jwt/v4"
gOidc "github.com/coreos/go-oidc"
gOidc "github.com/coreos/go-oidc/v3/oidc"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/oidc"
"github.com/owncloud/ocis/ocis-pkg/sync"

2
proxy/pkg/middleware/oidc_auth_test.go
View File

@@ -7,7 +7,7 @@ import (
"net/http/httptest"
"testing"
"github.com/coreos/go-oidc"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/owncloud/ocis/ocis-pkg/log"
"golang.org/x/oauth2"
)