ombi: fix password reset on default route

the ombi password wasn't being changed w/ password resets initiated
through the admin page (and probably by other routes, too), as the code
was considering a HTTP 204 from Jellyfin as a failure, causing it to
skip anything with Ombi. Also added a little check for Ombi-imported
accounts that probably won't help with anything, but whatever.

api-ombi.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/gin-gonic/gin"
+	"github.com/hrfee/mediabrowser"
 )
 
 func (app *appContext) getOmbiUser(jfID string) (map[string]interface{}, int, error) {
@@ -29,7 +30,31 @@ func (app *appContext) getOmbiUser(jfID string) (map[string]interface{}, int, er
 			return ombiUser, code, err
 		}
 	}
-	return nil, 400, fmt.Errorf("Couldn't find user")
+	return nil, 400, fmt.Errorf("couldn't find user")
+}
+
+// Returns a user with the given name who has been imported from Jellyfin/Emby by Ombi
+func (app *appContext) getOmbiImportedUser(name string) (map[string]interface{}, int, error) {
+	// Ombi User Types: 3/4 = Emby, 5 = Jellyfin
+	ombiUsers, code, err := app.ombi.GetUsers()
+	if err != nil || code != 200 {
+		return nil, code, err
+	}
+	for _, ombiUser := range ombiUsers {
+		if ombiUser["userName"].(string) == name {
+			uType, ok := ombiUser["userType"].(int)
+			if !ok { // Don't know if Ombi somehow allows duplicate usernames
+				continue
+			}
+			if serverType == mediabrowser.JellyfinServer && uType != 5 { // Jellyfin
+				continue
+			} else if uType != 3 && uType != 4 { // Emby
+				continue
+			}
+			return ombiUser, code, err
+		}
+	}
+	return nil, 400, fmt.Errorf("couldn't find user")
 }
 
 // @Summary Get a list of Ombi users.
@@ -107,3 +132,18 @@ func (app *appContext) DeleteOmbiProfile(gc *gin.Context) {
 	app.storage.SetProfileKey(profileName, profile)
 	respondBool(204, true, gc)
 }
+
+func (app *appContext) applyOmbiProfile(user map[string]interface{}, profile map[string]interface{}) (status int, err error) {
+	for k, v := range profile {
+		switch v.(type) {
+		case map[string]interface{}, []interface{}:
+			user[k] = v
+		default:
+			if v != user[k] {
+				user[k] = v
+			}
+		}
+	}
+	status, err = app.ombi.ModifyUser(user)
+	return
+}

api-users.go

@@ -377,16 +377,34 @@ func (app *appContext) newUser(req newUserDTO, confirmed bool) (f errorFunc, suc
 		if profile.Ombi != nil && len(profile.Ombi) != 0 {
 			template := profile.Ombi
 			errors, code, err := app.ombi.NewUser(req.Username, req.Password, req.Email, template)
+			accountExists := false
+			var ombiUser map[string]interface{}
 			if err != nil || code != 200 {
+				// Check if on the off chance, Ombi's user importer has already added the account.
+				ombiUser, status, err = app.getOmbiImportedUser(req.Username)
+				if status == 200 && err == nil {
+					app.info.Println("Found existing Ombi user, applying changes")
+					accountExists = true
+					template["password"] = req.Password
+					status, err = app.applyOmbiProfile(ombiUser, template)
+					if status != 200 || err != nil {
+						app.err.Printf("Failed to modify existing Ombi user (%d): %v\n", status, err)
+					}
+				} else {
 					app.info.Printf("Failed to create Ombi user (%d): %s", code, err)
 					app.debug.Printf("Errors reported by Ombi: %s", strings.Join(errors, ", "))
+				}
 			} else {
-				app.info.Println("Created Ombi user")
+				ombiUser, status, err = app.getOmbiUser(id)
-				if discordVerified || telegramVerified {
-					ombiUser, status, err := app.getOmbiUser(id)
 				if status != 200 || err != nil {
 					app.err.Printf("Failed to get Ombi user (%d): %v", status, err)
 				} else {
+					app.info.Println("Created Ombi user")
+					accountExists = true
+				}
+			}
+			if accountExists {
+				if discordVerified || telegramVerified {
 					dID := ""
 					tUser := ""
 					if discordVerified {
@@ -403,7 +421,6 @@ func (app *appContext) newUser(req newUserDTO, confirmed bool) (f errorFunc, suc
 					}
 				}
 			}
-			}
 		} else {
 			app.debug.Printf("Skipping Ombi: Profile \"%s\" was empty", invite.Profile)
 		}
@@ -1214,17 +1231,7 @@ func (app *appContext) ApplySettings(gc *gin.Context) {
 				// newUser["userName"] = user["userName"]
 				// newUser["alias"] = user["alias"]
 				// newUser["emailAddress"] = user["emailAddress"]
-				for k, v := range ombi {
+				status, err = app.applyOmbiProfile(user, ombi)
-					switch v.(type) {
-					case map[string]interface{}, []interface{}:
-						user[k] = v
-					default:
-						if v != user[k] {
-							user[k] = v
-						}
-					}
-				}
-				status, err = app.ombi.ModifyUser(user)
 				if status != 200 || err != nil {
 					errorString += fmt.Sprintf("Apply %d: %v ", status, err)
 				}

api.go

@@ -182,7 +182,7 @@ func (app *appContext) ResetSetPassword(gc *gin.Context) {
 	}
 	if app.config.Section("ombi").Key("enabled").MustBool(false) {
 		// Silently fail for changing ombi passwords
-		if status != 200 || err != nil {
+		if (status != 200 && status != 204) || err != nil {
 			app.err.Printf("Failed to get user \"%s\" from jellyfin/emby (%d): %v", username, status, err)
 			respondBool(200, true, gc)
 			return