Skip to content

Commit ee9efa2

Browse files
committed
fix
1 parent 9ab94cb commit ee9efa2

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.DS_Store

0 Bytes
Binary file not shown.

routes/auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func (ep Endpoint) GoogleLogin(c *fiber.Ctx) error {
283283
name := userGoogleData.Name
284284
avatar := userGoogleData.Picture
285285

286-
user, token, err := RegisterSocialUser(db, email, name, &avatar)
286+
user, token, err := RegisterSocialUser(db, email, name, &avatar, "google")
287287
if err != nil {
288288
return c.Status(401).JSON(err)
289289
}
@@ -322,7 +322,7 @@ func (ep Endpoint) FacebookLogin(c *fiber.Ctx) error {
322322
email := userFacebookData.Email
323323
name := userFacebookData.Name
324324

325-
user, token, err := RegisterSocialUser(db, email, name, nil)
325+
user, token, err := RegisterSocialUser(db, email, name, nil, "facebook")
326326
if err != nil {
327327
return c.Status(401).JSON(err)
328328
}

routes/auth_utils.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package routes
22

33
import (
44
"context"
5+
"fmt"
56
"log"
67
"strings"
78
"time"
@@ -198,7 +199,7 @@ func ConvertFacebookToken(accessToken string) (*FacebookPayload, *utils.ErrorRes
198199
return &data, nil
199200
}
200201

201-
func RegisterSocialUser(db *gorm.DB, email string, name string, avatar *string) (*models.User, *models.AuthToken, *utils.ErrorResponse) {
202+
func RegisterSocialUser(db *gorm.DB, email string, name string, avatar *string, authType string) (*models.User, *models.AuthToken, *utils.ErrorResponse) {
202203
cfg := config.GetConfig()
203204

204205
user := models.User{Email: email}
@@ -208,7 +209,7 @@ func RegisterSocialUser(db *gorm.DB, email string, name string, avatar *string)
208209
db.Create(&user)
209210
} else {
210211
if !user.SocialLogin {
211-
errData := utils.RequestErr(utils.ERR_INVALID_AUTH, "Requires password to login")
212+
errData := utils.RequestErr(utils.ERR_INVALID_AUTH, fmt.Sprintf("This account wasn't created via %s. Please sign in using your email and password.", authType))
212213
return nil, nil, &errData
213214
}
214215
}

0 commit comments

Comments
 (0)