hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-23 01:20:11 +00:00
Code Issues Projects Releases Wiki Activity

pwr: fix Send PWR when not using "Set password"

Browse Source
This commit is contained in:
Harvey Tindall 2021-10-13 15:19:52 +01:00
parent eeb9b07bce
commit a4f59203b0
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
views.go
View File

@ -9,6 +9,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt" "github.com/golang-jwt/jwt"
"github.com/hrfee/mediabrowser"
) )
var css = []string{"bundle.css", "remixicon.css"} var css = []string{"bundle.css", "remixicon.css"}
@ -155,12 +156,8 @@ func (app *appContext) ResetPassword(gc *gin.Context) {
"success": false, "success": false,
"ombiEnabled": app.config.Section("ombi").Key("enabled").MustBool(false), "ombiEnabled": app.config.Section("ombi").Key("enabled").MustBool(false),
} }
if _, ok := app.internalPWRs[pin]; !ok { pwr, isInternal := app.internalPWRs[pin]
app.debug.Printf("Ignoring PWR request due to invalid internal PIN: %s", pin) if isInternal && setPassword {
app.NoRouteHandler(gc)
return
}
if setPassword {
data["helpMessage"] = app.config.Section("ui").Key("help_message").String() data["helpMessage"] = app.config.Section("ui").Key("help_message").String()
data["successMessage"] = app.config.Section("ui").Key("success_message").String() data["successMessage"] = app.config.Section("ui").Key("success_message").String()
data["jfLink"] = app.config.Section("jellyfin").Key("public_server").String() data["jfLink"] = app.config.Section("jellyfin").Key("public_server").String()
@ -199,22 +196,43 @@ func (app *appContext) ResetPassword(gc *gin.Context) {
// data["success"] = true // data["success"] = true
// data["pin"] = pin // data["pin"] = pin
// } // }
resp, status, err := app.jf.ResetPassword(pin) var resp mediabrowser.PasswordResetResponse
if status == 200 && err == nil && resp.Success { var status int
var err error
var username string
if !isInternal {
resp, status, err = app.jf.ResetPassword(pin)
} else if time.Now().After(pwr.Expiry) {
app.debug.Printf("Ignoring PWR request due to expired internal PIN: %s", pin)
app.NoRouteHandler(gc)
return
} else {
status, err = app.jf.ResetPasswordAdmin(pwr.ID)
if !(status == 200 || status == 204) || err != nil {
app.err.Printf("Password Reset failed (%d): %v", status, err)
} else {
status, err = app.jf.SetPassword(pwr.ID, "", pin)
}
username = pwr.Username
}
if (status == 200 || status == 204) && err == nil && (isInternal || resp.Success) {
data["success"] = true data["success"] = true
data["pin"] = pin data["pin"] = pin
if !isInternal {
username = resp.UsersReset[0]
}
} else { } else {
app.err.Printf("Password Reset failed (%d): %v", status, err) app.err.Printf("Password Reset failed (%d): %v", status, err)
} }
if app.config.Section("ombi").Key("enabled").MustBool(false) { if app.config.Section("ombi").Key("enabled").MustBool(false) {
jfUser, status, err := app.jf.UserByName(resp.UsersReset[0], false) jfUser, status, err := app.jf.UserByName(username, false)
if status != 200 || err != nil { if status != 200 || err != nil {
app.err.Printf("Failed to get user \"%s\" from jellyfin/emby (%d): %v", resp.UsersReset[0], status, err) app.err.Printf("Failed to get user \"%s\" from jellyfin/emby (%d): %v", username, status, err)
return return
} }
ombiUser, status, err := app.getOmbiUser(jfUser.ID) ombiUser, status, err := app.getOmbiUser(jfUser.ID)
if status != 200 || err != nil { if status != 200 || err != nil {
app.err.Printf("Failed to get user \"%s\" from ombi (%d): %v", resp.UsersReset[0], status, err) app.err.Printf("Failed to get user \"%s\" from ombi (%d): %v", username, status, err)
return return
} }
ombiUser["password"] = pin ombiUser["password"] = pin