better errors

Author: autom8ter

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.13.1
+current_version = 0.13.2
 commit = False
 tag = False
 

Makefile

@@ -1,4 +1,4 @@
-version := "0.13.1"
+version := "0.13.2"
 
 .DEFAULT_GOAL := help
 

README.md

@@ -7,7 +7,7 @@ https://graphikdb.github.io/graphik/
 
 `git clone git@github.com:graphikDB/graphik.git`
 
-`docker pull graphikdb/graphik:v0.13.1`
+`docker pull graphikdb/graphik:v0.13.2`
 
 Graphik is a Backend as a Service implemented as an identity-aware, permissioned, persistant document/graph database & pubsub server written in Go.
 
@@ -910,7 +910,7 @@ add this docker-compose.yml to ${pwd}:
     version: '3.7'
     services:
       graphik:
-        image: graphikdb/graphik:v0.13.1
+        image: graphikdb/graphik:v0.13.2
         env_file:
           - .env
         ports:

database/constants.go

@@ -32,4 +32,5 @@ var (
 	ErrNotFound             = errors.New("not found")
 	ErrAlreadyExists        = errors.New("already exists")
 	ErrUnsupportedAlgorithm = errors.New("unsupported algorithm")
+	ErrFailedToGetUser      = errors.New("failed to get user")
 )

database/errors.go

@@ -0,0 +1,41 @@
+package database
+
+import (
+	"go.etcd.io/bbolt"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"strings"
+)
+
+func prepareError(err error) error {
+	if err == nil {
+		return nil
+	}
+	_, ok := status.FromError(err)
+	if !ok {
+		if err == ErrNotFound {
+			return status.Error(codes.NotFound, err.Error())
+		}
+		if err == ErrAlreadyExists {
+			return status.Error(codes.InvalidArgument, err.Error())
+		}
+		if err == ErrUnsupportedAlgorithm {
+			return status.Error(codes.InvalidArgument, err.Error())
+		}
+		if err == ErrFailedToGetUser {
+			return status.Error(codes.Unauthenticated, err.Error())
+		}
+		if err == bbolt.ErrTimeout {
+			return status.Error(codes.Internal, "internal error")
+		}
+		if strings.Contains(err.Error(), "does not exist") {
+			return status.Error(codes.InvalidArgument, err.Error())
+		}
+		if strings.Contains(err.Error(), "trigger: ") {
+			return status.Error(codes.InvalidArgument, err.Error())
+		}
+
+		return status.Error(codes.Internal, err.Error())
+	}
+	return err
+}