userByName reloads cache if user not found, more things in test

closing the settings modal to immediately open another caused the
'modal-open' class on the body to get deleted, which meant scrolling
stopped working inside them. Also fix mistake added to jfapi in last commit.

.gitignore

@@ -14,3 +14,4 @@ build/
 pkg/
 old/
 version.go
+notes

data/templates/admin.html

@@ -136,6 +136,10 @@
             .settingIcon {
                 margin-left: 0.2rem;
             }
+
+            body.modal-open {
+                overflow: hidden;
+            }
         </style>
         <title>Admin</title>
     </head>
@@ -404,10 +408,23 @@
         <script>
             {{ if .bs5 }}
                 function createModal(id, find = false) {
+                    let modal;
                     if (find) {
-                        return bootstrap.Modal.getInstance(document.getElementById(id));
+                        modal = bootstrap.Modal.getInstance(document.getElementById(id));
+                    } else {
+                        modal = new bootstrap.Modal(document.getElementById(id));
                     }
-                    return new bootstrap.Modal(document.getElementById(id));
+                    document.getElementById(id).addEventListener('shown.bs.modal', function () {
+                        document.body.classList.add("modal-open");
+                    });
+                    return {
+                        modal: modal,
+                        show: function() {
+                            let temp = this.modal.show();
+                            return temp
+                        },
+                        hide: function() { return this.modal.hide(); }
+                    };
                 }
             {{ else }}
                 let send_to_addess_enabled = document.getElementById('send_to_address_enabled');
