From 355620f06b36577a40928ef718c75d0987de7031 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 12:08:23 -0400
Subject: [PATCH 1/3] Implement frontend component of max user sessions

---
 src/controllers/dashboard/users/useredit.html | 8 ++++++++
 src/controllers/dashboard/users/useredit.js   | 2 ++
 src/strings/en-us.json                        | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/src/controllers/dashboard/users/useredit.html b/src/controllers/dashboard/users/useredit.html
index f4dc8c096b..d501d0ba26 100644
--- a/src/controllers/dashboard/users/useredit.html
+++ b/src/controllers/dashboard/users/useredit.html
@@ -190,6 +190,14 @@
                     </div>
                 </div>
                 <br />
+                <div class=verticalSection>
+                    <div class="inputContainer" id="fldMaxActiveSessions">
+                        <input is="emby-input" type="number" id="txtMaxActiveSessions" min="-1" step="1" label="${LabelUserMaxActiveSessions}"/>
+                        <div class="fieldDescription">${OptionMaxActiveSessions}</div>
+                        <div class="fieldDescription">${OptionMaxActiveSessionsHelp}</div>
+                    </div>
+                </div>
+                <br />
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
                         <span>${Save}</span>
diff --git a/src/controllers/dashboard/users/useredit.js b/src/controllers/dashboard/users/useredit.js
index 796b70c704..08a62ad071 100644
--- a/src/controllers/dashboard/users/useredit.js
+++ b/src/controllers/dashboard/users/useredit.js
@@ -102,6 +102,7 @@ import globalize from 'globalize';
         $('#chkEnableSharing', page).prop('checked', user.Policy.EnablePublicSharing);
         $('#txtRemoteClientBitrateLimit', page).val(user.Policy.RemoteClientBitrateLimit / 1e6 || '');
         $('#txtLoginAttemptsBeforeLockout', page).val(user.Policy.LoginAttemptsBeforeLockout || '0');
+        $('#txtMaxActiveSessions', page).val(user.Policy.MaxActiveSessions || '-1');
         if (ApiClient.isMinServerVersion('10.6.0')) {
             $('#selectSyncPlayAccess').val(user.Policy.SyncPlayAccess);
         }
@@ -138,6 +139,7 @@ import globalize from 'globalize';
         user.Policy.EnableRemoteAccess = $('#chkRemoteAccess', page).is(':checked');
         user.Policy.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat($('#txtRemoteClientBitrateLimit', page).val() || '0'));
         user.Policy.LoginAttemptsBeforeLockout = parseInt($('#txtLoginAttemptsBeforeLockout', page).val() || '0');
+        user.Policy.MaxActiveSessions = parseInt($('#txtMaxActiveSessions', page).val() || '-1');
         user.Policy.AuthenticationProviderId = page.querySelector('.selectLoginProvider').value;
         user.Policy.PasswordResetProviderId = page.querySelector('.selectPasswordResetProvider').value;
         user.Policy.EnableContentDeletion = $('#chkEnableDeleteAllFolders', page).is(':checked');
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 4eed373b46..02cd595808 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -815,6 +815,7 @@
     "LabelUserLibrary": "User library:",
     "LabelUserLibraryHelp": "Select which user library to display to the device. Leave empty to inherit the default setting.",
     "LabelUserLoginAttemptsBeforeLockout": "Failed login attempts before user is locked out:",
+    "LabelUserMaxActiveSessions": "Maximum number of simultaneous user sessions:",
     "LabelUserRemoteClientBitrateLimitHelp": "Override the default global value set in server playback settings.",
     "LabelUsername": "Username:",
     "LabelVaapiDevice": "VA API Device:",
@@ -1066,6 +1067,8 @@
     "OptionLikes": "Likes",
     "OptionLoginAttemptsBeforeLockout": "Determines how many incorrect login attempts can be made before lockout occurs.",
     "OptionLoginAttemptsBeforeLockoutHelp": "A value of zero means inheriting the default of three attempts for normal users and five for administrators. Setting this to -1 will disable the feature.",
+    "OptionMaxActiveSessions": "Sets the maximum number of simultaneous user sessions.",
+    "OptionMaxActiveSessionsHelp": "A value of 0 will disable user access. A value of -1 will disable the feature.",
     "OptionMax": "Max",
     "OptionMissingEpisode": "Missing Episodes",
     "OptionNew": "New…",

