oldaplib 0.2.7__tar.gz → 0.2.8__tar.gz

{oldaplib-0.2.7 → oldaplib-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.2.7
+Version: 0.2.8
 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 → oldaplib-0.2.8}/oldaplib/src/connection.py

@@ -250,11 +250,7 @@ class Connection(IConnection):
     @property
     def jwtkey(self) -> str:
         """Getter for the JWT token"""
-        return self.__jwtkey
-
-    @jwtkey.setter
-    def jwtkey(self, value: str) -> None:
-        self.__jwtkey = value
+        return Connection.__jwtkey
 
     @property
     def server(self) -> str:

oldaplib-0.2.8/oldaplib/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.2.8"

{oldaplib-0.2.7 → oldaplib-0.2.8}/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 → oldaplib-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.2.7"
+version = "0.2.8"
 description = "Open Media Access Server Library (Linked Open Data middleware/RESTApi)"
 authors = ["Lukas Rosenthaler <lukas.rosenthaler@unibas.ch>"]
 license = "GNU Affero General Public License version 3"

oldaplib-0.2.7/oldaplib/src/version.py

@@ -1 +0,0 @@
-__version__ = "0.2.7"