Writefreely
/
writefreely
mirror of https://github.com/writeas/writefreely
1
0
Fork 0
Code Issues Releases Wiki Activity

Accept Apper in writefreely.ResetPassword() 

instead of *App
This commit is contained in:
Matt Baer 2019-07-03 14:39:43 -04:00
parent 79cf6ce0eb
commit 3b079810bb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app.go
View File

@ -577,14 +577,14 @@ func Migrate(apper Apper) error {
}
// ResetPassword runs the interactive password reset process.
func ResetPassword(app *App, username string) error {
func ResetPassword(apper Apper, username string) error {
// Connect to the database
app.LoadConfig()
connectToDatabase(app)
defer shutdown(app)
apper.LoadConfig()
connectToDatabase(apper.App())
defer shutdown(apper.App())
// Fetch user
u, err := app.db.GetUserForAuth(username)
u, err := apper.App().db.GetUserForAuth(username)
if err != nil {
log.Error("Get user: %s", err)
os.Exit(1)
@ -606,7 +606,7 @@ func ResetPassword(app *App, username string) error {
// Do the update
log.Info("Updating...")
err = adminResetPassword(app, u, newPass)
err = adminResetPassword(apper.App(), u, newPass)
if err != nil {
log.Error("%s", err)
os.Exit(1)