From 152ecdb52fded19c89b9e0599a2a851666727331 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 14:07:50 -0400
Subject: [PATCH 2/3] Remove disabling user mention

---
 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 02cd595808..c484819818 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1068,7 +1068,7 @@
     "OptionLoginAttemptsBeforeLockout": "Determines how many incorrect login attempts can be made before lockout occurs.",
     "OptionLoginAttemptsBeforeLockoutHelp": "A value of zero means inheriting the default of three attempts for normal users and five for administrators. Setting this to -1 will disable the feature.",
     "OptionMaxActiveSessions": "Sets the maximum number of simultaneous user sessions.",
-    "OptionMaxActiveSessionsHelp": "A value of 0 will disable user access. A value of -1 will disable the feature.",
+    "OptionMaxActiveSessionsHelp": "A value of 0 will disable the feature.",
     "OptionMax": "Max",
     "OptionMissingEpisode": "Missing Episodes",
     "OptionNew": "New…",

From 63b0554a52d7abfcc7bf1ca4d0e70ad80940f92e Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 16:48:34 -0400
Subject: [PATCH 3/3] Update default from -1 to 0

This was changed in the main PR so that 0 was disabled instead of -1.
---
 src/controllers/dashboard/users/useredit.html | 2 +-
 src/controllers/dashboard/users/useredit.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controllers/dashboard/users/useredit.html b/src/controllers/dashboard/users/useredit.html
index d501d0ba26..dbf9cc066b 100644
--- a/src/controllers/dashboard/users/useredit.html
+++ b/src/controllers/dashboard/users/useredit.html
@@ -192,7 +192,7 @@
                 <br />
                 <div class=verticalSection>
                     <div class="inputContainer" id="fldMaxActiveSessions">
-                        <input is="emby-input" type="number" id="txtMaxActiveSessions" min="-1" step="1" label="${LabelUserMaxActiveSessions}"/>
+                        <input is="emby-input" type="number" id="txtMaxActiveSessions" min="0" step="1" label="${LabelUserMaxActiveSessions}"/>
                         <div class="fieldDescription">${OptionMaxActiveSessions}</div>
                         <div class="fieldDescription">${OptionMaxActiveSessionsHelp}</div>
                     </div>
diff --git a/src/controllers/dashboard/users/useredit.js b/src/controllers/dashboard/users/useredit.js
index 08a62ad071..7e80c3884c 100644
--- a/src/controllers/dashboard/users/useredit.js
+++ b/src/controllers/dashboard/users/useredit.js
@@ -102,7 +102,7 @@ import globalize from 'globalize';
         $('#chkEnableSharing', page).prop('checked', user.Policy.EnablePublicSharing);
         $('#txtRemoteClientBitrateLimit', page).val(user.Policy.RemoteClientBitrateLimit / 1e6 || '');
         $('#txtLoginAttemptsBeforeLockout', page).val(user.Policy.LoginAttemptsBeforeLockout || '0');
-        $('#txtMaxActiveSessions', page).val(user.Policy.MaxActiveSessions || '-1');
+        $('#txtMaxActiveSessions', page).val(user.Policy.MaxActiveSessions || '0');
         if (ApiClient.isMinServerVersion('10.6.0')) {
             $('#selectSyncPlayAccess').val(user.Policy.SyncPlayAccess);
         }
@@ -139,7 +139,7 @@ import globalize from 'globalize';
         user.Policy.EnableRemoteAccess = $('#chkRemoteAccess', page).is(':checked');
         user.Policy.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat($('#txtRemoteClientBitrateLimit', page).val() || '0'));
         user.Policy.LoginAttemptsBeforeLockout = parseInt($('#txtLoginAttemptsBeforeLockout', page).val() || '0');
-        user.Policy.MaxActiveSessions = parseInt($('#txtMaxActiveSessions', page).val() || '-1');
+        user.Policy.MaxActiveSessions = parseInt($('#txtMaxActiveSessions', page).val() || '0');
         user.Policy.AuthenticationProviderId = page.querySelector('.selectLoginProvider').value;
         user.Policy.PasswordResetProviderId = page.querySelector('.selectPasswordResetProvider').value;
         user.Policy.EnableContentDeletion = $('#chkEnableDeleteAllFolders', page).is(':checked');