Update display name and avatar URL from Google auth token. (#301) (9c5fb952) · Commits · public-projects / Nakama

server/api_link.go

+19 −4

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@
		package server

		import (
		"strconv"
		"strings"

		"github.com/cockroachdb/cockroach-go/crdb"
		"github.com/gofrs/uuid"
		"github.com/golang/protobuf/ptypes/empty"
		@@ -25,8 +28,6 @@ import (
		"golang.org/x/net/context"
		"google.golang.org/grpc/codes"
		"google.golang.org/grpc/status"
		"strconv"
		"strings"
		)

		func (s ApiServer) LinkCustom(ctx context.Context, in api.AccountCustom) (*empty.Empty, error) {
		@@ -442,16 +443,30 @@ func (s ApiServer) LinkGoogle(ctx context.Context, in api.AccountGoogle) (*emp
		return nil, status.Error(codes.Unauthenticated, "Could not authenticate Google profile.")
		}

		displayName := googleProfile.Name
		if len(displayName) > 255 {
		// Ignore the name in case it is longer than db can store
		s.logger.Warn("Skipping updating display_name: value received from Google longer than max length of 255 chars.", zap.String("display_name", displayName))
		displayName = ""
		}

		avatarUrl := googleProfile.Picture
		if len(avatarUrl) > 512 \|\| avatarUrl == "" {
		// Ignore the url in case it is longer than db can store
		s.logger.Warn("Skipping updating avatar_url: value received from Google longer than max length of 512 chars.", zap.String("avatar_url", avatarUrl))
		avatarUrl = ""
		}

		res, err := s.db.ExecContext(ctx, `
		UPDATE users
		SET google_id = $2, update_time = now()
		SET google_id = $2, display_name = $3, avatar_url = $4, update_time = now()
		WHERE (id = $1)
		AND (NOT EXISTS
		(SELECT id
		FROM users
		WHERE google_id = $2 AND NOT id = $1))`,
		userID,
		googleProfile.Sub)
		googleProfile.Sub, displayName, avatarUrl)

		if err != nil {
		s.logger.Error("Could not link Google ID.", zap.Error(err), zap.Any("input", in))

server/core_authenticate.go

+30 −4

Original line number	Diff line number	Diff line
		@@ -455,11 +455,13 @@ func AuthenticateGoogle(ctx context.Context, logger zap.Logger, db sql.DB, cli
		found := true

		// Look for an existing account.
		query := "SELECT id, username, disable_time FROM users WHERE google_id = $1"
		query := "SELECT id, username, disable_time, display_name, avatar_url FROM users WHERE google_id = $1"
		var dbUserID string
		var dbUsername string
		var dbDisableTime pq.NullTime
		err = db.QueryRowContext(ctx, query, googleProfile.Sub).Scan(&dbUserID, &dbUsername, &dbDisableTime)
		var dbDisplayName sql.NullString
		var dbAvatarUrl sql.NullString
		err = db.QueryRowContext(ctx, query, googleProfile.Sub).Scan(&dbUserID, &dbUsername, &dbDisableTime, &dbDisplayName, &dbAvatarUrl)
		if err != nil {
		if err == sql.ErrNoRows {
		found = false
		@@ -469,6 +471,20 @@ func AuthenticateGoogle(ctx context.Context, logger zap.Logger, db sql.DB, cli
		}
		}

		displayName := googleProfile.Name
		if len(displayName) > 255 {
		// Trim the name in case it is longer than db can store
		logger.Warn("Skipping updating display_name: value received from Google longer than max length of 255 chars.", zap.String("display_name", displayName))
		displayName = dbDisplayName.String
		}

		avatarUrl := googleProfile.Picture
		if len(avatarUrl) > 512 \|\| avatarUrl == "" {
		// Ignore the url in case it is longer than db can store
		logger.Warn("Skipping updating avatar_url: value received from Google longer than max length of 512 chars.", zap.String("avatar_url", avatarUrl))
		avatarUrl = dbAvatarUrl.String
		}

		// Existing account found.
		if found {
		// Check if it's disabled.
		@@ -477,6 +493,16 @@ func AuthenticateGoogle(ctx context.Context, logger zap.Logger, db sql.DB, cli
		return "", "", false, status.Error(codes.Unauthenticated, "Error finding or creating user account.")
		}

		// Check if display name / avatar received from Google different from those in the DB
		if dbDisplayName.String != displayName \|\| dbAvatarUrl.String != avatarUrl {
		// At least one difference found, update the DB to reflect changed values
		if _, err = db.ExecContext(ctx, "UPDATE users SET display_name = $1, avatar_url = $2, update_time = now() WHERE id = $3", displayName, avatarUrl, dbUserID); err != nil {
		logger.Error("Error in updating google profile details", zap.Error(err), zap.String("googleId", googleProfile.Sub), zap.String("display_name", googleProfile.Name), zap.String("display_name", googleProfile.Picture))
		// Do no return error. Failure to update the display_name / avatar_url should not
		// interrupt the execution. Ignore the result and the error, just log the error.
		}
		}

		return dbUserID, dbUsername, false, nil
		}

		@@ -487,8 +513,8 @@ func AuthenticateGoogle(ctx context.Context, logger zap.Logger, db sql.DB, cli

		// Create a new account.
		userID := uuid.Must(uuid.NewV4()).String()
		query = "INSERT INTO users (id, username, google_id, create_time, update_time) VALUES ($1, $2, $3, now(), now())"
		result, err := db.ExecContext(ctx, query, userID, username, googleProfile.Sub)
		query = "INSERT INTO users (id, username, google_id, display_name, avatar_url, create_time, update_time) VALUES ($1, $2, $3, $4, $5, now(), now())"
		result, err := db.ExecContext(ctx, query, userID, username, googleProfile.Sub, displayName, avatarUrl)
		if err != nil {
		if e, ok := err.(*pq.Error); ok && e.Code == dbErrorUniqueViolation {
		if strings.Contains(e.Message, "users_username_key") {