summaryrefslogtreecommitdiffstats
path: root/app/ldap.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-09-06 17:12:54 -0500
committerGitHub <noreply@github.com>2017-09-06 17:12:54 -0500
commit1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 (patch)
tree2766bacc1f045fa685ca3d8310cd6174d0311d09 /app/ldap.go
parentb84bd21089d305333fa4114b95be70f5ad94ad1b (diff)
downloadchat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.gz
chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.bz2
chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.zip
app type transition (#7167)
Diffstat (limited to 'app/ldap.go')
-rw-r--r--app/ldap.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/ldap.go b/app/ldap.go
index e3c90b263..8f852114c 100644
--- a/app/ldap.go
+++ b/app/ldap.go
@@ -38,17 +38,17 @@ func TestLdap() *model.AppError {
return nil
}
-func SwitchEmailToLdap(email, password, code, ldapId, ldapPassword string) (string, *model.AppError) {
- user, err := GetUserByEmail(email)
+func (a *App) SwitchEmailToLdap(email, password, code, ldapId, ldapPassword string) (string, *model.AppError) {
+ user, err := a.GetUserByEmail(email)
if err != nil {
return "", err
}
- if err := CheckPasswordAndAllCriteria(user, password, code); err != nil {
+ if err := a.CheckPasswordAndAllCriteria(user, password, code); err != nil {
return "", err
}
- if err := RevokeAllSessions(user.Id); err != nil {
+ if err := a.RevokeAllSessions(user.Id); err != nil {
return "", err
}
@@ -70,8 +70,8 @@ func SwitchEmailToLdap(email, password, code, ldapId, ldapPassword string) (stri
return "/login?extra=signin_change", nil
}
-func SwitchLdapToEmail(ldapPassword, code, email, newPassword string) (string, *model.AppError) {
- user, err := GetUserByEmail(email)
+func (a *App) SwitchLdapToEmail(ldapPassword, code, email, newPassword string) (string, *model.AppError) {
+ user, err := a.GetUserByEmail(email)
if err != nil {
return "", err
}
@@ -93,11 +93,11 @@ func SwitchLdapToEmail(ldapPassword, code, email, newPassword string) (string, *
return "", err
}
- if err := UpdatePassword(user, newPassword); err != nil {
+ if err := a.UpdatePassword(user, newPassword); err != nil {
return "", err
}
- if err := RevokeAllSessions(user.Id); err != nil {
+ if err := a.RevokeAllSessions(user.Id); err != nil {
return "", err
}