Merge pull request #1517 from IFRCGo/fix/azure-storage-read

Fix azure file read/open issue.

Author: szabozoltan69

api/storage.py

@@ -73,7 +73,7 @@ def _open(self, name, mode='rb'):
             blob_name=name
         )
 
-        return ContentFile(contents)
+        return ContentFile(contents.content)
 
     def _save(self, name, content):
         """

main/settings.py

@@ -338,9 +338,17 @@
     'USE_SSL': False,
 }
 if AZURE_STORAGE_ACCOUNT:
-    # FIXME: Use https://django-storages.readthedocs.io/en/latest/backends/azure.html instead.
     DEFAULT_FILE_STORAGE = 'api.storage.AzureStorage'
 
+"""
+# FIXME: TODO: Use this instead. https://django-storages.readthedocs.io/en/latest/backends/azure.html
+AZURE_ACCOUNT_NAME = env('AZURE_STORAGE_ACCOUNT')
+AZURE_ACCOUNT_KEY = env('AZURE_STORAGE_KEY')
+AZURE_CONTAINER = 'api'
+if AZURE_STORAGE_ACCOUNT:
+    DEFAULT_FILE_STORAGE = 'storages.backends.azure_storage.AzureStorage'
+"""
+
 # Email config
 EMAIL_API_ENDPOINT = env('EMAIL_API_ENDPOINT')
 EMAIL_HOST = env('EMAIL_HOST')