moving things around to allow saving images on signup

internal/auth/handlers.go

@@ -252,6 +252,7 @@ func (a *Auth) signUpHelper(c *gin.Context, sup *signupUser) (_ bool) {
 		misc.AbortWithErr(c, http.StatusBadRequest, err)
 		return
 	}
+
 	return true
 }
 

server/image.go → internal/auth/images.go

@@ -1,4 +1,4 @@
-package server
+package auth
 
 import (
 	"bytes"
@@ -11,6 +11,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/swayops/sway/config"
+
 	"image"
 	_ "image/gif"
 	_ "image/jpeg"
@@ -27,7 +29,7 @@ var (
 	ErrInvalidImage = errors.New("Invalid image!")
 )
 
-func saveImageToDisk(fileNameBase, data, id, suffix string, minWidth, minHeight int) (string, error) {
+func SaveImageToDisk(fileNameBase, data, id, suffix string, minWidth, minHeight int) (string, error) {
 	idx := strings.Index(data, ";base64,")
 	if idx < 0 {
 		return "", ErrInvalidImage
@@ -57,20 +59,44 @@ func saveImageToDisk(fileNameBase, data, id, suffix string, minWidth, minHeight
 	return id + suffix + "." + fm, err
 }
 
-func getImageUrl(s *Server, bucket, typ, filename string, addDomain bool) string {
+func GetImageUrl(cfg *config.Config, bucket, typ, filename string, addDomain bool) string {
 	var base string
 	switch typ {
 	case "dash":
 		if addDomain {
-			base = s.Cfg.DashURL
+			base = cfg.DashURL
 		}
 
 	case "inf":
 		if addDomain {
-			base = s.Cfg.InfAppURL
+			base = cfg.InfAppURL
 		}
 	default:
 		log.Panicf("invalid type: %v", typ)
 	}
-	return base + "/" + filepath.Join(s.Cfg.ImageUrlPath, bucket, filename)
+	return base + "/" + filepath.Join(cfg.ImageUrlPath, bucket, filename)
+}
+
+// saveUserImage saves the user image to disk and sets User.ImageURL to the url for it if the image is a data:image/
+func SaveUserImage(cfg *config.Config, u *User) error {
+	if strings.HasPrefix(u.ImageURL, "data:image/") {
+		filename, err := SaveImageToDisk(filepath.Join(cfg.ImagesDir, cfg.Bucket.User, u.ID), u.ImageURL, u.ID, "", 300, 300)
+		if err != nil {
+			return err
+		}
+
+		u.ImageURL = GetImageUrl(cfg, cfg.Bucket.User, "dash", filename, false)
+	}
+
+	if strings.HasPrefix(u.CoverImageURL, "data:image/") {
+		filename, err := SaveImageToDisk(filepath.Join(cfg.ImagesDir, cfg.Bucket.User, u.ID),
+			u.CoverImageURL, u.ID, "-cover", 300, 300)
+		if err != nil {
+			return err
+		}
+
+		u.CoverImageURL = GetImageUrl(cfg, cfg.Bucket.User, "dash", filename, false)
+	}
+
+	return nil
 }

internal/auth/user.go

@@ -259,6 +259,10 @@ func (a *Auth) CreateUserTx(tx *bolt.Tx, u *User, password string) (err error) {
 	}
 
 SKIP:
+	if err = SaveUserImage(a.cfg, u); err != nil {
+		return
+	}
+
 	if err = misc.PutTxJson(tx, a.cfg.Bucket.User, u.ID, u); err != nil {
 		return
 	}

server/handlers.go

@@ -317,15 +317,15 @@ func postCampaign(s *Server) gin.HandlerFunc {
 				c.JSON(400, misc.StatusErr("Please provide a valid campaign image"))
 				return
 			}
-			filename, err := saveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.Campaign, cmp.Id), cmp.ImageData, cmp.Id, "", 750, 389)
+			filename, err := auth.SaveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.Campaign, cmp.Id), cmp.ImageData, cmp.Id, "", 750, 389)
 			if err != nil {
 				c.JSON(400, misc.StatusErr(err.Error()))
 				return
 			}
 
-			cmp.ImageURL, cmp.ImageData = getImageUrl(s, s.Cfg.Bucket.Campaign, "dash", filename, false), ""
+			cmp.ImageURL, cmp.ImageData = auth.GetImageUrl(s.Cfg, s.Cfg.Bucket.Campaign, "dash", filename, false), ""
 		} else {
-			cmp.ImageURL = getImageUrl(s, s.Cfg.Bucket.Campaign, "dash", DEFAULT_IMAGES[rand.Intn(len(DEFAULT_IMAGES))], false)
+			cmp.ImageURL = auth.GetImageUrl(s.Cfg, s.Cfg.Bucket.Campaign, "dash", DEFAULT_IMAGES[rand.Intn(len(DEFAULT_IMAGES))], false)
 		}
 
 		// Save the Campaign
@@ -493,13 +493,13 @@ func putCampaign(s *Server) gin.HandlerFunc {
 				return
 			}
 
-			filename, err := saveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.Campaign, cmp.Id), upd.ImageData, cmp.Id, "", 750, 389)
+			filename, err := auth.SaveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.Campaign, cmp.Id), upd.ImageData, cmp.Id, "", 750, 389)
 			if err != nil {
 				c.JSON(400, misc.StatusErr(err.Error()))
 				return
 			}
 
