diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Application.php | 17 | ||||
| -rw-r--r-- | core/Controller/LoginController.php | 3 | ||||
| -rw-r--r-- | core/src/components/login/LoginForm.vue | 8 |
3 files changed, 10 insertions, 18 deletions
diff --git a/core/Application.php b/core/Application.php index ca9b6ce2d8c..2ad8b9f2a30 100644 --- a/core/Application.php +++ b/core/Application.php @@ -44,7 +44,6 @@ use OC\Authentication\Listeners\UserDeletedWebAuthnCleanupListener; use OC\Authentication\Notifications\Notifier as AuthenticationNotifier; use OC\Core\Listener\BeforeTemplateRenderedListener; use OC\Core\Notification\CoreNotifier; -use OC\Metadata\FileEventListener; use OC\TagManager; use OCP\AppFramework\App; use OCP\AppFramework\Http\Events\BeforeLoginTemplateRenderedEvent; @@ -54,13 +53,9 @@ use OCP\DB\Events\AddMissingIndicesEvent; use OCP\DB\Events\AddMissingPrimaryKeyEvent; use OCP\DB\Types; use OCP\EventDispatcher\IEventDispatcher; -use OCP\Files\Events\Node\NodeDeletedEvent; -use OCP\Files\Events\Node\NodeWrittenEvent; -use OCP\Files\Events\NodeRemovedFromCache; use OCP\User\Events\BeforeUserDeletedEvent; use OCP\User\Events\UserDeletedEvent; use OCP\Util; -use OCP\IConfig; /** * Class Application @@ -331,18 +326,6 @@ class Application extends App { $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedFilesCleanupListener::class); $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedWebAuthnCleanupListener::class); - // Metadata - /** @var IConfig $config */ - $config = $container->get(IConfig::class); - if ($config->getSystemValueBool('enable_file_metadata', true)) { - /** @psalm-suppress InvalidArgument */ - $eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class); - /** @psalm-suppress InvalidArgument */ - $eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class); - /** @psalm-suppress InvalidArgument */ - $eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class); - } - // Tags $eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class); } diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 39ffcc81ac1..4f754204132 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -64,6 +64,7 @@ use OCP\Util; class LoginController extends Controller { public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword'; public const LOGIN_MSG_USERDISABLED = 'userdisabled'; + public const LOGIN_MSG_CSRFCHECKFAILED = 'csrfCheckFailed'; public function __construct( ?string $appName, @@ -291,7 +292,7 @@ class LoginController extends Controller { $user, $user, $redirect_url, - $this->l10n->t('Please try again') + self::LOGIN_MSG_CSRFCHECKFAILED ); } diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue index 7841edc5074..9a8689dc9cc 100644 --- a/core/src/components/login/LoginForm.vue +++ b/core/src/components/login/LoginForm.vue @@ -32,6 +32,11 @@ type="warning"> {{ t('core', 'Please contact your administrator.') }} </NcNoteCard> + <NcNoteCard v-if="csrfCheckFailed" + :heading="t('core', 'Temporary error')" + type="error"> + {{ t('core', 'Please try again.') }} + </NcNoteCard> <NcNoteCard v-if="messages.length > 0"> <div v-for="(message, index) in messages" :key="index"> @@ -184,6 +189,9 @@ export default { apacheAuthFailed() { return this.errors.indexOf('apacheAuthFailed') !== -1 }, + csrfCheckFailed() { + return this.errors.indexOf('csrfCheckFailed') !== -1 + }, internalException() { return this.errors.indexOf('internalexception') !== -1 }, |