update reva to ec4099da

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

graph/pkg/middleware/auth.go

@@ -4,9 +4,8 @@ import (
 	"net/http"
 
 	"github.com/cs3org/reva/pkg/auth/scope"
-	"github.com/cs3org/reva/pkg/token"
+	revactx "github.com/cs3org/reva/pkg/ctx"
 	"github.com/cs3org/reva/pkg/token/manager/jwt"
-	"github.com/cs3org/reva/pkg/user"
 	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/ocis-pkg/account"
 	"google.golang.org/grpc/metadata"
@@ -68,9 +67,9 @@ func Auth(opts ...account.Option) func(http.Handler) http.Handler {
 				return
 			}
 
-			ctx = token.ContextSetToken(ctx, t)
-			ctx = user.ContextSetUser(ctx, u)
-			ctx = metadata.AppendToOutgoingContext(ctx, token.TokenHeader, t)
+			ctx = revactx.ContextSetToken(ctx, t)
+			ctx = revactx.ContextSetUser(ctx, u)
+			ctx = metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, t)
 
 			next.ServeHTTP(w, r.WithContext(ctx))
 		})

graph/pkg/service/v0/users.go

@@ -6,7 +6,7 @@ import (
 
 	cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
-	"github.com/cs3org/reva/pkg/user"
+	revactx "github.com/cs3org/reva/pkg/ctx"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/render"
 	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
@@ -63,7 +63,7 @@ func (g Graph) UserCtx(next http.Handler) http.Handler {
 // GetMe implements the Service interface.
 func (g Graph) GetMe(w http.ResponseWriter, r *http.Request) {
 
-	u, ok := user.ContextGetUser(r.Context())
+	u, ok := revactx.ContextGetUser(r.Context())
 	if !ok {
 		g.logger.Error().Msg("user not in context")
 		errorcode.ServiceNotAvailable.Render(w, r, http.StatusInternalServerError, "user not in context")