-			cmp.ImageURL, upd.ImageData = getImageUrl(s, s.Cfg.Bucket.Campaign, "dash", filename, false), ""
+			cmp.ImageURL, upd.ImageData = auth.GetImageUrl(s.Cfg, s.Cfg.Bucket.Campaign, "dash", filename, false), ""
 		}
 
 		for _, g := range upd.Geos {
@@ -2515,6 +2515,7 @@ func userProfile(srv *Server) gin.HandlerFunc {
 			checkTalentAgency(c)
 		default:
 			misc.AbortWithErr(c, http.StatusUnauthorized, auth.ErrUnauthorized)
+			return
 		}
 		if c.IsAborted() {
 			return
@@ -2525,6 +2526,7 @@ func userProfile(srv *Server) gin.HandlerFunc {
 		}
 
 	SKIP:
+
 		cu = cu.Trim()
 
 		if cu.Advertiser == nil { // return the user if it isn't an advertiser
@@ -2578,59 +2580,6 @@ func forceEmail(s *Server) gin.HandlerFunc {
 	}
 }
 
-func uploadImage(s *Server) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		var upd UploadImage
-		if err := json.NewDecoder(c.Request.Body).Decode(&upd); err != nil {
-			c.JSON(400, misc.StatusErr("Error unmarshalling request body"))
-			return
-		}
-
-		id := c.Param("id")
-		if id == "" {
-			c.JSON(400, misc.StatusErr("Invalid ID"))
-			return
-		}
-
-		bucket := c.Param("bucket")
-		filename, err := saveImageToDisk(s.Cfg.ImagesDir+bucket+"/"+id, upd.Data, id, "", 750, 389)
-		if err != nil {
-			c.JSON(400, misc.StatusErr(err.Error()))
-			return
-		}
-
-		var imageURL string
-		if bucket == "campaign" {
-			var (
-				cmp common.Campaign
-				b   []byte
-			)
-			// Save image URL in campaign
-			s.db.View(func(tx *bolt.Tx) error {
-				b = tx.Bucket([]byte(s.Cfg.Bucket.Campaign)).Get([]byte(id))
-				return nil
-			})
-
-			if err = json.Unmarshal(b, &cmp); err != nil {
-				c.JSON(400, misc.StatusErr("Error unmarshalling campaign"))
-				return
-			}
-
-			imageURL = getImageUrl(s, s.Cfg.Bucket.Campaign, "dash", filename, false)
-			cmp.ImageURL = imageURL
-
-			// Save the Campaign
-			if err = s.db.Update(func(tx *bolt.Tx) (err error) {
-				return saveCampaign(tx, &cmp, s)
-			}); err != nil {
-				c.JSON(500, misc.StatusErr(err.Error()))
-				return
-			}
-		}
-		c.JSON(200, UploadImage{ImageURL: imageURL})
-	}
-}
-
 func getLatestGeo(s *Server) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		inf, ok := s.auth.Influencers.Get(c.Param("influencerId"))

server/helpers.go

@@ -137,13 +137,13 @@ func getUserImage(s *Server, data, suffix string, minW, minH int, user *auth.Use
 		return data, nil
 	}
 
-	filename, err := saveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.User, user.ID),
+	filename, err := auth.SaveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.User, user.ID),
 		data, user.ID, suffix, minW, minH)
 	if err != nil {
 		return "", err
 	}
 
-	return getImageUrl(s, s.Cfg.Bucket.User, "dash", filename, false), nil
+	return auth.GetImageUrl(s.Cfg, s.Cfg.Bucket.User, "dash", filename, false), nil
 }
 
 func savePassword(s *Server, tx *bolt.Tx, oldPass, pass, pass2 string, user *auth.User) (bool, error) {
@@ -619,31 +619,6 @@ func emailList(s *Server, cid string, override []string) {
 	)
 }
 
-// saveUserImage saves the user image to disk and sets User.ImageURL to the url for it if the image is a data:image/
-func saveUserImage(s *Server, u *auth.User) error {
-	if strings.HasPrefix(u.ImageURL, "data:image/") {
-
-		filename, err := saveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.User, u.ID), u.ImageURL, u.ID, "", 300, 300)
-		if err != nil {
-			return err
-		}
-
-		u.ImageURL = getImageUrl(s, s.Cfg.Bucket.User, "dash", filename, false)
-	}
-
-	if strings.HasPrefix(u.CoverImageURL, "data:image/") {
-		filename, err := saveImageToDisk(filepath.Join(s.Cfg.ImagesDir, s.Cfg.Bucket.User, u.ID),
-			u.CoverImageURL, u.ID, "-cover", 300, 300)
-		if err != nil {
-			return err
-		}
-
-		u.CoverImageURL = getImageUrl(s, s.Cfg.Bucket.User, "dash", filename, false)
-	}
-
-	return nil
-}
-
 func saveUserHelper(s *Server, c *gin.Context, userType string) {
 	var (
 		incUser struct {
@@ -696,7 +671,7 @@ func saveUserHelper(s *Server, c *gin.Context, userType string) {
 		incUser.ID = id // for saveImage
 	}
 
-	if err := saveUserImage(s, &incUser.User); err != nil {
+	if err := auth.SaveUserImage(s.Cfg, &incUser.User); err != nil {
 		misc.AbortWithErr(c, 400, err)
 		return
 	}

server/server.go

@@ -327,7 +327,6 @@ func (srv *Server) initializeRoutes(r gin.IRouter) {
 
 	createRoutes(verifyGroup, srv, "/getCampaignsByAdvertiser", "id", scopes["adv"], auth.AdAgencyItem,
 		getCampaignsByAdvertiser, nil, nil, nil)
-	verifyGroup.POST("/uploadImage/:id/:bucket", uploadImage(srv))
 	verifyGroup.GET("/getDealsForCampaign/:id", getDealsForCampaign(srv))
 	r.Static("images", srv.Cfg.ImagesDir)