fix: adjust headers token in case of multitenancy and auth type

ehrbase · Jun 7, 2024 · 395828c · 395828c
1 parent b2b40c1
commit 395828c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/tests/robot/_resources/keywords/admin_keywords.robot b/tests/robot/_resources/keywords/admin_keywords.robot
@@ -30,8 +30,7 @@ Resource        template_opt1.4_keywords.robot
     [Arguments]         ${multitenancy_token}=${None}
     IF  '${multitenancy_token}' != '${None}'
         Set To Dictionary     ${headers}    Authorization=Bearer ${multitenancy_token}
-    END
-    IF      '${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH'
+    ELSE IF     ('${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH') and '${multitenancy_token}' == '${None}'
         Set To Dictionary       ${headers}      &{authorization}
     END
     Create Session      ${SUT}    ${ADMIN_BASEURL}    debug=2
@@ -97,11 +96,10 @@ Resource        template_opt1.4_keywords.robot
     ...                 Needs `${versioned_object_uid}` var from e.g. `commit composition (JSON)` KW.
     [Arguments]         ${multitenancy_token}=${None}
 
-    IF     '${multitenancy_token}' != '${None}'
-            Set To Dictionary   ${headers}      Authorization=Bearer ${multitenancy_token}
-    END
-    IF      '${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH'
-            Set To Dictionary       ${headers}      &{authorization}
+    IF  '${multitenancy_token}' != '${None}'
+        Set To Dictionary     ${headers}    Authorization=Bearer ${multitenancy_token}
+    ELSE IF     ('${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH') and '${multitenancy_token}' == '${None}'
+        Set To Dictionary       ${headers}      &{authorization}
     END
     Create Session      ${SUT}    ${ADMIN_BASEURL}    debug=2
                             ...     verify=False

diff --git a/tests/robot/_resources/keywords/aql_query_keywords.robot b/tests/robot/_resources/keywords/aql_query_keywords.robot
@@ -321,7 +321,9 @@ PUT /definition/query/{qualified_query_name}/{version}
     ...                 {random_query_qualified_name}/{random_query_version}
     [Arguments]     ${query_to_store}    ${format}=json     ${multitenancy_token}=${None}
     &{headers}      Create Dictionary
-    IF      '${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH'
+    IF  '${multitenancy_token}' != '${None}'
+        Set To Dictionary     ${headers}    Authorization=Bearer ${multitenancy_token}
+    ELSE IF     ('${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH') and '${multitenancy_token}' == '${None}'
         Set To Dictionary       ${headers}      &{authorization}
     END
     IF      '${format}' == 'json'
@@ -331,9 +333,6 @@ PUT /definition/query/{qualified_query_name}/{version}
         Set To Dictionary   ${headers}      Content-Type=text/plain
         ${query}    Set Variable    ${query_to_store}
     END
-    IF  '${multitenancy_token}' != '${None}'
-        Set To Dictionary    ${headers}    Authorization=Bearer ${multitenancy_token}
-    END
     Create Session      ${SUT}      ${BASEURL}      debug=2
     ${random_version}   Generate Version Number To Store Query Multitenancy
     Set Test Variable   ${random_query_version}   ${random_version}
@@ -357,13 +356,12 @@ GET /definition/query/{qualified_query_name} / including {version}
     ...                 Returns {resp_query}, query from response.
     [Arguments]     ${qualif_name}      ${multitenancy_token}=${None}
     &{headers}      Create Dictionary       Content-Type=application/json
-    IF      '${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH'
-        Set To Dictionary       ${headers}      &{authorization}
-    END
-    Create Session      ${SUT}      ${BASEURL}      debug=2
     IF  '${multitenancy_token}' != '${None}'
         Set To Dictionary     ${headers}    Authorization=Bearer ${multitenancy_token}
+    ELSE IF     ('${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH') and '${multitenancy_token}' == '${None}'
+        Set To Dictionary       ${headers}      &{authorization}
     END
+    Create Session      ${SUT}      ${BASEURL}      debug=2
     ${resp}     GET On Session      ${SUT}
     ...         /definition/query/${qualif_name}
     ...         expected_status=anything

diff --git a/tests/robot/_resources/keywords/composition_keywords.robot b/tests/robot/_resources/keywords/composition_keywords.robot
@@ -310,13 +310,10 @@ commit composition
 
     &{headers}=        Create Dictionary   Prefer=return=${prefer}
     ...                openEHR-VERSION.lifecycle_state=${lifecycle}
-    IF      '${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH'
-        Set To Dictionary       ${headers}      &{authorization}
-    END
-
     IF  '${multitenancy_token}' != '${None}'
-        Set To Dictionary   ${headers}
-        ...     Authorization=Bearer ${multitenancy_token}
+        Set To Dictionary     ${headers}    Authorization=Bearer ${multitenancy_token}
+    ELSE IF     ('${AUTH_TYPE}' == 'BASIC' or '${AUTH_TYPE}' == 'OAUTH') and '${multitenancy_token}' == '${None}'
+        Set To Dictionary       ${headers}      &{authorization}
     END
 
     Set Test Variable   ${headers}      ${headers}