Merge branch '801-twilio-integration-is-broken-due-to-the-usage-of-wrong-settings' into 'master'

Resolve "Twilio integration is broken due to the usage of wrong settings"

Closes #801

See merge request !1179

CHANGELOG.rst

@@ -61,6 +61,7 @@ Fixed
 * Invitations for existing short name did not work.
 * Invitations for persons without pre-defined e-mail address did not behave correctly
 * OIDC scope "phone" had no claims.
+* 2FA via messages or phone calls didn't work.
 
 Removed
 ~~~~~~~

aleksis/core/settings.py

@@ -750,8 +750,8 @@ if _settings.get("2fa.sms.enabled", False):
     TWO_FACTOR_SMS_GATEWAY = "two_factor.gateways.twilio.gateway.Twilio"
 
 if _settings.get("twilio.sid", None):
-    TWILIO_SID = _settings.get("twilio.sid")
-    TWILIO_TOKEN = _settings.get("twilio.token")
+    TWILIO_ACCOUNT_SID = _settings.get("twilio.sid")
+    TWILIO_AUTH_TOKEN = _settings.get("twilio.token")
     TWILIO_CALLER_ID = _settings.get("twilio.callerid")
 
 CELERY_BROKER_URL = _settings.get("celery.broker", REDIS_URL)