diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-24 14:51:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 14:51:15 +0200 |
| commit | df6e9109c8d2f4d461073a0e6f69d6fd7b67d0e3 (patch) | |
| tree | 4148415b3f3d9261857e7e81b85efe278492a6f3 /settings | |
| parent | 37718ddc0a82bf4207a56d5dc36b99667650a56e (diff) | |
| parent | 20a5ce217a47c9e3d5dd4016e96e0cc557c51417 (diff) | |
| download | nextcloud-server-df6e9109c8d2f4d461073a0e6f69d6fd7b67d0e3.tar.gz nextcloud-server-df6e9109c8d2f4d461073a0e6f69d6fd7b67d0e3.zip | |
Merge pull request #11396 from nextcloud/wellknown-webfinger
adding .well-known/webfinger
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Application.php | 16 | ||||
| -rw-r--r-- | settings/js/admin.js | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/settings/Application.php b/settings/Application.php index 4ad59a64d40..4a144082427 100644 --- a/settings/Application.php +++ b/settings/Application.php @@ -121,6 +121,8 @@ class Application extends App { Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword'); Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo'); + + Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig'); } /** @@ -152,4 +154,18 @@ class Application extends App { $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; + } + + $settings['array']['oc_appconfig'] = json_encode($appConfig); + } } diff --git a/settings/js/admin.js b/settings/js/admin.js index de5bc2b9537..35f3d949ab6 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -248,13 +248,14 @@ $(document).ready(function(){ // run setup checks then gather error messages $.when( OC.SetupChecks.checkWebDAV(), + OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!oc_appconfig.core.public_webfinger, 200), OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkSetup(), OC.SetupChecks.checkGeneric(), OC.SetupChecks.checkDataProtected() - ).then(function(check1, check2, check3, check4, check5, check6) { - var messages = [].concat(check1, check2, check3, check4, check5, check6); + ).then(function(check1, check2, check3, check4, check5, check6, check7) { + var messages = [].concat(check1, check2, check3, check4, check5, check6, check7); var $el = $('#postsetupchecks'); $('#security-warning-state-loading').addClass('hidden'); |