email.go

@@ -535,7 +535,7 @@ func (emailer *Emailer) resetValues(pwr PasswordReset, app *appContext, noSub bo
 			if inviteLink != "" {
 				// Strip /invite form end of this URL, ik its ugly.
 				template["link_reset"] = true
-				pinLink := fmt.Sprintf("%s/reset?pin=%s", strings.TrimPrefix(inviteLink, "/invite"), pwr.Pin)
+				pinLink := fmt.Sprintf("%s/reset?pin=%s", strings.Replace(inviteLink, "/invite", "", 1), pwr.Pin)
 				template["pin"] = pinLink
 				// Only used in html email.
 				template["pin_code"] = pwr.Pin

pwreset.go

@@ -54,12 +54,10 @@ func pwrMonitor(app *appContext, watcher *fsnotify.Watcher) {
 				var pwr PasswordReset
 				data, err := os.ReadFile(event.Name)
 				if err != nil {
-					app.debug.Printf("PWR: Failed to read file: %v", err)
 					return
 				}
 				err = json.Unmarshal(data, &pwr)
 				if len(pwr.Pin) == 0 || err != nil {
-					app.debug.Printf("PWR: Failed to read PIN: %v", err)
 					return
 				}
 				app.info.Printf("New password reset for user \"%s\"", pwr.Username)

views.go

@@ -137,7 +137,6 @@ func (app *appContext) AdminPage(gc *gin.Context) {
 }
 
 func (app *appContext) ResetPassword(gc *gin.Context) {
-	isBot := strings.Contains(gc.Request.Header.Get("User-Agent"), "Bot")
 	pin := gc.Query("pin")
 	if pin == "" {
 		app.NoRouteHandler(gc)
@@ -152,13 +151,6 @@ func (app *appContext) ResetPassword(gc *gin.Context) {
 		"success":        false,
 		"ombiEnabled":    app.config.Section("ombi").Key("enabled").MustBool(false),
 	}
-	defer gcHTML(gc, http.StatusOK, "password-reset.html", data)
-	// If it's a bot, pretend to be a success so the preview is nice.
-	if isBot {
-		app.debug.Println("PWR: Ignoring magic link visit from bot")
-		data["success"] = true
-		data["pin"] = "NO-BO-TS"
-	} else {
 	resp, status, err := app.jf.ResetPassword(pin)
 	if status == 200 && err == nil && resp.Success {
 		data["success"] = true
@@ -166,6 +158,7 @@ func (app *appContext) ResetPassword(gc *gin.Context) {
 	} else {
 		app.err.Printf("Password Reset failed (%d): %v", status, err)
 	}
+	defer gcHTML(gc, http.StatusOK, "password-reset.html", data)
 	if app.config.Section("ombi").Key("enabled").MustBool(false) {
 		jfUser, status, err := app.jf.UserByName(resp.UsersReset[0], false)
 		if status != 200 || err != nil {
@@ -185,7 +178,6 @@ func (app *appContext) ResetPassword(gc *gin.Context) {
 		}
 		app.debug.Printf("Reset password for ombi user \"%s\"", ombiUser["userName"])
 	}
-	}
 }
 
 func (app *appContext) InviteProxy(gc *gin.Context) {