Merge pull request #71 from PolicyEngine/fix/remove_final_clients

Remove final `@clients` from `client_id` parameter of JWT

.gitignore

@@ -14,4 +14,5 @@ dist/*
 **/*.rdb
 **/*.h5
 **/*.csv.gz
-.env
+.env
+.ds_store

Makefile

@@ -2,7 +2,7 @@ install:
 	pip install -e .[dev]
 
 debug:
-	FLASK_APP=policyengine_household_api.api FLASK_DEBUG=1 flask run --without-threads -p 5050
+	FLASK_APP=policyengine_household_api.api FLASK_DEBUG=1 flask run --without-threads
 
 test:
 	pytest -vv --timeout=150 -rP tests

changelog_entry.yaml

@@ -0,0 +1,4 @@
+- bump: patch
+  changes:
+    changed:
+    - Removed the '@clients' parameter from the client_id portion of the JWT

policyengine_household_api/decorators/analytics.py

@@ -20,6 +20,12 @@ def decorated_function(*args, **kwargs):
         token = auth_header.split(" ")[1]
         decoded_token = jwt.decode(token, options={"verify_signature": False})
         client_id = decoded_token["sub"]
+        suffix_to_slice = "@clients"
+        if (
+            len(client_id) >= len(suffix_to_slice)
+            and client_id[-len(suffix_to_slice) :] == suffix_to_slice
+        ):
+            client_id = client_id[: -len(suffix_to_slice)]
         new_visit.client_id = client_id
 
         # Set API version