Merge branch 'master' into feature/firestor-add-databaseid

Author: nbransby

.github/workflows/pull_request.yml

@@ -8,33 +8,11 @@ on:
     branches: [ master ]
 
 concurrency:
-  group: ci-${{ github.ref }}
+  group: ci-pull-request-${{ github.head_ref }}
   cancel-in-progress: true
 
 jobs:
-  lintAndApiChecks:
-    runs-on: macos-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: latest-stable
-      - name: Format Kotlin
-        run: ./gradlew formatKotlin
-      - name: Api File Update
-        run: ./gradlew apiDump
-      - uses: stefanzweifel/git-auto-commit-action@v6
   jobMatrixSetup:
-    needs: lintAndApiChecks
     runs-on: macos-latest
     outputs:
       emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }}

.github/workflows/pull_request_target.yml

@@ -0,0 +1,40 @@
+name: Lint and API Checks
+
+on:
+  pull_request_target:
+    branches: [ master ]
+
+concurrency:
+  group: ci-lint-api-check-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  lintAndApiChecks:
+    runs-on: macos-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+          cache: gradle
+      - name: Cocoapods cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cocoapods
+            ~/Library/Caches/CocoaPods
+            */build/cocoapods
+            */build/classes
+          key: cocoapods-cache-v2
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+      - name: Format Kotlin
+        run: ./gradlew formatKotlin
+      - name: Api File Update
+        run: ./gradlew apiDump
+      - uses: stefanzweifel/git-auto-commit-action@v6

firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -159,6 +159,7 @@ internal fun ActionCodeSettings.toAndroid() = com.google.firebase.auth.ActionCod
     .setUrl(url)
     .also { androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) } }
     .also { dynamicLinkDomain?.run { it.setDynamicLinkDomain(this) } }
+    .also { linkDomain?.run { it.setLinkDomain(this) } }
     .setHandleCodeInApp(canHandleCodeInApp)
     .also { iOSBundleId?.run { it.setIOSBundleId(this) } }
     .build()

firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -77,6 +77,7 @@ public data class ActionCodeSettings(
     val dynamicLinkDomain: String? = null,
     val canHandleCodeInApp: Boolean = false,
     val iOSBundleId: String? = null,
+    val linkDomain: String? = null,
 )
 
 public data class AndroidPackageName(

firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -9,6 +9,7 @@ import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
 import dev.gitlive.firebase.FirebaseNetworkException
+import dev.gitlive.firebase.FirebaseTooManyRequestsException
 import dev.gitlive.firebase.auth.ActionCodeResult.*
 import dev.gitlive.firebase.ios
 import kotlinx.cinterop.*
@@ -154,6 +155,7 @@ internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().also {
     it.setURL(NSURL.URLWithString(url))
     androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) }
     it.setDynamicLinkDomain(dynamicLinkDomain)
+    it.setLinkDomain(linkDomain)
     it.setHandleCodeInApp(canHandleCodeInApp)
     iOSBundleId?.run { it.setIOSBundleID(this) }
 }
@@ -164,7 +166,7 @@ public actual open class FirebaseAuthEmailException(message: String) : FirebaseA
 public actual open class FirebaseAuthInvalidCredentialsException(message: String) : FirebaseAuthException(message)
 public actual open class FirebaseAuthWeakPasswordException(message: String) : FirebaseAuthInvalidCredentialsException(message)
 public actual open class FirebaseAuthInvalidUserException(message: String) : FirebaseAuthException(message)
-public actual open class FirebaseAuthMultiFactorException(message: String) : FirebaseAuthException(message)
+public actual open class FirebaseAuthMultiFactorException(message: String, public val resolver: FIRMultiFactorResolver?) : FirebaseAuthException(message)
 public actual open class FirebaseAuthRecentLoginRequiredException(message: String) : FirebaseAuthException(message)
 public actual open class FirebaseAuthUserCollisionException(message: String) : FirebaseAuthException(message)
 public actual open class FirebaseAuthWebException(message: String) : FirebaseAuthException(message)
@@ -241,7 +243,13 @@ private fun NSError.toException() = when (domain) {
         17078L, // AuthErrorCode.secondFactorRequired
         17088L, // AuthErrorCode.maximumSecondFactorCountExceeded
         17084L, // AuthErrorCode.multiFactorInfoNotFound
-        -> FirebaseAuthMultiFactorException(toString())
+        -> {
+            val resolver = userInfo["FIRAuthErrorUserInfoMultiFactorResolverKey"] as? FIRMultiFactorResolver
+            FirebaseAuthMultiFactorException(toString(), resolver)
+        }
+
+        17052L, // AuthErrorCode.quotaExceeded
+        -> FirebaseTooManyRequestsException(toString())
 
         17007L, // AuthErrorCode.emailAlreadyInUse
         17012L, // AuthErrorCode.accountExistsWithDifferentCredential

firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -177,6 +177,7 @@ public actual class AuthTokenResult(internal val js: IdTokenResult) {
 internal fun ActionCodeSettings.toJson() = json(
     "url" to url,
     "android" to (androidPackageName?.run { json("installApp" to installIfNotAvailable, "minimumVersion" to minimumVersion, "packageName" to packageName) } ?: undefined),
+    "linkDomain" to (linkDomain ?: undefined),
     "dynamicLinkDomain" to (dynamicLinkDomain ?: undefined),
     "handleCodeInApp" to canHandleCodeInApp,
     "ios" to (iOSBundleId?.run { json("bundleId" to iOSBundleId) } ?: undefined),

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ androidx-test-core = "1.7.0"
 androidx-test-junit = "1.3.0"
 androidx-test-runner = "1.7.0"
 ben-manes-versions = "0.52.0"
-firebase-bom = "33.10.0"
-gitlive-firebase-java-sdk = "0.4.6"
+firebase-bom = "33.15.0"
+gitlive-firebase-java-sdk = "0.6.1"
 gson = "2.13.1"
 junit = "4.13.2"
 kotlin = "2.2.0"
@@ -16,7 +16,7 @@ kotlinx-datetime = "0.7.1"
 kotlinter = "5.2.0"
 settings-api = "2.2"
 settings-language = "2.2"
-firebase-cocoapods = "11.4.0"
+firebase-cocoapods = "11.8.0"
 ios-deploymentTarget = "13.0"
 test-logger-plugin = "4.0.0"
 dokka = "2.0.0"