set the projectId from env var only once

Author: guyp-descope

descope/auth.py

@@ -52,8 +52,7 @@ def __init__(
         http_client: HTTPClient,
     ):
         self.lock_public_keys = Lock()
-        # validate project id
-        project_id = project_id or os.getenv("DESCOPE_PROJECT_ID", "")
+
         if not project_id:
             raise AuthException(
                 400,

descope/descope_client.py

@@ -35,6 +35,18 @@ def __init__(
         auth_management_key: Optional[str] = None,
         fga_cache_url: Optional[str] = None,
     ):
+        # validate project id
+        project_id = project_id or os.getenv("DESCOPE_PROJECT_ID", "")
+        if not project_id:
+            raise AuthException(
+                400,
+                ERROR_TYPE_INVALID_ARGUMENT,
+                (
+                    "Unable to init DescopeClient because project_id cannot be empty. "
+                    "Set environment variable DESCOPE_PROJECT_ID or pass your Project ID to the init function."
+                ),
+            )
+
         # Auth Initialization
         auth_http_client = HTTPClient(
             project_id=project_id,

descope/http_client.py

@@ -53,8 +53,6 @@ def __init__(
         secure: bool = True,
         management_key: Optional[str] = None,
     ) -> None:
-        # validate project id
-        project_id = project_id or os.getenv("DESCOPE_PROJECT_ID", "")
         if not project_id:
             raise AuthException(
                 400,

tests/test_auth.py

@@ -1,5 +1,4 @@
 import json
-import os
 import unittest
 from enum import Enum
 from http import HTTPStatus
@@ -134,12 +133,7 @@ def test_fetch_public_key(self):
             mock_get.return_value.text = valid_keys_response
             self.assertIsNone(auth._fetch_public_keys())
 
-    def test_project_id_from_env(self):
-        os.environ["DESCOPE_PROJECT_ID"] = self.dummy_project_id
-        Auth(http_client=self.make_http_client())
-
-    def test_project_id_from_env_without_env(self):
-        os.environ["DESCOPE_PROJECT_ID"] = ""
+    def test_empty_project_id(self):
         self.assertRaises(AuthException, Auth, http_client=self.make_http_client())
 
     def test_base_url_for_project_id(self):

tests/test_descope_client.py

@@ -1,4 +1,5 @@
 import json
+import os
 import sys
 import unittest
 from copy import deepcopy
@@ -69,6 +70,10 @@ def test_descope_client(self):
             DescopeClient(project_id="dummy", public_key=self.public_key_str)
         )
 
+    def test_project_id_from_env_without_env(self):
+        os.environ["DESCOPE_PROJECT_ID"] = ""
+        self.assertRaises(AuthException, DescopeClient, "")
+
     def test_mgmt(self):
         client = DescopeClient(self.dummy_project_id, self.public_key_dict)
 

tests/test_http_client.py

@@ -1,11 +1,9 @@
 import importlib
 import importlib.util
-import os
 import sys
 import types
 import unittest
 
-from descope import AuthException
 from descope.http_client import HTTPClient
 
 
@@ -17,10 +15,6 @@ def test_base_url_for_project_id(self):
         pid = "Puse12aAc4T2V93bddihGEx2Ryhc8e5Z"
         assert HTTPClient.base_url_for_project_id(pid) == "https://api.use1.descope.com"
 
-    def test_project_id_from_env_without_env(self):
-        os.environ["DESCOPE_PROJECT_ID"] = ""
-        self.assertRaises(AuthException, HTTPClient, "")
-
     @unittest.skipIf(
         importlib.util.find_spec("importlib.metadata") is not None,
         "Stdlib metadata available; skip fallback path test",