From 268d7eb42bd9d01cfd1e662e9dbfbc7e68f9ed58 Mon Sep 17 00:00:00 2001
From: Bert Van Hauwaert <bert.vanhauwaert@showpad.com>
Date: Thu, 29 Aug 2024 15:30:07 +0200
Subject: [PATCH] Provide the method_name for the CallCredentials callback
 generateMetadata

---
 packages/grpc-js/src/call-credentials.ts       | 1 +
 packages/grpc-js/src/load-balancing-call.ts    | 2 +-
 packages/grpc-js/test/test-call-credentials.ts | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/grpc-js/src/call-credentials.ts b/packages/grpc-js/src/call-credentials.ts
index b0013eeae..a9afe4ae3 100644
--- a/packages/grpc-js/src/call-credentials.ts
+++ b/packages/grpc-js/src/call-credentials.ts
@@ -18,6 +18,7 @@
 import { Metadata } from './metadata';
 
 export interface CallMetadataOptions {
+  method_name: string;
   service_url: string;
 }
 
diff --git a/packages/grpc-js/src/load-balancing-call.ts b/packages/grpc-js/src/load-balancing-call.ts
index 764769753..2b23ff7f9 100644
--- a/packages/grpc-js/src/load-balancing-call.ts
+++ b/packages/grpc-js/src/load-balancing-call.ts
@@ -162,7 +162,7 @@ export class LoadBalancingCall implements Call, DeadlineInfoProvider {
     switch (pickResult.pickResultType) {
       case PickResultType.COMPLETE:
         this.credentials
-          .generateMetadata({ service_url: this.serviceUrl })
+          .generateMetadata({ method_name: this.methodName, service_url: this.serviceUrl })
           .then(
             credsMetadata => {
               /* If this call was cancelled (e.g. by the deadline) before
diff --git a/packages/grpc-js/test/test-call-credentials.ts b/packages/grpc-js/test/test-call-credentials.ts
index 007ed4847..0a6827274 100644
--- a/packages/grpc-js/test/test-call-credentials.ts
+++ b/packages/grpc-js/test/test-call-credentials.ts
@@ -87,6 +87,7 @@ describe('CallCredentials', () => {
         generateFromServiceURL
       );
       const metadata: Metadata = await callCredentials.generateMetadata({
+        method_name: 'bar',
         service_url: 'foo',
       });
 
@@ -98,7 +99,7 @@ describe('CallCredentials', () => {
         CallCredentials.createFromMetadataGenerator(generateWithError);
       let metadata: Metadata | null = null;
       try {
-        metadata = await callCredentials.generateMetadata({ service_url: '' });
+        metadata = await callCredentials.generateMetadata({ method_name: '', service_url: '' });
       } catch (err) {
         assert.ok(err instanceof Error);
       }
@@ -139,6 +140,7 @@ describe('CallCredentials', () => {
         testCases.map(async testCase => {
           const { credentials, expected } = testCase;
           const metadata: Metadata = await credentials.generateMetadata({
+            method_name: '',
             service_url: '',
           });