From 1779c978a63d2b825325012577847a59f6aa1bc7 Mon Sep 17 00:00:00 2001
From: Jan Friedli
Date: Fri, 26 Jun 2020 16:51:53 +0200
Subject: removed urljoin

---
 matweb/rest_api.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'matweb/rest_api.py')

diff --git a/matweb/rest_api.py b/matweb/rest_api.py
index f893fca..49334c0 100644
--- a/matweb/rest_api.py
+++ b/matweb/rest_api.py
@@ -6,10 +6,9 @@ import zipfile
 from uuid import uuid4
 
 from flask import after_this_request, send_from_directory
-from flask_restful import Resource, reqparse, abort, request
+from flask_restful import Resource, reqparse, abort, request, url_for
 from cerberus import Validator
 from werkzeug.datastructures import FileStorage
-from urllib.parse import urljoin
 
 from matweb import file_removal_scheduler, utils
 
@@ -55,7 +54,13 @@ class APIUpload(Resource):
             secret,
             meta,
             meta_after,
-            urljoin(request.host_url, '%s/%s/%s/%s/%s' % ('api', 'download', key, secret, output_filename))
+            url_for(
+                'apidownload',
+                key=key,
+                secret=secret,
+                filename=output_filename,
+                _external=True
+            )
         )
 
 
@@ -140,9 +145,12 @@ class APIBulkDownloadCreator(Resource):
                    'key': key,
                    'secret': secret,
                    'meta_after': meta_after,
-                   'download_link': urljoin(
-                       request.host_url,
-                       '%s/%s/%s/%s/%s' % ('api', 'download', key, secret, output_filename)
+                   'download_link': url_for(
+                       'apidownload',
+                       key=key,
+                       secret=secret,
+                       filename=output_filename,
+                       _external=True
                    )
                }, 201
 
-- 
cgit v1.3