vc-utils 2.0__tar.gz → 2.1__tar.gz

{vc_utils-2.0 → vc_utils-2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vc-utils
-Version: 2.0
+Version: 2.1
 Summary: Vulcan Coalition Python Utility Library
 Home-page: https://github.com/vulcan-coalition/vulcan-utils
 Author: Chatavut Viriyasuthee
@@ -35,7 +35,7 @@ Vulcan python utility
 ## Installation
 
 ```bash
-pip install vulcan-utils
+pip install vc-utils
 ```
 
 ## Usage
@@ -48,12 +48,13 @@ export LINKAGE_CLIENT_ID="test-client-id"
 export LINKAGE_CLIENT_SECRET="test-client-secret"
 
 export LINKAGE_M2M_HOST="https://application-linkage.vulcanproduct.com"
+export LINKAGE_U2M_HOST="https://account-linkage.vulcanproduct.com"
 ```
 
 Then you can import and use the Linkage API in your code:
 
 ```python
-from vulcan_utils import linkage
+import linkage
 ```
 
 ## Test

{vc_utils-2.0 → vc_utils-2.1}/README.md

@@ -11,7 +11,7 @@ Vulcan python utility
 ## Installation
 
 ```bash
-pip install vulcan-utils
+pip install vc-utils
 ```
 
 ## Usage
@@ -24,12 +24,13 @@ export LINKAGE_CLIENT_ID="test-client-id"
 export LINKAGE_CLIENT_SECRET="test-client-secret"
 
 export LINKAGE_M2M_HOST="https://application-linkage.vulcanproduct.com"
+export LINKAGE_U2M_HOST="https://account-linkage.vulcanproduct.com"
 ```
 
 Then you can import and use the Linkage API in your code:
 
 ```python
-from vulcan_utils import linkage
+import linkage
 ```
 
 ## Test

{vc_utils-2.0 → vc_utils-2.1}/linkage/session.py

@@ -14,6 +14,7 @@ CLIENT_ID = None
 CLIENT_SECRET = None
 
 LINKAGE_M2M_HOST = None
+LINKAGE_U2M_HOST = None
 
 async def init():
     LINKAGE_OPENID_CONF_PATH = os.getenv("LINKAGE_OPENID_CONF_PATH", None)
@@ -46,6 +47,11 @@ async def init():
     if not LINKAGE_M2M_HOST:    
         raise Exception("LINKAGE_M2M_HOST environment variable must be set")
     
+    global LINKAGE_U2M_HOST
+    LINKAGE_U2M_HOST = os.getenv("LINKAGE_U2M_HOST", None)
+    if not LINKAGE_U2M_HOST:    
+        raise Exception("LINKAGE_U2M_HOST environment variable must be set")
+    
 
 async def application_get_token():
     # use separate session to avoid token refresh logic in Linkage_Application_Session
@@ -122,8 +128,7 @@ class Linkage_Application:
         return await resp.json()
 
 
-
-async def get_user_data(token):
+async def get_user_data(token, spec_id=None):
     if not token:
         return None
     
@@ -131,11 +136,18 @@ async def get_user_data(token):
         "Authorization": f"Bearer {token}"
     }
     async with aiohttp.ClientSession() as session:
-        async with session.get(USERINFO_ENDPOINT, headers=headers) as resp:
-            if resp.status != 200:
-                error_data = await resp.json()
-                raise Exception(error_data)
-            return await resp.json()
+        if spec_id is not None:
+            async with session.get(f"{LINKAGE_U2M_HOST}/data/{spec_id}", headers=headers) as resp:
+                if resp.status != 200:
+                    error_data = await resp.json()
+                    raise Exception(error_data)
+                return await resp.json()
+        else:
+            async with session.get(USERINFO_ENDPOINT, headers=headers) as resp:
+                if resp.status != 200:
+                    error_data = await resp.json()
+                    raise Exception(error_data)
+                return await resp.json()
 
 
 def get_authn_req_url(scope, redirect_uri):

{vc_utils-2.0 → vc_utils-2.1}/setup.py

@@ -11,7 +11,7 @@ import shutil
 
 setup(
     name="vc-utils",
-    version="2.0",
+    version="2.1",
     author="Chatavut Viriyasuthee",
     author_email="chatavut@lab.ai",
     description="Vulcan Coalition Python Utility Library",

{vc_utils-2.0 → vc_utils-2.1}/vc_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vc-utils
-Version: 2.0
+Version: 2.1
 Summary: Vulcan Coalition Python Utility Library
 Home-page: https://github.com/vulcan-coalition/vulcan-utils
 Author: Chatavut Viriyasuthee
@@ -35,7 +35,7 @@ Vulcan python utility
 ## Installation
 
 ```bash
-pip install vulcan-utils
+pip install vc-utils
 ```
 
 ## Usage
@@ -48,12 +48,13 @@ export LINKAGE_CLIENT_ID="test-client-id"
 export LINKAGE_CLIENT_SECRET="test-client-secret"
 
 export LINKAGE_M2M_HOST="https://application-linkage.vulcanproduct.com"
+export LINKAGE_U2M_HOST="https://account-linkage.vulcanproduct.com"
 ```
 
 Then you can import and use the Linkage API in your code:
 
 ```python
-from vulcan_utils import linkage
+import linkage
 ```
 
 ## Test