From dba9b60800977f879536836813a940171e8d14c4 Mon Sep 17 00:00:00 2001
From: Phallacy <Dragoonmac@gmail.com>
Date: Fri, 22 Mar 2019 00:12:01 -0700
Subject: [PATCH 1/7] added ui stuff for password reset pr

---
 src/scripts/useredit.js | 13 +++++++++++++
 src/useredit.html       |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/src/scripts/useredit.js b/src/scripts/useredit.js
index 74d70ac0bf..9a13a207f2 100644
--- a/src/scripts/useredit.js
+++ b/src/scripts/useredit.js
@@ -21,11 +21,23 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function($, loading, l
         })
     }
 
+    function loadPasswordResetProviders(page, user, providers) {
+        providers.length > 1 && !user.Policy.IsAdministrator ? page.querySelector(".fldSelectPasswordResetProvider").classList.remove("hide") : page.querySelector(".fldSelectPasswordResetProvider").classList.add("hide");
+        var currentProviderId = user.Policy.PasswordResetProviderId;
+        page.querySelector(".selectPasswordResetProvider").innerHTML = providers.map(function(provider) {
+            var selected = provider.Id === currentProviderId || providers.length < 2 ? " selected" : "";
+            return '<option value="' + provider.Id + '"' + selected + ">" + provider.Name + "</option>"
+        })
+    }
+
     function loadUser(page, user) {
         currentUser = user;
         ApiClient.getJSON(ApiClient.getUrl("Auth/Providers")).then(function(providers) {
             loadAuthProviders(page, user, providers)
         });
+        ApiClient.getJSON(ApiClient.getUrl("Auth/PasswordResetProviders")).then(function(providers) {
+            loadPasswordResetProviders(page, user, providers)
+        });
         ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", {
              IsHidden: false
         })).then(function(folders) {
@@ -99,6 +111,7 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function($, loading, l
         user.Policy.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat($("#txtRemoteClientBitrateLimit", page).val() || "0"));
         user.Policy.LoginAttemptsBeforeLockout = parseInt($("#txtLoginAttemptsBeforeLockout", page).val() || "0");
         user.Policy.AuthenticationProviderId = page.querySelector(".selectLoginProvider").value;
+        user.Policy.PasswordResetProviderId = page.querySelector(".selectPasswordResetProvider").value;
         user.Policy.EnableContentDeletion = $("#chkEnableDeleteAllFolders", page).checked();
         user.Policy.EnableContentDeletionFromFolders = user.Policy.EnableContentDeletion ? [] : $(".chkFolder", page).get().filter(function(c) {
                 return c.checked
diff --git a/src/useredit.html b/src/useredit.html
index a8247fa771..887d4ce5c3 100644
--- a/src/useredit.html
+++ b/src/useredit.html
@@ -40,6 +40,12 @@
                     <select class="selectLoginProvider" is="emby-select" label="${LabelAuthProvider}"></select>
                     <div class="fieldDescription">${AuthProviderHelp}</div>
                 </div>
+
+                <div class="selectContainer fldSelectPasswordResetProvider hide">
+                    <select class="selectPasswordResetProvider" is="emby-select" label="${LabelPasswordResetProvider}"></select>
+                    <div class="fieldDescription">${PasswordResetProviderHelp}</div>
+                </div>
+
                 <div class="checkboxContainer checkboxContainer-withDescription fldRemoteAccess hide">
                     <label>
                         <input type="checkbox" is="emby-checkbox" id="chkRemoteAccess" />

From 24ed198960dcbcaf1789fd4c5553c5d5635ed8a4 Mon Sep 17 00:00:00 2001
From: Phallacy <Dragoonmac@gmail.com>
Date: Mon, 25 Mar 2019 22:41:16 -0700
Subject: [PATCH 2/7] adds strings and a link on the password reset page

---
 src/controllers/forgotpassword.js | 2 +-
 src/strings/en-us.json            | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/controllers/forgotpassword.js b/src/controllers/forgotpassword.js
index fc944a410a..f31c5724a7 100644
--- a/src/controllers/forgotpassword.js
+++ b/src/controllers/forgotpassword.js
@@ -12,7 +12,7 @@ define([], function() {
         });
         if ("PinCode" == result.Action) {
             var msg = Globalize.translate("MessageForgotPasswordFileCreated");
-            return msg += "<br/>", msg += "<br/>", msg += result.PinFile, msg += "<br/>", void Dashboard.alert({
+            return msg += "<br/>", msg += "<br/>", msg += "<a href=\"/web/index.html#!/forgotpasswordpin.html\">Enter PIN here to finish Password Reset</a>" ,msg += "<br/>",msg += result.PinFile, msg += "<br/>", void Dashboard.alert({
                 message: msg,
                 title: Globalize.translate("HeaderForgotPassword")
             })
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 765e74cf86..cdaba76e06 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -40,6 +40,7 @@
     "AspectRatio": "Aspect ratio",
     "AttributeNew": "New",
     "Audio": "Audio",
+    "AuthProviderHelp": "Select an Authentication Provider to be used to Authenticate this user's password",
     "Auto": "Auto",
     "AutoBasedOnLanguageSetting": "Auto (based on language setting)",
     "Backdrop": "Backdrop",
@@ -548,6 +549,7 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "LabelAudio": "Audio:",
     "LabelAudioLanguagePreference": "Preferred audio language:",
+    "LabelAuthProvider": "Authentication Provider:",
     "LabelAutomaticallyRefreshInternetMetadataEvery": "Automatically refresh metadata from the internet:",
     "LabelBindToLocalNetworkAddress": "Bind to local network address:",
     "LabelBindToLocalNetworkAddressHelp": "Optional. Override the local IP address to bind the http server to. If left empty, the server will bind to all availabile addresses. Changing this value requires restarting Jellyfin Server.",
@@ -746,6 +748,7 @@
     "LabelParentalRating": "Parental rating:",
     "LabelPassword": "Password:",
     "LabelPasswordConfirm": "Password (confirm):",
+    "LabelPasswordResetProvider": "Password Reset Provider:",
     "LabelPasswordRecoveryPinCode": "Pin code:",
     "LabelPath": "Path:",
     "LabelPersonRole": "Role:",
@@ -961,7 +964,7 @@
     "MessageNoServersAvailableToConnect": "No servers are available to connect to. If you've been invited to share a server, make sure to accept it below or by clicking the link in the email.",
     "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
     "MessageNothingHere": "Nothing here.",
-    "MessagePasswordResetForUsers": "Passwords have been removed for the following users. To login, sign in with a blank password.",
+    "MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the PIN code that was used this reset.",
     "MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your Jellyfin Server administrator for more information.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "MessagePleaseWait": "Please wait. This may take a minute.",
@@ -1170,6 +1173,7 @@
     "PasswordResetComplete": "The password has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
     "PasswordResetHeader": "Reset Password",
+    "PasswordResetProviderHelp": "Choose a Password Reset Provider to be used if this user resets their password",
     "PasswordSaved": "Password saved.",
     "People": "People",
     "PerfectMatch": "Perfect match",

From 82e0a2f7da8f17590c4fbac12acbba3bf0c03a85 Mon Sep 17 00:00:00 2001
From: Phallacy <Dragoonmac@gmail.com>
Date: Mon, 25 Mar 2019 22:43:32 -0700
Subject: [PATCH 3/7] replaces a duplicate anthonylavado with me

---
 CONTRIBUTORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9a343ddd15..bbdb64f7a5 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -19,7 +19,7 @@
  - [nkmerrill](https://github.com/nkmerrill)
  - [TtheCreator](https://github.com/Tthecreator)
  - [RazeLighter777](https://github.com/RazeLighter777)
- - [anthonylavado](https://github.com/anthonylavado)
+ - [LogicalPhallacy](https://github.com/LogicalPhallacy)
 
 # Emby Contributors
 

From e01feca025798f518f4c5acb00bb680a489d8c03 Mon Sep 17 00:00:00 2001
From: Vasily <JustAMan@users.noreply.github.com>
Date: Wed, 27 Mar 2019 10:02:48 -0700
Subject: [PATCH 4/7] Deuglify

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
---
 src/scripts/useredit.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/scripts/useredit.js b/src/scripts/useredit.js
index 96003fb74d..853bb2454d 100644
--- a/src/scripts/useredit.js
+++ b/src/scripts/useredit.js
@@ -22,7 +22,11 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function($, loading, l
     }
 
     function loadPasswordResetProviders(page, user, providers) {
-        providers.length > 1 && !user.Policy.IsAdministrator ? page.querySelector(".fldSelectPasswordResetProvider").classList.remove("hide") : page.querySelector(".fldSelectPasswordResetProvider").classList.add("hide");
+        if (providers.length > 1 && !user.Policy.IsAdministrator) {
+            page.querySelector(".fldSelectPasswordResetProvider").classList.remove("hide");
+        } else {
+            page.querySelector(".fldSelectPasswordResetProvider").classList.add("hide");
+        }
         var currentProviderId = user.Policy.PasswordResetProviderId;
         page.querySelector(".selectPasswordResetProvider").innerHTML = providers.map(function(provider) {
             var selected = provider.Id === currentProviderId || providers.length < 2 ? " selected" : "";

From 6c3814f014fca6c5570521d9673fdc3d3f9c6157 Mon Sep 17 00:00:00 2001
From: Vasily <JustAMan@users.noreply.github.com>
Date: Wed, 27 Mar 2019 13:42:01 -0700
Subject: [PATCH 5/7] Apply suggestions from code review

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
---
 src/scripts/useredit.js | 2 +-
 src/strings/en-us.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/useredit.js b/src/scripts/useredit.js
index 853bb2454d..356a93c4e7 100644
--- a/src/scripts/useredit.js
+++ b/src/scripts/useredit.js
@@ -29,7 +29,7 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function($, loading, l
         }
         var currentProviderId = user.Policy.PasswordResetProviderId;
         page.querySelector(".selectPasswordResetProvider").innerHTML = providers.map(function(provider) {
-            var selected = provider.Id === currentProviderId || providers.length < 2 ? " selected" : "";
+            var selected = (provider.Id === currentProviderId || providers.length < 2) ? " selected" : "";
             return '<option value="' + provider.Id + '"' + selected + ">" + provider.Name + "</option>"
         })
     }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index cdaba76e06..2189e827b2 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -964,7 +964,7 @@
     "MessageNoServersAvailableToConnect": "No servers are available to connect to. If you've been invited to share a server, make sure to accept it below or by clicking the link in the email.",
     "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
     "MessageNothingHere": "Nothing here.",
-    "MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the PIN code that was used this reset.",
+    "MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the PIN codes that were used to perform the reset.",
     "MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your Jellyfin Server administrator for more information.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "MessagePleaseWait": "Please wait. This may take a minute.",

From 18af617c741f92a8ac448a990cc9cdccdf654e8c Mon Sep 17 00:00:00 2001
From: Phallacy <Dragoonmac@gmail.com>
Date: Wed, 27 Mar 2019 22:51:27 -0700
Subject: [PATCH 6/7] minor fixes

---
 src/controllers/forgotpassword.js | 2 +-
 src/strings/en-us.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/forgotpassword.js b/src/controllers/forgotpassword.js
index f31c5724a7..bb9489a11a 100644
--- a/src/controllers/forgotpassword.js
+++ b/src/controllers/forgotpassword.js
@@ -12,7 +12,7 @@ define([], function() {
         });
         if ("PinCode" == result.Action) {
             var msg = Globalize.translate("MessageForgotPasswordFileCreated");
-            return msg += "<br/>", msg += "<br/>", msg += "<a href=\"/web/index.html#!/forgotpasswordpin.html\">Enter PIN here to finish Password Reset</a>" ,msg += "<br/>",msg += result.PinFile, msg += "<br/>", void Dashboard.alert({
+            return msg += "<br/>", msg += "<br/>", msg += "<a href=\"forgotpasswordpin.html\">Enter PIN here to finish Password Reset</a>" ,msg += "<br/>",msg += result.PinFile, msg += "<br/>", void Dashboard.alert({
                 message: msg,
                 title: Globalize.translate("HeaderForgotPassword")
             })
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index cdaba76e06..38da20bc12 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1173,7 +1173,7 @@
     "PasswordResetComplete": "The password has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
     "PasswordResetHeader": "Reset Password",
-    "PasswordResetProviderHelp": "Choose a Password Reset Provider to be used if this user resets their password",
+    "PasswordResetProviderHelp": "Choose a Password Reset Provider to be used when this user requests a password reset",
     "PasswordSaved": "Password saved.",
     "People": "People",
     "PerfectMatch": "Perfect match",

From 37cc900a8e50de1f0285d2484e3ca0c0e9eac464 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 29 Mar 2019 07:12:15 -0700
Subject: [PATCH 7/7] Update src/strings/en-us.json

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
---
 src/strings/en-us.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index c65eab375c..a6c3955885 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -40,7 +40,7 @@
     "AspectRatio": "Aspect ratio",
     "AttributeNew": "New",
     "Audio": "Audio",
-    "AuthProviderHelp": "Select an Authentication Provider to be used to Authenticate this user's password",
+    "AuthProviderHelp": "Select an Authentication Provider to be used to authenticate this user's password",
     "Auto": "Auto",
     "AutoBasedOnLanguageSetting": "Auto (based on language setting)",
     "Backdrop": "Backdrop",