Added withFreshTokensPerformActionWithAdditionalParameters to OIDAuth…

…State
openid · Nov 8, 2016 · e6acfd9 · e6acfd9
1 parent d01f30b
commit e6acfd9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Source/OIDAuthState.h b/Source/OIDAuthState.h
@@ -206,6 +206,16 @@ typedef void (^OIDAuthStateAuthorizationCallback)(OIDAuthState *_Nullable authSt
  */
 - (void)withFreshTokensPerformAction:(OIDAuthStateAction)action;
 
+/*! @fn performActionWithFreshTokens:additionalRefreshParameters:
+    @brief Calls the block with a valid access token (refreshing it first, if needed), or if a
+        refresh was needed and failed, with the error that caused it to fail.
+    @param action The block to execute with a fresh token. This block will be executed on the main thread.
+    @param additionalRefreshParameters Additional parameters for the token request if token is refreshed.
+
+ */
+- (void)performActionWithFreshTokens:(OIDAuthStateAction)action
+         additionalRefreshParameters:(nullable NSDictionary<NSString *, NSString *> *)additionalParameters;
+
 /*! @fn setNeedsTokenRefresh
     @brief Forces a token refresh the next time @c OIDAuthState.withFreshTokensPerformAction: is
         called, even if the current tokens are considered valid.

diff --git a/Source/OIDAuthState.m b/Source/OIDAuthState.m
@@ -408,6 +408,11 @@ - (void)setNeedsTokenRefresh {
 }
 
 - (void)withFreshTokensPerformAction:(OIDAuthStateAction)action {
+  [self performActionWithFreshTokens:action additionalRefreshParameters:nil];
+}
+
+- (void)performActionWithFreshTokens:(OIDAuthStateAction)action
+         additionalRefreshParameters:(nullable NSDictionary<NSString *, NSString *> *)additionalParameters {
   if (!_refreshToken) {
     [OIDErrorUtilities raiseException:kRefreshTokenRequestException];
   }
@@ -434,7 +439,8 @@ - (void)withFreshTokensPerformAction:(OIDAuthStateAction)action {
     }
 
     // refresh the tokens
-    OIDTokenRequest *tokenRefreshRequest = [self tokenRefreshRequest];
+    OIDTokenRequest *tokenRefreshRequest =
+        [self tokenRefreshRequestWithAdditionalParameters:additionalParameters];
     [OIDAuthorizationService performTokenRequest:tokenRefreshRequest
                                         callback:^(OIDTokenResponse *_Nullable response,
                                                    NSError *_Nullable error) {