Merge pull request #375 from robbieaverill/pulls/4.0/fix-cms-access

FIX Members minimal CMS access were previously stuck in a login loop, now redirects to MFA
silverstripe · Mar 26, 2020 · d839cfb · d839cfb
2 parents 4b97095 + a648e63
commit d839cfb
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Service/EnforcementManager.php b/src/Service/EnforcementManager.php
@@ -98,8 +98,13 @@ public function shouldRedirectToMFA(Member $member): bool
             return false;
         }
 
-        if ($this->config()->get('requires_admin_access') && !$this->hasAdminAccess($member)) {
-            return false;
+        if ($this->config()->get('requires_admin_access')) {
+            $hasAdminAccess = Member::actAs($member, function () use ($member) {
+                return $this->hasAdminAccess($member);
+            });
+            if (!$hasAdminAccess) {
+                return false;
+            }
         }
 
         $methodRegistry = MethodRegistry::singleton();
@@ -229,7 +234,7 @@ protected function hasAdminAccess(Member $member): bool
         }
 
         // Look through all LeftAndMain subclasses to find if one permits the member to view
-        $menu = $leftAndMain->MainMenu();
+        $menu = $leftAndMain->MainMenu(false);
         foreach ($menu as $candidate) {
             if (
                 $candidate->Link