diff options
Diffstat (limited to 'api4/user.go')
-rw-r--r-- | api4/user.go | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/api4/user.go b/api4/user.go index 593d704a5..b30d066ab 100644 --- a/api4/user.go +++ b/api4/user.go @@ -69,13 +69,13 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) { var ruser *model.User var err *model.AppError if len(hash) > 0 { - ruser, err = app.CreateUserWithHash(user, hash, r.URL.Query().Get("d"), c.GetSiteURL()) + ruser, err = app.CreateUserWithHash(user, hash, r.URL.Query().Get("d")) } else if len(inviteId) > 0 { - ruser, err = app.CreateUserWithInviteId(user, inviteId, c.GetSiteURL()) + ruser, err = app.CreateUserWithInviteId(user, inviteId) } else if c.IsSystemAdmin() { - ruser, err = app.CreateUserAsAdmin(user, c.GetSiteURL()) + ruser, err = app.CreateUserAsAdmin(user) } else { - ruser, err = app.CreateUserFromSignup(user, c.GetSiteURL()) + ruser, err = app.CreateUserFromSignup(user) } if err != nil { @@ -493,7 +493,7 @@ func updateUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if ruser, err := app.UpdateUserAsUser(user, c.GetSiteURL(), c.IsSystemAdmin()); err != nil { + if ruser, err := app.UpdateUserAsUser(user, c.IsSystemAdmin()); err != nil { c.Err = err return } else { @@ -519,7 +519,7 @@ func patchUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if ruser, err := app.PatchUser(c.Params.UserId, patch, c.GetSiteURL(), c.IsSystemAdmin()); err != nil { + if ruser, err := app.PatchUser(c.Params.UserId, patch, c.IsSystemAdmin()); err != nil { c.Err = err return } else { @@ -640,7 +640,7 @@ func updateUserMfa(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt") - if err := app.UpdateMfa(activate, c.Params.UserId, code, c.GetSiteURL()); err != nil { + if err := app.UpdateMfa(activate, c.Params.UserId, code); err != nil { c.Err = err return } @@ -692,9 +692,9 @@ func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) { return } - err = app.UpdatePasswordAsUser(c.Params.UserId, currentPassword, newPassword, c.GetSiteURL()) + err = app.UpdatePasswordAsUser(c.Params.UserId, currentPassword, newPassword) } else if app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { - err = app.UpdatePasswordByUserIdSendEmail(c.Params.UserId, newPassword, c.T("api.user.reset_password.method"), c.GetSiteURL()) + err = app.UpdatePasswordByUserIdSendEmail(c.Params.UserId, newPassword, c.T("api.user.reset_password.method")) } else { err = model.NewAppError("updatePassword", "api.user.update_password.context.app_error", nil, "", http.StatusForbidden) } @@ -722,7 +722,7 @@ func resetPassword(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt - code=" + code) - if err := app.ResetPasswordFromCode(code, newPassword, c.GetSiteURL()); err != nil { + if err := app.ResetPasswordFromCode(code, newPassword); err != nil { c.LogAudit("fail - code=" + code) c.Err = err return @@ -742,7 +742,7 @@ func sendPasswordReset(c *Context, w http.ResponseWriter, r *http.Request) { return } - if sent, err := app.SendPasswordReset(email, c.GetSiteURL()); err != nil { + if sent, err := app.SendPasswordReset(email, utils.GetSiteURL()); err != nil { c.Err = err return } else if sent { @@ -974,9 +974,9 @@ func sendVerificationEmail(c *Context, w http.ResponseWriter, r *http.Request) { } if _, err := app.GetStatus(user.Id); err != nil { - go app.SendVerifyEmail(user.Id, user.Email, user.Locale, c.GetSiteURL()) + go app.SendVerifyEmail(user.Id, user.Email, user.Locale, utils.GetSiteURL()) } else { - go app.SendEmailChangeVerifyEmail(user.Id, user.Email, user.Locale, c.GetSiteURL()) + go app.SendEmailChangeVerifyEmail(user.Id, user.Email, user.Locale, utils.GetSiteURL()) } ReturnStatusOK(w) |