sweatstack 0.13.2__py3-none-any.whl → 0.14.1__py3-none-any.whl

sweatstack/streamlit.py

@@ -1,7 +1,4 @@
-import hashlib
-import base64
 import os
-import secrets
 import urllib.parse
 
 try:
@@ -13,59 +10,42 @@ except ImportError:
         "pip install 'sweatstack[streamlit]'\n\n"
     )
 import httpx
-from streamlit_cookies_controller import CookieController
 from sweatstack import Client
 
 from .constants import DEFAULT_URL
 
 
-cookie_controller = CookieController()
-
-
 class StreamlitAuth:
-    def __init__(self, set_env_var=False, client_id=None, client_secret=None, scope=None, redirect_uri=None):
+    def __init__(self, client_id=None, client_secret=None, scope=None, redirect_uri=None):
         """
         Args:
-            set_env_var: Whether to set the SWEATSTACK_API_KEY environment variable. Default is False.
             client_id: The client ID to use. If not provided, the SWEATSTACK_CLIENT_ID environment variable will be used.
             client_secret: The client secret to use. If not provided, the SWEATSTACK_CLIENT_SECRET environment variable will be used.
             scope: The scope to use. If not provided, the SWEATSTACK_SCOPE environment variable will be used.
             redirect_uri: The redirect URI to use. If not provided, the SWEATSTACK_REDIRECT_URI environment variable will be used.
         """
-        self.set_env_var = set_env_var
         self.client_id = client_id or os.environ.get("SWEATSTACK_CLIENT_ID")
         self.client_secret = client_secret or os.environ.get("SWEATSTACK_CLIENT_SECRET")
         self.scope = scope or os.environ.get("SWEATSTACK_SCOPE")
         self.redirect_uri = redirect_uri or os.environ.get("SWEATSTACK_REDIRECT_URI")
 
-        self.api_key = cookie_controller.get("sweatstack_api_key")
+        self.api_key = st.session_state.get("sweatstack_api_key")
         self.client = Client(self.api_key)
 
-        if self.api_key and self.set_env_var:
-            os.environ["SWEATSTACK_API_KEY"] = self.api_key
-
     def _show_sweatstack_logout(self):
         if st.button("Logout"):
             self.api_key = None
             self.client = Client()
-            cookie_controller.remove("sweatstack_api_key")
-            if self.set_env_var:
-                os.environ.pop("SWEATSTACK_API_KEY")
+            st.session_state.pop("sweatstack_api_key")
             st.rerun()
 
     def _show_sweatstack_login(self):
         st.link_button("Login", self._get_authorization_url_implicit())
 
     def _get_authorization_url_implicit(self):
-        code_verifier = secrets.token_urlsafe(32)
-        cookie_controller.set("code_verifier", code_verifier)
-        code_challenge = hashlib.sha256(code_verifier.encode("ascii")).digest()
-        code_challenge = base64.urlsafe_b64encode(code_challenge).rstrip(b"=").decode("ascii")
-
         params = {
             "client_id": self.client_id,
             "redirect_uri": self.redirect_uri,
-            "code_challenge": code_challenge,
             "scope": "data:read",
         }
         path = "/oauth/authorize"
@@ -73,17 +53,15 @@ class StreamlitAuth:
 
         return authorization_url
 
-
-    def _exchange_token_implicit(self, code):
-        code_verifier = cookie_controller.get("code_verifier")
+    def _exchange_token(self, code):
         token_data = {
             "grant_type": "authorization_code",
             "client_id": self.client_id,
+            "client_secret": self.client_secret,
             "code": code,
-            "code_verifier": code_verifier
         }
         response = httpx.post(
-            f"{DEFAULT_URL}/oauth/token",
+            f"{DEFAULT_URL}/api/v1/oauth/token",
             data=token_data,
         )
         try:
@@ -93,14 +71,10 @@ class StreamlitAuth:
         token_response = response.json()
 
         self.api_key = token_response.get("access_token")
-        cookie_controller.set("sweatstack_api_key", self.api_key)
-        if self.set_env_var:
-            os.environ["SWEATSTACK_API_KEY"] = self.api_key
+        st.session_state["sweatstack_api_key"] = self.api_key
 
         self.client = Client(self.api_key)
 
-        cookie_controller.remove("code_verifier")
-
         return
 
     def is_authenticated(self):
@@ -110,7 +84,7 @@ class StreamlitAuth:
         if self.is_authenticated():
             self._show_sweatstack_logout()
         elif code := st.query_params.get("code"):
-            self._exchange_token_implicit(code)
+            self._exchange_token(code)
             st.query_params.clear()
             st.rerun()
         else:

{sweatstack-0.13.2.dist-info → sweatstack-0.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sweatstack
-Version: 0.13.2
+Version: 0.14.1
 Summary: The official Python client for SweatStack
 Author-email: Aart Goossens <aart@gssns.io>
 Requires-Python: >=3.12
@@ -13,7 +13,6 @@ Requires-Dist: ipython>=8.31.0; extra == 'jupyterlab'
 Requires-Dist: jupyterlab>=4.3.4; extra == 'jupyterlab'
 Requires-Dist: matplotlib; extra == 'jupyterlab'
 Provides-Extra: streamlit
-Requires-Dist: streamlit-cookies-controller>=0.0.4; extra == 'streamlit'
 Requires-Dist: streamlit>=1.42.0; extra == 'streamlit'
 Description-Content-Type: text/markdown
 

{sweatstack-0.13.2.dist-info → sweatstack-0.14.1.dist-info}/RECORD

@@ -7,10 +7,10 @@ sweatstack/jupyterlab_oauth2_startup.py,sha256=eZ6xi0Sa4hO4vUanimq0SqjduHtiywCUR
 sweatstack/openapi_schemas.py,sha256=vtYHa6A0kADFbd_jK1O7Kbn8YkbPfzaIwsRDDYjYeSA,13038
 sweatstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sweatstack/schemas.py,sha256=CdkeV6IRmIuvxae7C5dz-hVlb6hkzEYfqKHHgVJprmY,90
-sweatstack/streamlit.py,sha256=0OE26TPMEwtIbm18E0JXE9fyJW_bER_wrOp90EC5C1g,4317
+sweatstack/streamlit.py,sha256=8RLMklQmpwyoRuLQDUeeGAveRvYu5PoBBay2ecOV5FM,3268
 sweatstack/sweatshell.py,sha256=MYLNcWbOdceqKJ3S0Pe8dwHXEeYsGJNjQoYUXpMTftA,333
 sweatstack/utils.py,sha256=0DcvHV1EOHQnN5OlfYo2DRrw8a9-6YkxTjLVCfi5ylE,277
-sweatstack-0.13.2.dist-info/METADATA,sha256=OZgehws5KkzNtvyHbyaMKRn31R8YJ6iG7usrbFl-jaQ,3039
-sweatstack-0.13.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sweatstack-0.13.2.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
-sweatstack-0.13.2.dist-info/RECORD,,
+sweatstack-0.14.1.dist-info/METADATA,sha256=A7gRbsBnp_lEH5YxR0YfmJCxECOMTHXTE2g3d29g4rU,2966
+sweatstack-0.14.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sweatstack-0.14.1.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
+sweatstack-0.14.1.dist-info/RECORD,,