feature/python-sdk-psd2: Added PaymentServiceProviderCredential to relevant classes.

Author: angelomelonas

bunq/sdk/context/user_context.py

@@ -14,6 +14,7 @@ def __init__(self, user_id: int) -> None:
         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())
@@ -32,6 +33,9 @@ def _set_user(self, user: BunqModel) -> None:
         elif isinstance(user, endpoint.UserApiKey):
             self._user_api_key = user
 
+        elif isinstance(user, endpoint.UserPaymentServiceProvider):
+            self._user_payment_service_provider = user
+
         else:
             raise BunqException(
                 self._ERROR_UNEXPECTED_USER_INSTANCE.format(user.__class__))
@@ -73,6 +77,10 @@ def is_all_user_type_set(self) -> bool:
 
     def refresh_user_context(self) -> None:
         self._set_user(self.__get_user_object())
+
+        if self._user_payment_service_provider is not None:
+            return
+
         self.init_main_monetary_account()
 
     @property

bunq/sdk/http/api_client.py

@@ -33,10 +33,12 @@ class ApiClient:
     _URL_DEVICE_SERVER = 'device-server'
     _URI_INSTALLATION = 'installation'
     _URI_SESSION_SERVER = 'session-server'
+    _URL_PAYMENT_SERVICE_PROVIDER_CREDENTIAL = 'payment-service-provider-credential'
     _URIS_NOT_REQUIRING_ACTIVE_SESSION = [
         _URI_INSTALLATION,
         _URI_SESSION_SERVER,
         _URL_DEVICE_SERVER,
+        _URL_PAYMENT_SERVICE_PROVIDER_CREDENTIAL,
     ]
 
     # HTTPS type of proxy, the only used at bunq

bunq/sdk/json/session_server_adapter.py

@@ -37,6 +37,10 @@ class SessionServerAdapter(converter.JsonAdapter):
     _ATTRIBUTE_USER_API_KEY = '_user_api_key'
     _FIELD_USER_API_KEY = 'UserApiKey'
 
+    # UserPaymentServiceProvider constants
+    _ATTRIBUTE_USER_PAYMENT_SERVER_PROVIDER = '_user_payment_service_provider'
+    _FIELD_USER_PAYMENT_SERVER_PROVIDER = 'UserPaymentServiceProvider'
+
     @classmethod
     def deserialize(cls,
                     target_class: Type[SessionServer],
@@ -52,7 +56,7 @@ def deserialize(cls,
                 array[cls._INDEX_TOKEN][cls._FIELD_TOKEN]
             ),
             cls._ATTRIBUTE_USER_COMPANY: None,
-            cls._ATTRIBUTE_USER_PERSON: None,
+            cls._ATTRIBUTE_USER_PERSON: None
         }
 
         user_dict_wrapped = array[cls._INDEX_USER]
@@ -75,6 +79,12 @@ def deserialize(cls,
                     endpoint.UserApiKey,
                     user_dict_wrapped[cls._FIELD_USER_API_KEY]
                 )
+        elif cls._FIELD_USER_PAYMENT_SERVER_PROVIDER in user_dict_wrapped:
+            session_server.__dict__[cls._ATTRIBUTE_USER_PAYMENT_SERVER_PROVIDER] = \
+                converter.deserialize(
+                    endpoint.UserPaymentServiceProvider,
+                    user_dict_wrapped[cls._FIELD_USER_PAYMENT_SERVER_PROVIDER]
+                )
         else:
             raise BunqException(cls._ERROR_COULD_NOT_DETERMINE_USER)
 
@@ -97,4 +107,8 @@ def serialize(cls, session_server: SessionServer) -> List:
                 cls._FIELD_USER_API_KEY:
                     converter.serialize(session_server.user_api_key),
             },
+            {
+                cls._FIELD_USER_PAYMENT_SERVER_PROVIDER:
+                    converter.serialize(session_server.user_payment_service_provider),
+            },
         ]

bunq/sdk/model/core/session_server.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from bunq.sdk.context.api_context import ApiContext
 from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.http.api_client import ApiClient
@@ -8,16 +10,17 @@
 from bunq.sdk.model.core.bunq_model import BunqModel
 from bunq.sdk.model.core.id import Id
 from bunq.sdk.model.core.session_token import SessionToken
-from bunq.sdk.model.generated.endpoint import UserPerson, UserCompany, UserApiKey
+from bunq.sdk.model.generated.endpoint import UserPerson, UserCompany, UserApiKey, UserPaymentServiceProvider
 
 
 class SessionServer(BunqModel):
     """
-    :type _id_: Id
-    :type _token: SessionToken
-    :type _user_person: bunq.sdk.model.generated.UserPerson
-    :type _user_company: bunq.sdk.model.generated.UserCompany
-    :type _user_api_key: bunq.sdk.model.generated.UserApiKey
+    :type _id_: Id|None
+    :type _token: SessionToken|None
+    :type _user_person: UserPerson|None
+    :type _user_company: UserCompany|None
+    :type _user_api_key: UserApiKey|None
+    :type _user_payment_service_provider:UserPaymentServiceProvider|None
     """
 
     # Endpoint name.
@@ -35,6 +38,7 @@ def __init__(self) -> None:
         self._user_person = None
         self._user_company = None
         self._user_api_key = None
+        self._user_payment_service_provider = None
 
     @property
     def id_(self) -> Id:
@@ -53,9 +57,13 @@ def user_company(self) -> UserCompany:
         return self._user_company
 
     @property
-    def user_api_key(self) -> UserApiKey:
+    def user_api_key(self) -> Optional[UserApiKey]:
         return self._user_api_key
 
+    @property
+    def user_payment_service_provider(self) -> UserPaymentServiceProvider:
+        return self._user_payment_service_provider
+
     @classmethod
     def create(cls, api_context: ApiContext) -> BunqResponse[SessionServer]:
         api_client = ApiClient(api_context)
@@ -81,6 +89,9 @@ def is_all_field_none(self) -> bool:
         if self.user_company is not None:
             return False
 
+        if self.user_payment_service_provider is not None:
+            return False
+
         if self.user_api_key is not None:
             return False
 
@@ -93,6 +104,9 @@ def get_referenced_user(self) -> BunqModel:
         if self._user_company is not None:
             return self._user_company
 
+        if self._user_payment_service_provider is not None:
+            return self._user_payment_service_provider
+
         if self._user_api_key is not None:
             return self._user_api_key