diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-12-18 13:34:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 13:34:04 +0100 |
| commit | f37e150d1caa0918e3258011f3c9b04ce469bb7c (patch) | |
| tree | 24eca361971f6ea7e3c586927105da40c8ef8c44 /apps | |
| parent | fbf25e164d1d508b4e587ebd454f18382d1917ba (diff) | |
| parent | 6995223b1ed202c7f8e920e83cb5b53efd7ce761 (diff) | |
| download | nextcloud-server-f37e150d1caa0918e3258011f3c9b04ce469bb7c.tar.gz nextcloud-server-f37e150d1caa0918e3258011f3c9b04ce469bb7c.zip | |
Merge pull request #24702 from nextcloud/enhancement/well-known-handler-api
Add well known handlers API
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/js/admin.js | 8 | ||||
| -rw-r--r-- | apps/settings/lib/AppInfo/Application.php | 21 |
2 files changed, 4 insertions, 25 deletions
diff --git a/apps/settings/js/admin.js b/apps/settings/js/admin.js index 9252125de12..cffaefa3821 100644 --- a/apps/settings/js/admin.js +++ b/apps/settings/js/admin.js @@ -256,10 +256,10 @@ window.addEventListener('DOMContentLoaded', function(){ // run setup checks then gather error messages $.when( OC.SetupChecks.checkWebDAV(), - OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_webfinger, [200, 404]), - OC.SetupChecks.checkWellKnownUrl('/.well-known/nodeinfo', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_nodeinfo, [200, 404]), - OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), - OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkWellKnownUrl('GET', '/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true, [200, 404], true), + OC.SetupChecks.checkWellKnownUrl('GET', '/.well-known/nodeinfo', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true, [200, 404], true), + OC.SetupChecks.checkWellKnownUrl('PROPFIND', '/.well-known/caldav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkWellKnownUrl('PROPFIND', '/.well-known/carddav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocm-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocs-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkSetup(), diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php index fe9ba63b012..af45c56e517 100644 --- a/apps/settings/lib/AppInfo/Application.php +++ b/apps/settings/lib/AppInfo/Application.php @@ -163,8 +163,6 @@ class Application extends App implements IBootstrap { $groupManager->listen('\OC\Group', 'postRemoveUser', [$this, 'removeUserFromGroup']); $groupManager->listen('\OC\Group', 'postAddUser', [$this, 'addUserToGroup']); }); - - Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig'); } public function addUserToGroup(IGroup $group, IUser $user): void { @@ -209,23 +207,4 @@ class Application extends App implements IBootstrap { $hooks = $this->getContainer()->query(Hooks::class); $hooks->onChangeEmail($parameters['user'], $parameters['old_value']); } - - /** - * @param array $settings - */ - public function extendJsConfig(array $settings) { - $appConfig = json_decode($settings['array']['oc_appconfig'], true); - - $publicWebFinger = \OC::$server->getConfig()->getAppValue('core', 'public_webfinger', ''); - if (!empty($publicWebFinger)) { - $appConfig['core']['public_webfinger'] = $publicWebFinger; - } - - $publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', ''); - if (!empty($publicNodeInfo)) { - $appConfig['core']['public_nodeinfo'] = $publicNodeInfo; - } - - $settings['array']['oc_appconfig'] = json_encode($appConfig); - } } |