deltachat-rpc-client 1.159.0__tar.gz → 1.159.2__tar.gz

{deltachat_rpc_client-1.159.0/src/deltachat_rpc_client.egg-info → deltachat_rpc_client-1.159.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deltachat-rpc-client
-Version: 1.159.0
+Version: 1.159.2
 Summary: Python client for Delta Chat core JSON-RPC interface
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.159.0"
+version = "1.159.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2}/src/deltachat_rpc_client/_utils.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 import re
 import sys
 from threading import Thread
@@ -89,8 +90,8 @@ def _run_cli(
         help="accounts folder (default: current working directory)",
         nargs="?",
     )
-    parser.add_argument("--email", action="store", help="email address")
-    parser.add_argument("--password", action="store", help="password")
+    parser.add_argument("--email", action="store", help="email address", default=os.getenv("DELTACHAT_EMAIL"))
+    parser.add_argument("--password", action="store", help="password", default=os.getenv("DELTACHAT_PASSWORD"))
     args = parser.parse_args(argv[1:])
 
     with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2}/src/deltachat_rpc_client/account.py

@@ -110,6 +110,17 @@ class Account:
         """Configure an account."""
         yield self._rpc.configure.future(self.id)
 
+    @futuremethod
+    def add_or_update_transport(self, params):
+        """Add a new transport."""
+        yield self._rpc.add_or_update_transport.future(self.id, params)
+
+    @futuremethod
+    def list_transports(self):
+        """Returns the list of all email accounts that are used as a transport in the current profile."""
+        transports = yield self._rpc.list_transports.future(self.id)
+        return transports
+
     def bring_online(self):
         """Start I/O and wait until IMAP becomes IDLE."""
         self.start_io()

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2}/src/deltachat_rpc_client/const.py

@@ -48,6 +48,7 @@ class EventType(str, Enum):
     MSG_READ = "MsgRead"
     MSG_DELETED = "MsgDeleted"
     CHAT_MODIFIED = "ChatModified"
+    CHAT_DELETED = "ChatDeleted"
     CHAT_EPHEMERAL_TIMER_MODIFIED = "ChatEphemeralTimerModified"
     CONTACTS_CHANGED = "ContactsChanged"
     LOCATION_CHANGED = "LocationChanged"

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2}/src/deltachat_rpc_client/pytestplugin.py

@@ -34,7 +34,7 @@ class ACFactory:
         addr, password = self.get_credentials()
         account = self.get_unconfigured_account()
         params = {"addr": addr, "password": password}
-        yield account._rpc.add_transport.future(account.id, params)
+        yield account.add_or_update_transport.future(params)
 
         assert account.is_configured()
         return account

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2/src/deltachat_rpc_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deltachat-rpc-client
-Version: 1.159.0
+Version: 1.159.2
 Summary: Python client for Delta Chat core JSON-RPC interface
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2}/tests/test_account_events.py

@@ -17,7 +17,7 @@ def test_event_on_configuration(acfactory: ACFactory) -> None:
     account = acfactory.get_unconfigured_account()
     account.clear_all_events()
     assert not account.is_configured()
-    future = account._rpc.add_transport.future(account.id, {"addr": addr, "password": password})
+    future = account.add_or_update_transport.future({"addr": addr, "password": password})
     while True:
         event = account.wait_for_event()
         if event.kind == EventType.ACCOUNTS_ITEM_CHANGED:

{deltachat_rpc_client-1.159.0 → deltachat_rpc_client-1.159.2}/tests/test_something.py

@@ -63,8 +63,7 @@ def test_acfactory(acfactory) -> None:
 def test_configure_starttls(acfactory) -> None:
     addr, password = acfactory.get_credentials()
     account = acfactory.get_unconfigured_account()
