Merge pull request #562 from NBISweden/feature/save-user-consent

Add user to when giving consent and fix temporary links
NBISweden · May 17, 2019 · a723542 · a723542
2 parents 536cff8 + 859c446
commit a723542
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/backend/application.py b/backend/application.py
@@ -414,6 +414,7 @@ def post(self, dataset, event, target):
         user = self.current_user
 
         if event == 'consent':
+            user.save()
             dv = (db.DatasetVersion
                     .select()
                     .join(db.Dataset)

diff --git a/backend/handlers.py b/backend/handlers.py
@@ -226,15 +226,15 @@ class AuthorizedStaticNginxFileHandler(AuthorizedHandler, BaseStaticNginxFileHan
 
 
 class TemporaryStaticNginxFileHandler(BaseStaticNginxFileHandler):
-    def get(self, dataset, hash_value, file):
+    def get(self, dataset, ds_version, hash_value, file):
         logging.debug("Want to download hash {} ({})".format(hash_value, file))
         linkhash = (db.Linkhash
                         .select()
                         .join(db.DatasetVersion)
                         .join(db.DatasetFile)
-                        .where(db.Linkhash.hash       == hash_value,
-                               db.Linkhash.expires_on >  datetime.datetime.now(),
-                               db.DatasetFile.name    == file))
+                        .where(db.Linkhash.hash == hash_value,
+                               db.Linkhash.expires_on > datetime.datetime.now(),
+                               db.DatasetFile.name == file))
         if linkhash.count() > 0:
             logging.debug("Linkhash valid")
             # Get temporary user from hash_value
@@ -243,7 +243,7 @@ def get(self, dataset, hash_value, file):
                        .join(db.Linkhash)
                        .where(db.Linkhash.hash == hash_value)
                    ).get()
-            super().get(dataset, file, user)
+            super().get(dataset, file, ds_version, user)
         else:
             logging.debug("Linkhash invalid")
             self.send_error(status_code=403)

diff --git a/backend/route.py b/backend/route.py
@@ -41,7 +41,7 @@ def __init__(self, settings):
                                                                                          {"path": "static/"}),
             (r'/(favicon.ico)',                                                      tornado.web.StaticFileHandler,
                                                                                          {"path": "static/img/"}),
-            (r"/release/(?P<dataset>[^\/]+)/(?P<hash_value>[^\/]+)/(?P<file>[^\/]+)", handlers.TemporaryStaticNginxFileHandler,
+            (r"/release/(?P<dataset>[^\/]+)/versions/(?P<ds_version>[^/]+)/(?P<hash_value>[^\/]+)/(?P<file>[^\/]+)", handlers.TemporaryStaticNginxFileHandler,
                                                                                          {"path": "/release-files/"}),
             (r"/release/(?P<dataset>[^\/]+)/versions/(?P<ds_version>[^/]+)/(?P<file>[^\/]+)", handlers.AuthorizedStaticNginxFileHandler,
                                                                                          {"path": "/release-files/"}),