@@ -328,8 +328,8 @@ func composeFullName(firstname, surname, username string) string {
328
328
329
329
// LoginViaLDAP queries if login/password is valid against the LDAP directory pool,
330
330
// and create a local user if success when enabled.
331
- func LoginViaLDAP (user * User , login , passowrd string , source * LoginSource , autoRegister bool ) (* User , error ) {
332
- username , fn , sn , mail , isAdmin , succeed := source .Cfg .(* LDAPConfig ).SearchEntry (login , passowrd , source .Type == LoginDLDAP )
331
+ func LoginViaLDAP (user * User , login , password string , source * LoginSource , autoRegister bool ) (* User , error ) {
332
+ username , fn , sn , mail , isAdmin , succeed := source .Cfg .(* LDAPConfig ).SearchEntry (login , password , source .Type == LoginDLDAP )
333
333
if ! succeed {
334
334
// User not in LDAP, do nothing
335
335
return nil , ErrUserNotExist {0 , login , 0 }
@@ -545,7 +545,7 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
545
545
}
546
546
547
547
// UserSignIn validates user name and password.
548
- func UserSignIn (username , passowrd string ) (* User , error ) {
548
+ func UserSignIn (username , password string ) (* User , error ) {
549
549
var user * User
550
550
if strings .Contains (username , "@" ) {
551
551
user = & User {Email : strings .ToLower (username )}
@@ -561,7 +561,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
561
561
if hasUser {
562
562
switch user .LoginType {
563
563
case LoginNoType , LoginPlain :
564
- if user .ValidatePassword (passowrd ) {
564
+ if user .ValidatePassword (password ) {
565
565
return user , nil
566
566
}
567
567
@@ -576,7 +576,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
576
576
return nil , ErrLoginSourceNotExist {user .LoginSource }
577
577
}
578
578
579
- return ExternalUserLogin (user , user .LoginName , passowrd , & source , false )
579
+ return ExternalUserLogin (user , user .LoginName , password , & source , false )
580
580
}
581
581
}
582
582
@@ -586,7 +586,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
586
586
}
587
587
588
588
for _ , source := range sources {
589
- authUser , err := ExternalUserLogin (nil , username , passowrd , source , true )
589
+ authUser , err := ExternalUserLogin (nil , username , password , source , true )
590
590
if err == nil {
591
591
return authUser , nil
592
592
}
0 commit comments