Merge pull request #592 from siarhei-luskanau/firebase-cocoapods-11.1.0

Updated firebase-cocoapods to "11.1.0"

Author: nbransby

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

@@ -31,7 +31,7 @@ public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(
 public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth) {
 
     public actual val currentUser: FirebaseUser?
-        get() = ios.currentUser?.let { FirebaseUser(it) }
+        get() = ios.currentUser()?.let { FirebaseUser(it) }
 
     public actual val authStateChanged: Flow<FirebaseUser?> get() = callbackFlow {
         val handle = ios.addAuthStateDidChangeListener { _, user -> trySend(user?.let { FirebaseUser(it) }) }
@@ -44,7 +44,7 @@ public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth)
     }
 
     public actual var languageCode: String
-        get() = ios.languageCode ?: ""
+        get() = ios.languageCode() ?: ""
         set(value) {
             ios.setLanguageCode(value)
         }
@@ -90,15 +90,15 @@ public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth)
     public actual suspend fun <T : ActionCodeResult> checkActionCode(code: String): T {
         val result: FIRActionCodeInfo = ios.awaitResult { checkActionCode(code, it) }
         @Suppress("UNCHECKED_CAST")
-        return when (result.operation) {
+        return when (result.operation()) {
             FIRActionCodeOperationEmailLink -> SignInWithEmailLink
-            FIRActionCodeOperationVerifyEmail -> VerifyEmail(result.email!!)
-            FIRActionCodeOperationPasswordReset -> PasswordReset(result.email!!)
-            FIRActionCodeOperationRecoverEmail -> RecoverEmail(result.email!!, result.previousEmail!!)
-            FIRActionCodeOperationVerifyAndChangeEmail -> VerifyBeforeChangeEmail(result.email!!, result.previousEmail!!)
-            FIRActionCodeOperationRevertSecondFactorAddition -> RevertSecondFactorAddition(result.email!!, null)
-            FIRActionCodeOperationUnknown -> throw UnsupportedOperationException(result.operation.toString())
-            else -> throw UnsupportedOperationException(result.operation.toString())
+            FIRActionCodeOperationVerifyEmail -> VerifyEmail(result.email())
+            FIRActionCodeOperationPasswordReset -> PasswordReset(result.email())
+            FIRActionCodeOperationRecoverEmail -> RecoverEmail(result.email(), result.previousEmail()!!)
+            FIRActionCodeOperationVerifyAndChangeEmail -> VerifyBeforeChangeEmail(result.email(), result.previousEmail()!!)
+            FIRActionCodeOperationRevertSecondFactorAddition -> RevertSecondFactorAddition(result.email(), null)
+            FIRActionCodeOperationUnknown -> throw UnsupportedOperationException(result.operation().toString())
+            else -> throw UnsupportedOperationException(result.operation().toString())
         } as T
     }
 
@@ -108,31 +108,31 @@ public val AuthResult.ios: FIRAuthDataResult get() = ios
 
 public actual class AuthResult internal constructor(internal val ios: FIRAuthDataResult) {
     public actual val user: FirebaseUser?
-        get() = FirebaseUser(ios.user)
+        get() = FirebaseUser(ios.user())
 }
 
 public val AuthTokenResult.ios: FIRAuthTokenResult get() = ios
 public actual class AuthTokenResult(internal val ios: FIRAuthTokenResult) {
 //    actual val authTimestamp: Long
 //        get() = ios.authDate
     public actual val claims: Map<String, Any>
-        get() = ios.claims.map { it.key.toString() to it.value as Any }.toMap()
+        get() = ios.claims().map { it.key.toString() to it.value as Any }.toMap()
 
 //    actual val expirationTimestamp: Long
 //        get() = ios.expirationDate
 //    actual val issuedAtTimestamp: Long
 //        get() = ios.issuedAtDate
     public actual val signInProvider: String?
-        get() = ios.signInProvider
+        get() = ios.signInProvider()
     public actual val token: String?
-        get() = ios.token
+        get() = ios.token()
 }
 
 internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().also {
-    it.URL = NSURL.URLWithString(url)
+    it.setURL(NSURL.URLWithString(url))
     androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) }
