From 27690fb2b69aaabc3da189ad51c46773f1fe69cb Mon Sep 17 00:00:00 2001
From: Lakhan Samani <lakhan.m.samani@gmail.com>
Date: Wed, 14 Jul 2021 12:46:48 +0530
Subject: [PATCH] add sign_up_method to users table

---
 server/db/user.go                | 4 +++-
 server/enum/signUpMethod.go      | 6 +++---
 server/graph/schema.resolvers.go | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/server/db/user.go b/server/db/user.go
index bc33236..a5934e7 100644
--- a/server/db/user.go
+++ b/server/db/user.go
@@ -18,6 +18,8 @@ type User struct {
 	EmailVerifiedAt int64
 	CreatedAt       int64 `gorm:"autoCreateTime"`
 	UpdatedAt       int64 `gorm:"autoUpdateTime"`
+	Image           string
+	SignUpMethod    string
 }
 
 func (user *User) BeforeSave(tx *gorm.DB) error {
@@ -31,7 +33,7 @@ func (user *User) BeforeSave(tx *gorm.DB) error {
 
 // AddUser function to add user
 func (mgr *manager) AddUser(user User) (User, error) {
-	result := mgr.db.Clauses(clause.OnConflict{DoNothing: true}).Create(&user)
+	result := mgr.db.Clauses(clause.OnConflict{UpdateAll: true, Columns: []clause.Column{{Name: "email"}}}).Create(&user)
 	if result.Error != nil {
 		log.Println(result.Error)
 		return user, result.Error
diff --git a/server/enum/signUpMethod.go b/server/enum/signUpMethod.go
index b18fc20..acc8540 100644
--- a/server/enum/signUpMethod.go
+++ b/server/enum/signUpMethod.go
@@ -3,7 +3,7 @@ package enum
 type SignupMethod int
 
 const (
-	Basic SignupMethod = iota
+	BasicAuth SignupMethod = iota
 	MagicLink
 	Google
 	Github
@@ -12,8 +12,8 @@ const (
 
 func (d SignupMethod) String() string {
 	return [...]string{
-		"basic",
-		"magiclink",
+		"basic_auth",
+		"magic_link",
 		"google",
 		"github",
 		"facebook",
diff --git a/server/graph/schema.resolvers.go b/server/graph/schema.resolvers.go
index e8f2954..e19fa1e 100644
--- a/server/graph/schema.resolvers.go
+++ b/server/graph/schema.resolvers.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/yauthdev/yauth/server/db"
+	"github.com/yauthdev/yauth/server/enum"
 	"github.com/yauthdev/yauth/server/graph/generated"
 	"github.com/yauthdev/yauth/server/graph/model"
 	"github.com/yauthdev/yauth/server/utils"
@@ -121,13 +122,14 @@ func (r *mutationResolver) BasicAuthSignUp(ctx context.Context, params model.Bas
 			user.LastName = *params.LastName
 		}
 
+		user.SignUpMethod = enum.BasicAuth.String()
 		_, err = db.Mgr.AddUser(user)
 		if err != nil {
 			return res, err
 		}
 
 		// insert verification request
-		verificationType := "BASIC_AUTH_SIGNUP"
+		verificationType := enum.BasicAuth.String()
 		token, err := utils.CreateVerificationToken(params.Email, verificationType)
 		if err != nil {
 			log.Println(`Error generating token`, err)