@@ -419,9 +436,13 @@
                     multiUseEnabled.classList.remove('form-check-input');
                 }
                 function createModal(id, find = false) {
+                    $('#' + id).on('shown.bs.modal', function () {
+                        document.body.classList.add("modal-open");
+                    });
                     return {
                         show: function() {
-                            return $('#' + id).modal('show');
+                            let temp = $('#' + id).modal('show');
+                            return temp
                         },
                         hide: function() {
                             return $('#' + id).modal('hide');

jfapi.go

@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -136,7 +137,7 @@ func (jf *Jellyfin) authenticate(username, password string) (map[string]interfac
 	return user, resp.StatusCode, nil
 }
 
-func (jf *Jellyfin) _getReader(url string, params map[string]string) (io.Reader, int, error) {
+func (jf *Jellyfin) _get(url string, params map[string]string) (string, int, error) {
 	var req *http.Request
 	if params != nil {
 		jsonParams, _ := json.Marshal(params)
@@ -154,26 +155,32 @@ func (jf *Jellyfin) _getReader(url string, params map[string]string) (io.Reader,
 			jf.authenticated = false
 			_, _, authErr := jf.authenticate(jf.username, jf.password)
 			if authErr == nil {
-				v1, v2, v3 := jf._getReader(url, params)
+				v1, v2, v3 := jf._get(url, params)
 				return v1, v2, v3
 			}
 		}
-		return nil, resp.StatusCode, err
+		return "", resp.StatusCode, err
 	}
 	defer resp.Body.Close()
 	var data io.Reader
-	switch resp.Header.Get("Content-Encoding") {
+	encoding := resp.Header.Get("Content-Encoding")
+	if TEST {
+		fmt.Println("response encoding:", encoding)
+	}
+	switch encoding {
 	case "gzip":
 		data, _ = gzip.NewReader(resp.Body)
 	default:
 		data = resp.Body
 	}
+	buf := new(strings.Builder)
+	io.Copy(buf, data)
 	//var respData map[string]interface{}
 	//json.NewDecoder(data).Decode(&respData)
-	return data, resp.StatusCode, nil
+	return buf.String(), resp.StatusCode, nil
 }
 
-func (jf *Jellyfin) _post(url string, data map[string]interface{}, response bool) (io.Reader, int, error) {
+func (jf *Jellyfin) _post(url string, data map[string]interface{}, response bool) (string, int, error) {
 	params, _ := json.Marshal(data)
 	req, _ := http.NewRequest("POST", url, bytes.NewBuffer(params))
 	for name, value := range jf.header {
@@ -190,7 +197,7 @@ func (jf *Jellyfin) _post(url string, data map[string]interface{}, response bool
 				return v1, v2, v3
 			}
 		}
-		return nil, resp.StatusCode, err
+		return "", resp.StatusCode, err
 	}
 	if response {
 		defer resp.Body.Close()
@@ -201,29 +208,30 @@ func (jf *Jellyfin) _post(url string, data map[string]interface{}, response bool
 		default:
 			outData = resp.Body
 		}
-		return outData, resp.StatusCode, nil
+		buf := new(strings.Builder)
+		io.Copy(buf, outData)
+		return buf.String(), resp.StatusCode, nil
 	}
-	return nil, resp.StatusCode, nil
+	return "", resp.StatusCode, nil
 }
 
 func (jf *Jellyfin) getUsers(public bool) ([]map[string]interface{}, int, error) {
 	var result []map[string]interface{}
-	var data io.Reader
+	var data string
 	var status int
 	var err error
 	if time.Now().After(jf.cacheExpiry) {
 		if public {
 			url := fmt.Sprintf("%s/users/public", jf.server)
-			data, status, err = jf._getReader(url, nil)
+			data, status, err = jf._get(url, nil)
-
 		} else {
 			url := fmt.Sprintf("%s/users", jf.server)
-			data, status, err = jf._getReader(url, jf.loginParams)
+			data, status, err = jf._get(url, jf.loginParams)
 		}
 		if err != nil || status != 200 {
 			return nil, status, err
 		}
-		json.NewDecoder(data).Decode(&result)
+		json.Unmarshal([]byte(data), &result)
 		jf.userCache = result
 		jf.cacheExpiry = time.Now().Add(time.Minute * time.Duration(jf.cacheLength))
 		return result, status, nil
@@ -232,16 +240,25 @@ func (jf *Jellyfin) getUsers(public bool) ([]map[string]interface{}, int, error)
 }
 
 func (jf *Jellyfin) userByName(username string, public bool) (map[string]interface{}, int, error) {
-	users, status, err := jf.getUsers(public)
+	var match map[string]interface{}
-	if err != nil || status != 200 {
+	find := func() (map[string]interface{}, int, error) {
+		users, status, err := jf.getUsers(public)
+		if err != nil || status != 200 {
+			return nil, status, err
+		}
+		for _, user := range users {
+			if user["Name"].(string) == username {
+				return user, status, err
+			}
+		}
 		return nil, status, err
 	}
-	for _, user := range users {
+	match, status, err := find()
-		if user["Name"].(string) == username {
+	if match == nil {
-			return user, status, nil
+		jf.cacheExpiry = time.Now()
-		}
+		match, status, err = find()
 	}
-	return nil, status, err
+	return match, status, err
 }
 
 func (jf *Jellyfin) userById(userId string, public bool) (map[string]interface{}, int, error) {
@@ -265,15 +282,15 @@ func (jf *Jellyfin) userById(userId string, public bool) (map[string]interface{}
 		return nil, status, err
 	} else {
 		var result map[string]interface{}
-		var data io.Reader
+		var data string
 		var status int
 		var err error
 		url := fmt.Sprintf("%s/users/%s", jf.server, userId)
-		data, status, err = jf._getReader(url, jf.loginParams)
+		data, status, err = jf._get(url, jf.loginParams)
 		if err != nil || status != 200 {
 			return nil, status, err
 		}
-		json.NewDecoder(data).Decode(&result)
+		json.Unmarshal([]byte(data), &result)
 		return result, status, nil
 	}
 }
@@ -288,9 +305,9 @@ func (jf *Jellyfin) newUser(username, password string) (map[string]interface{},
 	for key, value := range stringData {
 		data[key] = value
 	}
-	reader, status, err := jf._post(url, data, true)
+	response, status, err := jf._post(url, data, true)
 	var recv map[string]interface{}
-	json.NewDecoder(reader).Decode(&recv)
+	json.Unmarshal([]byte(response), &recv)
 	if err != nil || !(status == 200 || status == 204) {
 		return nil, status, err
 	}
@@ -314,12 +331,12 @@ func (jf *Jellyfin) setConfiguration(userId string, configuration map[string]int
 
 func (jf *Jellyfin) getDisplayPreferences(userId string) (map[string]interface{}, int, error) {
 	url := fmt.Sprintf("%s/DisplayPreferences/usersettings?userId=%s&client=emby", jf.server, userId)
-	data, status, err := jf._getReader(url, nil)
+	data, status, err := jf._get(url, nil)
 	if err != nil || !(status == 204 || status == 200) {
 		return nil, status, err
 	}
 	var displayprefs map[string]interface{}
-	err = json.NewDecoder(data).Decode(&displayprefs)
+	err = json.Unmarshal([]byte(data), &displayprefs)
 	if err != nil {
 		return nil, status, err
 	}

main.go

@@ -132,6 +132,13 @@ func test(app *appContext) {
 		out, err := json.MarshalIndent(users, "", "  ")
 		fmt.Print(string(out), err)
 	}
+	fmt.Printf("Enter a user to grab: ")
+	var username string
+	fmt.Scanln(&username)
+	user, status, err := app.jf.userByName(username, false)
+	fmt.Printf("userByName (%s): code %d err %s", username, status, err)
+	out, err := json.MarshalIndent(user, "", "  ")
+	fmt.Print(string(out))
 }
 
 func start(asDaemon, firstCall bool) {

pwreset.go

@@ -67,6 +67,12 @@ func pwrMonitor(app *appContext, watcher *fsnotify.Watcher) {
 					}
 					app.storage.loadEmails()
 					var address string
+					uid := user["Id"]
+					if uid == nil {
+						app.err.Printf("Couldn't get user ID for user \"%s\"", pwr.Username)
+						app.debug.Printf("user maplength: %d", len(user))
+						return
+					}
 					addr, ok := app.storage.emails[user["Id"].(string)]
 					if !ok || addr == nil {
 						app.err.Printf("Couldn't find email for user \"%s\". Make sure it's set", pwr.Username)