Feat: add UseEmulator to storage api

Author: AustinBenoit

release_build_files/readme.md

@@ -613,6 +613,12 @@ workflow use only during the development of your app, not for publicly shipping
 code.
 
 ## Release Notes
+### 13.3.0
+-   Changes
+    - Storage: Add support for Firebase Storage emulator via `UseEmulator`.
+	  The `UseEmulator` method should be called before invoking any other
+	  methods on a new instance of Storage. Default port is 9199.
+
 ### 13.2.0
 -   Changes
     - General (Android): Update to Firebase Android BoM version 34.4.0.

storage/src/android/storage_android.cc

@@ -62,7 +62,9 @@ namespace internal {
     "(Ljava/lang/String;)"                                              \
     "Lcom/google/firebase/storage/StorageReference;"),                  \
   X(GetApp, "getApp",                                                   \
-    "()Lcom/google/firebase/FirebaseApp;")
+    "()Lcom/google/firebase/FirebaseApp;"),                             \
+  X(UseEmulator, "useEmulator",                                         \
+    "(Ljava/lang/String;I)V")
 // clang-format on
 
 METHOD_LOOKUP_DECLARATION(firebase_storage, FIREBASE_STORAGE_METHODS)
@@ -471,6 +473,23 @@ void StorageInternal::set_max_operation_retry_time(
                       millis);
 }
 
+void StorageInternal::UseEmulator(const char* host, int port) {
+  JNIEnv* env = app_->GetJNIEnv();
+  FIREBASE_ASSERT_MESSAGE_RETURN_VOID((host != nullptr && host[0] != '\0'),
+                                      "Emulator host cannot be null or empty.")
+  FIREBASE_ASSERT_MESSAGE_RETURN_VOID((port > 0),
+                                      "Emulator port must be a positive number.")
+
+  jobject host_string = env->NewStringUTF(host);
+  jint port_num = static_cast<jint>(port);
+
+  env->CallVoidMethod(
+      obj_, firebase_storage::GetMethodId(firebase_storage::kUseEmulator),
+      host_string, port_num);
+  env->DeleteLocalRef(host_string);
+  util::CheckAndClearJniExceptions(env);
+}
+
 }  // namespace internal
 }  // namespace storage
 }  // namespace firebase

storage/src/android/storage_android.h

@@ -92,6 +92,10 @@ class StorageInternal {
   // if a failure occurs.
   void set_max_operation_retry_time(double max_transfer_retry_seconds);
 
+  // Configures the Storage SDK to use an emulated backend instead of call the
+  // default remote backend
+  void UseEmulator(const char* host, int port);
+
   // Convert an error code obtained from a Java StorageException into a C++
   // Error enum.
   Error ErrorFromJavaErrorCode(jint java_error_code) const;

storage/src/common/storage.cc

@@ -226,5 +226,10 @@ void Storage::set_max_operation_retry_time(double max_transfer_retry_seconds) {
     return internal_->set_max_operation_retry_time(max_transfer_retry_seconds);
 }
 
+void Storage::UseEmulator(const char* host, int port) {
+  if (internal_)
+    internal_->UseEmulator(host, port);
+}
+
 }  // namespace storage
 }  // namespace firebase

storage/src/desktop/metadata_desktop.cc