-    account._rpc.add_transport(
-        account.id,
+    account.add_or_update_transport(
         {
             "addr": addr,
             "password": password,
@@ -75,14 +74,36 @@ def test_configure_starttls(acfactory) -> None:
     assert account.is_configured()
 
 
+def test_lowercase_address(acfactory) -> None:
+    addr, password = acfactory.get_credentials()
+    addr_upper = addr.upper()
+    account = acfactory.get_unconfigured_account()
+    account.add_or_update_transport(
+        {
+            "addr": addr_upper,
+            "password": password,
+        },
+    )
+    assert account.is_configured()
+    assert addr_upper != addr
+    assert account.get_config("configured_addr") == addr
+    assert account.list_transports()[0]["addr"] == addr
+
+    for param in [
+        account.get_info()["used_account_settings"],
+        account.get_info()["entered_account_settings"],
+    ]:
+        assert addr in param
+        assert addr_upper not in param
+
+
 def test_configure_ip(acfactory) -> None:
     addr, password = acfactory.get_credentials()
     account = acfactory.get_unconfigured_account()
     ip_address = socket.gethostbyname(addr.rsplit("@")[-1])
 
     with pytest.raises(JsonRpcError):
-        account._rpc.add_transport(
-            account.id,
+        account.add_or_update_transport(
             {
                 "addr": addr,
                 "password": password,
@@ -96,8 +117,7 @@ def test_configure_alternative_port(acfactory) -> None:
     """Test that configuration with alternative port 443 works."""
     addr, password = acfactory.get_credentials()
     account = acfactory.get_unconfigured_account()
-    account._rpc.add_transport(
-        account.id,
+    account.add_or_update_transport(
         {
             "addr": addr,
             "password": password,
@@ -111,15 +131,14 @@ def test_configure_alternative_port(acfactory) -> None:
 def test_list_transports(acfactory) -> None:
     addr, password = acfactory.get_credentials()
     account = acfactory.get_unconfigured_account()
-    account._rpc.add_transport(
-        account.id,
+    account.add_or_update_transport(
         {
             "addr": addr,
             "password": password,
             "imapUser": addr,
         },
     )
-    transports = account._rpc.list_transports(account.id)
+    transports = account.list_transports()
     assert len(transports) == 1
     params = transports[0]
     assert params["addr"] == addr
@@ -424,7 +443,7 @@ def test_wait_next_messages(acfactory) -> None:
     addr, password = acfactory.get_credentials()
     bot = acfactory.get_unconfigured_account()
     bot.set_config("bot", "1")
-    bot._rpc.add_transport(bot.id, {"addr": addr, "password": password})
+    bot.add_or_update_transport({"addr": addr, "password": password})
     assert bot.is_configured()
 
     # There are no old messages and the call returns immediately.
@@ -607,7 +626,7 @@ def test_reactions_for_a_reordering_move(acfactory, direct_imap):
 
     addr, password = acfactory.get_credentials()
     ac2 = acfactory.get_unconfigured_account()
-    ac2._rpc.add_transport(ac2.id, {"addr": addr, "password": password})
+    ac2.add_or_update_transport({"addr": addr, "password": password})
     ac2.set_config("mvbox_move", "1")
     assert ac2.is_configured()
 
@@ -717,12 +736,11 @@ def test_get_http_response(acfactory):
 
 def test_configured_imap_certificate_checks(acfactory):
     alice = acfactory.new_configured_account()
-    configured_certificate_checks = alice.get_config("configured_imap_certificate_checks")
 
     # Certificate checks should be configured (not None)
-    assert configured_certificate_checks
+    assert "cert_automatic" in alice.get_info().used_account_settings
 
-    # 0 is the value old Delta Chat core versions used
+    # "cert_old_automatic" is the value old Delta Chat core versions used
     # to mean user entered "imap_certificate_checks=0" (Automatic)
     # and configuration failed to use strict TLS checks
     # so it switched strict TLS checks off.
@@ -733,7 +751,7 @@ def test_configured_imap_certificate_checks(acfactory):
     #
     # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
     # This test is a regression test to prevent this happening again.
-    assert configured_certificate_checks != "0"
+    assert "cert_old_automatic" not in alice.get_info().used_account_settings
 
 
 def test_no_old_msg_is_fresh(acfactory):
@@ -805,3 +823,27 @@ def test_get_all_accounts_deadlock(rpc):
         all_accounts = rpc.get_all_accounts.future()
         rpc.add_account()
         all_accounts()
+
+
+def test_delete_deltachat_folder(acfactory, direct_imap):
+    """Test that DeltaChat folder is recreated if user deletes it manually."""
+    ac1 = acfactory.new_configured_account()
+    ac1.set_config("mvbox_move", "1")
+    ac1.bring_online()
+
+    ac1_direct_imap = direct_imap(ac1)
+    ac1_direct_imap.conn.folder.delete("DeltaChat")
+    assert "DeltaChat" not in ac1_direct_imap.list_folders()
+
+    # Wait until new folder is created and UIDVALIDITY is updated.
+    while True:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.INFO and "uid/validity change folder DeltaChat" in event.msg:
+            break
+
+    ac2 = acfactory.get_online_account()
+    ac2.create_chat(ac1).send_text("hello")
+    msg = ac1.wait_for_incoming_msg().get_snapshot()
+    assert msg.text == "hello"
+
+    assert "DeltaChat" in ac1_direct_imap.list_folders()