Merge pull request #540 from deBasMan21/feat/StorageWithUrl

Add storage with custom url
GitLiveApp · Jun 21, 2024 · e54c12e · e54c12e
2 parents 8e900e8 + e0ebbce
commit e54c12e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 9 deletions.
diff --git a/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -26,11 +26,13 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 
-actual val Firebase.storage get() =
-    FirebaseStorage(com.google.firebase.storage.FirebaseStorage.getInstance())
+actual val Firebase.storage get() = FirebaseStorage(com.google.firebase.storage.FirebaseStorage.getInstance())
 
-actual fun Firebase.storage(app: FirebaseApp) =
-    FirebaseStorage(com.google.firebase.storage.FirebaseStorage.getInstance(app.android))
+actual fun Firebase.storage(url: String): FirebaseStorage = FirebaseStorage(com.google.firebase.storage.FirebaseStorage.getInstance(url))
+
+actual fun Firebase.storage(app: FirebaseApp) = FirebaseStorage(com.google.firebase.storage.FirebaseStorage.getInstance(app.android))
+
+actual fun Firebase.storage(app: FirebaseApp, url: String) = FirebaseStorage(com.google.firebase.storage.FirebaseStorage.getInstance(app.android, url))
 
 actual class FirebaseStorage(val android: com.google.firebase.storage.FirebaseStorage) {
     actual val maxOperationRetryTimeMillis = android.maxOperationRetryTimeMillis

diff --git a/firebase-storage/src/commonMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/commonMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -11,9 +11,15 @@ import kotlinx.coroutines.launch
 /** Returns the [FirebaseStorage] instance of the default [FirebaseApp]. */
 expect val Firebase.storage: FirebaseStorage
 
+/** Returns the [FirebaseStorage] instance of the default [FirebaseApp]. */
+expect fun Firebase.storage(url: String): FirebaseStorage
+
 /** Returns the [FirebaseStorage] instance of a given [FirebaseApp]. */
 expect fun Firebase.storage(app: FirebaseApp): FirebaseStorage
 
+/** Returns the [FirebaseStorage] instance of a given [FirebaseApp]. */
+expect fun Firebase.storage(app: FirebaseApp, url: String): FirebaseStorage
+
 /**
  * FirebaseStorage is a service that supports uploading and downloading large objects to Google
  * Cloud Storage. Pass a custom instance of [FirebaseApp] to [Firebase.storage]

diff --git a/firebase-storage/src/iosMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/iosMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -31,10 +31,18 @@ import platform.Foundation.NSURL
 actual val Firebase.storage get() =
     FirebaseStorage(FIRStorage.storage())
 
+actual fun Firebase.storage(url: String): FirebaseStorage = FirebaseStorage(
+    FIRStorage.storageWithURL(url)
+)
+
 actual fun Firebase.storage(app: FirebaseApp): FirebaseStorage = FirebaseStorage(
     FIRStorage.storageForApp(app.ios as objcnames.classes.FIRApp)
 )
 
+actual fun Firebase.storage(app: FirebaseApp, url: String) = FirebaseStorage(
+    FIRStorage.storageForApp(app.ios as objcnames.classes.FIRApp, url)
+)
+
 actual class FirebaseStorage(val ios: FIRStorage) {
     actual val maxOperationRetryTimeMillis = ios.maxOperationRetryTime().toLong()
     actual val maxUploadRetryTimeMillis = ios.maxUploadRetryTime().toLong()

diff --git a/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/externals/storage.kt b/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/externals/storage.kt
@@ -6,6 +6,8 @@ package dev.gitlive.firebase.storage.externals
 import dev.gitlive.firebase.externals.FirebaseApp
 import kotlin.js.Promise
 
+external fun getStorage(app: FirebaseApp? = definedExternally, url: String): FirebaseStorage
+
 external fun getStorage(app: FirebaseApp? = definedExternally): FirebaseStorage
 
 external fun ref(storage: FirebaseStorage, url: String? = definedExternally): StorageReference

diff --git a/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -18,8 +18,11 @@ import kotlinx.coroutines.flow.emitAll
 actual val Firebase.storage
     get() = FirebaseStorage(getStorage())
 
-actual fun Firebase.storage(app: FirebaseApp) =
-    FirebaseStorage(getStorage(app.js))
+actual fun Firebase.storage(url: String): FirebaseStorage = FirebaseStorage(getStorage(null, url), )
+
+actual fun Firebase.storage(app: FirebaseApp) = FirebaseStorage(getStorage(app.js))
+
+actual fun Firebase.storage(app: FirebaseApp, url: String) = FirebaseStorage(getStorage(app.js, url))
 
 actual class FirebaseStorage(val js: dev.gitlive.firebase.storage.externals.FirebaseStorage) {
     actual val maxOperationRetryTimeMillis = js.maxOperationRetryTime.toLong()

diff --git a/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt b/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt
@@ -8,10 +8,12 @@ import dev.gitlive.firebase.FirebaseException
 actual val Firebase.storage: FirebaseStorage
     get() = TODO("Not yet implemented")
 
+actual fun Firebase.storage(url: String): FirebaseStorage = TODO("Not yet implemented")
+
 /** Returns the [FirebaseStorage] instance of a given [FirebaseApp]. */
-actual fun Firebase.storage(app: FirebaseApp): FirebaseStorage {
-    TODO("Not yet implemented")
-}
+actual fun Firebase.storage(app: FirebaseApp): FirebaseStorage = TODO("Not yet implemented")
+
+actual fun Firebase.storage(app: FirebaseApp, url: String): FirebaseStorage = TODO("Not yet implemented")
 
 actual class FirebaseStorage {
     actual val maxOperationRetryTimeMillis: Long