@@ -133,7 +133,7 @@ const char* MetadataInternal::download_url() const {
 
 std::string MetadataInternal::GetPathFromToken(const std::string& token) const {
   std::string http_url =
-      StoragePath("gs://" + bucket_ + "/" + path_).AsHttpUrl();
+    StoragePath(storage_internal_,  "gs://" + bucket_ + "/" + path_).AsHttpUrl();
   if (!token.empty()) http_url += "&token=" + token;
   return http_url;
 }

storage/src/desktop/storage_desktop.cc

@@ -35,10 +35,10 @@ StorageInternal::StorageInternal(App* app, const char* url) {
 
   if (url) {
     url_ = url;
-    root_ = StoragePath(url_);
+    root_ = StoragePath(this, url_);
   } else {
     const char* bucket = app->options().storage_bucket();
-    root_ = StoragePath(bucket ? std::string(kGsScheme) + bucket : "");
+    root_ = StoragePath(this, bucket ? std::string(kGsScheme) + bucket : "");
   }
 
   // LINT.IfChange
@@ -76,20 +76,22 @@ StorageInternal::~StorageInternal() {
 }
 
 // Get a StorageReference to the root of the database.
-StorageReferenceInternal* StorageInternal::GetReference() const {
+StorageReferenceInternal* StorageInternal::GetReference() {
+  configured_ = true;
   return new StorageReferenceInternal(url_, const_cast<StorageInternal*>(this));
 }
 
 // Get a StorageReference for the specified path.
-StorageReferenceInternal* StorageInternal::GetReference(
-    const char* path) const {
+StorageReferenceInternal* StorageInternal::GetReference(const char* path) {
+  configured_ = true;
   return new StorageReferenceInternal(root_.GetChild(path),
                                       const_cast<StorageInternal*>(this));
 }
 
 // Get a StorageReference for the provided URL.
 StorageReferenceInternal* StorageInternal::GetReferenceFromUrl(
-    const char* url) const {
+    const char* url) {
+  configured_ = true;
   return new StorageReferenceInternal(url, const_cast<StorageInternal*>(this));
 }
 
@@ -134,6 +136,27 @@ void StorageInternal::CleanupCompletedOperations() {
   }
 }
 
+void StorageInternal::UseEmulator(const char* host, int port) {
+  if (host == nullptr || host[0] == '\0') {
+    throw std::invalid_argument("Emulator host cannot be null or empty.");
+  }
+  host_ = host;
+
+  if (port <= 0) {
+    throw std::invalid_argument("Emulator port must be a positive number.");
+  }
+  port_ = port;
+
+  if (configured_) {
+    throw std::logic_error(
+        "Cannot connect to emulator after Storage SDK initialization. "
+        "Call use_emulator(host, port) before creating a Storage "
+        "reference or trying to load data.");
+  }
+
+  scheme_ = "http";
+}
+
 }  // namespace internal
 }  // namespace storage
 }  // namespace firebase

storage/src/desktop/storage_desktop.h

