fix auth header bug and pass request metadata to interceptors

momentohq · Aug 14, 2024 · 8a23641 · 8a23641
1 parent 077a2ae
commit 8a23641
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/packages/client-sdk-nodejs/src/config/retry/eligibility-strategy.ts b/packages/client-sdk-nodejs/src/config/retry/eligibility-strategy.ts
@@ -1,9 +1,10 @@
-import {StatusObject} from '@grpc/grpc-js';
+import {Metadata, StatusObject} from '@grpc/grpc-js';
 import {ClientMethodDefinition} from '@grpc/grpc-js/build/src/make-client';
 
 export interface EligibleForRetryProps {
   grpcStatus: StatusObject;
   grpcRequest: ClientMethodDefinition<unknown, unknown>;
+  requestMetadata?: Metadata;
 }
 
 export interface EligibilityStrategy {

diff --git a/packages/client-sdk-nodejs/src/config/retry/retry-strategy.ts b/packages/client-sdk-nodejs/src/config/retry/retry-strategy.ts
@@ -1,10 +1,11 @@
-import {StatusObject} from '@grpc/grpc-js';
+import {Metadata, StatusObject} from '@grpc/grpc-js';
 import {ClientMethodDefinition} from '@grpc/grpc-js/build/src/make-client';
 
 export interface DeterminewhenToRetryRequestProps {
   grpcStatus: StatusObject;
   grpcRequest: ClientMethodDefinition<unknown, unknown>;
   attemptNumber: number;
+  requestMetadata?: Metadata;
 }
 
 export interface RetryStrategy {

diff --git a/packages/client-sdk-nodejs/src/internal/grpc/headers-interceptor.ts b/packages/client-sdk-nodejs/src/internal/grpc/headers-interceptor.ts
@@ -36,9 +36,9 @@ export class HeaderInterceptorProvider {
     return (options, nextCall) => {
       return new InterceptingCall(nextCall(options), {
         start: (metadata, listener, next) => {
-          this.headersToAddEveryTime.forEach(h =>
-            metadata.add(h.name, h.value)
-          );
+          this.headersToAddEveryTime.forEach(h => {
+            metadata.set(h.name, h.value);
+          });
           if (!this.areOnlyOnceHeadersSent) {
             this.areOnlyOnceHeadersSent = true;
             this.headersToAddOnce.forEach(h => metadata.add(h.name, h.value));

diff --git a/packages/client-sdk-nodejs/src/internal/grpc/retry-interceptor.ts b/packages/client-sdk-nodejs/src/internal/grpc/retry-interceptor.ts
@@ -82,6 +82,7 @@ export class RetryInterceptor {
                         grpcStatus: status,
                         grpcRequest: options.method_definition,
                         attemptNumber: attempts,
+                        requestMetadata: metadata,
                       });
 
                     if (whenToRetry === null) {