proxy working

proxy/go.mod

@@ -7,25 +7,31 @@ require (
 	contrib.go.opencensus.io/exporter/ocagent v0.7.0
 	contrib.go.opencensus.io/exporter/zipkin v0.1.1
 	github.com/coreos/go-oidc v2.2.1+incompatible
-	github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd
-	github.com/cs3org/reva v1.1.0
+	github.com/cs3org/go-cs3apis v0.0.0-20200810113633-b00aca449666
+	github.com/cs3org/reva v1.2.1-0.20200826162318-c0f54e1f37ea
 	github.com/justinas/alice v1.2.0
 	github.com/micro/cli/v2 v2.1.2
 	github.com/micro/go-micro/v2 v2.9.1
 	github.com/oklog/run v1.1.0
 	github.com/openzipkin/zipkin-go v0.2.2
 	github.com/owncloud/flaex v0.2.0
-	github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e
-	github.com/owncloud/ocis-pkg/v2 v2.4.0
-	github.com/owncloud/ocis-settings v0.3.2-0.20200828130413-0cc0f5bf26fe
-	github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b
+	github.com/owncloud/ocis/accounts v0.0.0-00010101000000-000000000000
+	github.com/owncloud/ocis/ocis-pkg v0.0.0-20200918114005-1a0ddd2190ee
+	github.com/owncloud/ocis/settings v0.0.0-20200918114005-1a0ddd2190ee
+	github.com/owncloud/ocis/store v0.0.0-00010101000000-000000000000
 	github.com/prometheus/client_golang v1.7.1
 	github.com/restic/calens v0.2.0
 	github.com/spf13/viper v1.7.0
 	go.opencensus.io v0.22.4
-	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
+	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	google.golang.org/grpc v1.31.0
+	google.golang.org/grpc v1.31.1
 )
 
-replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
+replace (
+	github.com/owncloud/ocis/accounts => ../accounts
+	github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
+	github.com/owncloud/ocis/settings => ../settings
+	github.com/owncloud/ocis/store => ../store
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0
+)

proxy/pkg/command/root.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/flagset"
 	"github.com/owncloud/ocis/proxy/pkg/version"

proxy/pkg/command/server.go

@@ -21,8 +21,8 @@ import (
 	"github.com/oklog/run"
 	openzipkin "github.com/openzipkin/zipkin-go"
 	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
-	acc "github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	acc "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/cs3"
 	"github.com/owncloud/ocis/proxy/pkg/flagset"
@@ -31,8 +31,8 @@ import (
 	"github.com/owncloud/ocis/proxy/pkg/proxy"
 	"github.com/owncloud/ocis/proxy/pkg/server/debug"
 	proxyHTTP "github.com/owncloud/ocis/proxy/pkg/server/http"
-	settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
-	storepb "github.com/owncloud/ocis-store/pkg/proto/v0"
+	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
+	storepb "github.com/owncloud/ocis/store/pkg/proto/v0"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"
 	"golang.org/x/oauth2"

proxy/pkg/crypto/gencert.go

@@ -12,7 +12,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
 func publicKey(priv interface{}) interface{} {

proxy/pkg/middleware/account_uuid.go

@@ -11,10 +11,10 @@ import (
 	revauser "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
 	"github.com/cs3org/reva/pkg/token/manager/jwt"
-	acc "github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-pkg/v2/oidc"
-	settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
+	acc "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/owncloud/ocis/ocis-pkg/oidc"
+	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
 )
 
 func getAccount(l log.Logger, ac acc.AccountsService, query string) (account *acc.Account, status int) {

proxy/pkg/middleware/account_uuid_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 
 	"github.com/micro/go-micro/v2/client"
-	"github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-pkg/v2/oidc"
+	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/owncloud/ocis/ocis-pkg/oidc"
 	"github.com/owncloud/ocis/proxy/pkg/config"
-	settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
+	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
 )
 
 // TODO testing the getAccount method should inject a cache

proxy/pkg/middleware/create_home.go

@@ -9,7 +9,7 @@ import (
 	tokenpkg "github.com/cs3org/reva/pkg/token"
 	"github.com/cs3org/reva/pkg/token/manager/jwt"
 	"github.com/micro/go-micro/v2/errors"
-	"github.com/owncloud/ocis-accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"google.golang.org/grpc/metadata"
 )
 

proxy/pkg/middleware/openidconnect.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/coreos/go-oidc"
-	ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc"
+	ocisoidc "github.com/owncloud/ocis/ocis-pkg/oidc"
 	"github.com/owncloud/ocis/proxy/pkg/cache"
 	"golang.org/x/oauth2"
 )

proxy/pkg/middleware/openidconnect_test.go

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

proxy/pkg/middleware/options.go

@@ -1,14 +1,14 @@
 package middleware
 
 import (
-	settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
+	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
 	"net/http"
 
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
-	acc "github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	acc "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
-	storepb "github.com/owncloud/ocis-store/pkg/proto/v0"
+	storepb "github.com/owncloud/ocis/store/pkg/proto/v0"
 )
 
 // Option defines a single option function.

proxy/pkg/middleware/presigned_url.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
-	ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	ocisoidc "github.com/owncloud/ocis/ocis-pkg/oidc"
 	"github.com/owncloud/ocis/proxy/pkg/config"
-	storepb "github.com/owncloud/ocis-store/pkg/proto/v0"
+	storepb "github.com/owncloud/ocis/store/pkg/proto/v0"
 	"golang.org/x/crypto/pbkdf2"
 )
 

proxy/pkg/proxy/option.go

@@ -1,7 +1,7 @@
 package proxy
 
 import (
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 

proxy/pkg/proxy/policy/selector.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	"github.com/micro/go-micro/v2/client/grpc"
-	accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/oidc"
+	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/oidc"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 

proxy/pkg/proxy/policy/selector_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/micro/go-micro/v2/client"
-	"github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/oidc"
+	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/oidc"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 

proxy/pkg/proxy/proxy.go

@@ -12,7 +12,7 @@ import (
 	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
 	"go.opencensus.io/trace"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 

proxy/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 

proxy/pkg/server/debug/server.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/service/debug"
+	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/version"
 )

proxy/pkg/server/http/option.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/justinas/alice"
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/metrics"
 )

proxy/pkg/server/http/server.go

@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"os"
 
-	svc "github.com/owncloud/ocis-pkg/v2/service/http"
+	svc "github.com/owncloud/ocis/ocis-pkg/service/http"
 	"github.com/owncloud/ocis/proxy/pkg/crypto"
 	"github.com/owncloud/ocis/proxy/pkg/version"
 )