@@ -43,13 +43,13 @@ class StorageInternal {
   std::string url() { return url_; }
 
   // Get a StorageReference to the root of the database.
-  StorageReferenceInternal* GetReference() const;
+  StorageReferenceInternal* GetReference();
 
   // Get a StorageReference for the specified path.
-  StorageReferenceInternal* GetReference(const char* path) const;
+  StorageReferenceInternal* GetReference(const char* path);
 
   // Get a StorageReference for the provided URL.
-  StorageReferenceInternal* GetReferenceFromUrl(const char* url) const;
+  StorageReferenceInternal* GetReferenceFromUrl(const char* url);
 
   // Returns the maximum time (in seconds) to retry a download if a failure
   // occurs.
@@ -99,6 +99,19 @@ class StorageInternal {
   // Remove an operation from the list of outstanding operations.
   void RemoveOperation(RestOperation* operation);
 
+  // Configures the Storage SDK to use an emulated backend instead of call the
+  // default remote backend
+  void UseEmulator(const char* host, int port);
+
+  // Returns the Host for the storage backend
+  std::string get_host() { return host_; }
+
+  // Returns the Port for the storage backend
+  int get_port() { return port_; }
+
+  // Returns the url scheme currenly in use for the storage backend
+  std::string get_scheme() {return scheme_;}
+
  private:
   // Clean up completed operations.
   void CleanupCompletedOperations();
@@ -119,6 +132,11 @@ class StorageInternal {
   std::string user_agent_;
   Mutex operations_mutex_;
   std::vector<RestOperation*> operations_;
+  std::string host_ = "firebasestorage.googleapis.com";
+  std::string scheme_ = "https";
+  int port_ = 443;
+  bool configured_;
+
 };
 
 }  // namespace internal

storage/src/desktop/storage_path.cc

@@ -17,9 +17,11 @@
 #include <string.h>
 
 #include <string>
+#include <iostream>
 
 #include "app/rest/util.h"
 #include "app/src/include/firebase/internal/common.h"
+#include "storage/src/desktop/storage_desktop.h"
 
 namespace firebase {
 namespace storage {
@@ -38,8 +40,10 @@ const char kBucketStartString[] = "firebasestorage.googleapis.com/v0/b/";
 const size_t kBucketStartStringLength = FIREBASE_STRLEN(kBucketStartString);
 const char kBucketEndString[] = "/o/";
 const size_t kBucketEndStringLength = FIREBASE_STRLEN(kBucketEndString);
+const char kBucketIdentifierString[] = "/v0/b/";
 
-StoragePath::StoragePath(const std::string& path) {
+StoragePath::StoragePath(StorageInternal *storage, const std::string& path) {
+  storage_internal_ = storage;
   bucket_ = "";
   path_ = Path("");
   if (path.compare(0, kGsSchemeLength, kGsScheme) == 0) {
@@ -56,8 +60,10 @@ StoragePath::StoragePath(const std::string& path) {
 
 // Constructs a storage path, based on raw strings for the bucket, path, and
 // object.
-StoragePath::StoragePath(const std::string& bucket, const std::string& path,
+StoragePath::StoragePath(StorageInternal *storage,
+                         const std::string& bucket, const std::string& path,
                          const std::string& object) {
+  storage_internal_ = storage;
   bucket_ = bucket;
   path_ = Path(path).GetChild(object);
 }
@@ -97,15 +103,20 @@ void StoragePath::ConstructFromHttpUrl(const std::string& url, int path_start) {
 std::string StoragePath::AsHttpUrl() const {
   static const char* kUrlEnd = "?alt=media";
   // Construct the URL.  Final format is:
-  // https://[projectname].googleapis.com/v0/b/[bucket]/o/[path and/or object]
+  // http[s]://[host]:[port]/v0/b/[bucket]/o/[path and/or object]
   return AsHttpMetadataUrl() + kUrlEnd;
 }
 
 std::string StoragePath::AsHttpMetadataUrl() const {
   // Construct the URL.  Final format is:
-  // https://[projectname].googleapis.com/v0/b/[bucket]/o/[path and/or object]
-  std::string result = kHttpsScheme;
-  result += kBucketStartString;
+  // [scheme]://[host]:[port]/v0/b/[bucket]/o/[path and/or object]
+
+  std::string result = storage_internal_->get_scheme();
+  result += "://";
+  result += storage_internal_->get_host();
+  result += ":";
+  result += std::to_string(storage_internal_->get_port());
+  result += kBucketIdentifierString;
   result += bucket_;
   result += kBucketEndString;
   result += rest::util::EncodeUrl(path_.str());

storage/src/desktop/storage_path.h

@@ -25,6 +25,8 @@ namespace internal {
 
 extern const char kGsScheme[];
 
+class StorageInternal;
+
 // Class for managing paths for firebase storage.
 // Storage paths are made up of a bucket, a path,
 // and (optionally) an object, located at that path.
@@ -35,11 +37,11 @@ class StoragePath {
 
   // Constructs a storage path, based on an input URL.  The URL can either be
   // an HTTP[s] link, or a gs URI.
-  explicit StoragePath(const std::string& path);
+  explicit StoragePath(StorageInternal *storage, const std::string& path);
 
   // Constructs a storage path, based on raw strings for the bucket, path, and
   // object.
-  StoragePath(const std::string& bucket, const std::string& path,
+  StoragePath(StorageInternal *storage, const std::string& bucket, const std::string& path,
               const std::string& object = "");
 
   // The bucket portion of this path.
@@ -60,14 +62,14 @@ class StoragePath {
   // in a path where bucket is "bucket", local_path is "path/otherchild/" and
   // object is an empty string.
   StoragePath GetChild(const std::string& path) const {
-    return StoragePath(bucket_, path_.GetChild(path));
+    return StoragePath(storage_internal_, bucket_, path_.GetChild(path));
   }
 
   // Returns the location one folder up from the current location.  If the
   // path is at already at the root level, this returns the path unchanged.
   // The Object in the result is always set to empty.
   StoragePath GetParent() const {
-    return StoragePath(bucket_, path_.GetParent());
+    return StoragePath(storage_internal_, bucket_, path_.GetParent());
   }
 
   // Returns the path as a HTTP URL to the asset.
@@ -82,14 +84,16 @@ class StoragePath {
  private:
   static const char* const kSeparator;
 
-  StoragePath(const std::string& bucket, const Path& path)
-      : bucket_(bucket), path_(path) {}
+  StoragePath(StorageInternal *storage, const std::string& bucket, const Path& path)
+    : storage_internal_(storage), bucket_(bucket), path_(path) {}
 
   void ConstructFromGsUri(const std::string& uri, int path_start);
   void ConstructFromHttpUrl(const std::string& url, int path_start);
 
   std::string bucket_;
   Path path_;
+  StorageInternal* storage_internal_;
+
 };
 
 }  // namespace internal

storage/src/desktop/storage_reference_desktop.cc

@@ -48,7 +48,7 @@ namespace internal {
 
 StorageReferenceInternal::StorageReferenceInternal(
     const std::string& storageUri, StorageInternal* storage)
-    : storage_(storage), storageUri_(storageUri) {
+  : storage_(storage), storageUri_(storage, storageUri) {
   storage_->future_manager().AllocFutureApi(this, kStorageReferenceFnCount);
 }