modify the tests to include the claims_namespace_path

hasura · Apr 10, 2020 · 4976874 · 4976874
1 parent bc6c31f
commit 4976874
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/.circleci/test-server.sh b/.circleci/test-server.sh
@@ -318,6 +318,21 @@ kill_hge_servers
 
 unset HASURA_GRAPHQL_JWT_SECRET
 
+##########
+echo -e "\n$(time_elapsed): <########## TEST GRAPHQL-ENGINE WITH ADMIN SECRET AND JWT (with claims_namespace_path) #####################################>\n"
+TEST_TYPE="jwt"
+
+init_jwt
+
+export HASURA_GRAPHQL_JWT_SECRET="$(jq -n --arg key "$(cat $OUTPUT_FOLDER/ssl/jwt_public.key)" '{ type: "RS512", key: $key , claims_namespace_path: "$.hasuraClaims"}')"
+
+start_multiple_hge_servers
+
+run_pytest_parallel --hge-key="$HASURA_GRAPHQL_ADMIN_SECRET" --hge-jwt-key-file="$OUTPUT_FOLDER/ssl/jwt_private.key" --hge-jwt-conf="$HASURA_GRAPHQL_JWT_SECRET" --hge-jwt-claims-ns-path="$.hasuraClaims"
+
+kill_hge_servers
+
+unset HASURA_GRAPHQL_JWT_SECRET
 
 # test with CORS modes
 

diff --git a/server/tests-py/conftest.py b/server/tests-py/conftest.py
@@ -39,6 +39,10 @@ def pytest_addoption(parser):
         "--hge-jwt-conf", metavar="HGE_JWT_CONF", help="The JWT conf", required=False
     )
 
+    parser.addoption(
+        "--hge-jwt-claims-ns-path", metavar="HGE_JWT_CLAIMS_NS_PATH", help="The JWT conf claims namespace path", required=False
+    )
+
     parser.addoption(
         "--test-cors", action="store_true",
         required=False,

diff --git a/server/tests-py/test_jwt.py b/server/tests-py/test_jwt.py
@@ -31,6 +31,11 @@ def get_claims_fmt(raw_conf):
 
 def mk_claims(conf, claims):
     claims_fmt = get_claims_fmt(conf)
+    claims_namespace_path = PytestConf.config.getoption(--hge-jwt-claims-ns-path)
+    if claims_namespace_path == '$.hasuraClaims':
+        claims = {
+            "hasuraClaims":claims
+        }
     if claims_fmt == 'json':
         return claims
     elif claims_fmt == 'stringified_json':