Import additional changes in FirebaseAppDistributionInternal (#10950)

Author: tejasd

FirebaseAppDistributionInternal/Sources/ApiService.swift

@@ -500,7 +500,7 @@ struct CreateFeedbackReportRequest: Codable {
     request.setValue(authTokenResult.authToken, forHTTPHeaderField: Strings.installationsAuthHeader)
     request.setValue(
       app.options.apiKey,
-      forHTTPHeaderField: Strings.installationsAuthHeader
+      forHTTPHeaderField: Strings.apiHeaderKey
     )
     request.setValue(Bundle.main.bundleIdentifier, forHTTPHeaderField: Strings.apiBundleKey)
     return request

FirebaseAppDistributionInternal/Sources/FeedbackViewController.swift

@@ -18,18 +18,29 @@ class FeedbackViewController: UIViewController {
   // TODO: Consider the situations where this instance is initiated once, and used
   // multiple times.
   var viewDidDisappearCallback: () -> Void = {}
+  // (TODO) Can we make feedbackName and additionalFormText non-null?
+  var releaseName: String?
+  var additionalFormText: String?
   var image: UIImage?
-  var additionalInfo: String?
 
   @IBOutlet var screenshotUIImageView: UIImageView!
-  @IBOutlet var additionalInfoLabel: UILabel!
+  @IBOutlet var additionalFormTextLabel: UILabel!
   @IBOutlet var feedbackTextView: UITextView!
-
   @IBOutlet var navigationBar: UINavigationBar!
 
   override func viewDidLoad() {
     super.viewDidLoad()
     // Do any additional setup after loading the view.
+
+    let additionalFormText = additionalFormText
+    if additionalFormText != nil {
+      additionalFormTextLabel.text = additionalFormText
+    }
+
+    let image = image
+    if image != nil {
+      screenshotUIImageView.image = image
+    }
   }
 
   override func viewWillAppear(_ animated: Bool) {

FirebaseAppDistributionInternal/Sources/InAppFeedback.swift

@@ -17,9 +17,13 @@ import UIKit
 import Photos
 
 @objc(FIRFADInAppFeedback) open class InAppFeedback: NSObject {
-  @objc(feedbackViewControllerWithImage:onDismiss:) public static func feedbackViewController(image: UIImage?,
-                                                                                              onDismiss: @escaping ()
-                                                                                                -> Void)
+  @objc(
+    feedbackViewControllerWithAdditionalFormText:releaseName:image:onDismiss:
+  ) public static func feedbackViewController(additionalFormText: String,
+                                              releaseName: String,
+                                              image: UIImage?,
+                                              onDismiss: @escaping ()
+                                                -> Void)
     -> UIViewController {
     // TODO: Add the additionalInfoText parameter.
     let frameworkBundle = Bundle(for: self)
@@ -37,8 +41,10 @@ import Photos
     let vc: FeedbackViewController = storyboard
       .instantiateViewController(withIdentifier: "fir-ad-iaf") as! FeedbackViewController
 
-    vc.viewDidDisappearCallback = onDismiss
+    vc.additionalFormText = additionalFormText
+    vc.releaseName = releaseName
     vc.image = image
+    vc.viewDidDisappearCallback = onDismiss
 
     return vc
   }

FirebaseAppDistributionInternal/Tests/Unit/AppDistributionApiServiceTests.swift renamed to FirebaseAppDistributionInternal/Tests/Unit/ApiServiceTests.swift

@@ -18,7 +18,7 @@ import FirebaseCore
 @testable import FirebaseInstallations
 @testable import FirebaseAppDistributionInternal
 
-class AppDistributionApiServiceTests: XCTestCase {
+class ApiServiceTests: XCTestCase {
   override class func setUp() {
     let options = FirebaseOptions(
       googleAppID: "0:0000000000000:ios:0000000000000000",
@@ -38,7 +38,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Generate auth token succeeds")
 
-    AppDistributionApiService.generateAuthToken(
+    ApiService.generateAuthToken(
       installations: installations,
       completion: { identifier, authTokenResult, error in
         XCTAssertNotNil(identifier)
@@ -56,7 +56,7 @@ class AppDistributionApiServiceTests: XCTestCase {
     let expectation =
       XCTestExpectation(description: "Generate auth token fails to generate auth token.")
 
-    AppDistributionApiService.generateAuthToken(
+    ApiService.generateAuthToken(
       installations: installations,
       completion: { identifier, authTokenResult, error in
         let nserror = error as? NSError
@@ -75,7 +75,7 @@ class AppDistributionApiServiceTests: XCTestCase {
     let installations = FakeInstallations(testCase: .installationIDFailure)
     let expectation = XCTestExpectation(description: "Generate auth token fails to find ID.")
 
-    AppDistributionApiService.generateAuthToken(
+    ApiService.generateAuthToken(
       installations: installations,
       completion: { identifier, authTokenResult, error in
         let nserror = error as? NSError
@@ -121,7 +121,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Fetch releases succeeds with two releases.")
 
-    AppDistributionApiService.fetchReleases(
+    ApiService.fetchReleases(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -147,7 +147,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Fetch releases succeeds with 0 releases.")
 
-    AppDistributionApiService.fetchReleases(
+    ApiService.fetchReleases(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -173,7 +173,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Fetch releases fails")
 
-    AppDistributionApiService.fetchReleases(
+    ApiService.fetchReleases(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -196,7 +196,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Fetch releases fails with unknown error.")
 
-    AppDistributionApiService.fetchReleases(
+    ApiService.fetchReleases(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -220,7 +220,7 @@ class AppDistributionApiServiceTests: XCTestCase {
     let expectation =
       XCTestExpectation(description: "Fetch releases fails with unauthenticated error.")
 
-    AppDistributionApiService.fetchReleases(
+    ApiService.fetchReleases(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -248,7 +248,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Find release succeeds")
 
-    AppDistributionApiService.findRelease(
+    ApiService.findRelease(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -273,7 +273,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Find release fails")
 
-    AppDistributionApiService.findRelease(
+    ApiService.findRelease(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -297,7 +297,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Find release fails")
 
-    AppDistributionApiService.findRelease(
+    ApiService.findRelease(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -321,7 +321,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Find release fails")
 
-    AppDistributionApiService.findRelease(
+    ApiService.findRelease(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -348,7 +348,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Create feedback succeeds")
 
-    AppDistributionApiService.createFeedback(
+    ApiService.createFeedback(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -374,7 +374,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Create feedback fails")
 
-    AppDistributionApiService.createFeedback(
+    ApiService.createFeedback(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -397,7 +397,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Create feedback fails")
 
-    AppDistributionApiService.createFeedback(
+    ApiService.createFeedback(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -422,7 +422,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Create feedback fails")
 
-    AppDistributionApiService.createFeedback(
+    ApiService.createFeedback(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -447,7 +447,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Upload image succeeds")
 
-    AppDistributionApiService.uploadImage(
+    ApiService.uploadImage(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -469,7 +469,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Upload image fails")
 
-    AppDistributionApiService.uploadImage(
+    ApiService.uploadImage(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -493,7 +493,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Upload image fails")
 
-    AppDistributionApiService.uploadImage(
+    ApiService.uploadImage(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -520,7 +520,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Commit feedback succeeds")
 
-    AppDistributionApiService.commitFeedback(
+    ApiService.commitFeedback(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -541,7 +541,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Commit feedback fails")
 
-    AppDistributionApiService.commitFeedback(
+    ApiService.commitFeedback(
       app: app,
       installations: installations,
       urlSession: urlSession,
@@ -564,7 +564,7 @@ class AppDistributionApiServiceTests: XCTestCase {
 
     let expectation = XCTestExpectation(description: "Commit feedback fails")
 
-    AppDistributionApiService.commitFeedback(
+    ApiService.commitFeedback(
       app: app,
       installations: installations,
       urlSession: urlSession,