jaaql-middleware-python 4.27.8__tar.gz → 4.28.2__tar.gz

{jaaql-middleware-python-4.27.8/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.27.8
+Version: 4.28.2
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv

{jaaql-middleware-python-4.27.8 → jaaql-middleware-python-4.28.2}/jaaql/constants.py

@@ -183,5 +183,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.27.8"
+VERSION = "4.28.2"
 

{jaaql-middleware-python-4.27.8 → jaaql-middleware-python-4.28.2}/jaaql/mvc/model.py

@@ -625,7 +625,6 @@ WHERE
                 access_token,
                 access_signing_key.key,
                 algorithms=allowed_algs,
-                audience=database_user_registry[KG__database_user_registry__client_id],
                 issuer=expected_issuer
             )
 
@@ -675,7 +674,7 @@ WHERE
             print("new federated user with account id " + account_id)
             account = account__select(self.jaaql_lookup_connection, self.get_db_crypt_key(), account_id)
             db_params = {"tenant": tenant, "application": application, "account_id": account_id, "provider": provider,
-                         "email": email}
+                         "email": email, "sub": sub}
             parameters = fetch_parameters_for_federation_procedure(self.jaaql_lookup_connection,
                                                                    database_user_registry[KG__database_user_registry__federation_procedure])
             for claim in parameters:
@@ -1099,7 +1098,8 @@ WHERE
         if datetime.fromisoformat(decoded[KEY__created]) + timedelta(milliseconds=self.refresh_expiry_ms) < datetime.now():
             raise UserUnauthorized()
 
-        return self.get_auth_token(decoded[KEY__username], ip_address, cookie=cookie, remember_me=remember_me, response=response, is_refresh=True)
+        return self.get_auth_token(decoded[KEY__username], ip_address, cookie=cookie, remember_me=remember_me, response=response, is_refresh=True, account_id=
+                                   decoded[KEY__account_id])
 
     def get_bypass_user(self, username: str, ip_address: str, provider: str = None, tenant: str = None):
         account = fetch_account_from_username(self.jaaql_lookup_connection, username, singleton_code=HTTPStatus.UNAUTHORIZED)
@@ -1120,17 +1120,23 @@ WHERE
         self,
         username: str, ip_address: str, password: str = None,
         response: JAAQLResponse = None, remember_me: bool = False, cookie: bool = False,
-        is_refresh=False,
+        is_refresh=False, account_id: str = None
     ):
         incorrect_credentials = False
         account = None
         encrypted_salted_ip_address = None
 
         try:
-            account = fetch_account_from_username(
-                self.jaaql_lookup_connection,
-                username,
-                singleton_code=HTTPStatus.UNAUTHORIZED)
+            if account_id is None:
+                account = fetch_account_from_username(
+                    self.jaaql_lookup_connection,
+                    username,
+                    singleton_code=HTTPStatus.UNAUTHORIZED)
+            else:
+                account = fetch_account_from_id(
+                    self.jaaql_lookup_connection,
+                    account_id,
+                    singleton_code=HTTPStatus.UNAUTHORIZED)
         except HttpStatusException as exc:
             if exc.response_code == HTTPStatus.UNAUTHORIZED:
                 incorrect_credentials = True

{jaaql-middleware-python-4.27.8 → jaaql-middleware-python-4.28.2/jaaql_middleware_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.27.8
+Version: 4.28.2
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv