Develop into master

.travis.yml

@@ -1,4 +1,11 @@
 language: go
 
 go:
-  - 1.3.1
+  - 1.3.1
+
+before_script:
+  - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+  - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+  - sudo apt-get update
+  - sudo apt-get install rethinkdb
+  - rethinkdb --bind all &

README.md

@@ -10,6 +10,50 @@ curl --data "username=abc&password=def" localhost:5000/login
 curl --header "Auth: <token>" localhost:5000/me
 ```
 
+## Configuration variables
+
+You can use either commandline flags:
+```
+{ api } master » ./api -help
+Usage of api:
+  -bind=":5000": Network address used to bind
+  -classic_registration=false: Classic registration enabled?
+  -force_colors=false: Force colored prompt?
+  -log="text": Log formatter type. Either "json" or "text"
+  -rethinkdb_db="dev": Database name on the RethinkDB server
+  -rethinkdb_key="": Authentication key of the RethinkDB database
+  -rethinkdb_url="localhost:28015": Address of the RethinkDB database
+  -session_duration=72: Session duration expressed in hours
+  -version="v0": Shown API version
+```
+
+Or environment variables:
+```
+{ api } master » BIND=127.0.0.1:5000 CLASSIC_REGISTRATION=false \
+FORCE_COLORS=false LOG=text RETHINKDB_DB=dev RETHINKDB_KEY="" \
+RETHINKDB_URL=localhost:28015 SESSION_DURATION=72 VERSION=v0 ./api
+```
+
+Or configuration files:
+```
+{ api } master » cat api.conf
+# lines beggining with a "#" character are treated as comments
+bind :5000
+classic_registration false
+force_colors false
+log text
+
+rethinkdb_db dev
+# configuration values can be empty
+rethinkdb_key
+# Keys and values can be also seperated by the "=" character
+rethinkdb_url=localhost:28015
+
+session_duration=72
+version=v0
+{ api } master » ./api -config api.conf
+```
+
 ## Build status:
 
  - `master` - [![Build Status](https://magnum.travis-ci.com/lavab/api.svg?token=kJbppXeTxzqpCVvt4t5X&branch=master)](https://magnum.travis-ci.com/lavab/api)

db/default_crud.go

@@ -123,6 +123,22 @@ func (d *Default) FindBy(key string, value interface{}) (*gorethink.Cursor, erro
 	return cursor, nil
 }
 
+func (d *Default) FindByAndCount(key string, value interface{}) (int, error) {
+	cursor, err := d.GetTable().Filter(map[string]interface{}{
+		key: value,
+	}).Count().Run(d.session)
+	if err != nil {
+		return 0, err
+	}
+
+	var count int
+	if err := cursor.One(&count); err != nil {
+		return 0, NewDatabaseError(d, err, "")
+	}
+
+	return count, nil
+}
+
 // FindByAndFetch retrieves a value by key and then fills results with the result.
 func (d *Default) FindByAndFetch(key string, value interface{}, results interface{}) error {
 	cursor, err := d.FindBy(key, value)
@@ -137,7 +153,7 @@ func (d *Default) FindByAndFetch(key string, value interface{}, results interfac
 	return nil
 }
 
-// FindByFetchOne retrieves a value by key and then fills result with the first row of the result
+// FindByAndFetchOne retrieves a value by key and then fills result with the first row of the result
 func (d *Default) FindByAndFetchOne(key string, value interface{}, result interface{}) error {
 	cursor, err := d.FindBy(key, value)
 	if err != nil {

db/errors.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 )
 
+// DatabaseError is the wrapper for RethinkDB errors that allows passing more data with the message
 type DatabaseError struct {
 	err     error
 	message string
@@ -20,23 +21,11 @@ func (d *DatabaseError) Error() string {
 	)
 }
 
+// NewDatabaseError creates a new DatabaseError, wraps err and adds a message
 func NewDatabaseError(t RethinkTable, err error, message string) *DatabaseError {
 	return &DatabaseError{
 		err:     err,
 		table:   t,
 		message: message,
 	}
 }
-
-type ConnectionError struct {
-	error
-	WrongAuthKey bool
-	Unreachable  bool
-}
-
-type NotFound struct {
-	error
-	Database bool
-	Table    bool
-	Item     bool
-}

db/rethink_crud.go

@@ -23,6 +23,7 @@ type RethinkReader interface {
 	FindBy(key string, value interface{}) (*rethink.Cursor, error)
 	FindByAndFetch(key string, value interface{}, results interface{}) error
 	FindByAndFetchOne(key string, value interface{}, result interface{}) error
+	FindByAndCount(key string, value interface{}) (int, error)
 
 	Where(filter map[string]interface{}) (*rethink.Cursor, error)
 	WhereAndFetch(filter map[string]interface{}, results interface{}) error

db/setup.go

@@ -12,21 +12,23 @@ var (
 
 // Indexes of tables in the database
 var tableIndexes = map[string][]string{
-	"tokens":   []string{"user", "user_id"},
-	"accounts": []string{"name"},
-	"emails":   []string{"user_id"},
-	"drafts":   []string{"user_id"},
-	"contacts": []string{},
-	"threads":  []string{"user_id"},
-	"labels":   []string{},
-	"keys":     []string{},
+	"tokens":       []string{"user", "user_id"},
+	"accounts":     []string{"name"},
+	"emails":       []string{"user_id"},
+	"drafts":       []string{"user_id"},
+	"contacts":     []string{},
+	"threads":      []string{"user_id"},
+	"labels":       []string{},
+	"keys":         []string{},
+	"reservations": []string{},
 }
 
 // List of names of databases
 var databaseNames = []string{
 	"prod",
 	"staging",
 	"dev",
+	"test",
 }
 
 // Setup configures the RethinkDB server

db/table_accounts.go

@@ -1,12 +1,16 @@
 package db
 
 import (
+	"errors"
+
 	"github.com/lavab/api/models"
 )
 
 // AccountsTable implements the CRUD interface for accounts
 type AccountsTable struct {
 	RethinkCRUD
+
+	Tokens *TokensTable
 }
 
 // GetAccount returns an account with specified ID
@@ -30,3 +34,40 @@ func (users *AccountsTable) FindAccountByName(name string) (*models.Account, err
 
 	return &result, nil
 }
+
+func (a *AccountsTable) GetTokenOwner(token *models.Token) (*models.Account, error) {
+	user, err := a.GetAccount(token.Owner)
+	if err != nil {
+		// Try to remove the orphaned token
+		a.Tokens.DeleteID(token.ID)
+		return nil, errors.New("Account disabled")
+	}
+
+	return user, nil
+}
+
+func (a *AccountsTable) IsUsernameUsed(name string) (bool, error) {
+	count, err := a.FindByAndCount("name", name)
+	if err != nil {
+		return false, err
+	}
+
+	if count == 0 {
+		return false, nil
+	}
+
+	return true, nil
+}
+
+func (a *AccountsTable) IsEmailUsed(email string) (bool, error) {
+	count, err := a.FindByAndCount("alt_email", email)
+	if err != nil {
+		return false, err
+	}
+
+	if count == 0 {
+		return false, nil
+	}
+
+	return true, nil
+}

db/table_contacts.go

@@ -0,0 +1,42 @@
+package db
+
+import (
+	"github.com/lavab/api/models"
+)
+
+// Contacts implements the CRUD interface for tokens
+type ContactsTable struct {
+	RethinkCRUD
+}
+
+// GetContact returns a token with specified name
+func (c *ContactsTable) GetContact(id string) (*models.Contact, error) {
+	var result models.Contact
+
+	if err := c.FindFetchOne(id, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+// GetOwnedBy returns all contacts owned by id
+func (c *ContactsTable) GetOwnedBy(id string) ([]*models.Contact, error) {
+	var result []*models.Contact
+
+	err := c.WhereAndFetch(map[string]interface{}{
+		"owner": id,
+	}, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+// DeleteOwnedBy deletes all contacts owned by id
+func (c *ContactsTable) DeleteOwnedBy(id string) error {
+	return c.Delete(map[string]interface{}{
+		"owner": id,
+	})
+}

db/table_keys.go

@@ -0,0 +1,29 @@
+package db
+
+import (
+	"github.com/lavab/api/models"
+)
+
+type KeysTable struct {
+	RethinkCRUD
+}
+
+func (k *KeysTable) FindByName(name string) ([]*models.Key, error) {
+	var results []*models.Key
+
+	if err := k.FindByAndFetch("owner_name", name, &results); err != nil {
+		return nil, err
+	}
+
+	return results, nil
+}
+
+func (k *KeysTable) FindByFingerprint(fp string) (*models.Key, error) {
+	var result models.Key
+
+	if err := k.FindFetchOne(fp, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}

db/table_reservations.go

@@ -0,0 +1,32 @@
+package db
+
+// ReservationsTable is a CRUD interface for accessing the "reservation" table
+type ReservationsTable struct {
+	RethinkCRUD
+}
+
+func (r *ReservationsTable) IsUsernameUsed(name string) (bool, error) {
+	count, err := r.FindByAndCount("name", name)
+	if err != nil {
+		return false, err
+	}
+
+	if count == 0 {
+		return false, nil
+	}
+
+	return true, nil
+}
+
+func (r *ReservationsTable) IsEmailUsed(email string) (bool, error) {
+	count, err := r.FindByAndCount("email", email)
+	if err != nil {
+		return false, err
+	}
+
+	if count == 0 {
+		return false, nil
+	}
+
+	return true, nil
+}

db/table_tokens.go

@@ -0,0 +1,28 @@
+package db
+
+import (
+	"github.com/lavab/api/models"
+)
+
+// TokensTable implements the CRUD interface for tokens
+type TokensTable struct {
+	RethinkCRUD
+}
+
+// GetToken returns a token with specified name
+func (t *TokensTable) GetToken(id string) (*models.Token, error) {
+	var result models.Token
+
+	if err := t.FindFetchOne(id, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+// DeleteOwnedBy deletes all tokens owned by id
+func (t *TokensTable) DeleteOwnedBy(id string) error {
+	return t.Delete(map[string]interface{}{
+		"owner": id,
+	})
+}