libtimed 0.6.0__tar.gz → 0.6.2__tar.gz

{libtimed-0.6.0 → libtimed-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libtimed
-Version: 0.6.0
+Version: 0.6.2
 Summary: Library to intreact with timed webapp.
 Author: Arthur Deierlein
 Author-email: arthur.deierlein@adfinis.com

{libtimed-0.6.0 → libtimed-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "libtimed"
-version = "0.6.0"
+version = "0.6.2"
 description = "Library to intreact with timed webapp."
 authors = [
   "Arthur Deierlein <arthur.deierlein@adfinis.com>",

{libtimed-0.6.0 → libtimed-0.6.2}/src/libtimed/models.py

@@ -263,8 +263,8 @@ class Activities(BaseModel):
     ]
 
     attributes = [
-        ("from-time", datetime.now().time(), transforms.Time),
-        ("to-time", None, transforms.Time),
+        ("from-time", datetime.now().time(), transforms.Time(True)),
+        ("to-time", None, transforms.Time(True)),
         ("transferred", False, transforms.Type(bool)),
         COMMENT,
         DATE,

{libtimed-0.6.0 → libtimed-0.6.2}/src/libtimed/oidc.py

@@ -4,6 +4,7 @@ import base64
 import datetime
 import http.server
 import json
+import time
 import webbrowser
 from urllib.parse import urlparse
 
@@ -41,18 +42,20 @@ class OIDCHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
 
 
 class OIDCClient:
-    def __init__(self, client_id, sso_url, sso_realm, auth_path):
+    def __init__(self, client_id, sso_url, sso_realm, auth_path, use_device_flow=False):
         self.client_id = client_id
         self.sso_url = sso_url
         self.sso_realm = sso_realm
         self.auth_path = auth_path
+        self.use_device_flow = use_device_flow
 
     def autoconfig(self):
         data = requests.get(
-            f"{self.sso_url}/auth/realms/{self.sso_realm}/.well-known/openid-configuration"
+            f"{self.sso_url}/realms/{self.sso_realm}/.well-known/openid-configuration"
         ).json()
         self.authorization_endpoint = data["authorization_endpoint"]
         self.token_endpoint = data["token_endpoint"]
+        self.device_endpoint = data["device_authorization_endpoint"]
 
     def start_browser_flow(self):
         # construct the authorization request
@@ -74,6 +77,29 @@ class OIDCClient:
         self.code = code
         return True
 
+    def start_device_flow(self):
+        # construct the authorization request
+        auth_data = requests.post(self.device_endpoint, data={"client_id": self.client_id}).json()
+        verification_uri_complete = auth_data["verification_uri_complete"]
+        verification_uri = auth_data["verification_uri"]
+        device_code = auth_data["device_code"]
+        user_code = auth_data["user_code"]
+
+        # open the browser to the authorization URL
+        webbrowser.open_new(verification_uri_complete)
+        # print manual instructions
+        print(f"Please visit {verification_uri} and enter the code {user_code}")
+        time.sleep(5)
+
+        resp = {}
+        while "access_token" not in resp:
+            resp =  requests.post(self.token_endpoint, data={"client_id": self.client_id, "grant_type": "urn:ietf:params:oauth:grant-type:device_code", "device_code": device_code}).json()
+            print(resp)
+            time.sleep(5)
+        access_token = resp["access_token"]
+        return access_token
+
+
     def get_token(self):
         # construct the token request
         token_request = {
@@ -113,9 +139,11 @@ class OIDCClient:
         return now.timestamp() < expires_at
 
     def keyring_get(self):
+        return []
         return keyring.get_password("system", "libtimed_token_" + self.client_id)
 
     def keyring_set(self, token):
+        return True
         keyring.set_password("system", "libtimed_token_" + self.client_id, token)
 
     def authorize(self):
@@ -124,6 +152,12 @@ class OIDCClient:
             return cached_token
 
         self.autoconfig()
+        if self.use_device_flow:
+            if token:= self.start_device_flow():
+                self.keyring_set(token)
+                return token
+            return False
+
         if self.start_browser_flow():
             token = self.get_token()
             if not token:

{libtimed-0.6.0 → libtimed-0.6.2}/src/libtimed/transforms.py

@@ -153,8 +153,17 @@ class Time(BaseTransform):
 
     """Transform for times."""
 
-    @staticmethod
-    def serialize(value: time | str, **_) -> str | None:
+    def __init__(self, return_datetime: bool = False):
+        # return_datetime will be removed at some point
+        # it defaults to True to maintain backwards compatibility
+        self.return_datetime = return_datetime
+
+    def _return_value(self, value: datetime):
+        if self.return_datetime:
+            return value
+        return value.time()
+
+    def serialize(self, value: time | str, **_) -> str | None:
         if isinstance(value, str):
             try:
                 value = datetime.strptime(value, TIME_FORMAT).time()
@@ -165,9 +174,10 @@ class Time(BaseTransform):
 
         return value.strftime(TIME_FORMAT) if value else None
 
-    @staticmethod
-    def deserialize(value) -> date | None:
-        return datetime.strptime(value, "%H:%M:%S").time() if value else None
+    def deserialize(self, value) -> time | datetime | None:
+        return (
+            self._return_value(datetime.strptime(value, "%H:%M:%S")) if value else None
+        )
 
 
 class Enum(BaseTransform):