Merge pull request #589 from sammyskills/fix/update-groups-permissions-redirects

Fix: groups and permissions filter redirects

Author: datamweb

src/Filters/AbstractAuthFilter.php

@@ -37,12 +37,6 @@ public function before(RequestInterface $request, $arguments = null)
             return;
         }
 
-        // If the previous_url is from this site, then
-        // we can redirect back to it.
-        if (strpos(previous_url(), site_url()) === 0) {
-            return redirect()->back()->with('error', lang('Auth.notEnoughPrivilege'));
-        }
-
         // Otherwise, we'll just send them to the home page.
         return redirect()->to('/')->with('error', lang('Auth.notEnoughPrivilege'));
     }

tests/Authentication/Filters/GroupFilterTest.php

@@ -63,21 +63,4 @@ public function testFilterIncorrectGroupNoPrevious(): void
         // Should have error message
         $result->assertSessionHas('error');
     }
-
-    public function testFilterIncorrectGroupWithPrevious(): void
-    {
-        /** @var User $user */
-        $user = fake(UserModel::class);
-        $user->addGroup('beta');
-
-        $result = $this
-            ->actingAs($user)
-            ->withSession(['_ci_previous_url' => site_url('open-route')])
-            ->get('protected-route');
-
-        // Should redirect to the previous url (open-route)
-        $result->assertRedirectTo(site_url('open-route'));
-
-        $result->assertSessionHas('error');
-    }
 }

tests/Authentication/Filters/PermissionFilterTest.php

@@ -63,21 +63,4 @@ public function testFilterIncorrectGroupNoPrevious(): void
         // Should have error message
         $result->assertSessionHas('error');
     }
-
-    public function testFilterIncorrectGroupWithPrevious(): void
-    {
-        /** @var User $user */
-        $user = fake(UserModel::class);
-        $user->addPermission('beta.access');
-
-        $result = $this
-            ->actingAs($user)
-            ->withSession(['_ci_previous_url' => site_url('open-route')])
-            ->get('protected-route');
-
-        // Should redirect to the previous url (open-route)
-        $result->assertRedirectTo(site_url('open-route'));
-
-        $result->assertSessionHas('error');
-    }
 }