fix(auth): google auth (#27)

* Fix record duplicate when logging with Google * Codegen fix
oxygenpay · Aug 1, 2023 · 1204b51 · 1204b51
1 parent 715a27c
commit 1204b51
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 27 deletions.
diff --git a/internal/db/repository/users.sql.go b/internal/db/repository/users.sql.go
diff --git a/internal/service/user/service_google.go b/internal/service/user/service_google.go
@@ -15,7 +15,7 @@ import (
 )
 
 func (s *Service) ResolveWithGoogle(ctx context.Context, user *auth.GoogleUser) (*User, error) {
-	entry, err := s.store.GetUserByGoogleID(ctx, repository.StringToNullable(user.Sub))
+	entry, err := s.store.GetUserByEmail(ctx, user.Email)
 	switch {
 	case errors.Is(err, pgx.ErrNoRows):
 		return s.registerGoogleUser(ctx, user)
@@ -57,6 +57,8 @@ func (s *Service) registerGoogleUser(ctx context.Context, user *auth.GoogleUser)
 func (s *Service) updateGoogleUser(ctx context.Context, userID int64, user *auth.GoogleUser) (*User, error) {
 	entry, err := s.store.UpdateUser(ctx, repository.UpdateUserParams{
 		ID:              userID,
+		SetGoogleID:     true,
+		GoogleID:        repository.StringToNullable(user.Sub),
 		Name:            user.Name,
 		ProfileImageUrl: repository.StringToNullable(user.Picture),
 		UpdatedAt:       time.Now(),

diff --git a/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_parameters.go b/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_parameters.go
diff --git a/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_responses.go b/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_responses.go
diff --git a/pkg/api-kms/v1/client/wallet/wallet_client.go b/pkg/api-kms/v1/client/wallet/wallet_client.go
diff --git a/scripts/queries/users.sql b/scripts/queries/users.sql
@@ -31,10 +31,11 @@ RETURNING *;
 
 -- name: UpdateUser :one
 UPDATE users
-SET name = $1,
-    profile_image_url= $2,
-    updated_at = $3
-WHERE id = $4
+SET name = $2,
+    profile_image_url= $3,
+    google_id = CASE WHEN @set_google_id::boolean THEN $4 ELSE users.google_id END,
+    updated_at = $5
+WHERE id = $1
 RETURNING *;
 
 -- name: UpdateUserPassword :one