api!: remove all oauth support and drop DC_LP_AUTH* flags

Cargo.toml

@@ -89,7 +89,6 @@ rusqlite = { workspace = true, features = ["sqlcipher"] }
 sanitize-filename = { workspace = true }
 sdp = "0.17.1"
 serde_json = { workspace = true }
-serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"

deltachat-ffi/deltachat.h

@@ -503,7 +503,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `send_pw`      = SMTP-password, guessed if left out
  * - `send_port`    = SMTP-port, guessed if left out
  * - `send_security`= SMTP-socket, one of @ref DC_SOCKET, defaults to #DC_SOCKET_AUTO
- * - `server_flags` = IMAP-/SMTP-flags as a combination of @ref DC_LP flags, guessed if left out
  * - `proxy_enabled` = Proxy enabled. Disabled by default.
  * - `proxy_url` = Proxy URL. May contain multiple URLs separated by newline, but only the first one is used.
  * - `imap_certificate_checks` = how to check IMAP and SMTP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
@@ -590,36 +589,7 @@ int             dc_set_config_from_qr   (dc_context_t* context, const char* qr);
 char*           dc_get_info                  (const dc_context_t* context);
 
 
-/**
- * Get URL that can be used to initiate an OAuth2 authorization.
- *
- * If an OAuth2 authorization is possible for a given e-mail address,
- * this function returns the URL that should be opened in a browser.
- *
- * If the user authorizes access,
- * the given redirect_uri is called by the provider.
- * It's up to the UI to handle this call.
- *
- * The provider will attach some parameters to the URL,
- * most important the parameter `code` that should be set as the `mail_pw`.
- * With `server_flags` set to #DC_LP_AUTH_OAUTH2,
- * dc_configure() can be called as usual afterwards.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param addr E-mail address the user has entered.
- *     In case the user selects a different e-mail address during
- *     authorization, this is corrected in dc_configure()
- * @param redirect_uri URL that will get `code` that is used as `mail_pw` then.
- *     Not all URLs are allowed here, however, the following should work:
- *     `chat.delta:/PATH`, `http://localhost:PORT/PATH`,
- *     `https://localhost:PORT/PATH`, `urn:ietf:wg:oauth:2.0:oob`
- *     (the latter just displays the code the user can copy+paste then)
- * @return URL that can be opened in the browser to start OAuth2.
- *     Returned strings must be released using dc_str_unref().
- *     If OAuth2 is not possible for the given e-mail address, NULL is returned.
- */
-char*           dc_get_oauth2_url            (dc_context_t* context, const char* addr, const char* redirect_uri);
+
 
 
 #define DC_CONNECTIVITY_NOT_CONNECTED        1000
@@ -713,7 +683,7 @@ int              dc_get_push_state           (dc_context_t* context);
  *       to get the full configuration from well-known URLs.
  *
  *     - If _more_ options as `mail_server`, `mail_port`, `send_server`,
- *       `send_port`, `send_user` or `server_flags` are specified,
+ *       `send_port` or `send_user` are specified,
  *       **autoconfigure/autodiscover is skipped**.
  *
  * While dc_configure() returns immediately,
@@ -5736,41 +5706,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
  * @}
  */
 
