Merge pull request #19704 from Nils160988/master
Fix hostname in Apple configuration profile
This commit is contained in:
commit
0d613cd2f0
|
@ -125,7 +125,7 @@ class AppleProvisioningPlugin extends ServerPlugin {
|
|||
return false;
|
||||
}
|
||||
|
||||
$absoluteURL = $request->getAbsoluteUrl();
|
||||
$absoluteURL = $this->urlGenerator->getBaseUrl();
|
||||
$parsedUrl = parse_url($absoluteURL);
|
||||
if (isset($parsedUrl['port'])) {
|
||||
$serverPort = (int) $parsedUrl['port'];
|
||||
|
|
|
@ -158,10 +158,9 @@ class AppleProvisioningPluginTest extends TestCase {
|
|||
->method('getServerProtocol')
|
||||
->wilLReturn('https');
|
||||
|
||||
$this->sabreRequest->expects($this->at(1))
|
||||
->method('getAbsoluteUrl')
|
||||
->with()
|
||||
->willReturn('https://nextcloud.tld/nextcloud/remote.php/dav/provisioning/apple-provisioning.mobileconfig');
|
||||
$this->urlGenerator->expects($this->once())
|
||||
->method('getBaseUrl')
|
||||
->willReturn('https://nextcloud.tld/nextcloud');
|
||||
|
||||
$this->themingDefaults->expects($this->at(0))
|
||||
->method('getName')
|
||||
|
|
Loading…
Reference in New Issue