mirror of
https://github.com/pacnpal/thrilltrack-explorer.git
synced 2025-12-22 16:11:13 -05:00
Refactor Novu registration to frontend
This commit is contained in:
196
src/components/admin/NovuMigrationUtility.tsx
Normal file
196
src/components/admin/NovuMigrationUtility.tsx
Normal file
@@ -0,0 +1,196 @@
|
||||
import { useState } from 'react';
|
||||
import { supabase } from '@/integrations/supabase/client';
|
||||
import { notificationService } from '@/lib/notificationService';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
|
||||
import { Progress } from '@/components/ui/progress';
|
||||
import { Alert, AlertDescription } from '@/components/ui/alert';
|
||||
import { CheckCircle2, XCircle, AlertCircle, Loader2 } from 'lucide-react';
|
||||
import { useToast } from '@/hooks/use-toast';
|
||||
|
||||
interface MigrationResult {
|
||||
userId: string;
|
||||
email: string;
|
||||
success: boolean;
|
||||
error?: string;
|
||||
}
|
||||
|
||||
export function NovuMigrationUtility() {
|
||||
const { toast } = useToast();
|
||||
const [isRunning, setIsRunning] = useState(false);
|
||||
const [progress, setProgress] = useState(0);
|
||||
const [results, setResults] = useState<MigrationResult[]>([]);
|
||||
const [totalUsers, setTotalUsers] = useState(0);
|
||||
|
||||
const runMigration = async () => {
|
||||
setIsRunning(true);
|
||||
setResults([]);
|
||||
setProgress(0);
|
||||
|
||||
try {
|
||||
// Fetch users without Novu subscriber IDs
|
||||
const { data: users, error: fetchError } = await supabase
|
||||
.from('profiles')
|
||||
.select('user_id, users:user_id(email)')
|
||||
.not('user_id', 'in',
|
||||
supabase
|
||||
.from('user_notification_preferences')
|
||||
.select('user_id')
|
||||
.not('novu_subscriber_id', 'is', null)
|
||||
);
|
||||
|
||||
if (fetchError) throw fetchError;
|
||||
|
||||
if (!users || users.length === 0) {
|
||||
toast({
|
||||
title: "No users to migrate",
|
||||
description: "All users are already registered with Novu.",
|
||||
});
|
||||
setIsRunning(false);
|
||||
return;
|
||||
}
|
||||
|
||||
setTotalUsers(users.length);
|
||||
const migrationResults: MigrationResult[] = [];
|
||||
|
||||
// Process users one by one
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
const user = users[i];
|
||||
const email = (user.users as any)?.email;
|
||||
|
||||
if (!email) {
|
||||
migrationResults.push({
|
||||
userId: user.user_id,
|
||||
email: 'No email found',
|
||||
success: false,
|
||||
error: 'User email not found',
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await notificationService.createSubscriber({
|
||||
subscriberId: user.user_id,
|
||||
email,
|
||||
data: { userId: user.user_id },
|
||||
});
|
||||
|
||||
migrationResults.push({
|
||||
userId: user.user_id,
|
||||
email,
|
||||
success: result.success,
|
||||
error: result.error,
|
||||
});
|
||||
|
||||
// Small delay to avoid overwhelming the API
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
} catch (error: any) {
|
||||
migrationResults.push({
|
||||
userId: user.user_id,
|
||||
email,
|
||||
success: false,
|
||||
error: error.message,
|
||||
});
|
||||
}
|
||||
|
||||
setProgress(((i + 1) / users.length) * 100);
|
||||
setResults([...migrationResults]);
|
||||
}
|
||||
|
||||
const successCount = migrationResults.filter(r => r.success).length;
|
||||
const failureCount = migrationResults.filter(r => !r.success).length;
|
||||
|
||||
toast({
|
||||
title: "Migration completed",
|
||||
description: `Successfully migrated ${successCount} users. ${failureCount} failures.`,
|
||||
});
|
||||
} catch (error: any) {
|
||||
toast({
|
||||
variant: "destructive",
|
||||
title: "Migration failed",
|
||||
description: error.message,
|
||||
});
|
||||
} finally {
|
||||
setIsRunning(false);
|
||||
}
|
||||
};
|
||||
|
||||
const successCount = results.filter(r => r.success).length;
|
||||
const failureCount = results.filter(r => !r.success).length;
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>Novu User Migration</CardTitle>
|
||||
<CardDescription>
|
||||
Register existing users with Novu notification service
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
<Alert>
|
||||
<AlertCircle className="h-4 w-4" />
|
||||
<AlertDescription>
|
||||
This utility will register all existing users who don't have a Novu subscriber ID.
|
||||
The process is non-blocking and will continue even if individual registrations fail.
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
|
||||
<Button
|
||||
onClick={runMigration}
|
||||
disabled={isRunning}
|
||||
className="w-full"
|
||||
>
|
||||
{isRunning && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
|
||||
{isRunning ? 'Migrating Users...' : 'Start Migration'}
|
||||
</Button>
|
||||
|
||||
{isRunning && totalUsers > 0 && (
|
||||
<div className="space-y-2">
|
||||
<div className="flex justify-between text-sm text-muted-foreground">
|
||||
<span>Progress</span>
|
||||
<span>{Math.round(progress)}%</span>
|
||||
</div>
|
||||
<Progress value={progress} />
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Processing {results.length} of {totalUsers} users
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{results.length > 0 && (
|
||||
<div className="space-y-2">
|
||||
<div className="flex gap-4 text-sm">
|
||||
<div className="flex items-center gap-2 text-green-600">
|
||||
<CheckCircle2 className="h-4 w-4" />
|
||||
<span>{successCount} succeeded</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-2 text-red-600">
|
||||
<XCircle className="h-4 w-4" />
|
||||
<span>{failureCount} failed</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="max-h-60 overflow-y-auto border rounded-md p-2 space-y-1">
|
||||
{results.map((result, idx) => (
|
||||
<div
|
||||
key={idx}
|
||||
className="flex items-center justify-between text-xs p-2 rounded bg-muted/50"
|
||||
>
|
||||
<span className="truncate flex-1">{result.email}</span>
|
||||
{result.success ? (
|
||||
<CheckCircle2 className="h-3 w-3 text-green-600 ml-2" />
|
||||
) : (
|
||||
<div className="flex items-center gap-1 ml-2">
|
||||
<XCircle className="h-3 w-3 text-red-600" />
|
||||
<span className="text-red-600">{result.error}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
@@ -1362,19 +1362,6 @@ export type Database = {
|
||||
}
|
||||
Returns: undefined
|
||||
}
|
||||
migrate_existing_users_to_novu: {
|
||||
Args: Record<PropertyKey, never>
|
||||
Returns: {
|
||||
email: string
|
||||
error_message: string
|
||||
success: boolean
|
||||
user_id: string
|
||||
}[]
|
||||
}
|
||||
register_novu_subscriber: {
|
||||
Args: { _user_id: string }
|
||||
Returns: boolean
|
||||
}
|
||||
update_company_ratings: {
|
||||
Args: { target_company_id: string }
|
||||
Returns: undefined
|
||||
|
||||
@@ -11,6 +11,7 @@ import { AdminHeader } from '@/components/layout/AdminHeader';
|
||||
import { useAuth } from '@/hooks/useAuth';
|
||||
import { useUserRole } from '@/hooks/useUserRole';
|
||||
import { useAdminSettings } from '@/hooks/useAdminSettings';
|
||||
import { NovuMigrationUtility } from '@/components/admin/NovuMigrationUtility';
|
||||
import { Loader2, Save, Clock, Users, Bell, Shield, Settings, Trash2, Plug } from 'lucide-react';
|
||||
|
||||
export default function AdminSettings() {
|
||||
@@ -517,6 +518,8 @@ export default function AdminSettings() {
|
||||
<p>No integration settings configured yet.</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<NovuMigrationUtility />
|
||||
</CardContent>
|
||||
</Card>
|
||||
</TabsContent>
|
||||
|
||||
@@ -12,6 +12,7 @@ import { Zap, Mail, Lock, User, AlertCircle, Eye, EyeOff } from 'lucide-react';
|
||||
import { supabase } from '@/integrations/supabase/client';
|
||||
import { useToast } from '@/hooks/use-toast';
|
||||
import { TurnstileCaptcha } from '@/components/auth/TurnstileCaptcha';
|
||||
import { notificationService } from '@/lib/notificationService';
|
||||
export default function Auth() {
|
||||
const [searchParams] = useSearchParams();
|
||||
const navigate = useNavigate();
|
||||
@@ -141,6 +142,21 @@ export default function Auth() {
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
// Register user with Novu (non-blocking)
|
||||
if (data.user) {
|
||||
notificationService.createSubscriber({
|
||||
subscriberId: data.user.id,
|
||||
email: formData.email,
|
||||
firstName: formData.displayName || formData.username,
|
||||
data: {
|
||||
username: formData.username,
|
||||
}
|
||||
}).catch(err => {
|
||||
console.error('Failed to register Novu subscriber:', err);
|
||||
// Don't block signup if Novu registration fails
|
||||
});
|
||||
}
|
||||
|
||||
toast({
|
||||
title: "Welcome to ThrillWiki!",
|
||||
description: "Please check your email to verify your account."
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
-- Drop the problematic functions that try to call edge functions from database
|
||||
DROP FUNCTION IF EXISTS public.migrate_existing_users_to_novu();
|
||||
DROP FUNCTION IF EXISTS public.register_novu_subscriber(uuid);
|
||||
|
||||
-- Update handle_new_user to only create the profile (remove Novu registration)
|
||||
CREATE OR REPLACE FUNCTION public.handle_new_user()
|
||||
RETURNS trigger
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path = public
|
||||
AS $$
|
||||
BEGIN
|
||||
-- Create profile record
|
||||
INSERT INTO public.profiles (user_id, username, display_name)
|
||||
VALUES (
|
||||
NEW.id,
|
||||
COALESCE(NEW.raw_user_meta_data ->> 'username', 'user_' || substring(NEW.id::text, 1, 8)),
|
||||
COALESCE(NEW.raw_user_meta_data ->> 'display_name', NEW.raw_user_meta_data ->> 'name')
|
||||
);
|
||||
|
||||
-- Novu registration will be handled by the frontend
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$;
|
||||
|
||||
COMMENT ON FUNCTION public.handle_new_user IS 'Creates user profile on signup. Novu registration is handled by frontend.';
|
||||
Reference in New Issue
Block a user