Various fixes

Author: ncooke3

FirebaseAuth/Sources/Swift/Backend/RPC/CreateAuthURIRequest.swift

@@ -48,7 +48,7 @@ class CreateAuthURIRequest: IdentityToolkitRequest, AuthRPCRequest {
   typealias Response = CreateAuthURIResponse
 
   /// The email or federated ID of the user.
-  private let identifier: String
+  let identifier: String
 
   /// The URI to which the IDP redirects the user after the federated login flow.
   private let continueURI: String

FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift

@@ -110,7 +110,7 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
   private let requestType: GetOOBConfirmationCodeRequestType
 
   /// The email of the user for password reset.
-  private let email: String?
+  let email: String?
 
   /// The new email to be updated for verifyBeforeUpdateEmail.
   private let updatedEmail: String?
@@ -119,7 +119,7 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
   private let accessToken: String?
 
   /// This URL represents the state/Continue URL in the form of a universal link.
-  private let continueURL: String?
+  let continueURL: String?
 
   /// The iOS bundle Identifier, if available.
   private let iOSBundleID: String?
@@ -135,16 +135,16 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
 
   /// Indicates whether the action code link will open the app directly or after being
   ///   redirected from a Firebase owned web widget.
-  private let handleCodeInApp: Bool
+  let handleCodeInApp: Bool
 
   /// The Firebase Dynamic Link domain used for out of band code flow.
   private let dynamicLinkDomain: String?
 
   /// Response to the captcha.
-  private(set) var captchaResponse: String?
+  var captchaResponse: String?
 
   /// The reCAPTCHA version.
-  private(set) var recaptchaVersion: String?
+  var recaptchaVersion: String?
 
   /// Designated initializer.
   /// - Parameter requestType: The types of OOB Confirmation Code to request.

FirebaseAuth/Sources/Swift/Backend/RPC/RevokeTokenRequest.swift

@@ -37,13 +37,13 @@ class RevokeTokenRequest: IdentityToolkitRequest, AuthRPCRequest {
   typealias Response = RevokeTokenResponse
 
   /// The provider that issued the token to revoke.
-  private let providerID: String
+  let providerID: String
 
   /// The type of the token to revoke.
-  private let tokenType: TokenType
+  let tokenType: TokenType
 
   /// The token to be revoked.
-  private let token: String
+  let token: String
 
   /// The ID Token associated with this credential.
   private let idToken: String

FirebaseAuth/Sources/Swift/Backend/RPC/SetAccountInfoRequest.swift

@@ -89,7 +89,7 @@ class SetAccountInfoRequest: IdentityToolkitRequest, AuthRPCRequest {
   var displayName: String?
 
   /// The local ID of the user.
-  private let localID: String? = nil
+  var localID: String? = nil
 
   /// The email of the user.
   var email: String? = nil
@@ -101,37 +101,38 @@ class SetAccountInfoRequest: IdentityToolkitRequest, AuthRPCRequest {
   var password: String? = nil
 
   /// The associated identity providers of the user.
-  private let providers: [String]? = nil
+  var providers: [String]? = nil
 
   /// The out-of-band code of the change email request.
   var oobCode: String?
 
   /// Whether to mark the email as verified or not.
-  private let emailVerified: Bool = false
+  var emailVerified: Bool = false
 
   /// Whether to mark the user to upgrade to federated login.
-  private let upgradeToFederatedLogin: Bool = false
+  var upgradeToFederatedLogin: Bool = false
 
   /// The captcha challenge.
-  private let captchaChallenge: String? = nil
+  var captchaChallenge: String? = nil
 
   /// Response to the captcha.
-  private let captchaResponse: String? = nil
+  var captchaResponse: String? = nil
 
   /// The list of user attributes to delete.
   ///
   /// Every element of the list must be one of the predefined constant starts with
   /// `SetAccountInfoUserAttribute`.
-  private let deleteAttributes: [String]? = nil
+  var deleteAttributes: [String]? = nil
 
   /// The list of identity providers to delete.
   var deleteProviders: [String]?
 
   /// Whether the response should return access token and refresh token directly.
   /// The default value is `true` .
-  private let returnSecureToken: Bool = true
+  var returnSecureToken: Bool = true
 
-  init(requestConfiguration: AuthRequestConfiguration) {
+  init(accessToken: String? = nil, requestConfiguration: AuthRequestConfiguration) {
+    self.accessToken = accessToken
     super.init(endpoint: kSetAccountInfoEndpoint, requestConfiguration: requestConfiguration)
   }
 

FirebaseAuth/Sources/Swift/User/UserProfileUpdate.swift

@@ -49,8 +49,9 @@ actor UserProfileUpdate {
 
   func unlink(user: User, fromProvider provider: String) async throws -> User {
     let accessToken = try await user.internalGetTokenAsync()
-    let request = SetAccountInfoRequest(requestConfiguration: user.requestConfiguration)
-    request.accessToken = accessToken
+    let request = SetAccountInfoRequest(
+      accessToken: accessToken, requestConfiguration: user.requestConfiguration
+    )
 
     if user.providerDataRaw[provider] == nil {
       throw AuthErrorUtils.noSuchProviderError()
@@ -108,8 +109,10 @@ actor UserProfileUpdate {
 
     // Mutate setAccountInfoRequest in block
     let setAccountInfoRequest =
-      SetAccountInfoRequest(requestConfiguration: user.requestConfiguration)
-    setAccountInfoRequest.accessToken = accessToken
+      SetAccountInfoRequest(
+        accessToken: accessToken,
+        requestConfiguration: user.requestConfiguration
+      )
     changeBlock(userAccountInfo, setAccountInfoRequest)
     do {
       let accountInfoResponse = try await AuthBackend.call(with: setAccountInfoRequest)

FirebaseAuth/Tests/Unit/SetAccountInfoTests.swift

@@ -221,6 +221,6 @@ class SetAccountInfoTests: RPCBaseTests {
   }
 
   private func setAccountInfoRequest() -> SetAccountInfoRequest {
-    return SetAccountInfoRequest(requestConfiguration: makeRequestConfiguration())
+    return SetAccountInfoRequest(accessToken: nil, requestConfiguration: makeRequestConfiguration())
   }
 }