From d60dea61db0db184b246e068a08ef700b6819f4e Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Wed, 31 Jul 2024 15:54:05 +0100
Subject: [PATCH] accounts: make all components of profile application optional

Basically, added the ability to -not- apply the profile's policy.
---
 api-users.go           | 18 +++++++++++++-----
 html/admin.html        |  4 ++++
 lang/admin/en-us.json  |  1 +
 models.go              | 17 ++++++++++-------
 ts/modules/accounts.ts |  6 ++++--
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/api-users.go b/api-users.go
index f16fe3d..ec41a94 100644
--- a/api-users.go
+++ b/api-users.go
@@ -1372,7 +1372,9 @@ func (app *appContext) ApplySettings(gc *gin.Context) {
 			configuration = profile.Configuration
 			displayprefs = profile.Displayprefs
 		}
-		policy = profile.Policy
+		if req.Policy {
+			policy = profile.Policy
+		}
 		if req.Ombi && app.config.Section("ombi").Key("enabled").MustBool(false) {
 			if profile.Ombi != nil && len(profile.Ombi) != 0 {
 				ombi = profile.Ombi
@@ -1394,7 +1396,9 @@ func (app *appContext) ApplySettings(gc *gin.Context) {
 			return
 		}
 		applyingFrom = "\"" + user.Name + "\""
-		policy = user.Policy
+		if req.Policy {
+			policy = user.Policy
+		}
 		if req.Homescreen {
 			displayprefs, status, err = app.jf.GetDisplayPreferences(req.ID)
 			if !(status == 200 || status == 204) || err != nil {
@@ -1421,9 +1425,13 @@ func (app *appContext) ApplySettings(gc *gin.Context) {
 		app.debug.Println("Adding delay between requests for large batch")
 	}
 	for _, id := range req.ApplyTo {
-		status, err := app.jf.SetPolicy(id, policy)
-		if !(status == 200 || status == 204) || err != nil {
-			errors["policy"][id] = fmt.Sprintf("%d: %s", status, err)
+		var status int
+		var err error
+		if req.Policy {
+			status, err = app.jf.SetPolicy(id, policy)
+			if !(status == 200 || status == 204) || err != nil {
+				errors["policy"][id] = fmt.Sprintf("%d: %s", status, err)
+			}
 		}
 		if shouldDelay {
 			time.Sleep(250 * time.Millisecond)
diff --git a/html/admin.html b/html/admin.html
index 126f9e1..cd72885 100644
--- a/html/admin.html
+++ b/html/admin.html
@@ -101,6 +101,10 @@
                     <div class="select ~neutral @low unfocused">
                         <select id="modify-user-users"></select>
                     </div>
+                    <label class="switch">
+                        <input type="checkbox" id="modify-user-configuration" checked>
+                        <span>{{ .strings.applyConfigurationAndPolicy }}</span>
+                    </label>
                     <label class="switch">
                         <input type="checkbox" id="modify-user-homescreen" checked>
                         <span>{{ .strings.applyHomescreenLayout }}</span>
diff --git a/lang/admin/en-us.json b/lang/admin/en-us.json
index d9d2d93..15835cb 100644
--- a/lang/admin/en-us.json
+++ b/lang/admin/en-us.json
@@ -81,6 +81,7 @@
         "useInviteExpiry": "Set expiry from profile/invite",
         "useInviteExpiryNote": "By default, invites expire after 90 days but can be renewed by the user. Enable for the referral to be disabled after the time set.",
         "applyHomescreenLayout": "Apply homescreen layout",
+        "applyConfigurationAndPolicy": "Apply Jellyfin configuration/policy",
         "applyOmbi": "Apply Ombi profile (if available)",
         "applyJellyseerr": "Apply Jellyseerr profile (if available)",
         "sendDeleteNotificationEmail": "Send notification message",
diff --git a/models.go b/models.go
index 9ee770d..399d497 100644
--- a/models.go
+++ b/models.go
@@ -174,13 +174,16 @@ type ombiUsersDTO struct {
 type modifyEmailsDTO map[string]string
 
 type userSettingsDTO struct {
-	From       string   `json:"from"`       // Whether to apply from "user" or "profile"
-	Profile    string   `json:"profile"`    // Name of profile (if from = "profile")
-	ApplyTo    []string `json:"apply_to"`   // Users to apply settings to
-	ID         string   `json:"id"`         // ID of user (if from = "user")
-	Homescreen bool     `json:"homescreen"` // Whether to apply homescreen layout or not
-	Ombi       bool     `json:"ombi"`       // Whether to apply ombi profile or not
-	Jellyseerr bool     `json:"jellyseerr"` // Whether to apply jellyseerr profile or not
+	From    string   `json:"from"`     // Whether to apply from "user" or "profile"
+	Profile string   `json:"profile"`  // Name of profile (if from = "profile")
+	ApplyTo []string `json:"apply_to"` // Users to apply settings to
+	ID      string   `json:"id"`       // ID of user (if from = "user")
+	// Note confusing name: "Configuration" on the admin UI just means it in the sense
+	// of the account's settings.
+	Policy     bool `json:"configuration"` // Whether to apply jf policy not
+	Homescreen bool `json:"homescreen"`    // Whether to apply homescreen layout or not
+	Ombi       bool `json:"ombi"`          // Whether to apply ombi profile or not
+	Jellyseerr bool `json:"jellyseerr"`    // Whether to apply jellyseerr profile or not
 }
 
 type announcementDTO struct {
diff --git a/ts/modules/accounts.ts b/ts/modules/accounts.ts
index d01b7c0..512e047 100644
--- a/ts/modules/accounts.ts
+++ b/ts/modules/accounts.ts
@@ -795,7 +795,8 @@ export class accountsList {
     private _searchBox = document.getElementById("accounts-search") as HTMLInputElement;
     private _search: Search;
 
-    private _applyHomesreen = document.getElementById("modify-user-homescreen") as HTMLInputElement;
+    private _applyHomescreen = document.getElementById("modify-user-homescreen") as HTMLInputElement;
+    private _applyConfiguration = document.getElementById("modify-user-configuration") as HTMLInputElement;
     private _applyOmbi = document.getElementById("modify-user-ombi") as HTMLInputElement;
     private _applyJellyseerr = document.getElementById("modify-user-jellyseerr") as HTMLInputElement;
 
@@ -1490,7 +1491,8 @@ export class accountsList {
             toggleLoader(button);
             let send = {
                 "apply_to": list,
-                "homescreen": this._applyHomesreen.checked,
+                "homescreen": this._applyHomescreen.checked,
+                "configuration": this._applyConfiguration.checked,
                 "ombi": this._applyOmbi.checked,
                 "jellyseerr": this._applyJellyseerr.checked
             };