Generates links using UrlImmutable::withoutUserInfo() (nette/http#160)

Author: dg

composer.json

@@ -17,7 +17,7 @@
 	"require": {
 		"php": ">=7.1",
 		"nette/component-model": "^3.0",
-		"nette/http": "^3.0",
+		"nette/http": "^3.0.2",
 		"nette/routing": "~3.0.0",
 		"nette/utils": "^3.0"
 	},

src/Application/MicroPresenter.php

@@ -59,9 +59,9 @@ public function run(Application\Request $request): Application\IResponse
 		$this->request = $request;
 
 		if ($this->httpRequest && $this->router && !$this->httpRequest->isAjax() && ($request->isMethod('get') || $request->isMethod('head'))) {
-			$refUrl = $this->httpRequest->getUrl();
+			$refUrl = $this->httpRequest->getUrl()->withoutUserInfo();
 			$url = $this->router->constructUrl($request->toArray(), $refUrl);
-			if ($url !== null && !$this->httpRequest->getUrl()->isEqual($url)) {
+			if ($url !== null && !$refUrl->isEqual($url)) {
 				return new Responses\RedirectResponse($url, Http\IResponse::S301_MOVED_PERMANENTLY);
 			}
 		}
@@ -120,7 +120,7 @@ public function createTemplate(string $class = null, callable $latteFactory = nu
 		$template->presenter = $this;
 		$template->context = $this->context;
 		if ($this->httpRequest) {
-			$url = $this->httpRequest->getUrl();
+			$url = $this->httpRequest->getUrl()->withoutUserInfo();
 			$template->baseUrl = rtrim($url->getBaseUrl(), '/');
 			$template->basePath = rtrim($url->getBasePath(), '/');
 		}

src/Application/UI/Presenter.php

@@ -695,7 +695,7 @@ public function canonicalize(string $destination = null, array $args = []): void
 				);
 			} catch (InvalidLinkException $e) {
 			}
-			if (isset($url) && !$this->httpRequest->getUrl()->isEqual($url)) {
+			if (isset($url) && !$this->httpRequest->getUrl()->withoutUserInfo()->isEqual($url)) {
 				$code = $request->hasFlag($request::VARYING) ? Http\IResponse::S302_FOUND : Http\IResponse::S301_MOVED_PERMANENTLY;
 				$this->sendResponse(new Responses\RedirectResponse($url, $code));
 			}
@@ -921,7 +921,7 @@ protected function requestToUrl(Application\Request $request, bool $relative = n
 	{
 		if ($this->refUrlCache === null) {
 			$url = $this->httpRequest->getUrl();
-			$this->refUrlCache = new Http\UrlScript($url->getHostUrl() . $url->getScriptPath());
+			$this->refUrlCache = new Http\UrlScript($url->withoutUserInfo()->getHostUrl() . $url->getScriptPath());
 		}
 		if (!$this->router) {
 			throw new Nette\InvalidStateException('Unable to generate URL, service Router has not been set.');

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -91,7 +91,7 @@ public function loadConfiguration()
 
 		$builder->addDefinition($this->prefix('linkGenerator'))
 			->setFactory(Nette\Application\LinkGenerator::class, [
-				1 => new Definitions\Statement('@Nette\Http\IRequest::getUrl'),
+				1 => new Definitions\Statement([new Definitions\Statement('@Nette\Http\IRequest::getUrl'), 'withoutUserInfo']),
 			]);
 
 		if ($this->name === 'application') {

src/Bridges/ApplicationLatte/TemplateFactory.php

@@ -106,7 +106,7 @@ public function createTemplate(UI\Control $control = null): UI\ITemplate
 
 		// default parameters
 		$template->user = $this->user;
-		$template->baseUrl = $this->httpRequest ? rtrim($this->httpRequest->getUrl()->getBaseUrl(), '/') : null;
+		$template->baseUrl = $this->httpRequest ? rtrim($this->httpRequest->getUrl()->withoutUserInfo()->getBaseUrl(), '/') : null;
 		$template->basePath = preg_replace('#https?://[^/]+#A', '', $template->baseUrl);
 		$template->flashes = [];
 		if ($control) {