Merge pull request #108 from FirebasePrivate/fix_secure_token_crash

Fixes FIRSecureToken Crash

Author: protocol86

Firebase/Auth/Source/FIRSecureTokenService.m

@@ -20,9 +20,12 @@
 #import "FIRAuthKeychain.h"
 #import "FIRAuthSerialTaskQueue.h"
 #import "FIRAuthBackend.h"
+#import "FIRAuthRequestConfiguration.h"
 #import "FIRSecureTokenRequest.h"
 #import "FIRSecureTokenResponse.h"
 
+@class FIRAuthRequestConfiguration;
+
 /** @var kAPIKeyCodingKey
     @brief The key used to encode the APIKey for NSSecureCoding.
  */
@@ -57,10 +60,10 @@ - (nullable instancetype)initWithAPIKey:(NSString *)APIKey NS_DESIGNATED_INITIAL
 @end
 
 @implementation FIRSecureTokenService {
-  /** @var _APIKey
-      @brief A Google API key for making Secure Token Service requests.
+  /** @var _requestConfiguration
+      @brief Contains configuration relevant to the request.
    */
-  NSString *_APIKey;
+  FIRAuthRequestConfiguration *_requestConfiguration;
 
   /** @var _taskQueue
       @brief Used to serialize all requests for access tokens.
@@ -86,7 +89,7 @@ - (instancetype)init {
 - (nullable instancetype)initWithAPIKey:(NSString *)APIKey {
   self = [super init];
   if (self) {
-    _APIKey = [APIKey copy];
+    _requestConfiguration = [[FIRAuthRequestConfiguration alloc] initWithAPIKey:APIKey];
     _taskQueue = [[FIRAuthSerialTaskQueue alloc] init];
   }
   return self;
@@ -160,7 +163,7 @@ - (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 }
 
 - (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:_APIKey forKey:kAPIKeyCodingKey];
+  [aCoder encodeObject:_requestConfiguration.APIKey forKey:kAPIKeyCodingKey];
   // Authorization code is not encoded because it is not long-lived.
   [aCoder encodeObject:_refreshToken forKey:kRefreshTokenKey];
   [aCoder encodeObject:_accessToken forKey:kAccessTokenKey];
@@ -184,9 +187,11 @@ - (void)encodeWithCoder:(NSCoder *)aCoder {
 - (void)requestAccessToken:(FIRFetchAccessTokenCallback)callback {
   FIRSecureTokenRequest *request;
   if (_refreshToken.length) {
-    request = [FIRSecureTokenRequest refreshRequestWithRefreshToken:_refreshToken APIKey:_APIKey];
+    request = [FIRSecureTokenRequest refreshRequestWithRefreshToken:_refreshToken
+                                               requestConfiguration:_requestConfiguration];
   } else {
-    request = [FIRSecureTokenRequest authCodeRequestWithCode:_authorizationCode APIKey:_APIKey];
+    request = [FIRSecureTokenRequest authCodeRequestWithCode:_authorizationCode
+                                        requestConfiguration:_requestConfiguration];
   }
   [FIRAuthBackend secureToken:request
                      callback:^(FIRSecureTokenResponse *_Nullable response,

Firebase/Auth/Source/RPCs/FIRSecureTokenRequest.h

@@ -71,19 +71,22 @@ typedef NS_ENUM(NSUInteger, FIRSecureTokenRequestGrantType) {
 /** @fn authCodeRequestWithCode:
     @brief Creates an authorization code request with the given code (legacy Gitkit "ID Token").
     @param code The authorization code (legacy Gitkit "ID Token").
-    @param APIKey The client's API Key.
+    @param requestConfiguration An object containing configurations to be added to the request.
     @return An authorization request.
  */
-+ (FIRSecureTokenRequest *)authCodeRequestWithCode:(NSString *)code APIKey:(NSString *)APIKey;
++ (FIRSecureTokenRequest *)authCodeRequestWithCode:(NSString *)code
+                              requestConfiguration:(FIRAuthRequestConfiguration *)
+                                  requestConfiguration;
 
 /** @fn refreshRequestWithCode:
     @brief Creates a refresh request with the given refresh token.
     @param refreshToken The refresh token.
-    @param APIKey The client's API Key.
+    @param requestConfiguration An object containing configurations to be added to the request.
     @return A refresh request.
  */
 + (FIRSecureTokenRequest *)refreshRequestWithRefreshToken:(NSString *)refreshToken
-                                                   APIKey:(NSString *)APIKey;
+                                            requestConfiguration:(FIRAuthRequestConfiguration *)
+                                                requestConfiguration;
 
 /** @fn init
     @brief Please use initWithGrantType:scope:refreshToken:code:
@@ -96,13 +99,14 @@ typedef NS_ENUM(NSUInteger, FIRSecureTokenRequestGrantType) {
     @param scope The scopes requested.
     @param refreshToken The client's refresh token (for refresh requests.)
     @param code The client's authorization code (Gitkit ID Token) (for authorization code requests.)
-    @param APIKey The client's API Key.
+    @param requestConfiguration An object containing configurations to be added to the request.
  */
 - (nullable instancetype)initWithGrantType:(FIRSecureTokenRequestGrantType)grantType
                                      scope:(nullable NSString *)scope
                               refreshToken:(nullable NSString *)refreshToken
                                       code:(nullable NSString *)code
-                                    APIKey:(NSString *)APIKey NS_DESIGNATED_INITIALIZER;
+                      requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration
+                          NS_DESIGNATED_INITIALIZER;
 
 @end
 

Firebase/Auth/Source/RPCs/FIRSecureTokenRequest.m

@@ -15,6 +15,7 @@
  */
 
 #import "FIRSecureTokenRequest.h"
+#import "FIRAuthRequestConfiguration.h"
 
 /** @var kFIRSecureTokenServiceGetTokenURLFormat
     @brief The format of the secure token service URLs. Requires string format substitution with
@@ -57,23 +58,31 @@
  */
 static NSString *gAPIHost = @"securetoken.googleapis.com";
 
-@implementation FIRSecureTokenRequest
+@implementation FIRSecureTokenRequest {
+  /** @var _requestConfiguration
+      @brief Contains configuration relevant to the request.
+   */
+  FIRAuthRequestConfiguration *_requestConfiguration;
+}
 
-+ (FIRSecureTokenRequest *)authCodeRequestWithCode:(NSString *)code APIKey:(NSString *)APIKey {
++ (FIRSecureTokenRequest *)authCodeRequestWithCode:(NSString *)code
+                                     requestConfiguration:(FIRAuthRequestConfiguration *)
+                                         requestConfiguration {
   return [[self alloc] initWithGrantType:FIRSecureTokenRequestGrantTypeAuthorizationCode
                                    scope:nil
                             refreshToken:nil
                                     code:code
-                                  APIKey:APIKey];
+                    requestConfiguration:requestConfiguration];
 }
 
 + (FIRSecureTokenRequest *)refreshRequestWithRefreshToken:(NSString *)refreshToken
-                                                   APIKey:(NSString *)APIKey {
+                                     requestConfiguration:(FIRAuthRequestConfiguration *)
+                                         requestConfiguration {
   return [[self alloc] initWithGrantType:FIRSecureTokenRequestGrantTypeRefreshToken
                                    scope:nil
                             refreshToken:refreshToken
                                     code:nil
-                                  APIKey:APIKey];
+                    requestConfiguration:requestConfiguration];
 }
 
 /** @fn grantTypeStringWithGrantType:
@@ -93,18 +102,23 @@ - (nullable instancetype)initWithGrantType:(FIRSecureTokenRequestGrantType)grant
                                      scope:(nullable NSString *)scope
                               refreshToken:(nullable NSString *)refreshToken
                                       code:(nullable NSString *)code
-                                    APIKey:(NSString *)APIKey {
+                      requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
   self = [super init];
   if (self) {
     _grantType = grantType;
     _scope = [scope copy];
     _refreshToken = [refreshToken copy];
     _code = [code copy];
-    _APIKey = [APIKey copy];
+    _APIKey = [requestConfiguration.APIKey copy];
+    _requestConfiguration = requestConfiguration;
   }
   return self;
 }
 
+- (FIRAuthRequestConfiguration *)requestConfiguration {
+  return _requestConfiguration;
+}
+
 - (NSURL *)requestURL {
   NSString *URLString =
       [NSString stringWithFormat:kFIRSecureTokenServiceGetTokenURLFormat, gAPIHost, _APIKey];