added add/remove account users

Author: dstpierre

account.go

@@ -1,6 +1,7 @@
 package backend
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"strings"
@@ -91,6 +92,29 @@ func ResetPassword(email, code, password string) error {
 	return nil
 }
 
+// AddUser adds a user into the same account as token
+func AddUser(token, email, password string) error {
+	body := AccountParams{
+		Email:    email,
+		Password: password,
+	}
+	var ok bool
+	if err := Post(token, "/account/users", body, &ok); err != nil {
+		return err
+	} else if !ok {
+		return errors.New("could not add this user")
+	}
+
+	return nil
+}
+
+// RemoveUser removes a user from same account as token.
+// Token must have a higher level of permission (role) than deleted user
+func RemoveUser(token, userID string) error {
+	uri := fmt.Sprintf("/account/users/%s", userID)
+	return Del(token, uri)
+}
+
 // SudoGetToken returns a token from an AccountID
 // This is useful when performing creation that documents needs
 // to be attached to a specific account id and therefor the SudoCreate
@@ -106,7 +130,7 @@ func SudoGetToken(token, accountID string) (string, error) {
 // CurrentUser used to access current user's important information
 type CurrentUser struct {
 	AccountID string `json:"accountId"`
-	UserID    string `json:"userId"`
+	UserID    string `json:"id"`
 	Email     string `json:"email"`
 	Role      int    `json:"role"`
 }
@@ -117,3 +141,13 @@ func Me(token string) (me CurrentUser, err error) {
 	err = Get(token, "/me", &me)
 	return
 }
+
+// Users returns all users for the account linked with this token
+func Users(token string) ([]CurrentUser, error) {
+	var users []CurrentUser
+	if err := Get(token, "/account/users", &users); err != nil {
+		return nil, err
+	}
+
+	return users, nil
+}

account_test.go

@@ -15,7 +15,47 @@ func TestRegisterAndLogin(t *testing.T) {
 		t.Error(err)
 	}
 
-	if _, err := backend.Login(email, pass); err != nil {
+	authToken, err := backend.Login(email, pass)
+	if err != nil {
 		t.Error(err)
 	}
+
+	if err := backend.AddUser(authToken, "user2@ok.com", "passwd1234"); err != nil {
+		t.Fatal(err)
+	}
+
+	users, err := backend.Users(authToken)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var userID string
+	for _, user := range users {
+		if user.Email == "user2@ok.com" {
+			userID = user.UserID
+			break
+		}
+	}
+
+	t.Log("userID", userID)
+	if err := backend.RemoveUser(token, userID); err != nil {
+		t.Fatal(err)
+	}
+
+	users, err = backend.Users(token)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	found := false
+	for _, user := range users {
+		if user.UserID == userID {
+			found = true
+			break
+		}
+	}
+
+	if found {
+		t.Error("found the deleted user?")
+	}
 }

client_test.go

@@ -12,7 +12,7 @@ import (
 var token string
 
 func init() {
-	backend.PublicKey = "dev-memory-pk"
+	backend.PublicKey = "dev_memory_pk"
 
 	// this user is created by default in dev mod as an admin in the CLI
 	t, err := backend.Login("admin@dev.com", "devpw1234")