try again

models/user.go

@@ -101,7 +101,6 @@ func LoginCheck(username string, password string) (string, error) {
 					errString := fmt.Sprintf("LoginCheck error checking LDAP for user : '%s'\n", err)
 					log.Print(errString)
 					return "", errors.New(errString)
-
 				}
 
 				if ldapUser == (User{}) {
@@ -109,6 +108,7 @@ func LoginCheck(username string, password string) (string, error) {
 					log.Print(errString)
 					return "", errors.New(errString)
 				} else {
+					log.Printf("LoginCheck verified LDAP user successfully\n")
 					u = ldapUser
 				}
 			} else {
@@ -120,6 +120,8 @@ func LoginCheck(username string, password string) (string, error) {
 		log.Printf("LoginCheck retrieved user '%v' from database\n", u)
 	}
 
+	log.Printf("u: %v\n", u)
+
 	if !u.LdapUser {
 		err = VerifyPassword(password, u.Password)
 
@@ -131,6 +133,8 @@ func LoginCheck(username string, password string) (string, error) {
 		}
 	} else {
 		log.Printf("LoginCheck no need to verify password in database for LDAP user\n")
+
+		// TODO - verify LDAP credentials if this LDAP user was previously stored in the database
 	}
 
 	token, err := token.GenerateToken(uint(u.UserId))