From 667ccbe00ebde70e1a63799d059ad05b9b2e0a08 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Thu, 5 Aug 2021 18:45:21 +0200
Subject: [PATCH] web/admin: fix source form's userMatchingMode being swapped

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 .../pages/sources/oauth/OAuthSourceForm.ts    | 30 +++++++++----------
 web/src/pages/sources/plex/PlexSourceForm.ts  | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/web/src/pages/sources/oauth/OAuthSourceForm.ts b/web/src/pages/sources/oauth/OAuthSourceForm.ts
index 4a00b029a..0e4a9dc07 100644
--- a/web/src/pages/sources/oauth/OAuthSourceForm.ts
+++ b/web/src/pages/sources/oauth/OAuthSourceForm.ts
@@ -172,31 +172,31 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
                     >
                         ${t`Link users on unique identifier`}
                     </option>
-                    <option
-                        value=${UserMatchingModeEnum.UsernameLink}
-                        ?selected=${this.instance?.userMatchingMode ===
-                        UserMatchingModeEnum.UsernameLink}
-                    >
-                        ${t`Link to a user with identical email address. Can have security implications when a source doesn't validate email addresses`}
-                    </option>
-                    <option
-                        value=${UserMatchingModeEnum.UsernameDeny}
-                        ?selected=${this.instance?.userMatchingMode ===
-                        UserMatchingModeEnum.UsernameDeny}
-                    >
-                        ${t`Use the user's email address, but deny enrollment when the email address already exists.`}
-                    </option>
                     <option
                         value=${UserMatchingModeEnum.EmailLink}
                         ?selected=${this.instance?.userMatchingMode ===
                         UserMatchingModeEnum.EmailLink}
                     >
-                        ${t`Link to a user with identical username address. Can have security implications when a username is used with another source.`}
+                        ${t`Link to a user with identical email address. Can have security implications when a source doesn't validate email addresses`}
                     </option>
                     <option
                         value=${UserMatchingModeEnum.EmailDeny}
                         ?selected=${this.instance?.userMatchingMode ===
                         UserMatchingModeEnum.EmailDeny}
+                    >
+                        ${t`Use the user's email address, but deny enrollment when the email address already exists.`}
+                    </option>
+                    <option
+                        value=${UserMatchingModeEnum.UsernameLink}
+                        ?selected=${this.instance?.userMatchingMode ===
+                        UserMatchingModeEnum.UsernameLink}
+                    >
+                        ${t`Link to a user with identical username address. Can have security implications when a username is used with another source.`}
+                    </option>
+                    <option
+                        value=${UserMatchingModeEnum.UsernameDeny}
+                        ?selected=${this.instance?.userMatchingMode ===
+                        UserMatchingModeEnum.UsernameDeny}
                     >
                         ${t`Use the user's username, but deny enrollment when the username already exists.`}
                     </option>
diff --git a/web/src/pages/sources/plex/PlexSourceForm.ts b/web/src/pages/sources/plex/PlexSourceForm.ts
index 94aca9121..f4f65e384 100644
--- a/web/src/pages/sources/plex/PlexSourceForm.ts
+++ b/web/src/pages/sources/plex/PlexSourceForm.ts
@@ -182,31 +182,31 @@ export class PlexSourceForm extends ModelForm<PlexSource, string> {
                     >
                         ${t`Link users on unique identifier`}
                     </option>
-                    <option
-                        value=${UserMatchingModeEnum.UsernameLink}
-                        ?selected=${this.instance?.userMatchingMode ===
-                        UserMatchingModeEnum.UsernameLink}
-                    >
-                        ${t`Link to a user with identical email address. Can have security implications when a source doesn't validate email addresses`}
-                    </option>
-                    <option
-                        value=${UserMatchingModeEnum.UsernameDeny}
-                        ?selected=${this.instance?.userMatchingMode ===
-                        UserMatchingModeEnum.UsernameDeny}
-                    >
-                        ${t`Use the user's email address, but deny enrollment when the email address already exists.`}
-                    </option>
                     <option
                         value=${UserMatchingModeEnum.EmailLink}
                         ?selected=${this.instance?.userMatchingMode ===
                         UserMatchingModeEnum.EmailLink}
                     >
-                        ${t`Link to a user with identical username address. Can have security implications when a username is used with another source.`}
+                        ${t`Link to a user with identical email address. Can have security implications when a source doesn't validate email addresses`}
                     </option>
                     <option
                         value=${UserMatchingModeEnum.EmailDeny}
                         ?selected=${this.instance?.userMatchingMode ===
                         UserMatchingModeEnum.EmailDeny}
+                    >
+                        ${t`Use the user's email address, but deny enrollment when the email address already exists.`}
+                    </option>
+                    <option
+                        value=${UserMatchingModeEnum.UsernameLink}
+                        ?selected=${this.instance?.userMatchingMode ===
+                        UserMatchingModeEnum.UsernameLink}
+                    >
+                        ${t`Link to a user with identical username address. Can have security implications when a username is used with another source.`}
+                    </option>
+                    <option
+                        value=${UserMatchingModeEnum.UsernameDeny}
+                        ?selected=${this.instance?.userMatchingMode ===
+                        UserMatchingModeEnum.UsernameDeny}
                     >
                         ${t`Use the user's username, but deny enrollment when the username already exists.`}
                     </option>