Skip to content

Commit febcdc8

Browse files
committed
Merge remote-tracking branch 'treit/issue-731-linkDomain' into auth-suport-ActionCodeSettings.linkDomain
# Conflicts: # gradle/libs.versions.toml
2 parents becfdcf + ef183fc commit febcdc8

File tree

5 files changed

+5
-1
lines changed
  • firebase-auth/src
    • androidMain/kotlin/dev/gitlive/firebase/auth
    • commonMain/kotlin/dev/gitlive/firebase/auth
    • iosMain/kotlin/dev/gitlive/firebase/auth
    • jsMain/kotlin/dev/gitlive/firebase/auth
  • gradle

5 files changed

+5
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ internal fun ActionCodeSettings.toAndroid() = com.google.firebase.auth.ActionCod
159159
.setUrl(url)
160160
.also { androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) } }
161161
.also { dynamicLinkDomain?.run { it.setDynamicLinkDomain(this) } }
162+
.also { linkDomain?.run { it.setLinkDomain(this) } }
162163
.setHandleCodeInApp(canHandleCodeInApp)
163164
.also { iOSBundleId?.run { it.setIOSBundleId(this) } }
164165
.build()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public data class ActionCodeSettings(
7777
val dynamicLinkDomain: String? = null,
7878
val canHandleCodeInApp: Boolean = false,
7979
val iOSBundleId: String? = null,
80+
val linkDomain: String? = null,
8081
)
8182

8283
public data class AndroidPackageName(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().also {
154154
it.setURL(NSURL.URLWithString(url))
155155
androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) }
156156
it.setDynamicLinkDomain(dynamicLinkDomain)
157+
it.setLinkDomain(linkDomain)
157158
it.setHandleCodeInApp(canHandleCodeInApp)
158159
iOSBundleId?.run { it.setIOSBundleID(this) }
159160
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ public actual class AuthTokenResult(internal val js: IdTokenResult) {
177177
internal fun ActionCodeSettings.toJson() = json(
178178
"url" to url,
179179
"android" to (androidPackageName?.run { json("installApp" to installIfNotAvailable, "minimumVersion" to minimumVersion, "packageName" to packageName) } ?: undefined),
180+
"linkDomain" to (linkDomain ?: undefined),
180181
"dynamicLinkDomain" to (dynamicLinkDomain ?: undefined),
181182
"handleCodeInApp" to canHandleCodeInApp,
182183
"ios" to (iOSBundleId?.run { json("bundleId" to iOSBundleId) } ?: undefined),

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ androidx-test-core = "1.7.0"
44
androidx-test-junit = "1.3.0"
55
androidx-test-runner = "1.7.0"
66
ben-manes-versions = "0.52.0"
7-
firebase-bom = "33.10.0"
7+
firebase-bom = "33.15.0"
88
gitlive-firebase-java-sdk = "0.4.6"
99
gson = "2.13.1"
1010
junit = "4.13.2"

0 commit comments

Comments
 (0)