bump version

common/services/controllers.go

@@ -230,19 +230,28 @@ func getErrorCode(err error) int {
 
 //Writes and logs errors from the couchdb driver
 func WriteError(err error, response *restful.Response) {
-	str := err.Error()
-	errStrings := strings.Split(str, ":")
-	statusCode := 0
-	var cErr error
-	if len(errStrings) > 1 {
-		statusCode, cErr = strconv.Atoi(errStrings[1])
-	}
-	if cErr != nil || statusCode == 0 {
-		statusCode = 500
+	var statusCode int
+	var reason string = "error"
+	//Is this a couchdb error?
+	cErr, ok := err.(*couchdb.Error)
+	if ok { // Yes!
+		statusCode = cErr.StatusCode
+		reason = cErr.Reason
+	} else { // No, try to parse :(
+		str := err.Error()
+		errStrings := strings.Split(str, ":")
+		statusCode := 0
+		var cErr error
+		if len(errStrings) > 1 {
+			statusCode, cErr = strconv.Atoi(errStrings[1])
+			reason = http.StatusText(statusCode)
+		}
+		if cErr != nil || statusCode == 0 {
+			statusCode = 500
+		}
 	}
 	//Write the error to the response
-	response.WriteErrorString(statusCode,
-		http.StatusText(statusCode))
+	response.WriteErrorString(statusCode, reason)
 	//Log the error
 	log.Printf("%v", err)
 }

frontend/web_app/app/register.html

@@ -91,12 +91,15 @@ <h2 class="form-register-heading">Register</h2>
     }
     $("#registerForm").on("submit", function(event){
         event.preventDefault();
+        var button = event.currentTarget;
+        $(button).attr("disabled", "disabled");
         const userName = $("#inputUsername").val();
         const password = $("#inputPassword").val();
         const verifyPassword = $("#verifyPassword").val();
         const email = $("#inputEmail").val();
         if(password !== verifyPassword){
             showError(["Password fields do not match"]);
+            $(button).removeAttr("disabled");
             return;
         }
         const newUser = {
@@ -111,6 +114,7 @@ <h2 class="form-register-heading">Register</h2>
         var errors = validateUser(newUser);
         if(errors.length > 0){
             showError(errors);
+            $(button).removeAttr("disabled");
         } else {
             $.ajax({
                 type: "POST",

scripts/build_all.sh

@@ -7,7 +7,7 @@
 CC=gcc
 export CC
 
-VERSION=0.8.1-alpha
+VERSION=0.9.0
 ARCH=`uname -p`
 OS=`uname`
 BUILDNAME=wikifeat_${VERSION}.${OS}-${ARCH}

users/user_service/user_manager.go

@@ -33,7 +33,6 @@ package user_service
 // Manager for User Records
 
 import (
-	"errors"
 	"github.com/rhinoman/couchdb-go"
 	"github.com/rhinoman/wikifeat/common/config"
 	. "github.com/rhinoman/wikifeat/common/database"
@@ -669,15 +668,21 @@ func (um *UserManager) GetUserListForRole(pageNum int, numPerPage int,
 func (um *UserManager) validateUser(user *User) error {
 	var err error
 	if len(user.UserName) < 3 || len(user.UserName) > 80 {
-		err = errors.New("Username invalid")
+		err = &couchdb.Error{
+			StatusCode: 400,
+			Reason:     "Username invalid",
+		}
 	}
 	return err
 }
 
 //Validate Password
 func (um *UserManager) validatePassword(password string) error {
 	if len(password) < config.Auth.MinPasswordLength {
-		return errors.New("Password too short")
+		return &couchdb.Error{
+			StatusCode: 400,
+			Reason:     "Password too short",
+		}
 	} else {
 		return nil
 	}