Merge pull request #739 from scalecube/fix-bug-with-not-properly-prop…

…ageting-context Fixed bug with not preserving existing context
scalecube · May 14, 2020 · 324f8c9 · 324f8c9
2 parents 6378464 + 0bed53a
commit 324f8c9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java b/services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java
@@ -207,7 +207,7 @@ private Context newPrincipalContext(Object authData, Context context) {
       return context;
     }
     Object value = principalMapper.map(authData);
-    return Context.of(Authenticator.AUTH_CONTEXT_KEY, value);
+    return context.put(Authenticator.AUTH_CONTEXT_KEY, value);
   }
 
   public Object service() {

diff --git a/services-api/src/test/java/io/scalecube/services/methods/ServiceMethodInvokerTest.java b/services-api/src/test/java/io/scalecube/services/methods/ServiceMethodInvokerTest.java
@@ -331,7 +331,10 @@ void testAuthMethodWhenThereIsContextAndNoAuthenticator() throws Exception {
     StepVerifier.create(
             Mono.deferWithContext(context -> serviceMethodInvoker.invokeOne(message))
                 .subscriberContext(
-                    context -> context.put(Authenticator.AUTH_CONTEXT_KEY, AUTH_DATA)))
+                    context ->
+                        context
+                            .put(Authenticator.AUTH_CONTEXT_KEY, AUTH_DATA)
+                            .put("NON_AUTH_CONTEXT", "test")))
         .verifyComplete();
   }
 
@@ -377,7 +380,10 @@ void testAuthMethodWhenNoContextButThereIsAuthenticator() throws Exception {
     StepVerifier.create(
             Mono.deferWithContext(context -> serviceMethodInvoker.invokeOne(message))
                 .subscriberContext(
-                    context -> context.put(Authenticator.AUTH_CONTEXT_KEY, AUTH_DATA)))
+                    context ->
+                        context
+                            .put(Authenticator.AUTH_CONTEXT_KEY, AUTH_DATA)
+                            .put("NON_AUTH_CONTEXT", "test")))
         .verifyComplete();
   }
 }
diff --git a/services-api/src/test/java/io/scalecube/services/methods/StubServiceImpl.java b/services-api/src/test/java/io/scalecube/services/methods/StubServiceImpl.java
@@ -39,6 +39,8 @@ public Flux<String> throwException3(Flux<String> request) {
   @Override
   public Mono<Void> helloAuthContext() {
     return Mono.deferWithContext(
-        context -> Mono.fromRunnable(() -> context.get(Authenticator.AUTH_CONTEXT_KEY)));
+        context ->
+            Mono.fromRunnable(() -> context.get(Authenticator.AUTH_CONTEXT_KEY))
+                .then(Mono.fromRunnable(() -> context.get("NON_AUTH_CONTEXT"))));
   }
 }