Improve error messages

leepeuker · Jul 28, 2023 · fd3c540 · fd3c540
1 parent 241ded5
commit fd3c540
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -20,8 +20,8 @@ The `Web UI` column is set to yes if an environment variable can alternatively b
 | `TMDB_API_KEY`                              |        -        | **Required** (get key [here](https://www.themoviedb.org/settings/api))         |  yes   |
 | `APPLICATION_URL`                           |        -        | Public base url of the application (e.g. `htttp://localhost`)                  |  yes   |
 | `TMDB_ENABLE_IMAGE_CACHING`                 |       `0`       | More info [here](features/tmdb-data.md#image-cache)                            |        |
-| `PLEX_IDENTIFIER`                           |        -        | Required for Plex Authentication. Generate with e.g. `openssl rand -base64 32` |        |
-| `PLEX_APP_NAME`                             |    `Movary`     | Required for Plex Authentication                                               |        |
+| `PLEX_IDENTIFIER`                           |        -        | Required for Plex authentication. Generate with e.g. `openssl rand -base64 32` |        |
+| `PLEX_APP_NAME`                             |    `Movary`     | Required for Plex authentication                                               |        |
 | `ENABLE_REGISTRATION`                       |       `0`       | Enables public user registration                                               |        |
 | `MIN_RUNTIME_IN_SECONDS_FOR_JOB_PROCESSING` |      `15`       | Minimum time between background jobs processing                                |        |
 | `TIMEZONE`                                  | `Europe/Berlin` | Supported timezones [here](https://www.php.net/manual/en/timezones.php)        |        |

diff --git a/src/HttpController/SettingsController.php b/src/HttpController/SettingsController.php
@@ -349,13 +349,19 @@ public function renderPlexPage() : Response
             return Response::createSeeOther('/');
         }
 
-        $plexAccessToken = $this->userApi->findPlexAccessToken($this->authenticationService->getCurrentUserId());
+        $plexAccessToken = null;
+        $plexIdentifier = $this->serverSettings->getPlexIdentifier();
 
-        if ($plexAccessToken !== null && $this->serverSettings->getPlexIdentifier() !== null) {
-            $plexAccount = $this->plexApi->findPlexAccount($plexAccessToken);
-            if ($plexAccount !== null) {
-                $plexUsername = $plexAccount->getPlexUsername();
-                $plexServerUrl = $this->userApi->findPlexServerUrl($this->authenticationService->getCurrentUserId());
+        if ($plexIdentifier !== null) {
+            $plexAccessToken = $this->userApi->findPlexAccessToken($this->authenticationService->getCurrentUserId());
+
+            if ($plexAccessToken !== null) {
+                $plexAccount = $this->plexApi->findPlexAccount($plexAccessToken);
+
+                if ($plexAccount !== null) {
+                    $plexUsername = $plexAccount->getPlexUsername();
+                    $plexServerUrl = $this->userApi->findPlexServerUrl($this->authenticationService->getCurrentUserId());
+                }
             }
         }
 
@@ -378,6 +384,7 @@ public function renderPlexPage() : Response
                 'plexTokenExists' => $plexAccessToken !== null,
                 'plexServerUrl' => $plexServerUrl ?? '',
                 'plexUsername' => $plexUsername ?? '',
+                'hasServerPlexIdentifier' => $plexIdentifier !== null,
             ]),
         );
     }

diff --git a/templates/page/settings-integration-plex.html.twig b/templates/page/settings-integration-plex.html.twig
@@ -93,10 +93,15 @@
                      style="margin-left: 5%;margin-right: 5%;margin-bottom: 1rem!important;">
                     Authentication disabled - {% if currentUserIsAdmin == true %}<a href="/settings/server/general">Application url</a>{% else %}Application url{% endif %} required
                 </div>
+                <div class="alert alert-warning {% if hasServerPlexIdentifier == true %}d-none{% endif %}"
+                     role="alert"
+                     style="margin-left: 5%;margin-right: 5%;margin-bottom: 1rem!important;">
+                    Authentication disabled - Plex client identifier required
+                </div>
             </div>
 
             <div id="authenticateWithPlexDiv" class="{% if plexTokenExists == true %}d-none{% endif %}">
-                <button type="button" class="btn btn-primary mb-3" onclick="authenticateWithPlex()" {% if isActive == '' %}disabled{% endif %}>Authenticate</button>
+                <button type="button" class="btn btn-primary mb-3" onclick="authenticateWithPlex()" {% if (isActive == '') or (hasServerPlexIdentifier == false) %}disabled{% endif %}>Authenticate</button>
             </div>
             <div id="removeAuthenticationWithPlexDiv" class="{% if plexTokenExists == false %}d-none{% endif %}">
                 <button type="button" class="btn btn-danger mb-3" onclick="removePlexAuthentication()">Remove Authentication</button>