From 1843d1d07edbe5d4f13d66bd4571a0e12c30c674 Mon Sep 17 00:00:00 2001 From: Lim Chee Aun Date: Wed, 9 Jul 2025 18:40:32 +0800 Subject: [PATCH] Extra check on the creds Not really sure why this is happening or needed --- src/locales/en.po | 22 +++++++++++----------- src/pages/login.jsx | 6 +++++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/locales/en.po b/src/locales/en.po index ebf2873c..5f35edab 100644 --- a/src/locales/en.po +++ b/src/locales/en.po @@ -1491,7 +1491,7 @@ msgstr "" #: src/components/nav-menu.jsx:326 #: src/pages/login.jsx:32 -#: src/pages/login.jsx:195 +#: src/pages/login.jsx:199 #: src/pages/status.jsx:924 #: src/pages/welcome.jsx:65 msgid "Log in" @@ -1926,7 +1926,7 @@ msgstr "" #: src/components/shortcuts-settings.jsx:75 #: src/components/shortcuts-settings.jsx:84 #: src/components/shortcuts-settings.jsx:122 -#: src/pages/login.jsx:199 +#: src/pages/login.jsx:203 msgid "Instance" msgstr "" @@ -2612,7 +2612,7 @@ msgstr "Login required." #: src/compose.jsx:91 #: src/pages/annual-report.jsx:164 #: src/pages/http-route.jsx:91 -#: src/pages/login.jsx:276 +#: src/pages/login.jsx:280 msgid "Go home" msgstr "" @@ -3325,32 +3325,32 @@ msgstr "" msgid "No lists yet." msgstr "" -#: src/pages/login.jsx:118 -#: src/pages/login.jsx:128 +#: src/pages/login.jsx:122 +#: src/pages/login.jsx:132 msgid "Failed to register application" msgstr "Failed to register application" -#: src/pages/login.jsx:214 +#: src/pages/login.jsx:218 msgid "instance domain" msgstr "instance domain" -#: src/pages/login.jsx:238 +#: src/pages/login.jsx:242 msgid "e.g. “mastodon.social”" msgstr "" -#: src/pages/login.jsx:249 +#: src/pages/login.jsx:253 msgid "Failed to log in. Please try again or try another instance." msgstr "" -#: src/pages/login.jsx:261 +#: src/pages/login.jsx:265 msgid "Continue with {selectedInstanceText}" msgstr "" -#: src/pages/login.jsx:262 +#: src/pages/login.jsx:266 msgid "Continue" msgstr "" -#: src/pages/login.jsx:270 +#: src/pages/login.jsx:274 msgid "Don't have an account? Create one!" msgstr "" diff --git a/src/pages/login.jsx b/src/pages/login.jsx index 8759eed5..6ace1f88 100644 --- a/src/pages/login.jsx +++ b/src/pages/login.jsx @@ -93,7 +93,11 @@ function Login() { setUIState('loading'); try { let credentialApplication = getCredentialApplication(instanceURL); - if (!credentialApplication) { + if ( + !credentialApplication || + !credentialApplication.client_id || + !credentialApplication.client_secret + ) { credentialApplication = await registerApplication({ instanceURL, });