Add: config

.gitignore

@@ -0,0 +1 @@
+config_prod.json

auth/authNamePasswordController.go

@@ -26,27 +26,23 @@ func LoginUserWithEmail(c *gin.Context){
 		var user *UserAccount
 		user, err := getUserByEmail(loginJson.Email, c)
 		if err != nil {
-			c.JSON(http.StatusUnauthorized, gin.H{"authenticated":"false"})
+			abortWithError(c, http.StatusUnauthorized, "authentication fail")
 		}
 
 		passwordValidErr := safeComparePassword(user.Password, []byte(loginJson.Password))
 		if passwordValidErr != nil{
-			c.JSON(http.StatusUnauthorized, gin.H{"authenticated":"false"})	
+			abortWithError(c, http.StatusUnauthorized, "authentication fail")
 		}
 
 		tokenString, tokenErr := GenerateToken(loginJson.Email)
 
 		if tokenErr != nil{
-			c.JSON(http.StatusUnauthorized, gin.H{"authenticated":"false"})		
+			abortWithError(c, http.StatusUnauthorized, "authentication fail")	
 		}
 
 		c.JSON(http.StatusOK, gin.H{"authenticated":"true","token":tokenString})
 
-		// if loginJson.Email == "xw" && loginJson.Password =="xw"{
-		// 	c.JSON(http.StatusOK, gin.H{"authenticated":"true"})
-		// }else{
-		// 	c.JSON(http.StatusUnauthorized, gin.H{"authenticated":"false"})
-		// }
+
 	}else{
 		c.JSON(http.StatusUnauthorized, gin.H{"error":"unauthorized"})
 	}
@@ -60,16 +56,17 @@ func SignUpWithEmail(c *gin.Context) {
 		if validateEmail(signUpJson.Email, c) && validatePassword(signUpJson.Password){
 			hash, hasherr := hashPassword(signUpJson.Password)
 			if hasherr != nil{
-				c.JSON(http.StatusBadRequest, gin.H{"error":"sign up fail"})
+				abortWithError(c, http.StatusBadRequest, "signup fail")
 			}
 			db := c.MustGet(mongodb.DBMiddlewareName).(*mgo.Database)
 			err := db.C(CollectionUserAccount).Insert(&UserAccount{
 				Id:signUpJson.Email,
 				Password:hash,
 				CreatedOn:int64(time.Now().Second()),
-				UpdatedOn:int64(time.Now().Second())})
+				UpdatedOn:int64(time.Now().Second()),
+				Active:false})
 			if err != nil{
-				c.JSON(http.StatusBadRequest, gin.H{"error":"sign up fail"})			
+				abortWithError(c, http.StatusBadRequest, "signup fail")			
 			}
 
 			// sent email

auth/authUtil.go

@@ -6,6 +6,8 @@ import (
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 	"golang.org/x/crypto/bcrypt"
+	"time"
+	"golang.org/x/crypto/rand"
 )
 
 func getUserByEmail(userId string, c *gin.Context) (*UserAccount, error){
@@ -50,6 +52,23 @@ func validatePassword(password string) bool{
 	return true
 }
 
+func generateRandomToken() []byte{
+	b := make([]byte, 24)
+	rand.Read(b)
+	return b
+}
+
+func sendRegistrationConfirmationEmail(email string, userId string, c *gin.Context){
+	contex := c.Copy()
+	randomToken := generateRandomToken()
+	db := context.MustGet(mongodb.DBMiddlewareName).(*mgo.Database)
+	err := db.C(CollectionEmailConfirmation).Insert(&emailConfirmation{
+		UserId:signUpJson.Email,
+		Token:randomToken,
+		Used: false,
+		ExpireAt:time.Now()})
+}
+
 func abortWithError(c *gin.Context, code int, message string) {
 	c.Header("WWW-Authenticate", "JWT realm="+Realm)
 	c.JSON(code, gin.H{

auth/modelOperation.go

@@ -0,0 +1,32 @@
+package auth
+
+import (
+	"time"
+)
+
+const (
+	CollectionEmailConfirmation  	string 	=	"email_confirmations_tmp"
+	CollectionPasswordChange 		string 	=	"password_change_tmp"
+)
+
+const (
+	emailConfirmExpireTime   		time.Duration 	= time.Hour*7
+	passwordChangeExpireTime 		time.Duration 	= time.Hour*1
+)
+
+
+type tempOpsToken struct{
+	UserId 			string
+	Token 			[]byte
+	Used 			bool
+	ExpireAt 		int64
+}
+
+
+type emailConfirmation struct{
+	tempOpsToken
+}
+
+type passwordChange struct{
+	tempOpsToken
+}

auth/modelUser.go

@@ -20,6 +20,7 @@ type UserAccount struct{
 	SocialAuth  	SocialAuth
 	CreatedOn		int64				
 	UpdatedOn		int64
+	Active			bool 
 }
 
 type UserProfile struct{

config.json

@@ -0,0 +1,7 @@
+{
+	"emails":[
+			{"address":"[email protected]", "password":"testing"},
+			{"address":"[email protected]", "password":"testing"}
+		],
+	"jwtkey":"testing"
+}

config/config.go

@@ -0,0 +1,30 @@
+package config
+
+import (
+	"os"
+	"encoding/json"
+)
+
+type Configuration struct{
+	emails		[]email
+	jwtkey		string
+}
+
+type email struct{
+	address		string
+	password	string
+}
+
+func GetConfig() Configuration{
+	file,err:=os.Open("config.json")
+	if err != nil{
+		panic("Configuration file missing!")
+	}
+	decoder := json.NewDecoder(file)
+	config := Configuration{}
+	decodeErr := decoder.Decode(config)
+	if decoder!=nil {
+		panic("Configuration file error")
+	}
+	return config
+}