Rename getTokenWithHandler

1 files changed, 12 insertions, 2 deletions

diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index 589b52031a..18f79311a6 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -885,7 +885,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
     @synchronized(self) {
       self.isWaitingForToken = YES;
     }
-    [_callOptions.authTokenProvider getTokenWithHandler:^(NSString *token) {
+    void (^tokenHandler)(NSString *token) = ^(NSString *token) {
       @synchronized(self) {
         if (self.isWaitingForToken) {
           if (token) {
@@ -895,7 +895,17 @@ const char *kCFStreamVarName = "grpc_cfstream";
           self.isWaitingForToken = NO;
         }
       }
-    }];
+    };
+    id<GRPCAuthorizationProtocol> authTokenProvider = _callOptions.authTokenProvider;
+    if ([authTokenProvider respondsToSelector:@selector(provideTokenToHandler:)]) {
+      [_callOptions.authTokenProvider provideTokenToHandler:tokenHandler];
+    } else {
+      NSAssert([authTokenProvider respondsToSelector:@selector(getTokenWithHandler:)],
+               @"authTokenProvider has no usable method");
+      if ([authTokenProvider respondsToSelector:@selector(getTokenWithHandler:)]) {
+        [_callOptions.authTokenProvider getTokenWithHandler:tokenHandler];
+      }
+    }
   } else {
     [self startCallWithWriteable:writeable];
   }