update to 0.1.5 add getBankList and getAccountByPhone

Author: thedtvn

mbbank/main.py

@@ -306,6 +306,36 @@ def getCardTransactionHistory(self, cardNo: str, from_date: datetime.datetime, t
         data_out = self._req("https://online.mbbank.com.vn/api/retail_web/common/getTransactionHistory", json=json_data)
         return data_out
 
+    def getBankList(self):
+        """
+        Get transfer all bank list
+
+        Returns:
+            success (dict): bank list
+
+        Raises:
+            MBBankError: if api response not ok
+        """
+        data_out = await self._req("https://online.mbbank.com.vn/api/retail_web/common/getBankList")
+        return data_out
+
+    def getAccountByPhone(self, phone: str):
+        """
+        Get transfer account info by phone (MBank internal account only)
+
+        Args:
+            phone (str): MBBank account phone number
+
+        Returns:
+            success (dict): account info
+
+        """
+        json_data = {
+            "phone": phone
+        }
+        data_out = self._req("https://online.mbbank.com.vn/api/retail_web/common/getAccountByPhone", json=json_data)
+        return data_out
+
     def userinfo(self):
         """
         Get current user info

mbbank/mbasync.py

@@ -291,84 +291,49 @@ async def getCardTransactionHistory(self, cardNo: str, from_date: datetime.datet
                                    json=json_data)
         return data_out
 
-    async def userinfo(self):
+    async def getBankList(self):
         """
-        Get current user info
+        Get transfer all bank list
 
         Returns:
-            success (dict): user info
+            success (dict): bank list
 
         Raises:
             MBBankError: if api response not ok
         """
-        if self._userinfo is None:
-            await self._authenticate()
-        else:
-            await self.getBalance()
-        return self._userinfo
-
-    # working on beta
-
-    async def getBankList(self):
         data_out = await self._req("https://online.mbbank.com.vn/api/retail_web/common/getBankList")
         return data_out
 
-    async def inquiryAccountName(self, *, typeTransfer: str = None, debitAccount: str, bankCode: str = None,
-                                 creditAccount: str, creditAccountType: typing.Literal["ACCOUNT", "CARD"]):
-        creditCardNo = None
-        if (bankCode is None or typeTransfer is None) and creditAccountType != "CARD":
-            raise TypeError("creditAccount must be \"CARD\" so bankCode or typeTransfer can be None")
-        elif creditAccountType == "CARD":
-            out = await self.getBankList()
-            for i in out['listBank']:
-                bankCode = None
-                typeTransfer = None
-                if creditAccount.startswith(i["smlCode"]):
-                    bankCode = i["smlCode"]
-                    typeTransfer = i["typeTransfer"]
-                    datacard = await self.cardGenerateID(creditAccount)
-                    creditCardNo = datacard["cardNumber"]
-                    creditAccount = datacard["cardID"]
-                    break
-            if bankCode is None or typeTransfer is None:
-                raise Exception(f"Invaild card")
-            elif not creditAccount:
-                raise Exception(f"Card not exist")
-        json_data = {
-            "creditAccount": creditAccount,
-            "creditAccountType": creditAccountType,
-            "bankCode": bankCode,
-            "debitAccount": debitAccount,
-            "type": typeTransfer,
-            "remark": "",
-        }
-        if creditCardNo is not None:
-            json_data.setdefault("creditCardNo", creditCardNo)
-        data_out = await self._req("https://online.mbbank.com.vn/api/retail_web/transfer/inquiryAccountName",
-                                   json=json_data)
-        return data_out
+    async def getAccountByPhone(self, phone: str):
+        """
+        Get transfer account info by phone (MBank internal account only)
 
-    async def getServiceToken(self):
-        data_out = await self._req("https://online.mbbank.com.vn/api/retail_web/common/getServiceToken")
-        return data_out
+        Args:
+            phone (str): MBBank account phone number
 
-    async def cardGenerateID(self, cardNumber: str):
-        headers = headers_default.copy()
-        json_data = {
-            "requestID": f"{self.__userid}-{get_now_time()}",
-            "cardNumber": cardNumber
-        }
-        tok = await self.getServiceToken()
-        headers["Authorization"] = tok["type"].capitalize() + " " + tok["token"]
-        async with aiohttp.ClientSession() as s:
-            async with s.post("https://mbcard.mbbank.com.vn:8446/mbcardgw/internet/cardinfo/v1_0/generateid",
-                              headers=headers, json=json_data) as r:
-                return await r.json()
+        Returns:
+            success (dict): account info
 
-    async def getAccountByPhone(self, phone: str):
+        """
         json_data = {
             "phone": phone
         }
         data_out = await self._req("https://online.mbbank.com.vn/api/retail_web/common/getAccountByPhone",
                                    json=json_data)
         return data_out
+
+    async def userinfo(self):
+        """
+        Get current user info
+
+        Returns:
+            success (dict): user info
+
+        Raises:
+            MBBankError: if api response not ok
+        """
+        if self._userinfo is None:
+            await self._authenticate()
+        else:
+            await self.getBalance()
+        return self._userinfo