copy cmd + user already exists

Author: pierre-b

console/src/components/settings/WorkspaceMembers.tsx

@@ -179,9 +179,9 @@ export function WorkspaceMembers({
 
       // Refresh the members list
       onMembersChange()
-    } catch (error) {
+    } catch (error: any) {
       console.error('Failed to create API key', error)
-      message.error('Failed to create API key')
+      message.error(error.message || 'Failed to create API key')
     } finally {
       setCreatingApiKey(false)
     }

console/src/pages/TransactionalNotificationsPage.tsx

@@ -25,7 +25,7 @@ import {
   faPaperPlane,
   faEye
 } from '@fortawesome/free-regular-svg-icons'
-import { faTerminal } from '@fortawesome/free-solid-svg-icons'
+import { faTerminal, faCopy } from '@fortawesome/free-solid-svg-icons'
 import UpsertTransactionalNotificationDrawer from '../components/transactional/UpsertTransactionalNotificationDrawer'
 import React, { useState } from 'react'
 import dayjs from '../lib/dayjs'
@@ -151,6 +151,43 @@ export function TransactionalNotificationsPage() {
     setApiModalOpen(true)
   }
 
+  const handleCopyCommand = () => {
+    if (!currentApiNotification) return
+
+    const curlCommand = `curl -X POST \\
+  "${window.location.origin}/api/transactional.send" \\
+  -H "Content-Type: application/json" \\
+  -H "Authorization: Bearer YOUR_API_KEY" \\
+  -d '{
+  "workspace_id": "${workspaceId}",
+  "notification": {
+    "id": "${currentApiNotification.id}",
+    "channels": ["email"],
+    "contact": {
+      "email": "recipient@example.com"
+      // other optional contact fields here
+    },
+    "data": {
+      // Your template variables here
+    },
+    "email_options": {
+      "reply_to": "reply@example.com",
+      "cc": ["cc@example.com"],
+      "bcc": ["bcc@example.com"]
+    }
+  }
+}'`
+
+    navigator.clipboard
+      .writeText(curlCommand)
+      .then(() => {
+        message.success('Curl command copied to clipboard!')
+      })
+      .catch(() => {
+        message.error('Failed to copy to clipboard')
+      })
+  }
+
   if (notificationsError) {
     return (
       <div>
@@ -300,7 +337,20 @@ export function TransactionalNotificationsPage() {
         title="API Command"
         open={apiModalOpen}
         onCancel={() => setApiModalOpen(false)}
-        footer={null}
+        footer={[
+          <Button
+            key="copy"
+            type="primary"
+            ghost
+            icon={<FontAwesomeIcon icon={faCopy} />}
+            onClick={handleCopyCommand}
+          >
+            Copy
+          </Button>,
+          <Button key="close" onClick={() => setApiModalOpen(false)}>
+            Close
+          </Button>
+        ]}
         width={800}
       >
         {currentApiNotification && (

internal/domain/user.go

@@ -111,6 +111,15 @@ func (e *ErrUserNotFound) Error() string {
 	return e.Message
 }
 
+// ErrUserExists is returned when trying to create a user that already exists
+type ErrUserExists struct {
+	Message string
+}
+
+func (e *ErrUserExists) Error() string {
+	return e.Message
+}
+
 // ErrSessionNotFound is returned when a session is not found
 type ErrSessionNotFound struct {
 	Message string

internal/domain/user_test.go

@@ -63,6 +63,11 @@ func TestErrUserNotFound_Error(t *testing.T) {
 	assert.Equal(t, "test error", err.Error())
 }
 
+func TestErrUserExists_Error(t *testing.T) {
+	err := &ErrUserExists{Message: "user already exists"}
+	assert.Equal(t, "user already exists", err.Error())
+}
+
 func TestErrSessionNotFound_Error(t *testing.T) {
 	err := &ErrSessionNotFound{Message: "test error"}
 	assert.Equal(t, "test error", err.Error())

internal/http/workspace_handler.go

@@ -338,7 +338,7 @@ func (h *WorkspaceHandler) handleCreateAPIKey(w http.ResponseWriter, r *http.Req
 			return
 		}
 
-		WriteJSONError(w, "Failed to create API key", http.StatusInternalServerError)
+		WriteJSONError(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 

internal/http/workspace_handler_test.go

@@ -1312,7 +1312,7 @@ func TestWorkspaceHandler_HandleCreateAPIKey_ServiceError(t *testing.T) {
 	var response map[string]string
 	err = json.NewDecoder(w.Body).Decode(&response)
 	require.NoError(t, err)
-	assert.Equal(t, "Failed to create API key", response["error"])
+	assert.Equal(t, "service error", response["error"])
 }
 
 func TestWorkspaceHandler_HandleRemoveMember(t *testing.T) {

internal/repository/user_postgres.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -46,6 +47,11 @@ func (r *userRepository) CreateUser(ctx context.Context, user *domain.User) erro
 		user.UpdatedAt,
 	)
 	if err != nil {
+		// Check for duplicate key constraint violation (PostgreSQL error code 23505)
+		if strings.Contains(err.Error(), "duplicate key value violates unique constraint") ||
+			strings.Contains(err.Error(), "UNIQUE constraint failed") {
+			return &domain.ErrUserExists{Message: "user already exists"}
+		}
 		return fmt.Errorf("failed to create user: %w", err)
 	}
 	return nil

internal/repository/user_postgres_test.go

@@ -52,6 +52,23 @@ func TestCreateUser(t *testing.T) {
 	err = repo.CreateUser(context.Background(), userWithError)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "failed to create user")
+
+	// Test case 3: Duplicate key constraint violation
+	duplicateUser := &domain.User{
+		ID:    uuid.New().String(),
+		Email: "duplicate@example.com",
+		Name:  "Duplicate User",
+		Type:  domain.UserTypeUser,
+	}
+
+	mock.ExpectExec(`INSERT INTO users \(id, email, name, type, created_at, updated_at\) VALUES \(\$1, \$2, \$3, \$4, \$5, \$6\)`).
+		WithArgs(duplicateUser.ID, duplicateUser.Email, duplicateUser.Name, duplicateUser.Type, sqlmock.AnyArg(), sqlmock.AnyArg()).
+		WillReturnError(errors.New("pq: duplicate key value violates unique constraint \"users_email_key\""))
+
+	err = repo.CreateUser(context.Background(), duplicateUser)
+	require.Error(t, err)
+	assert.IsType(t, &domain.ErrUserExists{}, err)
+	assert.Equal(t, "user already exists", err.Error())
 }
 
 func TestGetUserByEmail(t *testing.T) {

internal/service/workspace_service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -678,6 +679,12 @@ func (s *WorkspaceService) CreateAPIKey(ctx context.Context, workspaceID string,
 
 	err = s.userRepo.CreateUser(ctx, apiUser)
 	if err != nil {
+		// Check if this is a duplicate user error
+		var userExistsErr *domain.ErrUserExists
+		if errors.As(err, &userExistsErr) {
+			s.logger.WithField("workspace_id", workspaceID).WithField("user_email", apiUser.Email).Error("API user already exists")
+			return "", "", fmt.Errorf("this user already exists")
+		}
 		s.logger.WithField("workspace_id", workspaceID).WithField("user_id", apiUser.ID).WithField("error", err.Error()).Error("Failed to create API user")
 		return "", "", err
 	}