-
-/**
- * @defgroup DC_LP DC_LP
- *
- * Flags for configuring IMAP and SMTP servers.
- * These flags are optional
- * and may be set together with the username, password etc.
- * via dc_set_config() using the key "server_flags".
- *
- * @addtogroup DC_LP
- * @{
- */
-
-
-/**
- * Force OAuth2 authorization. This flag does not skip automatic configuration.
- * Before calling dc_configure() with DC_LP_AUTH_OAUTH2 set,
- * the user has to confirm access at the URL returned by dc_get_oauth2_url().
- */
-#define DC_LP_AUTH_OAUTH2                0x2
-
-
-/**
- * Force NORMAL authorization, this is the default.
- * If this flag is set, automatic configuration is skipped.
- */
-#define DC_LP_AUTH_NORMAL                0x4
-
-
-/**
- * @}
- */
-
-#define DC_LP_AUTH_FLAGS        (DC_LP_AUTH_OAUTH2|DC_LP_AUTH_NORMAL) // if none of these flags are set, the default is chosen
-
 /**
  * @defgroup DC_CERTCK DC_CERTCK
  *

deltachat-ffi/src/lib.rs

@@ -401,32 +401,6 @@ pub unsafe extern "C" fn dc_get_push_state(context: *const dc_context_t) -> libc
     block_on(ctx.push_state()) as libc::c_int
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_get_oauth2_url(
-    context: *mut dc_context_t,
-    addr: *const libc::c_char,
-    redirect: *const libc::c_char,
-) -> *mut libc::c_char {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_oauth2_url()");
-        return ptr::null_mut(); // NULL explicitly defined as "unknown"
-    }
-    let ctx = &*context;
-    let addr = to_string_lossy(addr);
-    let redirect = to_string_lossy(redirect);
-
-    block_on(async move {
-        match oauth2::get_oauth2_url(ctx, &addr, &redirect)
-            .await
-            .context("dc_get_oauth2_url failed")
-            .log_err(ctx)
-        {
-            Ok(Some(res)) => res.strdup(),
-            Ok(None) | Err(_) => ptr::null_mut(),
-        }
-    })
-}
-
 fn spawn_configure(ctx: Context) {
     spawn(async move {
         ctx.configure()

deltachat-jsonrpc/src/api/types/login_param.rs

@@ -66,10 +66,6 @@ pub struct EnteredLoginParam {
     /// invalid hostnames.
     /// Default: Automatic
     pub certificate_checks: Option<EnteredCertificateChecks>,
-
-    /// If true, login via OAUTH2 (not recommended anymore).
-    /// Default: false
-    pub oauth2: Option<bool>,
 }
 
 impl From<dc::TransportListEntry> for TransportListEntry {
@@ -100,7 +96,6 @@ impl From<dc::EnteredLoginParam> for EnteredLoginParam {
             smtp_user: param.smtp.user.into_option(),
             smtp_password: param.smtp.password.into_option(),
             certificate_checks: certificate_checks.into_option(),
-            oauth2: param.oauth2.into_option(),
         }
     }
 }
@@ -127,7 +122,6 @@ impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
                 password: param.smtp_password.unwrap_or_default(),
             },
             certificate_checks: param.certificate_checks.unwrap_or_default().into(),
-            oauth2: param.oauth2.unwrap_or_default(),
         })
     }
 }

deltachat-repl/src/cmdline.rs

@@ -319,7 +319,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  info\n\
                  set <configuration-key> [<value>]\n\
                  get <configuration-key>\n\
-                 oauth2\n\
                  configure\n\
                  connect\n\
                  disconnect\n\

deltachat-repl/src/main.rs

@@ -11,9 +11,7 @@ use std::borrow::Cow::{self, Borrowed, Owned};
 
 use anyhow::{bail, Error};
 use deltachat::chat::ChatId;
-use deltachat::config;
 use deltachat::context::*;
-use deltachat::oauth2::*;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
 use deltachat::EventType;
@@ -162,11 +160,10 @@ const IMEX_COMMANDS: [&str; 10] = [
     "stop",
 ];
 
-const DB_COMMANDS: [&str; 11] = [
+const DB_COMMANDS: [&str; 10] = [
     "info",
     "set",
     "get",
-    "oauth2",
     "configure",
     "connect",
     "disconnect",
@@ -425,19 +422,6 @@ async fn handle_cmd(
         "configure" => {
             ctx.configure().await?;
         }
-        "oauth2" => {
-            if let Some(addr) = ctx.get_config(config::Config::Addr).await? {
-                if let Some(oauth2_url) =
-                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?
-                {
-                    println!("Open the following url, set mail_pw to the generated token and server_flags to 2:\n{oauth2_url}");
-                } else {
-                    println!("OAuth2 not available for {addr}.");
-                }
-            } else {
-                println!("oauth2: set addr first.");
-            }
-        }
         "clear" => {
             println!("\n\n\n");
             print!("\x1b[1;1H\x1b[2J");

deltachat-rpc-client/src/deltachat_rpc_client/const.py

@@ -231,14 +231,6 @@ class KeyGenType(IntEnum):
     RSA4096 = 3
 
 
-# "Lp" means "login parameters"
-class LpAuthFlag(IntEnum):
-    """Authorization flags."""
-
-    OAUTH2 = 0x2
-    NORMAL = 0x4
-
-
 class MediaQuality(IntEnum):
     """Media quality setting."""
 

scripts/create-provider-data-rs.py

@@ -145,9 +145,6 @@ def process_data(data, file):
     opt = process_opt(data)
     config_defaults = process_config_defaults(data)
 
-    oauth2 = data.get("oauth2", "")
-    oauth2 = "Some(Oauth2Authorizer::" + camel(oauth2) + ")" if oauth2 != "" else "None"
-
     provider = ""
     before_login_hint = cleanstr(data.get("before_login_hint", "") or "")
     after_login_hint = cleanstr(data.get("after_login_hint", ""))
@@ -165,7 +162,6 @@ def process_data(data, file):
         provider += "    server: &[\n" + server + "    ],\n"
         provider += "    opt: " + opt + ",\n"
         provider += "    config_defaults: " + config_defaults + ",\n"
-        provider += "    oauth2_authorizer: " + oauth2 + ",\n"
         provider += "};\n\n"
     else:
         raise TypeError("SMTP and IMAP must be specified together or left out both")
@@ -180,7 +176,7 @@ def process_data(data, file):
     out_all += "// " + file.name + ": " + comment.strip(", ") + "\n"
 
     # also add provider with no special things to do -
-    # eg. _not_ supporting oauth2 is also an information and we can skip the mx-lookup in this case
+    # eg. we can skip the mx-lookup in this case
     out_all += provider
     out_domains += domains
     out_ids += ids
@@ -212,7 +208,7 @@ def process_dir(dir):
         "use crate::provider::Socket::*;\n"
         "use crate::provider::UsernamePattern::*;\n"
         "use crate::provider::{\n"
-        "    Config, ConfigDefault, Oauth2Authorizer, Provider, ProviderOptions, Server, Status,\n"
+        "    Config, ConfigDefault, Provider, ProviderOptions, Server, Status,\n"
         "};\n"
         "use std::collections::HashMap;\n\n"
         "use std::sync::LazyLock;\n\n"

src/config.rs

@@ -118,15 +118,6 @@ pub enum Config {
     /// SMTP server security (e.g. TLS, STARTTLS).
     SendSecurity,
 
-    /// Deprecated(2026-04).
-    /// Use EnteredLoginParam and add_transport{from_qr}()/list_transports() instead.
-    ///
-    /// Whether to use OAuth 2.
-    ///
-    /// Historically contained other bitflags, which are now deprecated.
-    /// Should not be extended in the future, create new config keys instead.
-    ServerFlags,
-
     /// True if proxy is enabled.
     ///
     /// Can be used to disable proxy without erasing known URLs.
@@ -298,12 +289,6 @@ pub enum Config {
     /// Configured SMTP server password.
     ConfiguredSendPw,
 
-    /// Deprecated(2026-04).
-    /// Use ConfiguredLoginParam and add_transport{from_qr}()/list_transports() instead.
-    ///
-    /// Whether OAuth 2 is used with configured provider.
-    ConfiguredServerFlags,
-
     /// Configured folder for incoming messages.
     ConfiguredInboxFolder,
 

src/configure.rs

@@ -32,7 +32,6 @@ pub use crate::login_param::EnteredLoginParam;
 use crate::login_param::{EnteredCertificateChecks, TransportListEntry};
 use crate::message::Message;
 use crate::net::proxy::ProxyConfig;
-use crate::oauth2::get_oauth2_addr;
 use crate::provider::{Protocol, Provider, Socket, UsernamePattern};
 use crate::qr::{login_param_from_account_qr, login_param_from_login_qr};
 use crate::smtp::Smtp;
@@ -451,24 +450,7 @@ async fn get_configured_param(
         param.smtp.password.clone()
     };
 
-    let mut addr = param.addr.clone();
-    if param.oauth2 {
-        // the used oauth2 addr may differ, check this.
-        // if get_oauth2_addr() is not available in the oauth2 implementation, just use the given one.
-        progress!(ctx, 10);
-        if let Some(oauth2_addr) = get_oauth2_addr(ctx, &param.addr, &param.imap.password)
-            .await?
-            .and_then(|e| e.parse().ok())
-        {
-            info!(ctx, "Authorized address is {}", oauth2_addr);
-            addr = oauth2_addr;
-            ctx.sql
-                .set_raw_config("addr", Some(param.addr.as_str()))
-                .await?;
-        }
-        progress!(ctx, 20);
-    }
-    // no oauth? - just continue it's no error
+    let addr = param.addr.clone();
 
     let parsed = EmailAddress::new(&param.addr).context("Bad email-address")?;
     let param_domain = parsed.domain;
@@ -618,7 +600,6 @@ async fn get_configured_param(
                 ConfiguredCertificateChecks::AcceptInvalidCertificates
             }
         },
-        oauth2: param.oauth2,
     };
     Ok(configured_login_param)
 }
@@ -649,7 +630,6 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Option<&'
             &proxy_config2,
             &smtp_addr,
             strict_tls,
-            configured_param.oauth2,
         )
         .await?;
 

src/constants.rs

@@ -162,25 +162,6 @@ pub const DC_DESIRED_TEXT_LINE_LEN: usize = 100;
 /// `char`s), not Unicode Grapheme Clusters.
 pub const DC_DESIRED_TEXT_LEN: usize = DC_DESIRED_TEXT_LINE_LEN * DC_DESIRED_TEXT_LINES;
 
-// Flags for configuring IMAP and SMTP servers.
-// These flags are optional
-// and may be set together with the username, password etc.
-// via dc_set_config() using the key "server_flags".
-
-/// Force OAuth2 authorization.
-///
-/// This flag does not skip automatic configuration.
-/// Before calling configure() with DC_LP_AUTH_OAUTH2 set,
-/// the user has to confirm access at the URL returned by dc_get_oauth2_url().
-pub const DC_LP_AUTH_OAUTH2: i32 = 0x2;
-
-/// Force NORMAL authorization, this is the default.
-/// If this flag is set, automatic configuration is skipped.
-pub const DC_LP_AUTH_NORMAL: i32 = 0x4;
-
-/// if none of these flags are set, the default is chosen
-pub const DC_LP_AUTH_FLAGS: i32 = DC_LP_AUTH_OAUTH2 | DC_LP_AUTH_NORMAL;
-
 // max. weight of images to send w/o recoding
 pub const BALANCED_IMAGE_BYTES: usize = 500_000;
 pub const WORSE_IMAGE_BYTES: usize = 130_000;

src/context.rs

@@ -231,8 +231,6 @@ pub struct InnerContext {
     /// This is a global mutex-like state for operations which should be modal in the
     /// clients.
     running_state: RwLock<RunningState>,
-    /// Mutex to enforce only a single running oauth2 is running.
-    pub(crate) oauth2_mutex: Mutex<()>,
     /// Mutex to prevent a race condition when a "your pw is wrong" warning is sent, resulting in multiple messages being sent.
     pub(crate) wrong_pw_warning_mutex: Mutex<()>,
     /// Mutex to prevent running housekeeping from multiple threads at once.
@@ -484,7 +482,6 @@ impl Context {
             blobdir,
             running_state: RwLock::new(Default::default()),
             sql: Sql::new(dbfile),
-            oauth2_mutex: Mutex::new(()),
             wrong_pw_warning_mutex: Mutex::new(()),
             housekeeping_mutex: Mutex::new(()),
             fetch_msgs_mutex: Mutex::new(()),