upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #19884 from nextcloud/backport/19704/stable18

Browse source 
[stable18] Fix hostname in Apple configuration profile
This commit is contained in:
Roeland Jago Douma 2020-03-12 10:27:44 +01:00 committed by GitHub
commit d9f3ed390a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
View file

@ -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'];

7
apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
View file

@ -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')