mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-06-23 02:09:03 +02:00
Removed redirect to userSettings in RedirectController
We do this in an EventSubscriber now, so this is not needed anymore.
This commit is contained in:
parent
311a342634
commit
7e0e83ef15
2 changed files with 0 additions and 31 deletions
|
@ -59,13 +59,6 @@ class RedirectController extends AbstractController
|
||||||
$locale = $user->getLanguage();
|
$locale = $user->getLanguage();
|
||||||
}
|
}
|
||||||
|
|
||||||
//Check if the user needs to change the password. In that case redirect him to settings_page
|
|
||||||
if ($user instanceof User && $user->isNeedPwChange()) {
|
|
||||||
$this->session->getFlashBag()->add('warning', $this->translator->trans('flash.password_change_needed'));
|
|
||||||
|
|
||||||
return $this->redirectToRoute('user_settings', ['_locale' => $locale]);
|
|
||||||
}
|
|
||||||
|
|
||||||
//$new_url = str_replace($request->getPathInfo(), '/' . $locale . $request->getPathInfo(), $request->getUri());
|
//$new_url = str_replace($request->getPathInfo(), '/' . $locale . $request->getPathInfo(), $request->getUri());
|
||||||
$new_url = $request->getUriForPath('/'.$locale.$request->getPathInfo());
|
$new_url = $request->getUriForPath('/'.$locale.$request->getPathInfo());
|
||||||
|
|
||||||
|
|
|
@ -120,28 +120,4 @@ class RedirectControllerTest extends WebTestCase
|
||||||
$this->client->request('GET', $input_path);
|
$this->client->request('GET', $input_path);
|
||||||
$this->assertEquals($redirect_path, $this->client->getResponse()->headers->get('Location'));
|
$this->assertEquals($redirect_path, $this->client->getResponse()->headers->get('Location'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Test if the user is redirected to password change page if he should do that.
|
|
||||||
*
|
|
||||||
* @depends testAddLocale
|
|
||||||
* @group slow
|
|
||||||
* @testWith ["de"]
|
|
||||||
* ["en"]
|
|
||||||
*/
|
|
||||||
public function testRedirectToPasswordChange(string $locale)
|
|
||||||
{
|
|
||||||
/** @var User $user */
|
|
||||||
$user = $this->userRepo->findOneBy(['name' => 'user']);
|
|
||||||
|
|
||||||
//Test for german user
|
|
||||||
$user->setLanguage($locale);
|
|
||||||
$user->setNeedPwChange(true);
|
|
||||||
$this->em->flush();
|
|
||||||
|
|
||||||
$this->client->followRedirects(false);
|
|
||||||
|
|
||||||
$this->client->request('GET', '/part/3');
|
|
||||||
$this->assertEquals('http://localhost' . "/$locale/user/settings", $this->client->getResponse()->headers->get('Location'));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue