refactored the storage API to use the backend package as a PoC

Author: dstpierre

account.go

@@ -2,13 +2,13 @@ package staticbackend
 
 import (
 	"fmt"
-	"math/rand"
 	"net/http"
 	"strings"
 	"time"
 
 	"github.com/staticbackendhq/core/config"
 	emailFuncs "github.com/staticbackendhq/core/email"
+	"github.com/staticbackendhq/core/internal"
 	"github.com/staticbackendhq/core/logger"
 	"github.com/staticbackendhq/core/middleware"
 	"github.com/staticbackendhq/core/model"
@@ -19,10 +19,6 @@ import (
 	"github.com/stripe/stripe-go/v72/sub"
 )
 
-var (
-	letterRunes = []rune("abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ2345679")
-)
-
 type accounts struct {
 	membership *membership
 	log        *logger.Logger
@@ -123,7 +119,7 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 
 	// make sure the DB name is unique
 	retry := 10
-	dbName := randStringRunes(12)
+	dbName := internal.RandStringRunes(12)
 	if memoryMode {
 		dbName = "dev-memory-pk"
 	}
@@ -134,7 +130,7 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 			return
 		} else if exists {
 			retry--
-			dbName = randStringRunes(12)
+			dbName = internal.RandStringRunes(12)
 			continue
 		}
 		break
@@ -156,7 +152,7 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 
 	// we create an admin user
 	// we make sure to switch DB
-	pw := randStringRunes(6)
+	pw := internal.RandStringRunes(6)
 	if memoryMode {
 		pw = "devpw1234"
 	}
@@ -312,15 +308,3 @@ func getStripePortalURL(customerID string) (string, error) {
 
 	return s.URL, nil
 }
-
-func randStringRunes(n int) string {
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = letterRunes[rand.Intn(len(letterRunes))]
-	}
-
-	// due to PostgreSQL schema requiring letter start.
-	b[0] = letterRunes[0]
-
-	return string(b)
-}

backend/backend.go

@@ -29,6 +29,7 @@ import (
 type Backend struct {
 	DB   database.Persister
 	User func(baseID string) User
+	File func(model.Auth, model.BaseConfig) FileStore
 }
 
 var (
@@ -132,6 +133,7 @@ func New(cfg config.AppConfig) Backend {
 	return Backend{
 		DB:   datastore,
 		User: newUser,
+		File: newFile,
 	}
 }
 

backend/file.go

@@ -0,0 +1,86 @@
+package backend
+
+import (
+	"fmt"
+	"io"
+	"path/filepath"
+	"time"
+
+	"github.com/staticbackendhq/core/internal"
+	"github.com/staticbackendhq/core/model"
+)
+
+type FileStore struct {
+	auth model.Auth
+	conf model.BaseConfig
+}
+
+func newFile(auth model.Auth, conf model.BaseConfig) FileStore {
+	return FileStore{
+		auth: auth,
+		conf: conf,
+	}
+}
+
+type SavedFile struct {
+	ID  string `json:"id"`
+	URL string `json:"url"`
+}
+
+func (f FileStore) Save(filename, name string, file io.ReadSeeker, size int64) (sf SavedFile, err error) {
+	ext := filepath.Ext(name)
+
+	if len(name) == 0 {
+		// if no forced name is used, let's use the original name
+		name = internal.CleanUpFileName(filename)
+	}
+
+	fileKey := fmt.Sprintf("%s/%s/%s%s",
+		f.conf.Name,
+		f.auth.AccountID,
+		name,
+		ext,
+	)
+
+	upData := model.UploadFileData{FileKey: fileKey, File: file}
+	url, err := Filestore.Save(upData)
+	if err != nil {
+		return
+	}
+
+	sbFile := model.File{
+		AccountID: f.auth.AccountID,
+		Key:       fileKey,
+		URL:       url,
+		Size:      size,
+		Uploaded:  time.Now(),
+	}
+
+	newID, err := datastore.AddFile(f.conf.Name, sbFile)
+	if err != nil {
+		return
+	}
+
+	sf.ID = newID
+	sf.URL = url
+
+	return
+}
+
+func (f FileStore) Delete(fileID string) error {
+	file, err := datastore.GetFileByID(f.conf.Name, fileID)
+	if err != nil {
+		return err
+	}
+
+	fileKey := file.Key
+
+	if err := Filestore.Delete(fileKey); err != nil {
+		return err
+	}
+
+	if err := datastore.DeleteFile(f.conf.Name, file.ID); err != nil {
+		return err
+	}
+	return nil
+}

backend/user.go

@@ -6,7 +6,8 @@ import (
 	"strings"
 	"time"
 
-	sb "github.com/staticbackendhq/core"
+	"github.com/gbrlsnchs/jwt/v3"
+	"github.com/staticbackendhq/core/internal"
 	"github.com/staticbackendhq/core/model"
 	"golang.org/x/crypto/bcrypt"
 )
@@ -63,7 +64,7 @@ func (u User) Authenticate(email, password string) (string, error) {
 
 	token := fmt.Sprintf("%s|%s", tok.ID, tok.Token)
 
-	jwt, err := sb.GetJWT(token)
+	jwt, err := GetJWT(token)
 	if err != nil {
 		return "", err
 	}
@@ -117,3 +118,20 @@ func (u User) UserSetPassword(tokenID, password string) error {
 
 	return datastore.UserSetPassword(u.conf.Name, tokenID, string(b))
 }
+
+func GetJWT(token string) ([]byte, error) {
+	now := time.Now()
+	pl := model.JWTPayload{
+		Payload: jwt.Payload{
+			Issuer:         "StaticBackend",
+			ExpirationTime: jwt.NumericDate(now.Add(12 * time.Hour)),
+			NotBefore:      jwt.NumericDate(now.Add(30 * time.Minute)),
+			IssuedAt:       jwt.NumericDate(now),
+			JWTID:          internal.RandStringRunes(32),
+		},
+		Token: token,
+	}
+
+	return jwt.Sign(pl, model.HashSecret)
+
+}

extras.go

@@ -12,6 +12,7 @@ import (
 	"github.com/chromedp/cdproto/page"
 	"github.com/chromedp/chromedp"
 	"github.com/staticbackendhq/core/extra"
+	"github.com/staticbackendhq/core/internal"
 	"github.com/staticbackendhq/core/logger"
 	"github.com/staticbackendhq/core/middleware"
 	"github.com/staticbackendhq/core/model"
@@ -54,7 +55,7 @@ func (ex *extras) resizeImage(w http.ResponseWriter, r *http.Request) {
 
 	name := r.Form.Get("name")
 	if len(name) == 0 {
-		name = randStringRunes(32)
+		name = internal.RandStringRunes(32)
 	}
 
 	newWidth, err := strconv.ParseFloat(r.Form.Get("width"), 64)

internal/helpers.go

@@ -0,0 +1,35 @@
+package internal
+
+import (
+	"math/rand"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+var (
+	letterRunes = []rune("abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ2345679")
+)
+
+// RandStringRunes returns a random string with n characters
+func RandStringRunes(n int) string {
+	b := make([]rune, n)
+	for i := range b {
+		b[i] = letterRunes[rand.Intn(len(letterRunes))]
+	}
+
+	// due to PostgreSQL schema requiring letter start.
+	b[0] = letterRunes[0]
+
+	return string(b)
+}
+
+// CleanUpFileName removes file extention and anything but a-zA-Z-_
+func CleanUpFileName(s string) string {
+	s = strings.TrimSuffix(s, filepath.Ext(s))
+
+	exp := regexp.MustCompile(`[^a-zA-Z\-_]`)
+
+	return exp.ReplaceAllString(s, "")
+
+}

membership.go

@@ -8,17 +8,16 @@ import (
 	"math/rand"
 	"net/http"
 	"strings"
-	"time"
 
+	"github.com/staticbackendhq/core/backend"
 	"github.com/staticbackendhq/core/config"
 	"github.com/staticbackendhq/core/email"
+	"github.com/staticbackendhq/core/internal"
 	"github.com/staticbackendhq/core/logger"
 	"github.com/staticbackendhq/core/middleware"
 	"github.com/staticbackendhq/core/model"
 
 	"golang.org/x/crypto/bcrypt"
-
-	"github.com/gbrlsnchs/jwt/v3"
 )
 
 type membership struct {
@@ -150,7 +149,7 @@ func (m *membership) getAuthToken(tok model.Token, conf model.BaseConfig) (jwtBy
 	token := fmt.Sprintf("%s|%s", tok.ID, tok.Token)
 
 	// get their JWT
-	jwtBytes, err = GetJWT(token)
+	jwtBytes, err = backend.GetJWT(token)
 	if err != nil {
 		return
 	}
@@ -212,7 +211,7 @@ func (m *membership) createUser(dbName, accountID, email, password string, role
 	token := fmt.Sprintf("%s|%s", tokID, tok.Token)
 
 	// Get their JWT
-	jwtBytes, err := GetJWT(token)
+	jwtBytes, err := backend.GetJWT(token)
 	if err != nil {
 		return nil, tok, err
 	}
@@ -238,7 +237,7 @@ func (m *membership) setResetCode(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	code := randStringRunes(10)
+	code := internal.RandStringRunes(10)
 
 	conf, _, err := middleware.Extract(r, false)
 	if err != nil {
@@ -356,23 +355,6 @@ func (m *membership) setPassword(w http.ResponseWriter, r *http.Request) {
 	respond(w, http.StatusOK, true)
 }
 
-func GetJWT(token string) ([]byte, error) {
-	now := time.Now()
-	pl := model.JWTPayload{
-		Payload: jwt.Payload{
-			Issuer:         "StaticBackend",
-			ExpirationTime: jwt.NumericDate(now.Add(12 * time.Hour)),
-			NotBefore:      jwt.NumericDate(now.Add(30 * time.Minute)),
-			IssuedAt:       jwt.NumericDate(now),
-			JWTID:          randStringRunes(32), // changed from primitive.NewObjectID
-		},
-		Token: token,
-	}
-
-	return jwt.Sign(pl, model.HashSecret)
-
-}
-
 func (m *membership) sudoGetTokenFromAccountID(w http.ResponseWriter, r *http.Request) {
 	conf, _, err := middleware.Extract(r, false)
 	if err != nil {
@@ -393,7 +375,7 @@ func (m *membership) sudoGetTokenFromAccountID(w http.ResponseWriter, r *http.Re
 
 	token := fmt.Sprintf("%s|%s", tok.ID, tok.Token)
 
-	jwtBytes, err := GetJWT(token)
+	jwtBytes, err := backend.GetJWT(token)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

oauth.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/staticbackendhq/core/backend"
 	"github.com/staticbackendhq/core/config"
 	"github.com/staticbackendhq/core/logger"
 	"github.com/staticbackendhq/core/middleware"
@@ -229,7 +230,7 @@ func (el *ExternalLogins) signIn(dbName, email string) (sessionToken string, err
 
 	token := fmt.Sprintf("%s|%s", tok.ID, tok.Token)
 
-	b, err := GetJWT(token)
+	b, err := backend.GetJWT(token)
 	if err != nil {
 		return
 	}