Allow parsing of already encrypted stuff into passportdata

jsmnbom · jsmnbom · commit b3f4de2ad02e · 2018-08-12T16:07:05.000+02:00
Such that de_json(to_dict()) still works as expected
diff --git a/telegram/passport/credentials.py b/telegram/passport/credentials.py
@@ -127,15 +127,19 @@ def de_json(cls, data, bot):
         if not data:
             return None
 
-        data['secret'] = bot.private_key.decrypt(b64decode(data.get('secret')), OAEP(
-            mgf=MGF1(algorithm=SHA1()),
-            algorithm=SHA1(),
-            label=None
-        ))
-        data['data'] = Credentials.de_json(decrypt_json(data.get('secret'),
-                                                        data.get('hash'),
-                                                        data.get('data')),
-                                           bot=bot)
+        # If already decrypted
+        if isinstance(data['data'], dict):
+            data['data'] = Credentials.de_json(data['data'], bot=bot)
+        else:
+            data['secret'] = bot.private_key.decrypt(b64decode(data.get('secret')), OAEP(
+                mgf=MGF1(algorithm=SHA1()),
+                algorithm=SHA1(),
+                label=None
+            ))
+            data['data'] = Credentials.de_json(decrypt_json(data.get('secret'),
+                                                            data.get('hash'),
+                                                            data.get('data')),
+                                               bot=bot)
 
         return cls(bot=bot, **data)
 
@@ -293,6 +297,13 @@ def de_json(cls, data, bot):
 
         return cls(bot=bot, **data)
 
+    def to_dict(self):
+        data = super(SecureValue, self).to_dict()
+
+        data['files'] = [p.to_dict() for p in self.files]
+
+        return data
+
 
 class _CredentialsBase(TelegramObject):
     """Base class for DataCredentials and FileCredentials."""
@@ -319,8 +330,8 @@ def de_list(cls, data, bot):
             return []
 
         credentials = list()
-        for credentials in data:
-            credentials.append(cls.de_json(credentials, bot=bot))
+        for c in data:
+            credentials.append(cls.de_json(c, bot=bot))
 
         return credentials
 
@@ -341,6 +352,14 @@ class DataCredentials(_CredentialsBase):
     def __init__(self, data_hash, secret, **kwargs):
         super(DataCredentials, self).__init__(data_hash, secret, **kwargs)
 
+    def to_dict(self):
+        data = super(DataCredentials, self).to_dict()
+
+        del data['file_hash']
+        del data['hash']
+
+        return data
+
 
 class FileCredentials(_CredentialsBase):
     """
@@ -357,3 +376,11 @@ class FileCredentials(_CredentialsBase):
         """
     def __init__(self, file_hash, secret, **kwargs):
         super(FileCredentials, self).__init__(file_hash, secret, **kwargs)
+
+    def to_dict(self):
+        data = super(FileCredentials, self).to_dict()
+
+        del data['data_hash']
+        del data['hash']
+
+        return data
diff --git a/telegram/passport/encryptedpassportelement.py b/telegram/passport/encryptedpassportelement.py
@@ -129,17 +129,19 @@ def de_json(cls, data, bot, credentials):
         if data['type'] not in ('phone_number', 'email'):
             secure_data = getattr(credentials.data.secure_data, data['type'])
 
-            data['data'] = decrypt_json(secure_data.data.secret,
-                                        secure_data.data.hash,
-                                        data['data'])
-
-            if data['type'] == 'personal_details':
-                data['data'] = PersonalDetails.de_json(data['data'], bot=bot)
-            elif data['type'] in ('passport', 'internal_passport',
-                                  'driver_license', 'identity_card'):
-                data['data'] = IdDocumentData.de_json(data['data'], bot=bot)
-            elif data['type'] == 'address':
-                data['data'] = ResidentialAddress.de_json(data['data'], bot=bot)
+            if secure_data.data is not None:
+                # If not already decrypted
+                if not isinstance(data['data'], dict):
+                    data['data'] = decrypt_json(secure_data.data.secret,
+                                                secure_data.data.hash,
+                                                data['data'])
+                if data['type'] == 'personal_details':
+                    data['data'] = PersonalDetails.de_json(data['data'], bot=bot)
+                elif data['type'] in ('passport', 'internal_passport',
+                                      'driver_license', 'identity_card'):
+                    data['data'] = IdDocumentData.de_json(data['data'], bot=bot)
+                elif data['type'] == 'address':
+                    data['data'] = ResidentialAddress.de_json(data['data'], bot=bot)
 
             if secure_data:
                 data['files'] = PassportFile.de_list(data.get('files'), bot, secure_data)
diff --git a/telegram/passport/passportfile.py b/telegram/passport/passportfile.py
@@ -68,9 +68,9 @@ def de_list(cls, data, bot, credentials):
             return []
 
         passport_files = list()
-        for passport_file in data:
+        for i, passport_file in enumerate(data):
             passport_files.append(cls.de_json(passport_file,
-                                              bot, getattr(credentials, passport_file['type'])))
+                                              bot, credentials.files[i]))
 
         return passport_files
 
