Merge pull request rucio#4130 from bziemons/patch-0-flask_header_change

Replace calls for removed method to get headers
mlassnig · Nov 13, 2020 · f711667 · f711667
2 parents 9f7a71b + 11aacd2
commit f711667
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/rucio/web/rest/flaskapi/v1/did.py b/lib/rucio/web/rest/flaskapi/v1/did.py
@@ -1015,7 +1015,7 @@ def post(self, scope_name, key):
 
         """
         try:
-            scope, name = parse_scope_name(scope_name)
+            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
         except ValueError as error:
             return generate_http_error_flask(400, 'ValueError', error.args[0])
         except Exception as error:

diff --git a/lib/rucio/web/rest/flaskapi/v1/redirect.py b/lib/rucio/web/rest/flaskapi/v1/redirect.py
@@ -71,7 +71,7 @@ def get(self, scope_name):
         headers.set('Access-Control-Allow-Credentials', 'true')
 
         try:
-            scope, name = parse_scope_name(scope_name, request_header_ensure_string('X-Rucio-VO', 'def'))
+            scope, name = parse_scope_name(scope_name, request.headers.get('X-Rucio-VO', default='def'))
         except ValueError as error:
             return generate_http_error_flask(400, 'ValueError', error.args[0], headers=headers)
         except Exception as error:
@@ -199,7 +199,7 @@ def get(self, scope_name):
         headers.set('Access-Control-Allow-Credentials', 'true')
 
         try:
-            scope, name = parse_scope_name(scope_name, request_header_ensure_string('X-Rucio-VO', 'def'))
+            scope, name = parse_scope_name(scope_name, request.headers.get('X-Rucio-VO', default='def'))
         except ValueError as error:
             return generate_http_error_flask(400, 'ValueError', error.args[0], headers=headers)
         except Exception as error: