aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/objective-c/GRPCClient/GRPCCall.m
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2018-12-19 09:16:26 -0800
committerGravatar Muxi Yan <mxyan@google.com>2018-12-19 09:16:26 -0800
commit25e73664136ea01e2b8a64149a97e782c57d9f7d (patch)
tree17890f21ecbc91416390c33e50d29a39e4d84148 /src/objective-c/GRPCClient/GRPCCall.m
parent3f57e3451bf4a3687e70e92fc218ea25ff7a17c9 (diff)
Revert "Rename getTokenWithHandler"
Since the renamed protocol is breaking people and is not general enough, we revert the rename and leave the work to interceptor This reverts commit 92db5fc72488f9d62b81ee311a79832df787f3ef.
Diffstat (limited to 'src/objective-c/GRPCClient/GRPCCall.m')
-rw-r--r--src/objective-c/GRPCClient/GRPCCall.m14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index 39e4967ec9..9bcacac0df 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;
}
- void (^tokenHandler)(NSString *token) = ^(NSString *token) {
+ [_callOptions.authTokenProvider getTokenWithHandler:^(NSString *token) {
@synchronized(self) {
if (self.isWaitingForToken) {
if (token) {
@@ -895,17 +895,7 @@ 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];
}