refactor x-access-header

cs3org · Jan 14, 2020 · 3132c9d · 3132c9d
1 parent ff09fe4
commit 3132c9d
Show file tree

Hide file tree

Showing 42 changed files with 24 additions and 2,011 deletions.
diff --git a/cmd/reva/common.go b/cmd/reva/common.go
@@ -77,10 +77,6 @@ func readConfig() (*config, error) {
 }
 
 func writeConfig(c *config) error {
-	if c.AuthHeader == "" {
-		c.AuthHeader = "x-access-token"
-	}
-
 	data, err := json.Marshal(c)
 	if err != nil {
 		return err
@@ -89,8 +85,7 @@ func writeConfig(c *config) error {
 }
 
 type config struct {
-	Host       string `json:"host"`
-	AuthHeader string `json:"auth_header"`
+	Host string `json:"host"`
 }
 
 func read(r *bufio.Reader) (string, error) {

diff --git a/cmd/reva/gen/gen.go b/cmd/reva/gen/gen.go
@@ -104,13 +104,6 @@ skip_methods = ["/status.php"]
 [http.middlewares.auth.token_managers.jwt]
 secret = "{{.TokenSecret}}"
 
-[http.middlewares.auth.token_strategies.header]
-header = "X-Access-Token"
-
-[http.middlewares.auth.token_writers.header]
-header = "X-Access-Token"
-
-
 # GRPC interceptors
 
 [grpc.interceptors.trace]
@@ -126,15 +119,11 @@ priority = 300
 [grpc.interceptors.auth]
 priority = 400
 # keys for grpc metadata are always lowercase, so interceptors headers need to use lowercase.
-header = "x-access-token"
 token_strategy = "header"
 token_manager = "jwt"
 # GenerateAccessToken contains the credentials in the payload. Skip auth, otherwise services cannot obtain a token.
 skip_methods = ["/cs3.authproviderv1beta1.AuthService/GenerateAccessToken"]
 
-[grpc.interceptors.auth.token_strategies.header]
-header = "X-Access-Token"
-
 [grpc.interceptors.auth.token_managers.jwt]
 secret = "{{.TokenSecret}}"
 

diff --git a/cmd/reva/grpc.go b/cmd/reva/grpc.go
@@ -30,8 +30,6 @@ import (
 	"google.golang.org/grpc/metadata"
 )
 
-const defaultHeader = "x-access-token"
-
 func getAuthContext() context.Context {
 	ctx := context.Background()
 	// read token from file
@@ -41,7 +39,7 @@ func getAuthContext() context.Context {
 		return ctx
 	}
 	ctx = token.ContextSetToken(ctx, t)
-	ctx = metadata.AppendToOutgoingContext(ctx, defaultHeader, t)
+	ctx = metadata.AppendToOutgoingContext(ctx, token.TokenHeader, t)
 	return ctx
 }
 

diff --git a/docs/old/README.md b/docs/old/README.md
diff --git a/docs/old/_config.yml b/docs/old/_config.yml
diff --git a/docs/old/beginner-guide.md b/docs/old/beginner-guide.md
diff --git a/docs/old/building-reva.md b/docs/old/building-reva.md
diff --git a/docs/old/command-line.md b/docs/old/command-line.md
diff --git a/docs/old/config/core.md b/docs/old/config/core.md
diff --git a/docs/old/config/grpc.md b/docs/old/config/grpc.md