Merge branch 'hotfix/0.106.17'

Author: icereval

osf_tests/test_guid.py

@@ -3,10 +3,10 @@
 import urllib
 from django.core.exceptions import MultipleObjectsReturned
 
-from framework.auth import Auth
 from osf.models import Guid, NodeLicenseRecord, OSFUser
 from osf.modm_compat import Q
-from osf_tests.factories import AuthUserFactory, UserFactory, NodeFactory, NodeLicenseRecordFactory, RegistrationFactory, PreprintFactory
+from osf_tests.factories import AuthUserFactory, UserFactory, NodeFactory, NodeLicenseRecordFactory, \
+    RegistrationFactory, PreprintFactory, PreprintProviderFactory
 from tests.base import OsfTestCase
 from tests.test_websitefiles import TestFile
 from website.settings import MFR_SERVER_URL, WATERBUTLER_URL
@@ -170,7 +170,7 @@ def test_resolve_guid_download_file(self):
 
         res = self.app.get(pp.url + 'download')
         assert res.status_code == 302
-        assert '/v1/resources/{}/providers/{}{}?action=download&version=1&direct'.format(pp.node._id, pp.primary_file.provider, pp.primary_file.path) in res.location
+        assert '{}/v1/resources/{}/providers/{}{}?action=download&version=1&direct'.format(WATERBUTLER_URL, pp.node._id, pp.primary_file.provider, pp.primary_file.path) in res.location
 
         res = self.app.get(pp.url + 'download/')
         assert res.status_code == 302
@@ -200,6 +200,26 @@ def test_resolve_guid_download_file(self):
         assert res.status_code == 302
         assert '{}/v1/resources/{}/providers/{}{}?action=download&version=1&direct'.format(WATERBUTLER_URL, unpub_pp.node._id, unpub_pp.primary_file.provider, unpub_pp.primary_file.path) in res.location
 
+    @mock.patch('website.settings.USE_EXTERNAL_EMBER', True)
+    @mock.patch('website.settings.EXTERNAL_EMBER_APPS', {
+        'preprints': {
+            'url': '/preprints/',
+            'server': 'http://localhost:4200',
+            'path': '/preprints/'
+        },
+    })
+    def test_resolve_guid_download_file_from_emberapp_preprints(self):
+        provider = PreprintProviderFactory(name='Sockarxiv')
+        pp = PreprintFactory(finish=True, provider=provider)
+
+        res = self.app.get('/preprints/sockarxiv' + pp.url + 'download')
+        assert res.status_code == 302
+        assert '{}/v1/resources/{}/providers/{}{}?action=download&version=1&direct'.format(WATERBUTLER_URL, pp.node._id, pp.primary_file.provider, pp.primary_file.path) in res.location
+
+        res = self.app.get('/preprints/sockarxiv' + pp.url + 'download/')
+        assert res.status_code == 302
+        assert '{}/v1/resources/{}/providers/{}{}?action=download&version=1&direct'.format(WATERBUTLER_URL, pp.node._id, pp.primary_file.provider, pp.primary_file.path) in res.location
+
     def test_resolve_guid_download_file_export(self):
         pp = PreprintFactory(finish=True)
 

website/routes.py

@@ -269,17 +269,35 @@ def make_url_map(app):
         Rule('/sitemaps/<path>', 'get', sitemap_file, json_renderer),
     ])
 
+    # Ember Applications
     if settings.USE_EXTERNAL_EMBER:
         # Routes that serve up the Ember application. Hide behind feature flag.
-        rules = []
         for prefix in settings.EXTERNAL_EMBER_APPS.keys():
-            rules += [
-                '/{}/'.format(prefix),
-                '/{}/<path:path>'.format(prefix),
-            ]
-        process_rules(app, [
-            Rule(rules, 'get', ember_app, json_renderer),
-        ])
+            process_rules(app, [
+                Rule(
+                    [
+                        '/<provider>/<guid>/download',
+                        '/<provider>/<guid>/download/',
+                    ],
+                    ['get', 'post', 'put', 'patch', 'delete'],
+                    website_views.resolve_guid_download,
+                    notemplate,
+                    endpoint_suffix='__' + prefix
+                ),
+            ], prefix='/' + prefix)
+
+            process_rules(app, [
+                Rule(
+                    [
+                        '/',
+                        '/<path:path>',
+                    ],
+                    'get',
+                    ember_app,
+                    json_renderer,
+                    endpoint_suffix='__' + prefix
+                ),
+            ], prefix='/' + prefix)
 
     ### Base ###
 

website/views.py

@@ -208,6 +208,10 @@ def _build_guid_url(base, suffix=None):
     return u'/{0}/'.format(url)
 
 
+def resolve_guid_download(guid, suffix=None, provider=None):
+    return resolve_guid(guid, suffix='download')
+
+
 def resolve_guid(guid, suffix=None):
     """Load GUID by primary key, look up the corresponding view function in the
     routing table, and return the return value of the view function without