Merge pull request #6898 from firefly-iii/pr-6831

Add debug info and a warning for login issues related to #6831

app/Exceptions/Handler.php

@@ -168,7 +168,7 @@ class Handler extends ExceptionHandler
             return response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 500);
         }
 
-        Log::debug('Error has no Firefly III treatment, parent will handle.');
+        Log::debug(sprintf('Error "%s" has no Firefly III treatment, parent will handle.', get_class($e)));
 
         return parent::render($request, $e);
     }

app/Support/Authentication/RemoteUserGuard.php

@@ -52,7 +52,7 @@ class RemoteUserGuard implements Guard
     {
         /** @var Request $request */
         $request = $app->get('request');
-        Log::debug(sprintf('Created RemoteUserGuard for "%s"', $request?->getRequestUri()));
+        Log::debug(sprintf('Created RemoteUserGuard for %s "%s"', $request?->getMethod(), $request?->getRequestUri()));
         $this->application = $app;
         $this->provider    = $provider;
         $this->user        = null;
@@ -82,16 +82,18 @@ class RemoteUserGuard implements Guard
         $header = config('auth.guard_header', 'REMOTE_USER');
         $userID = request()->server($header) ?? null;
 
-        //$userID = 'james@firefly';
-
         if (function_exists('apache_request_headers')) {
+            Log::debug('Use apache_request_headers to find user ID.');
             $userID = request()->server($header) ?? apache_request_headers()[$header] ?? null;
         }
-        if (null === $userID) {
+
+        if (null === $userID || '' === $userID) {
             Log::error(sprintf('No user in header "%s".', $header));
             throw new FireflyException('The guard header was unexpectedly empty. See the logs.');
         }
 
+        Log::debug(sprintf('User ID found in header is "%s"', $userID));
+
         /** @var User $retrievedUser */
         $retrievedUser = $this->provider->retrieveById($userID);
 
@@ -139,8 +141,13 @@ class RemoteUserGuard implements Guard
     public function user(): ?User
     {
         Log::debug(sprintf('Now at %s', __METHOD__));
-        //$this->authenticate();
+        $user = $this->user;
-        return $this->user;
+        if(null === $user) {
+            Log::debug('User is NULL');
+            return null;
+        }
+
+        return $user;
     }
 
     /**

resources/assets/js/components/passport/Clients.vue

@@ -40,7 +40,9 @@
         <p v-if="clients.length === 0" class="mb-0">
           {{ $t('firefly.profile_oauth_no_clients') }}
         </p>
-
+        <p class="mb-2">
+          {{ $t('firefly.profile_oauth_clients_external_auth') }}
+        </p>
         <table v-if="clients.length > 0" class="table table-responsive table-borderless mb-0">
           <caption>{{ $t('firefly.profile_oauth_clients_header') }}</caption>
           <thead>

resources/assets/js/locales/bg.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u043a\u043b\u0438\u0435\u043d\u0442",
         "profile_oauth_name_help": "\u041d\u0435\u0449\u043e, \u043a\u043e\u0435\u0442\u043e \u0432\u0430\u0448\u0438\u0442\u0435 \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0438 \u0449\u0435 \u0440\u0430\u0437\u043f\u043e\u0437\u043d\u0430\u044f\u0442 \u0438 \u0449\u0435 \u0441\u0435 \u0434\u043e\u0432\u0435\u0440\u044f\u0442.",
         "profile_oauth_redirect_url": "\u041b\u0438\u043d\u043a \u043d\u0430 \u043f\u0440\u0435\u043f\u0440\u0430\u0442\u043a\u0430\u0442\u0430",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "URL \u0430\u0434\u0440\u0435\u0441 \u0437\u0430 \u043e\u0431\u0440\u0430\u0442\u043d\u043e \u0438\u0437\u0432\u0438\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f\u0442\u0430 \u043d\u0430 \u0432\u0430\u0448\u0435\u0442\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435.",
         "profile_authorized_apps": "\u0423\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
         "profile_authorized_clients": "\u0423\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0435\u043d\u0438 \u043a\u043b\u0438\u0435\u043d\u0442\u0438",

resources/assets/js/locales/ca.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Editar client",
         "profile_oauth_name_help": "Alguna cosa que els teus usuaris reconeixeran i hi confiaran.",
         "profile_oauth_redirect_url": "URL de redirecci\u00f3",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "L'URL de crida de retorn de la teva aplicaci\u00f3.",
         "profile_authorized_apps": "Aplicacions autoritzades",
         "profile_authorized_clients": "Clients autoritzats",

resources/assets/js/locales/cs.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Upravit klienta",
         "profile_oauth_name_help": "Something your users will recognize and trust.",
         "profile_oauth_redirect_url": "P\u0159esm\u011brovat URL adresu",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Your application's authorization callback URL.",
         "profile_authorized_apps": "Authorized applications",
         "profile_authorized_clients": "Autorizovan\u00ed klienti",

resources/assets/js/locales/da.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Rediger klient",
         "profile_oauth_name_help": "Noget dine brugere vil genkende og stole p\u00e5.",
         "profile_oauth_redirect_url": "Omdirigerings-URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Din autoriserings callback URL.",
         "profile_authorized_apps": "Autoriserede programmer",
         "profile_authorized_clients": "Autoriserede klienter",

resources/assets/js/locales/de.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Client bearbeiten",
         "profile_oauth_name_help": "Etwas das Ihre Nutzer erkennen und dem sie vertrauen.",
         "profile_oauth_redirect_url": "Weiterleitungs-URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Die Authorisierungs-Callback-URL Ihrer Anwendung.",
         "profile_authorized_apps": "Autorisierte Anwendungen",
         "profile_authorized_clients": "Autorisierte Clients",

resources/assets/js/locales/el.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03c0\u03b5\u03bb\u03ac\u03c4\u03b7",
         "profile_oauth_name_help": "\u039a\u03ac\u03c4\u03b9 \u03c0\u03bf\u03c5 \u03bf\u03b9 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b5\u03c2 \u03c3\u03b1\u03c2 \u03b8\u03b1 \u03b1\u03bd\u03b1\u03b3\u03bd\u03c9\u03c1\u03af\u03b6\u03bf\u03c5\u03bd \u03ba\u03b1\u03b9 \u03b8\u03b1 \u03b5\u03bc\u03c0\u03b9\u03c3\u03c4\u03b5\u03cd\u03bf\u03bd\u03c4\u03b1\u03b9.",
         "profile_oauth_redirect_url": "URL \u03b1\u03bd\u03b1\u03ba\u03b1\u03c4\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7\u03c2",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "To authorization callback URL \u03c4\u03b7\u03c2 \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2 \u03c3\u03b1\u03c2.",
         "profile_authorized_apps": "\u0395\u03be\u03bf\u03c5\u03c3\u03b9\u03bf\u03b4\u03bf\u03c4\u03b7\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03c2",
         "profile_authorized_clients": "\u0395\u03be\u03bf\u03c5\u03c3\u03b9\u03bf\u03b4\u03bf\u03c4\u03b7\u03bc\u03ad\u03bd\u03bf\u03b9 \u03c0\u03b5\u03bb\u03ac\u03c4\u03b5\u03c2",

resources/assets/js/locales/en-gb.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Edit Client",
         "profile_oauth_name_help": "Something your users will recognize and trust.",
         "profile_oauth_redirect_url": "Redirect URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Your application's authorization callback URL.",
         "profile_authorized_apps": "Authorized applications",
         "profile_authorized_clients": "Authorized clients",

resources/assets/js/locales/en.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Edit Client",
         "profile_oauth_name_help": "Something your users will recognize and trust.",
         "profile_oauth_redirect_url": "Redirect URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Your application's authorization callback URL.",
         "profile_authorized_apps": "Authorized applications",
         "profile_authorized_clients": "Authorized clients",

resources/assets/js/locales/es.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Editar Cliente",
         "profile_oauth_name_help": "Algo que sus usuarios reconocer\u00e1n y confiar\u00e1n.",
         "profile_oauth_redirect_url": "Redirigir URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "La URL de devoluci\u00f3n de autorizaci\u00f3n de su aplicaci\u00f3n.",
         "profile_authorized_apps": "Aplicaciones autorizadas",
         "profile_authorized_clients": "Clientes autorizados",

resources/assets/js/locales/fi.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Muokkaa asiakasta",
         "profile_oauth_name_help": "Jotain k\u00e4ytt\u00e4jillesi tuttua ja luotettavaa.",
         "profile_oauth_redirect_url": "URL:n uudelleenohjaus",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Sovelluksesi valtuutuksen callback URL.",
         "profile_authorized_apps": "Valtuutetut sovellukset",
         "profile_authorized_clients": "Valtuutetut asiakkaat",

resources/assets/js/locales/fr.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Modifier le client",
         "profile_oauth_name_help": "Quelque chose que vos utilisateurs reconna\u00eetront et qui inspirera confiance.",
         "profile_oauth_redirect_url": "URL de redirection",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "URL de callback de votre application.",
         "profile_authorized_apps": "Applications autoris\u00e9es",
         "profile_authorized_clients": "Clients autoris\u00e9s",

resources/assets/js/locales/hu.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Kliens szerkeszt\u00e9se",
         "profile_oauth_name_help": "Seg\u00edts\u00e9g, hogy a felhaszn\u00e1l\u00f3k tudj\u00e1k mihez kapcsol\u00f3dik.",
         "profile_oauth_redirect_url": "\u00c1tir\u00e1ny\u00edt\u00e1si URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Az alkalmaz\u00e1sban haszn\u00e1lt autentik\u00e1ci\u00f3s URL.",
         "profile_authorized_apps": "Enged\u00e9lyezett alkalmaz\u00e1sok",
         "profile_authorized_clients": "Enged\u00e9lyezett kliensek",

resources/assets/js/locales/id.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Edit Client",
         "profile_oauth_name_help": "Something your users will recognize and trust.",
         "profile_oauth_redirect_url": "Redirect URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Your application's authorization callback URL.",
         "profile_authorized_apps": "Authorized applications",
         "profile_authorized_clients": "Authorized clients",

resources/assets/js/locales/it.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Modifica client",
         "profile_oauth_name_help": "Qualcosa di cui i tuoi utenti potranno riconoscere e fidarsi.",
         "profile_oauth_redirect_url": "URL di reindirizzamento",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "L'URL di callback dell'autorizzazione della tua applicazione.",
         "profile_authorized_apps": "Applicazioni autorizzate",
         "profile_authorized_clients": "Client autorizzati",

resources/assets/js/locales/ja.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306e\u7de8\u96c6",
         "profile_oauth_name_help": "\u30e6\u30fc\u30b6\u30fc\u304c\u8a8d\u8b58\u3001\u4fe1\u983c\u3059\u308b\u3082\u306e\u3067\u3059\u3002",
         "profile_oauth_redirect_url": "\u30ea\u30c0\u30a4\u30ec\u30af\u30c8 URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u8a8d\u8a3c\u30b3\u30fc\u30eb\u30d0\u30c3\u30af URL \u3067\u3059\u3002",
         "profile_authorized_apps": "\u8a8d\u8a3c\u6e08\u307f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3",
         "profile_authorized_clients": "\u8a8d\u8a3c\u6e08\u307f\u30af\u30e9\u30a4\u30a2\u30f3\u30c8",

resources/assets/js/locales/nb.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Rediger Klient",
         "profile_oauth_name_help": "Noe brukerne dine vil gjenkjenne og stole p\u00e5.",
         "profile_oauth_redirect_url": "Videresendings-URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Programmets tilbakekallingslenke til din adresse.",
         "profile_authorized_apps": "Dine autoriserte applikasjoner",
         "profile_authorized_clients": "Autoriserte klienter",

resources/assets/js/locales/nl.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Client bewerken",
         "profile_oauth_name_help": "Iets dat je gebruikers herkennen en vertrouwen.",
         "profile_oauth_redirect_url": "Redirect-URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "De authorisatie-callback-url van jouw applicatie.",
         "profile_authorized_apps": "Geautoriseerde toepassingen",
         "profile_authorized_clients": "Geautoriseerde clients",

resources/assets/js/locales/pl.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Edytuj klienta",
         "profile_oauth_name_help": "Co\u015b, co Twoi u\u017cytkownicy b\u0119d\u0105 rozpoznawa\u0107 i ufa\u0107.",
         "profile_oauth_redirect_url": "Przekierowanie URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Adres URL wywo\u0142ania zwrotnego autoryzacji aplikacji.",
         "profile_authorized_apps": "Autoryzowane aplikacje",
         "profile_authorized_clients": "Autoryzowani klienci",

resources/assets/js/locales/pt-br.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Editar cliente",
         "profile_oauth_name_help": "Alguma coisa que seus usu\u00e1rios v\u00e3o reconhecer e identificar.",
         "profile_oauth_redirect_url": "URL de redirecionamento",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "A URL de retorno da sua solicita\u00e7\u00e3o de autoriza\u00e7\u00e3o.",
         "profile_authorized_apps": "Aplicativos autorizados",
         "profile_authorized_clients": "Clientes autorizados",

resources/assets/js/locales/pt.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Editar Cliente",
         "profile_oauth_name_help": "Algo que os utilizadores reconhe\u00e7am e confiem.",
         "profile_oauth_redirect_url": "URL de redireccionamento",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "URL de callback de autoriza\u00e7\u00e3o da aplica\u00e7\u00e3o.",
         "profile_authorized_apps": "Aplica\u00e7\u00f5es autorizados",
         "profile_authorized_clients": "Clientes autorizados",

resources/assets/js/locales/ro.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Editare client",
         "profile_oauth_name_help": "Ceva ce utilizatorii vor recunoa\u0219te \u0219i vor avea \u00eencredere.",
         "profile_oauth_redirect_url": "Redirectioneaza URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "URL-ul de retroapelare al aplica\u021biei dvs.",
         "profile_authorized_apps": "Aplica\u021biile dvs autorizate",
         "profile_authorized_clients": "Clien\u021bi autoriza\u021bi",

resources/assets/js/locales/ru.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043a\u043b\u0438\u0435\u043d\u0442\u0430",
         "profile_oauth_name_help": "\u0427\u0442\u043e-\u0442\u043e, \u0447\u0442\u043e \u0432\u0430\u0448\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 \u0437\u043d\u0430\u044e\u0442, \u0438 \u0447\u0435\u043c\u0443 \u0434\u043e\u0432\u0435\u0440\u044f\u044e\u0442.",
         "profile_oauth_redirect_url": "URL \u0440\u0435\u0434\u0438\u0440\u0435\u043a\u0442\u0430",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "URL \u043e\u0431\u0440\u0430\u0442\u043d\u043e\u0433\u043e \u0432\u044b\u0437\u043e\u0432\u0430 \u0434\u043b\u044f \u0432\u0430\u0448\u0435\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f.",
         "profile_authorized_apps": "\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
         "profile_authorized_clients": "\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043a\u043b\u0438\u0435\u043d\u0442\u044b",

resources/assets/js/locales/sk.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Upravi\u0165 klienta",
         "profile_oauth_name_help": "Nie\u010do, \u010do va\u0161i pou\u017eivatelia poznaj\u00fa a bud\u00fa tomu d\u00f4verova\u0165.",
         "profile_oauth_redirect_url": "URL presmerovania",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Sp\u00e4tn\u00e1 URL pre overenie autoriz\u00e1cie va\u0161ej aplik\u00e1cie.",
         "profile_authorized_apps": "Povolen\u00e9 aplik\u00e1cie",
         "profile_authorized_clients": "Autorizovan\u00ed klienti",

resources/assets/js/locales/sl.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Urejanje odjemalca",
         "profile_oauth_name_help": "Something your users will recognize and trust.",
         "profile_oauth_redirect_url": "Redirect URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Your application's authorization callback URL.",
         "profile_authorized_apps": "Authorized applications",
         "profile_authorized_clients": "Authorized clients",

resources/assets/js/locales/sv.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Redigera klient",
         "profile_oauth_name_help": "N\u00e5got som dina anv\u00e4ndare kommer att k\u00e4nna igen och lita p\u00e5.",
         "profile_oauth_redirect_url": "Omdirigera URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Din applikations auktorisering callback URL.",
         "profile_authorized_apps": "Auktoriserade applikationer",
         "profile_authorized_clients": "Auktoriserade klienter",

resources/assets/js/locales/tr.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "\u0130stemciyi D\u00fczenle",
         "profile_oauth_name_help": "Kullan\u0131c\u0131lar\u0131n\u0131z\u0131n tan\u0131yaca\u011f\u0131 ve g\u00fcvenece\u011fi bir \u015fey.",
         "profile_oauth_redirect_url": "URL'yi y\u00f6nlendir",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Uygulaman\u0131z\u0131n yetkilendirme geri arama URL'si.",
         "profile_authorized_apps": "Yetkili uygulamalar",
         "profile_authorized_clients": "Yetkili m\u00fc\u015fteriler",

resources/assets/js/locales/uk.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043a\u043b\u0456\u0454\u043d\u0442\u0430",
         "profile_oauth_name_help": "\u0429\u043e\u0441\u044c, \u0449\u043e \u0432\u0430\u0448\u0456 \u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456 \u0432\u043f\u0456\u0437\u043d\u0430\u044e\u0442\u044c \u0456 \u0434\u043e\u0432\u0456\u0440\u044f\u0442\u0438\u043c\u0443\u0442\u044c.",
         "profile_oauth_redirect_url": "URL-\u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0435\u0440\u0435\u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u044f",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "\u0417\u043e\u0432\u043d\u0456\u0448\u043d\u0456\u0439 URL \u0434\u043b\u044f \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0456\u0457 \u0434\u043e\u0434\u0430\u0442\u043a\u0430.",
         "profile_authorized_apps": "\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u0456 \u0434\u043e\u0434\u0430\u0442\u043a\u0438",
         "profile_authorized_clients": "\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u0456 \u043a\u043b\u0456\u0454\u043d\u0442\u0438",

resources/assets/js/locales/vi.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "S\u1eeda Client",
         "profile_oauth_name_help": "M\u1ed9t c\u00e1i g\u00ec \u0111\u00f3 ng\u01b0\u1eddi d\u00f9ng c\u1ee7a b\u1ea1n s\u1ebd nh\u1eadn ra v\u00e0 tin t\u01b0\u1edfng.",
         "profile_oauth_redirect_url": "URL chuy\u1ec3n ti\u1ebfp",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "URL g\u1ecdi l\u1ea1i \u1ee7y quy\u1ec1n c\u1ee7a \u1ee9ng d\u1ee5ng c\u1ee7a b\u1ea1n.",
         "profile_authorized_apps": "U\u1ef7 quy\u1ec1n \u1ee9ng d\u1ee5ng",
         "profile_authorized_clients": "Client \u1ee7y quy\u1ec1n",

resources/assets/js/locales/zh-cn.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "\u7f16\u8f91\u5ba2\u6237\u7aef",
         "profile_oauth_name_help": "\u60a8\u7684\u7528\u6237\u53ef\u4ee5\u8bc6\u522b\u5e76\u4fe1\u4efb\u7684\u4fe1\u606f",
         "profile_oauth_redirect_url": "\u8df3\u8f6c\u7f51\u5740",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "\u60a8\u7684\u5e94\u7528\u7a0b\u5e8f\u7684\u6388\u6743\u56de\u8c03\u7f51\u5740",
         "profile_authorized_apps": "\u5df2\u6388\u6743\u5e94\u7528",
         "profile_authorized_clients": "\u5df2\u6388\u6743\u5ba2\u6237\u7aef",

resources/assets/js/locales/zh-tw.json

@@ -66,6 +66,7 @@
         "profile_oauth_edit_client": "Edit Client",
         "profile_oauth_name_help": "Something your users will recognize and trust.",
         "profile_oauth_redirect_url": "Redirect URL",
+        "profile_oauth_clients_external_auth": "If you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
         "profile_oauth_redirect_url_help": "Your application's authorization callback URL.",
         "profile_authorized_apps": "Authorized applications",
         "profile_authorized_clients": "Authorized clients",

resources/lang/en_US/firefly.php

@@ -1436,6 +1436,7 @@ return [
     'oauth'                                     => 'OAuth',
     'profile_oauth_clients'                     => 'OAuth Clients',
     'profile_oauth_no_clients'                  => 'You have not created any OAuth clients.',
+    'profile_oauth_clients_external_auth'       => 'If you\'re using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.',
     'profile_oauth_clients_header'              => 'Clients',
     'profile_oauth_client_id'                   => 'Client ID',
     'profile_oauth_client_name'                 => 'Name',

resources/views/profile/index.twig

@@ -28,12 +28,10 @@
                            data-toggle="tab">{{ 'pref_two_factor_auth'|_ }}</a>
                     </li>
                 {% endif %}
-                {% if true == isInternalAuth and true == isInternalIdentity %}
+                <li role="presentation">
-                    <li role="presentation">
+                    <a href="#delete" aria-controls="settings" role="tab"
-                        <a href="#delete" aria-controls="settings" role="tab"
+                       data-toggle="tab">{{ 'delete_stuff_header'|_ }}</a>
-                           data-toggle="tab">{{ 'delete_stuff_header'|_ }}</a>
+                </li>
-                    </li>
-                {% endif %}
             </ul>
             <div class="tab-content">
 

yarn.lock

@@ -1013,12 +1013,12 @@
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
 "@types/babel__core@^7.1.16":
-  version "7.1.20"
+  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
-  integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==
+  integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
   dependencies:
-    "@babel/parser" "^7.1.0"
+    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.20.7"
     "@types/babel__generator" "*"
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
@@ -1624,9 +1624,9 @@ autoprefixer@^10.4.0:
     postcss-value-parser "^4.2.0"
 
 axios@^1.2:
-  version "1.2.2"
+  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.3.tgz#31a3d824c0ebf754a004b585e5f04a5f87e6c4ff"
-  integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==
+  integrity sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
@@ -1901,9 +1901,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
-  version "1.0.30001445"
+  version "1.0.30001446"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz#cf2d4eb93f2bcdf0310de9dd6d18be271bc0b447"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz#6d4ba828ab19f49f9bcd14a8430d30feebf1e0c5"
-  integrity sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==
+  integrity sha512-fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw==
 
 chalk@^2.0.0:
   version "2.4.2"
@@ -2149,9 +2149,9 @@ cookie@0.5.0:
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
 core-js-compat@^3.25.1:
-  version "3.27.1"
+  version "3.27.2"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.27.1.tgz#b5695eb25c602d72b1d30cbfba3cb7e5e4cf0a67"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.27.2.tgz#607c50ad6db8fd8326af0b2883ebb987be3786da"
-  integrity sha512-Dg91JFeCDA17FKnneN7oCMz4BkQ4TcffkgHP4OWwp9yx3pi7ubqMDXXSacfNak1PQqjc95skyt+YBLHQJnkJwA==
+  integrity sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==
   dependencies:
     browserslist "^4.21.4"
 
@@ -3365,9 +3365,9 @@ kind-of@^6.0.2:
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 klona@^2.0.5:
-  version "2.0.5"
+  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
-  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
+  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
 
 laravel-mix@^6.0:
   version "6.0.49"