added confirm email endpoint

Author: dylankilkenny

api/errors/errors.go

@@ -35,6 +35,7 @@ var (
 	EmailOrPassword             = APIError{400, "EMAILPASSMISS", "Email or password missing", "The Email or password missing"}
 	EmailNotFound               = APIError{400, "EMAILNOTFND", "Email Not Found", "No matching email address was found"}
 	UserNotFound                = APIError{400, "USERNOTFND", "User Not Found", "No matching user found for the supplied ID"}
+	EmailTokenNotFound          = APIError{400, "TOKNOTFOUND", "Token Not Found", "No matching token found"}
 	WrongPassword               = APIError{401, "WRONGPASS", "Wrong Password", "password is incorrect"}
 	EmailTaken                  = APIError{400, "EMAILTAKEN", "Email Taken", "email already exists"}
 	AuthCookieMissing           = APIError{403, "AUTHCOOKMISS", "Auth Cookie Missing", "Auth Cookie is missing"}

api/integrations/stripe/stripe.go

@@ -33,8 +33,7 @@ type WebhookEvent struct {
 }
 
 func Init() {
-	conf = config.GetConfig()
-	stripe.Key = conf.Stripe.SecretKey
+	stripe.Key = config.Load().Stripe.SecretKey
 }
 
 func CreatePlan(amount, intervalCount int64, interval, name, currency string) (*string, *string, error) {

api/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"eirevpn/api/config"
+	cfg "eirevpn/api/config"
 	"eirevpn/api/integrations"
 	"eirevpn/api/logger"
 	"eirevpn/api/models"
@@ -18,8 +18,8 @@ func main() {
 
 	appPath, _ := os.Getwd()
 	filename, _ := filepath.Abs(appPath + "/config.yaml")
-	config.Init(filename)
-	conf := config.GetConfig()
+	cfg.Init(filename)
+	conf := cfg.Load()
 
 	integrations.Init()
 

api/models/cart.go

@@ -41,8 +41,8 @@ func (c *Cart) BeforeCreate(scope *gorm.Scope) error {
 	return nil
 }
 
-// Beforecdate sets the cdatedAt column to the current time
-func (c *Cart) Beforecdate(scope *gorm.Scope) error {
-	scope.SetColumn("cdatedAt", "check")
+// BeforeUpdate sets the UpdatedAt column to the current time
+func (c *Cart) BeforeUpdate(scope *gorm.Scope) error {
+	scope.SetColumn("UpdatedAt", time.Now())
 	return nil
 }

api/models/emailtoken.go

@@ -0,0 +1,66 @@
+package models
+
+import (
+	"time"
+
+	"github.com/satori/go.uuid"
+	"github.com/jinzhu/gorm"
+)
+
+// EmailConfirm contains the email confirmation tokens with a one to one mapping
+// to the user
+type EmailToken struct {
+	BaseModel
+	UserID uint 
+	Token  string `json:"token"`
+}
+
+func (et *EmailToken) Find() error {
+	if err := db().Where(&et).First(&et).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
+func (et *EmailToken) GetUser() (*User, error) {
+	var user User
+	if err := db().Model(&user).Related(&et).Error; err != nil {
+		return nil, err
+	}
+	return &user, nil
+}
+
+func (et *EmailToken) Create() error {
+	if err := db().Create(&et).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
+func (et *EmailToken) Save() error {
+	if err := db().Save(&et).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
+func (et *EmailToken) Delete() error {
+	if err := db().Delete(&et).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
+// BeforeCreate sets the CreatedAt column to the current time
+func (et *EmailToken) BeforeCreate(scope *gorm.Scope) error {
+	scope.SetColumn("CreatedAt", time.Now())
+	token := uuid.NewV4()
+	scope.SetColumn("Token", token.String())
+	return nil
+}
+
+// BeforeUpdate sets the UpdatedAt column to the current time
+func (et *EmailToken) BeforeUpdate(scope *gorm.Scope) error {
+	scope.SetColumn("UpdatedAt", time.Now())
+	return nil
+}

api/models/models.go

@@ -24,5 +24,6 @@ func Get() []interface{} {
 		&UserAppSession{},
 		&Cart{},
 		&Server{},
+		&EmailToken{},
 	}
 }

api/models/user.go

@@ -27,6 +27,7 @@ type User struct {
 	Password         string   `json:"password" binding:"required"`
 	StripeCustomerID string   `json:"stripe_customer_id"`
 	Type             UserType `json:"type"`
+	EmailConfirmed   bool     `json:"email_confirmed"`
 }
 
 func (u *User) Find() error {

api/router/router.go

@@ -26,7 +26,7 @@ const secretkey = "verysecretkey1995"
 
 func Init(logging bool) *gin.Engine {
 
-	conf := config.GetConfig()
+	conf := config.Load()
 
 	var router *gin.Engine
 
@@ -71,6 +71,8 @@ func Init(logging bool) *gin.Engine {
 	private.GET("/user/cancel", user.CancelSubscription)
 	public.GET("/user/logout", user.Logout) //public so this router can skip auth middleware
 
+	public.GET("/user/confirm_email/:token", user.ConfirmEmail)
+
 	protected.GET("/plans/:id", plan.Plan)
 	protected.POST("/plans/create", plan.CreatePlan)
 	protected.PUT("/plans/update/:id", plan.UpdatePlan)
@@ -100,7 +102,7 @@ func Init(logging bool) *gin.Engine {
 
 func auth(secret string, protected bool) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		conf := config.GetConfig()
+		conf := config.Load()
 		if conf.App.EnableAuth {
 			var usersession models.UserAppSession
 
@@ -149,7 +151,7 @@ func auth(secret string, protected bool) gin.HandlerFunc {
 				if err != nil {
 					logger.Log(logger.Fields{
 						Loc:  "router.go - auth()",
-						Code: errors.TokenInvalid.Code,
+						Code: errors.RefresCookieMissing.Code,
 						Err:  err.Error(),
 					})
 					clearCookies(c)
@@ -271,7 +273,7 @@ func auth(secret string, protected bool) gin.HandlerFunc {
 }
 
 func clearCookies(c *gin.Context) {
-	conf := config.GetConfig()
+	conf := config.Load()
 	c.SetCookie(conf.App.AuthCookieName, "", -1, "/", conf.App.Domain, false, true)
 	c.SetCookie(conf.App.RefreshCookieName, "", -1, "/", conf.App.Domain, false, true)
 	c.SetCookie("uid", "", -1, "/", conf.App.Domain, false, false)

api/server/server.go

@@ -213,7 +213,7 @@ func Connect(c *gin.Context) {
 		return
 	}
 
-	conf := config.GetConfig()
+	conf := config.Load()
 	if conf.App.EnableSubscriptions {
 		var userplan models.UserPlan
 		userplan.UserID = userID.(uint)