oldaplib 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

oldaplib/src/connection.py

@@ -96,7 +96,7 @@ class Connection(IConnection):
     _query_url: str
     _update_url: str
     _transaction_url: Optional[str]
-    __jwtkey: str = os.getenv("OLDAP_JWT_SECRET", "You have to change this!!! +D&RWG+")
+    __jwtkey: str
     _switcher = {
         SparqlResultFormat.XML: lambda a: a.text,
         SparqlResultFormat.JSON: lambda a: a.json(),
@@ -140,6 +140,7 @@ class Connection(IConnection):
                             in specific scenarios.
         """
         super().__init__(context_name=context_name)
+        self.__jwtkey = os.getenv("OLDAP_JWT_SECRET", "You have to change this!!! +D&RWG+")
         self._server = server or os.getenv("OLDAP_TS_SERVER", "http://localhost:7200")
         self._repo = repo or os.getenv("OLDAP_TS_REPO", "oldap")
         self._dbuser = dbuser or os.getenv("OLDAP_TS_USER", "")
@@ -153,7 +154,7 @@ class Connection(IConnection):
         context = Context(name=context_name)
         if token is not None:
             try:
-                payload = jwt.decode(jwt=token, key=Connection.__jwtkey, algorithms="HS256")
+                payload = jwt.decode(jwt=token, key=self.__jwtkey, algorithms="HS256")
             except InvalidTokenError:
                 logger.error("Connection with invalid token")
                 raise OldapError("Wrong credentials")
@@ -206,7 +207,7 @@ class Connection(IConnection):
         }
         self._token = jwt.encode(
             payload=payload,
-            key=Connection.__jwtkey,
+            key=self.__jwtkey,
             algorithm="HS256")
         #
         # Get projects and add to Context
@@ -252,10 +253,6 @@ class Connection(IConnection):
         """Getter for the JWT token"""
         return self.__jwtkey
 
-    @jwtkey.setter
-    def jwtkey(self, value: str) -> None:
-        self.__jwtkey = value
-
     @property
     def server(self) -> str:
         """Getter for server string"""

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.2.7"
+__version__ = "0.2.9"

oldaplib/test/test_connection.py

@@ -1,3 +1,5 @@
+import json
+import os
 import unittest
 from datetime import datetime, timezone
 from pathlib import Path
@@ -11,6 +13,7 @@ from oldaplib.src.enums.sparql_result_format import SparqlResultFormat
 from oldaplib.src.helpers.context import Context
 from oldaplib.src.dtypes.bnode import BNode
 from oldaplib.src.dtypes.namespaceiri import NamespaceIRI
+from oldaplib.src.helpers.serializer import serializer
 from oldaplib.src.xsd.iri import Iri
 from oldaplib.src.xsd.xsd_anyuri import Xsd_anyURI
 from oldaplib.src.xsd.xsd_qname import Xsd_QName
@@ -113,11 +116,15 @@ class TestBasicConnection(unittest.TestCase):
 
     #@unittest.skip('No longer used')
     def test_token(self):
-        Connection.jwtkey = "This is a very special secret, yeah!"
+        os.environ["OLDAP_JWT_SECRET"] = "This is a very special secret, yeah!"
         con = Connection(userId="rosenth",
                          credentials="RioGrande",
                          context_name="DEFAULT")
         token = con.token
+        tokendata = jwt.decode(jwt=token, key=con.jwtkey, algorithms="HS256")
+        userdata = json.loads(tokendata['userdata'], object_hook=serializer.decoder_hook)
+        self.assertEqual(userdata.userId, "rosenth")
+
         con = Connection(token=token,
                          context_name="DEFAULT")
         self.assertEqual(con.userid, Xsd_NCName("rosenth"))

{oldaplib-0.2.7.dist-info → oldaplib-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.2.7
+Version: 0.2.9
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.2.7.dist-info → oldaplib-0.2.9.dist-info}/RECORD

@@ -7,7 +7,7 @@ oldaplib/ontologies/oldap.ttl,sha256=w4q5SX6UIeuYXI2nxNSxzsjZKfR5-mDoLaJXyODBUps
 oldaplib/ontologies/shared.trig,sha256=Am3_Nrp1j6fr3W0CEns-RczBRX96mQD0T1GgSjdmvDY,17233
 oldaplib/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/cachesingleton.py,sha256=RzQz5-rSAuqgF0TbkdHPwdOjoGxpHFqO8Fpips4AK54,3550
-oldaplib/src/connection.py,sha256=EhcohYB6Ktt4NleNKf90GJ-Z9G7afWZZVqrdJXbV9m8,29098
+oldaplib/src/connection.py,sha256=LJMJO65QhSbheIEBnOCphRyAD1STwkO8zfNcYPcKwP8,29016
 oldaplib/src/datamodel.py,sha256=7jhqiFYT9fkn6cNTCn5Q7QfxSy29QyMrcVferPZLQrE,30309
 oldaplib/src/dtypes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/dtypes/bnode.py,sha256=aPdm6FpqqFXCAtZJtOniLwIUFRcxK4XmwpCcg3PEnGc,1554
@@ -66,7 +66,7 @@ oldaplib/src/propertyclass.py,sha256=sOxK1S5SEGOoUqSKrV4hxWAluNMagnTnPFoo5JuuWEQ
 oldaplib/src/resourceclass.py,sha256=DSuLMmgWutLUCbC1NuoBVwLHalDakeipMP3-NmnWx_g,98981
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=LIho7asb0pp1iNbJvXEhRMluyGN4gB4RHIIbAKpROsc,21
+oldaplib/src/version.py,sha256=oVsqrXzR8GvkVDBk6i2YQGHXmKdqeqypnb-K9OFmLlg,21
 oldaplib/src/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/xsd/floatingpoint.py,sha256=rDReKqh0mXyc4F5wslgTUxbeGf3-PGERyughj5_62YI,8852
 oldaplib/src/xsd/iri.py,sha256=tXOuDASdQ6k9KKp2wTO8H4K8yb-_o8jFPanua7wCHog,8269
@@ -113,7 +113,7 @@ oldaplib/src/xsd/xsd_unsignedlong.py,sha256=5fGH8_SAV1x6b0YGiIR44ZlJXjUiCUW6XHhC
 oldaplib/src/xsd/xsd_unsignedshort.py,sha256=M1E8SDR33rPJ0jUpRkzcDCcJYg17YfVbaItTuJeEibc,1013
 oldaplib/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/test/test_cache.py,sha256=6TGukPUruuj5BsZaPGZdIx9L7v39qB9jIKZkg_GkbW4,702
-oldaplib/test/test_connection.py,sha256=IxYWM3DAzWQAJPItoCk1HZdrHH0hAG4tbPCSwsGlFZE,13078
+oldaplib/test/test_connection.py,sha256=TM9f17G5RCa2B5gGWVbVhoLL0CUW1JHoM12Brz4P73U,13390
 oldaplib/test/test_context.py,sha256=cJJWzSiWpKq9UFhbScru_PdOAqaCWKB3f_lRzxcCm10,4939
 oldaplib/test/test_datamodel.py,sha256=6hE50zzh6tGb2PKQ4sFk-C829OM5qWOdsJKR107dhgw,54377
 oldaplib/test/test_dtypes.py,sha256=UVdlHNdJrJ5iujMWlwk9tOhRzouJYA8x0E-eLDXPmUo,8583
@@ -152,6 +152,6 @@ oldaplib/testdata/source_type.yaml,sha256=dSihKikw3O-IlGf6anj5KWMoBYLaweLVF1Zojm
 oldaplib/testdata/test_move_left_of_toL.yaml,sha256=2m1OSQrQFlsCQxeJrjzBAO74LMprNDo_HuyrYGsOeXI,787
 oldaplib/testdata/testlist.yaml,sha256=AT11nXEG81Sfyb-tr1gQV0H_dZBrOCcFuHf7YtL8P2g,1994
 oldaplib/testit.http,sha256=qW7mnr6aNLXFG6lQdLgyhXILOPN6qc5iFVZclLyVvkY,303
-oldaplib-0.2.7.dist-info/METADATA,sha256=LYvCy8XGpIyQ0EBwjO-20gZUAmGrkZ_6J7yvH5-CRUg,2803
-oldaplib-0.2.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.2.7.dist-info/RECORD,,
+oldaplib-0.2.9.dist-info/METADATA,sha256=UyG0whMOpshjA9sVHMfqAfqWxqnFcIkHG5jAtLlgcEw,2803
+oldaplib-0.2.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.2.9.dist-info/RECORD,,