Skip to content

Commit 1661128

Browse files
authored
Fixed invite email (#66)
Added error when starting test environment without test email
1 parent 20aa3b8 commit 1661128

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

config/config.go

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ func GetConfig() (*models.ConfigStruct, error) {
6767
// Set new value
6868
config.PoenskelistenEnvironment = "production"
6969
anythingChanged = true
70+
} else if config.PoenskelistenEnvironment == "test" && config.PoenskelistenTestEmail == "" {
71+
return nil, errors.New("Pønskelisten environment is set to 'test', but no test e-mail is configured.")
7072
}
7173

7274
if config.Timezone == "" {

controllers/user.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ func RegisterUser(context *gin.Context) {
167167
}
168168

169169
// Create user in DB
170-
record := database.Instance.Create(&user)
171-
if record.Error != nil {
170+
user, err = database.CreateUserInDB(user)
171+
if err != nil {
172172
log.Println("Failed to get create user. Error: " + err.Error())
173173
context.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get create user."})
174174
context.Abort()
@@ -200,7 +200,6 @@ func RegisterUser(context *gin.Context) {
200200

201201
// Return response
202202
context.JSON(http.StatusCreated, gin.H{"message": "User created!"})
203-
204203
}
205204

206205
func GetUser(context *gin.Context) {

database/user.go

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package database
33
import (
44
"aunefyren/poenskelisten/models"
55
"errors"
6+
"log"
67
"strings"
78
"time"
89

@@ -217,3 +218,15 @@ func UpdateUserInDB(userOriginal models.User) (user models.User, err error) {
217218

218219
return
219220
}
221+
222+
func CreateUserInDB(userRequest models.User) (user models.User, err error) {
223+
user = userRequest
224+
225+
record := Instance.Create(&user)
226+
if record.Error != nil {
227+
log.Println("Failed to create user in DB. Error: " + record.Error.Error())
228+
return user, errors.New("Failed to create user in DB.")
229+
}
230+
231+
return
232+
}

utilities/smtp.go

-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
)
1111

1212
func SendSMTPVerificationEmail(user models.User) error {
13-
1413
// Get configuration
1514
config, err := config.GetConfig()
1615
if err != nil {
@@ -38,11 +37,9 @@ func SendSMTPVerificationEmail(user models.User) error {
3837
}
3938

4039
return nil
41-
4240
}
4341

4442
func SendSMTPResetEmail(user models.User) error {
45-
4643
// Get configuration
4744
config, err := config.GetConfig()
4845
if err != nil {
@@ -72,11 +69,9 @@ func SendSMTPResetEmail(user models.User) error {
7269
}
7370

7471
return nil
75-
7672
}
7773

7874
func SendSMTPDeletedClaimedWish(user models.User, wish models.WishObject, wishlist models.WishlistUser) error {
79-
8075
// Get configuration
8176
config, err := config.GetConfig()
8277
if err != nil {
@@ -106,5 +101,4 @@ func SendSMTPDeletedClaimedWish(user models.User, wish models.WishObject, wishli
106101
}
107102

108103
return nil
109-
110104
}

0 commit comments

Comments
 (0)