Skip to content

Commit eb1fdf3

Browse files
committed
[App Check] Always return fresh limitedUseToken
Potential fix for #11270 (comment)
1 parent 16baf44 commit eb1fdf3

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

FirebaseAppCheck/Sources/Core/FIRAppCheck.m

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ @interface FIRAppCheck () <FIRAppCheckInterop>
7272
@property(nonatomic, readonly, nullable) id<FIRAppCheckTokenRefresherProtocol> tokenRefresher;
7373

7474
@property(nonatomic, nullable) FBLPromise<FIRAppCheckToken *> *ongoingRetrieveOrRefreshTokenPromise;
75-
@property(nonatomic, nullable) FBLPromise<FIRAppCheckToken *> *ongoingLimitedUseTokenPromise;
7675
@end
7776

7877
@implementation FIRAppCheck
@@ -180,7 +179,7 @@ - (void)tokenForcingRefresh:(BOOL)forcingRefresh
180179

181180
- (void)limitedUseTokenWithCompletion:(void (^)(FIRAppCheckToken *_Nullable token,
182181
NSError *_Nullable error))handler {
183-
[self retrieveLimitedUseToken]
182+
[self limitedUseToken]
184183
.then(^id _Nullable(FIRAppCheckToken *token) {
185184
handler(token, nil);
186185
return token;
@@ -314,26 +313,6 @@ - (nonnull NSString *)notificationTokenKey {
314313
});
315314
}
316315

317-
- (FBLPromise<FIRAppCheckToken *> *)retrieveLimitedUseToken {
318-
return [FBLPromise do:^id _Nullable {
319-
if (self.ongoingLimitedUseTokenPromise == nil) {
320-
// Kick off a new operation only when there is not an ongoing one.
321-
self.ongoingLimitedUseTokenPromise =
322-
[self limitedUseToken]
323-
// Release the ongoing operation promise on completion.
324-
.then(^FIRAppCheckToken *(FIRAppCheckToken *token) {
325-
self.ongoingLimitedUseTokenPromise = nil;
326-
return token;
327-
})
328-
.recover(^NSError *(NSError *error) {
329-
self.ongoingLimitedUseTokenPromise = nil;
330-
return error;
331-
});
332-
}
333-
return self.ongoingLimitedUseTokenPromise;
334-
}];
335-
}
336-
337316
- (FBLPromise<FIRAppCheckToken *> *)refreshToken {
338317
return [FBLPromise
339318
wrapObjectOrErrorCompletion:^(FBLPromiseObjectOrErrorCompletion _Nonnull handler) {

0 commit comments

Comments
 (0)