Commit 0e4b140e authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Move Facebook email import timing after account creation.

parent f1000c93

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
## [Unreleased]

### Changed

- Use the Facebook Graph API v11.0 version.

- Move Facebook email import timing after account creation.



### Fixed

- Fix log level in Lua runtime log calls which use logger fields.

server/core_authenticate.go

+2 −2
Original line number Diff line number Diff line
@@ -448,8 +448,8 @@ func AuthenticateFacebook(ctx context.Context, logger *zap.Logger, db *sql.DB, c 


	// Create a new account.

	userID := uuid.Must(uuid.NewV4()).String()

	query = "INSERT INTO users (id, username, display_name, email, avatar_url, facebook_id, create_time, update_time) VALUES ($1, $2, $3, $4, $5, $6, now(), now())"

	result, err := db.ExecContext(ctx, query, userID, username, facebookProfile.Name, facebookProfile.Email, facebookProfile.Picture.Data.Url, facebookProfile.ID)

	query = "INSERT INTO users (id, username, display_name, avatar_url, facebook_id, create_time, update_time) VALUES ($1, $2, $3, $4, $5, now(), now())"

	result, err := db.ExecContext(ctx, query, userID, username, facebookProfile.Name, facebookProfile.Picture.Data.Url, facebookProfile.ID)

	if err != nil {

		var pgErr *pgconn.PgError

		if errors.As(err, &pgErr) && pgErr.Code == dbErrorUniqueViolation {