Merge branch 'master' into 'fix/related-name-of-site-causes-name-clashes'

# Conflicts:
#   CHANGELOG.rst

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.
 * [Dev] Site reference on extensible models can no longer cause name clashes
   because of its related name.
 

aleksis/core/frontend/mixins/menus.js

@@ -19,12 +19,19 @@ const menusMixin = {
       let permArray = [];
 
       for (const route of this.$router.getRoutes()) {
-        if (
-          route.meta &&
-          route.meta["permission"] &&
-          !(route.meta["permission"] in permArray)
-        ) {
-          permArray.push(route.meta["permission"]);
+        if (route.meta) {
+          if (
+            route.meta["permission"] &&
+            !(route.meta["permission"] in permArray)
+          ) {
+            permArray.push(route.meta["permission"]);
+          }
+          if (
+            route.meta["menuPermission"] &&
+            !(route.meta["menuPermission"] in permArray)
+          ) {
+            permArray.push(route.meta["menuPermission"]);
+          }
         }
       }
 
@@ -41,9 +48,12 @@ const menusMixin = {
           route.meta &&
           route.meta[menuKey] &&
           !route.parent &&
-          (route.meta.permission
+          (route.meta.menuPermission
+            ? this.checkPermission(route.meta.menuPermission)
+            : route.meta.permission
             ? this.checkPermission(route.meta.permission)
-            : true) &&
+            : true
+          ) &&
           (route.meta.validators
             ? this.checkValidators(route.meta.validators)
             : true)
@@ -67,9 +77,12 @@ const menusMixin = {
           route.parent &&
           route.parent.name &&
           route.parent.name in menu &&
-          (route.meta.permission
+          (route.meta.menuPermission
+            ? this.checkPermission(route.meta.menuPermission)
+            : route.meta.permission
             ? this.checkPermission(route.meta.permission)
-            : true) &&
+            : true
+          ) &&
           (route.meta.validators
             ? this.checkValidators(route.meta.validators)
             : true)

aleksis/core/frontend/routes.js

@@ -37,6 +37,7 @@ const routes = [
       inMenu: true,
       icon: "mdi-account-plus-outline",
       titleKey: "accounts.signup.menu_title",
+      menuPermission: "core.signup_rule",
       validators: [notLoggedInValidator],
       invalidate: "leave",
     },

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)