Implementing Activate User

invite.go

@@ -22,6 +22,7 @@ import (
 var EMAIL_REGEXP = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$")
 
 func checkInviterLogin(w http.ResponseWriter, r *http.Request) *LoginStatus {
+
 	login := checkLogin(w, r)
 	if login == nil {
 		return nil

login.go

@@ -209,17 +209,26 @@ func handleLogin(w http.ResponseWriter, r *http.Request) *LoginInfo {
 		username := strings.Join(r.Form["username"], "")
 		password := strings.Join(r.Form["password"], "")
 		user_dn := fmt.Sprintf("%s=%s,%s", config.UserNameAttr, username, config.UserBaseDN)
+
 		if strings.EqualFold(username, config.AdminAccount) {
 			user_dn = username
 		}
+		return doLogin(w, r, username, user_dn, password)
+	} else {
+		http.Error(w, "Unsupported method", http.StatusBadRequest)
+		return nil
+	}
+}
 
+func doLogin(w http.ResponseWriter, r *http.Request, username string, user_dn string, password string) *LoginInfo {
 	l := ldapOpen(w)
 	if l == nil {
 		return nil
 	}
 
 	err := l.Bind(user_dn, password)
-		if err != nil {
+	if err == nil {
+		templateLogin := getTemplate("login.html")
 		data := &LoginFormData{
 			Username: username,
 		}
@@ -255,8 +264,5 @@ func handleLogin(w http.ResponseWriter, r *http.Request) *LoginInfo {
 		Username: username,
 		Password: password,
 	}
-	} else {
+
-		http.Error(w, "Unsupported method", http.StatusBadRequest)
-		return nil
-	}
 }