-    it.dynamicLinkDomain = dynamicLinkDomain
-    it.handleCodeInApp = canHandleCodeInApp
+    it.setDynamicLinkDomain(dynamicLinkDomain)
+    it.setHandleCodeInApp(canHandleCodeInApp)
     iOSBundleId?.run { it.setIOSBundleID(this) }
 }
 
@@ -184,47 +184,55 @@ internal suspend inline fun <T> T.await(function: T.(callback: (NSError?) -> Uni
 }
 
 private fun NSError.toException() = when (domain) {
+    // codes from AuthErrors.swift: https://github.com/firebase/firebase-ios-sdk/blob/
+    // 2f6ac4c2c61cd57c7ea727009e187b7e1163d613/FirebaseAuth/Sources/Swift/Utilities/
+    // AuthErrors.swift#L51
     FIRAuthErrorDomain -> when (code) {
-        FIRAuthErrorCodeInvalidActionCode,
-        FIRAuthErrorCodeExpiredActionCode,
+        17030L, // AuthErrorCode.invalidActionCode
+        17029L, // AuthErrorCode.expiredActionCode
         -> FirebaseAuthActionCodeException(toString())
 
-        FIRAuthErrorCodeInvalidEmail -> FirebaseAuthEmailException(toString())
-
-        FIRAuthErrorCodeCaptchaCheckFailed,
-        FIRAuthErrorCodeInvalidPhoneNumber,
-        FIRAuthErrorCodeMissingPhoneNumber,
-        FIRAuthErrorCodeInvalidVerificationID,
-        FIRAuthErrorCodeInvalidVerificationCode,
-        FIRAuthErrorCodeMissingVerificationID,
-        FIRAuthErrorCodeMissingVerificationCode,
-        FIRAuthErrorCodeUserTokenExpired,
-        FIRAuthErrorCodeInvalidCredential,
+        17008L, // AuthErrorCode.invalidEmail
+        -> FirebaseAuthEmailException(toString())
+
+        17056L, // AuthErrorCode.captchaCheckFailed
+        17042L, // AuthErrorCode.invalidPhoneNumber
+        17041L, // AuthErrorCode.missingPhoneNumber
+        17046L, // AuthErrorCode.invalidVerificationID
+        17044L, // AuthErrorCode.invalidVerificationCode
+        17045L, // AuthErrorCode.missingVerificationID
+        17043L, // AuthErrorCode.missingVerificationCode
+        17021L, // AuthErrorCode.userTokenExpired
+        17004L, // AuthErrorCode.invalidCredential
         -> FirebaseAuthInvalidCredentialsException(toString())
 
-        FIRAuthErrorCodeWeakPassword -> FirebaseAuthWeakPasswordException(toString())
+        17026L, // AuthErrorCode.weakPassword
+        -> FirebaseAuthWeakPasswordException(toString())
 
-        FIRAuthErrorCodeInvalidUserToken -> FirebaseAuthInvalidUserException(toString())
+        17017L, // AuthErrorCode.invalidUserToken
+        -> FirebaseAuthInvalidUserException(toString())
 
-        FIRAuthErrorCodeRequiresRecentLogin -> FirebaseAuthRecentLoginRequiredException(toString())
+        17014L, // AuthErrorCode.requiresRecentLogin
+        -> FirebaseAuthRecentLoginRequiredException(toString())
 
-        FIRAuthErrorCodeSecondFactorAlreadyEnrolled,
-        FIRAuthErrorCodeSecondFactorRequired,
-        FIRAuthErrorCodeMaximumSecondFactorCountExceeded,
-        FIRAuthErrorCodeMultiFactorInfoNotFound,
+        17087L, // AuthErrorCode.secondFactorAlreadyEnrolled
+        17078L, // AuthErrorCode.secondFactorRequired
+        17088L, // AuthErrorCode.maximumSecondFactorCountExceeded
+        17084L, // AuthErrorCode.multiFactorInfoNotFound
         -> FirebaseAuthMultiFactorException(toString())
 
-        FIRAuthErrorCodeEmailAlreadyInUse,
-        FIRAuthErrorCodeAccountExistsWithDifferentCredential,
-        FIRAuthErrorCodeCredentialAlreadyInUse,
+        17007L, // AuthErrorCode.emailAlreadyInUse
+        17012L, // AuthErrorCode.accountExistsWithDifferentCredential
+        17025L, // AuthErrorCode.credentialAlreadyInUse
         -> FirebaseAuthUserCollisionException(toString())
 
-        FIRAuthErrorCodeWebContextAlreadyPresented,
-        FIRAuthErrorCodeWebContextCancelled,
-        FIRAuthErrorCodeWebInternalError,
+        17057L, // AuthErrorCode.webContextAlreadyPresented
+        17058L, // AuthErrorCode.webContextCancelled
+        17062L, // AuthErrorCode.webInternalError
         -> FirebaseAuthWebException(toString())
 
-        FIRAuthErrorCodeNetworkError -> FirebaseNetworkException(toString())
+        17020L, // AuthErrorCode.networkError
+        -> FirebaseNetworkException(toString())
 
         else -> FirebaseAuthException(toString())
     }

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

@@ -8,7 +8,7 @@ import cocoapods.FirebaseAuth.*
 
 public actual open class AuthCredential(public open val ios: FIRAuthCredential) {
     public actual val providerId: String
-        get() = ios.provider
+        get() = ios.provider()
 }
 
 public actual class PhoneAuthCredential(override val ios: FIRPhoneAuthCredential) : AuthCredential(ios)

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

@@ -10,7 +10,7 @@ public val MultiFactor.ios: FIRMultiFactor get() = ios
 
 public actual class MultiFactor(internal val ios: FIRMultiFactor) {
     public actual val enrolledFactors: List<MultiFactorInfo>
-        get() = ios.enrolledFactors.mapNotNull { info -> (info as? FIRMultiFactorInfo)?.let { MultiFactorInfo(it) } }
+        get() = ios.enrolledFactors().mapNotNull { info -> (info as? FIRMultiFactorInfo)?.let { MultiFactorInfo(it) } }
     public actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?): Unit = ios.await { enrollWithAssertion(multiFactorAssertion.ios, displayName, it) }
     public actual suspend fun getSession(): MultiFactorSession = MultiFactorSession(ios.awaitResult { getSessionWithCompletion(completion = it) })
     public actual suspend fun unenroll(multiFactorInfo: MultiFactorInfo): Unit = ios.await { unenrollWithInfo(multiFactorInfo.ios, it) }
@@ -21,20 +21,20 @@ public val MultiFactorInfo.ios: FIRMultiFactorInfo get() = ios
 
 public actual class MultiFactorInfo(internal val ios: FIRMultiFactorInfo) {
     public actual val displayName: String?
-        get() = ios.displayName
+        get() = ios.displayName()
     public actual val enrollmentTime: Double
-        get() = ios.enrollmentDate.timeIntervalSinceReferenceDate
+        get() = ios.enrollmentDate().timeIntervalSinceReferenceDate
     public actual val factorId: String
-        get() = ios.factorID
+        get() = ios.factorID()
     public actual val uid: String
-        get() = ios.UID
+        get() = ios.UID()
 }
 
 public val MultiFactorAssertion.ios: FIRMultiFactorAssertion get() = ios
 
 public actual class MultiFactorAssertion(internal val ios: FIRMultiFactorAssertion) {
     public actual val factorId: String
-        get() = ios.factorID
+        get() = ios.factorID()
 }
 
 public val MultiFactorSession.ios: FIRMultiFactorSession get() = ios
@@ -44,9 +44,9 @@ public actual class MultiFactorSession(internal val ios: FIRMultiFactorSession)
 public val MultiFactorResolver.ios: FIRMultiFactorResolver get() = ios
 
 public actual class MultiFactorResolver(internal val ios: FIRMultiFactorResolver) {
-    public actual val auth: FirebaseAuth = FirebaseAuth(ios.auth)
-    public actual val hints: List<MultiFactorInfo> = ios.hints.mapNotNull { hint -> (hint as? FIRMultiFactorInfo)?.let { MultiFactorInfo(it) } }
-    public actual val session: MultiFactorSession = MultiFactorSession(ios.session)
+    public actual val auth: FirebaseAuth = FirebaseAuth(ios.auth())
+    public actual val hints: List<MultiFactorInfo> = ios.hints().mapNotNull { hint -> (hint as? FIRMultiFactorInfo)?.let { MultiFactorInfo(it) } }
+    public actual val session: MultiFactorSession = MultiFactorSession(ios.session())
 
     public actual suspend fun resolveSignIn(assertion: MultiFactorAssertion): AuthResult = AuthResult(ios.awaitResult { resolveSignInWithAssertion(assertion.ios, it) })
 }

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

@@ -14,27 +14,27 @@ public val FirebaseUser.ios: FIRUser get() = ios
 
 public actual class FirebaseUser internal constructor(internal val ios: FIRUser) {
     public actual val uid: String
-        get() = ios.uid
+        get() = ios.uid()
     public actual val displayName: String?
-        get() = ios.displayName
+        get() = ios.displayName()
     public actual val email: String?
-        get() = ios.email
+        get() = ios.email()
     public actual val phoneNumber: String?
-        get() = ios.phoneNumber
+        get() = ios.phoneNumber()
     public actual val photoURL: String?
-        get() = ios.photoURL?.absoluteString
+        get() = ios.photoURL()?.absoluteString
     public actual val isAnonymous: Boolean
-        get() = ios.anonymous
+        get() = ios.anonymous()
     public actual val isEmailVerified: Boolean
-        get() = ios.emailVerified
+        get() = ios.emailVerified()
     public actual val metaData: UserMetaData?
-        get() = UserMetaData(ios.metadata)
+        get() = UserMetaData(ios.metadata())
     public actual val multiFactor: MultiFactor
-        get() = MultiFactor(ios.multiFactor)
+        get() = MultiFactor(ios.multiFactor())
     public actual val providerData: List<UserInfo>
-        get() = ios.providerData.mapNotNull { provider -> (provider as? FIRUserInfoProtocol)?.let { UserInfo(it) } }
+        get() = ios.providerData().mapNotNull { provider -> (provider as? FIRUserInfoProtocol)?.let { UserInfo(it) } }
     public actual val providerId: String
-        get() = ios.providerID
+        get() = ios.providerID()
 
     public actual suspend fun delete(): Unit = ios.await { deleteWithCompletion(it) }
 
@@ -85,24 +85,24 @@ public val UserInfo.ios: FIRUserInfoProtocol get() = ios
 
 public actual class UserInfo(internal val ios: FIRUserInfoProtocol) {
     public actual val displayName: String?
-        get() = ios.displayName
+        get() = ios.displayName()
     public actual val email: String?
-        get() = ios.email
+        get() = ios.email()
     public actual val phoneNumber: String?
-        get() = ios.phoneNumber
+        get() = ios.phoneNumber()
     public actual val photoURL: String?
-        get() = ios.photoURL?.absoluteString
+        get() = ios.photoURL()?.absoluteString
     public actual val providerId: String
-        get() = ios.providerID
+        get() = ios.providerID()
     public actual val uid: String
-        get() = ios.uid
+        get() = ios.uid()
 }
 
 public val UserMetaData.ios: FIRUserMetadata get() = ios
 
 public actual class UserMetaData(internal val ios: FIRUserMetadata) {
     public actual val creationTime: Double?
-        get() = ios.creationDate?.timeIntervalSinceReferenceDate
+        get() = ios.creationDate()?.timeIntervalSinceReferenceDate
     public actual val lastSignInTime: Double?
-        get() = ios.lastSignInDate?.timeIntervalSinceReferenceDate
+        get() = ios.lastSignInDate()?.timeIntervalSinceReferenceDate
 }

firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/Timestamp.kt

@@ -1,6 +1,6 @@
 package dev.gitlive.firebase.firestore
 
-import cocoapods.FirebaseFirestoreInternal.FIRTimestamp
+import cocoapods.FirebaseCore.FIRTimestamp
 import kotlinx.serialization.Serializable
 
 /** A class representing a platform specific Firebase Timestamp. */

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ kotlinx-datetime = "0.6.1"
 kotlinter = "4.4.1"
 settings-api = "2.0"
 settings-language = "2.0"
-firebase-cocoapods = "10.28.0"
+firebase-cocoapods = "11.1.0"
 ios-deploymentTarget = "13.0"
 test-logger-plugin = "4.0.0"
 dokka = "1.9.20"