Merge pull request #150 from bunq/feature/sdk_python#149_remove_get_user_object_call

feature/sdk_python#149 Remove get_user_object call directly after UserContext creation

Author: angelomelonas

bunq/sdk/context/api_context.py

@@ -13,7 +13,7 @@
 from bunq.sdk.json import converter
 from bunq.sdk.model.core.payment_service_provider_credential_internal import PaymentServiceProviderCredentialInternal
 from bunq.sdk.model.generated import endpoint
-from bunq.sdk.model.generated.endpoint import UserCredentialPasswordIp, UserPaymentServiceProvider
+from bunq.sdk.model.generated.endpoint import UserCredentialPasswordIp
 from bunq.sdk.security import security
 
 if typing.TYPE_CHECKING:
@@ -90,7 +90,7 @@ def create_for_psd2(cls,
         api_context._api_key = service_provider_credential.token_value
 
         api_context.__register_device(description, all_permitted_ip)
-        api_context.__initialize_session_for_psd2(service_provider_credential)
+        api_context.__initialize_session()
 
         return api_context
 
@@ -104,8 +104,7 @@ def __initialize_installation(self) -> None:
             security.public_key_to_string(private_key_client.publickey())
         ).value
         token = installation.token.token
-        public_key_server_string = \
-            installation.server_public_key.server_public_key
+        public_key_server_string = installation.server_public_key.server_public_key
         public_key_server = RSA.import_key(public_key_server_string)
 
         self._installation_context = InstallationContext(
@@ -117,7 +116,7 @@ def __initialize_installation(self) -> None:
     def __initialize_psd2_credential(self,
                                      certificate: str,
                                      private_key: str,
-                                     all_chain_certificate: List[str], ) -> UserCredentialPasswordIp:
+                                     all_chain_certificate: List[str]) -> UserCredentialPasswordIp:
         session_token = self.installation_context.token
         client_key_pair = self.installation_context.private_key_client
 
@@ -149,22 +148,7 @@ def __initialize_session(self) -> None:
         from bunq.sdk.model.core.session_server import SessionServer
 
         session_server = SessionServer.create(self).value
-        token = session_server.token.token
-        expiry_time = self._get_expiry_timestamp(session_server)
-        user_id = session_server.get_referenced_user().id_
-
-        self._session_context = SessionContext(token, expiry_time, user_id)
-
-    def __initialize_session_for_psd2(self, user_payment_service_provider: UserPaymentServiceProvider) -> None:
-        from bunq.sdk.model.core.session_server import SessionServer
-
-        session_server = SessionServer.create(self).value
-
-        token = session_server.token.token
-        expiry_time = self._get_expiry_timestamp(session_server)
-        user_id = session_server.get_referenced_user().id_
-
-        self._session_context = SessionContext(token, expiry_time, user_id)
+        self._session_context = SessionContext(session_server)
 
     @classmethod
     def _get_expiry_timestamp(cls, session_server: SessionServer) -> datetime.datetime:

bunq/sdk/context/bunq_context.py

@@ -17,7 +17,7 @@ def __init__(self) -> None:
     @classmethod
     def load_api_context(cls, api_context: ApiContext) -> None:
         cls._api_context = api_context
-        cls._user_context = UserContext(api_context.session_context.user_id)
+        cls._user_context = UserContext(api_context.session_context.user_id, api_context.session_context.user)
         cls._user_context.init_main_monetary_account()
 
     @classmethod

bunq/sdk/context/session_context.py

@@ -1,20 +1,14 @@
 import datetime
 
+from bunq.sdk.model.core.session_server import SessionServer
 
-class SessionContext:
-    """
-    :type _token: str
-    :type _expiry_time: datetime.datetime
-    :type _user_id: int
-    """
 
-    def __init__(self,
-                 token: str,
-                 expiry_time: datetime.datetime,
-                 user_id: int) -> None:
-        self._token = token
-        self._expiry_time = expiry_time
-        self._user_id = user_id
+class SessionContext:
+    def __init__(self, session_server: SessionServer) -> None:
+        self._token = session_server.token.token
+        self._expiry_time = self._get_expiry_timestamp(session_server)
+        self._user_id = session_server.get_referenced_user().id_
+        self._user = session_server.get_referenced_user()
 
     @property
     def token(self) -> str:
@@ -27,3 +21,7 @@ def expiry_time(self) -> datetime.datetime:
     @property
     def user_id(self) -> int:
         return self._user_id
+
+    @property
+    def user(self):
+        return self._user

bunq/sdk/context/user_context.py

@@ -1,3 +1,4 @@
+from bunq import T
 from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.model.core.bunq_model import BunqModel
 from bunq.sdk.model.generated import endpoint
@@ -9,15 +10,15 @@ class UserContext:
     _ERROR_NO_ACTIVE_MONETARY_ACCOUNT_FOUND = 'No active monetary account found.'
     _STATUS_ACTIVE = 'ACTIVE'
 
-    def __init__(self, user_id: int) -> None:
+    def __init__(self, user_id: int, user: BunqModel) -> None:
         self._user_id = user_id
         self._user_person = None
         self._user_company = None
         self._user_api_key = None
         self._user_payment_service_provider = None
         self._primary_monetary_account = None
 
-        self._set_user(self.__get_user_object())
+        self._set_user(user)
 
     @staticmethod
     def __get_user_object() -> BunqModel: