Inject Namespace into Context

auth/auth.go

@@ -133,3 +133,11 @@ func ContextWithAccount(ctx context.Context, account *Account) (context.Context,
 	// generate a new context with the MetadataKey set
 	return metadata.Set(ctx, MetadataKey, string(bytes)), nil
 }
+
+// NamespaceFromContext gets the namespace from the context
+func NamespaceFromContext(ctx context.Context) string {
+	if ns, ok := metadata.Get(ctx, NamespaceKey); ok {
+		return ns
+	}
+	return DefaultNamespace
+}

auth/default.go

@@ -9,7 +9,7 @@ var (
 )
 
 func NewAuth(opts ...Option) Auth {
-	return &noop{}
+	return &noop{opts: NewOptions(opts...)}
 }
 
 type noop struct {

auth/options.go

@@ -7,6 +7,19 @@ import (
 	"github.com/micro/go-micro/v2/store"
 )
 
+func NewOptions(opts ...Option) Options {
+	var options Options
+	for _, o := range opts {
+		o(&options)
+	}
+
+	if len(options.Namespace) == 0 {
+		options.Namespace = DefaultNamespace
+	}
+
+	return options
+}
+
 type Options struct {
 	// Namespace the service belongs to
 	Namespace string

auth/service/service.go

@@ -18,9 +18,7 @@ import (
 
 // NewAuth returns a new instance of the Auth service
 func NewAuth(opts ...auth.Option) auth.Auth {
-	svc := new(svc)
+	return &svc{options: auth.NewOptions(opts...)}
-	svc.Init(opts...)
-	return svc
 }
 
 // svc is the service implementation of the Auth interface

util/wrapper/wrapper.go

@@ -159,7 +159,7 @@ func AuthHandler(fn func() auth.Auth) server.HandlerWrapper {
 			// Inspect the token and get the account
 			account, err := a.Inspect(token)
 			if err != nil {
-				account = &auth.Account{}
+				account = &auth.Account{Namespace: a.Options().Namespace}
 			}
 
 			// construct the resource
@@ -183,6 +183,11 @@ func AuthHandler(fn func() auth.Auth) server.HandlerWrapper {
 				return err
 			}
 
+			// Set the namespace in the context
+			if _, ok := metadata.Get(ctx, auth.NamespaceKey); !ok {
+				ctx = metadata.Set(ctx, auth.NamespaceKey, a.Options().Namespace)
+			}
+
 			// The user is authorised, allow the call
 			return h(ctx, req, rsp)
 		}