Merge branch 'master' into remake-traces

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/server/http/server.go

@@ -2,6 +2,7 @@ package http
 
 import (
 	"github.com/asim/go-micro/v3"
+	chimiddleware "github.com/go-chi/chi/middleware"
 	graphMiddleware "github.com/owncloud/ocis/graph/pkg/middleware"
 	svc "github.com/owncloud/ocis/graph/pkg/service/v0"
 	"github.com/owncloud/ocis/graph/pkg/version"
@@ -28,7 +29,7 @@ func Server(opts ...Option) (http.Service, error) {
 		svc.Logger(options.Logger),
 		svc.Config(options.Config),
 		svc.Middleware(
-			middleware.RequestID,
+			chimiddleware.RequestID,
 			middleware.Version(
 				"graph",
 				version.String,

graph/pkg/service/v0/errorcode/errorcode.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/render"
-	"github.com/ascarter/requestid"
 	msgraph "github.com/owncloud/open-graph-api-go"
 )
 
@@ -72,13 +72,12 @@ func (e ErrorCode) Render(w http.ResponseWriter, r *http.Request, status int, ms
 		"date": time.Now().UTC().Format(time.RFC3339),
 		// TODO return client-request-id?
 	}
-	if id, ok := requestid.FromContext(r.Context()); ok {
-		innererror["request-id"] = id
-	}
+
+	innererror["request-id"] = middleware.GetReqID(r.Context())
 	resp := &msgraph.OdataError{
 		Error: msgraph.OdataErrorMain{
-			Code:    e.String(),
-			Message: msg,
+			Code:       e.String(),
+			Message:    msg,
 			Innererror: &innererror,
 		},
 	}

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")