From 87614bc78af30d99fa4bc845e61aa18428f6c714 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 17 Jul 2025 17:37:41 -0500
Subject: [PATCH] Update auth message, update force re-login to pull auth
 methods to support oidc

---
 components/connection/ServerConnectForm.vue | 17 ++++++++++-------
 strings/en-us.json                          |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/components/connection/ServerConnectForm.vue b/components/connection/ServerConnectForm.vue
index 37c17485..404f993d 100644
--- a/components/connection/ServerConnectForm.vue
+++ b/components/connection/ServerConnectForm.vue
@@ -22,9 +22,6 @@
             <p class="text-xs text-warning">{{ $strings.MessageOldServerAuthWarning }}</p>
             <ui-btn class="text-xs whitespace-nowrap" :padding-x="2" :padding-y="1" @click="showOldAuthWarningDialog">{{ $strings.LabelMoreInfo }}</ui-btn>
           </div>
-          <div v-else-if="!config.version" class="flex flex-nowrap justify-between items-center space-x-4 pt-4">
-            <p class="text-xs text-warning">No server version set. Connect to update server config.</p>
-          </div>
         </div>
         <div class="my-1 py-4 w-full">
           <ui-btn class="w-full" @click="newServerConfigClick">{{ $strings.ButtonAddNewServer }}</ui-btn>
@@ -680,9 +677,13 @@ export default {
           if (statusData.data.authFormData?.authOpenIDAutoLaunch) {
             this.clickLoginWithOpenId()
           }
+          return true
+        } else {
+          return false
         }
       } catch (error) {
         this.handleLoginFormError(error)
+        return false
       } finally {
         this.processing = false
       }
@@ -925,10 +926,12 @@ export default {
       this.processing = false
       return authRes
     },
-    setForceReloginForNewAuth() {
-      this.error = this.$strings.MessageOldServerAuthReLoginRequired
-      this.showAuth = true
-      this.showForm = true
+    async setForceReloginForNewAuth() {
+      // This calls /status on the server and sets the auth methods
+      const result = await this.submit()
+      if (result) {
+        this.error = this.$strings.MessageOldServerAuthReLoginRequired
+      }
     },
     init() {
       // Handle force re-login for servers using new JWT auth but still using an old token in the server config
diff --git a/strings/en-us.json b/strings/en-us.json
index 5c38599b..ef8fb515 100644
--- a/strings/en-us.json
+++ b/strings/en-us.json
@@ -327,7 +327,7 @@
   "MessageNoUserPlaylists": "You have no playlists",
   "MessageOldServerAuthReLoginRequired": "Authentication has been improved for security in server v2.26.0. All users are required to re-login.",
   "MessageOldServerAuthWarning": "Server is using out-dated authentication",
-  "MessageOldServerAuthWarningHelp": "Authentication was updated in server v2.26.0 for security. It is strongly recommended to update the server to the latest version.",
+  "MessageOldServerAuthWarningHelp": "This server is running a version older than v2.26.0. A more secure authentication system was added in v2.26.0. It is strongly recommended to update the server to the latest version. If you have already updated the server, log in again to use the new authentication.",
   "MessageOldServerConnectionWarning": "Server connection config is using an old user ID. Please delete and re-add this server connection.",
   "MessageOldServerConnectionWarningHelp": "You originally set up the connection to this server prior to the database migration in 2.3.0, released June 2023. A future server update will remove the ability to sign in with this old connection. Please delete the existing server connection and connect again (using the same server address and credentials). If you have any downloaded media on this device, the media will need to be downloaded again to sync with the server.",
   "MessagePodcastSearchField": "Enter search term or RSS feed URL",