Adding dapr api token interceptor for durable task (dapr#963)

* adding dapr api token interceptor for durable task Signed-off-by: salaboy <Salaboy@gmail.com> * refactoring interceptor to internal package Signed-off-by: salaboy <Salaboy@gmail.com> * refactoring for codestyle Signed-off-by: salaboy <Salaboy@gmail.com> * adding file with correct caps Signed-off-by: salaboy <Salaboy@gmail.com> * Rename APITokenClientInterceptor.java to ApiTokenClientInterceptor.java Signed-off-by: salaboy <Salaboy@gmail.com> --------- Signed-off-by: salaboy <Salaboy@gmail.com>
skyao · Dec 12, 2023 · 0c7828e · 0c7828e
1 parent 4ef96e1
commit 0c7828e
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 21 deletions.
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java b/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
@@ -21,6 +21,7 @@
 import io.dapr.config.Properties;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
+import io.dapr.workflows.internal.ApiTokenClientInterceptor;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
@@ -262,25 +263,6 @@ public void close() throws InterruptedException {
     }
   }
 
-  private static ClientInterceptor WORKFLOW_INTERCEPTOR = new ClientInterceptor() {
-    @Override
-    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
-        MethodDescriptor<ReqT, RespT> methodDescriptor,
-        CallOptions options,
-        Channel channel) {
-      // TBD: do we need timeout in workflow client?
-      ClientCall<ReqT, RespT> clientCall = channel.newCall(methodDescriptor, options);
-      return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(clientCall) {
-        @Override
-        public void start(final Listener<RespT> responseListener, final Metadata metadata) {
-          String daprApiToken = Properties.API_TOKEN.get();
-          if (daprApiToken != null) {
-            metadata.put(Metadata.Key.of(Headers.DAPR_API_TOKEN, Metadata.ASCII_STRING_MARSHALLER), daprApiToken);
-          }
-          super.start(responseListener, metadata);
-        }
-      };
-    }
-  };
+  private static ClientInterceptor WORKFLOW_INTERCEPTOR = new ApiTokenClientInterceptor();
 }
 
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/internal/ApiTokenClientInterceptor.java b/sdk-workflows/src/main/java/io/dapr/workflows/internal/ApiTokenClientInterceptor.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.workflows.internal;
+
+import io.dapr.client.Headers;
+import io.dapr.config.Properties;
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+
+public class ApiTokenClientInterceptor implements ClientInterceptor {
+  @Override
+  public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+            MethodDescriptor<ReqT, RespT> methodDescriptor,
+            CallOptions options,
+            Channel channel) {
+    // TBD: do we need timeout in workflow client?
+    ClientCall<ReqT, RespT> clientCall = channel.newCall(methodDescriptor, options);
+    return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(clientCall) {
+        @Override
+        public void start(final Listener<RespT> responseListener, final Metadata metadata) {
+            String daprApiToken = Properties.API_TOKEN.get();
+            if (daprApiToken != null) {
+              metadata.put(Metadata.Key.of(Headers.DAPR_API_TOKEN, Metadata.ASCII_STRING_MARSHALLER), daprApiToken);
+            }
+            super.start(responseListener, metadata);
+        }
+    };
+  }
+}
+
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
@@ -16,13 +16,17 @@
 import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
+import io.dapr.workflows.internal.ApiTokenClientInterceptor;
+import io.grpc.ClientInterceptor;
 
 public class WorkflowRuntimeBuilder {
   private static volatile WorkflowRuntime instance;
   private DurableTaskGrpcWorkerBuilder builder;
+  private static ClientInterceptor WORKFLOW_INTERCEPTOR = new ApiTokenClientInterceptor();
 
   public WorkflowRuntimeBuilder() {
-    this.builder = new DurableTaskGrpcWorkerBuilder().grpcChannel(NetworkUtils.buildGrpcManagedChannel());
+    this.builder = new DurableTaskGrpcWorkerBuilder().grpcChannel(
+                          NetworkUtils.buildGrpcManagedChannel(WORKFLOW_INTERCEPTOR));
   }
 
   /**