mirror of
https://github.com/mito-systems/ranger-app.git
synced 2026-03-18 09:24:09 +00:00
rm google and supabase
This commit is contained in:
zramsay
parent
ff484a5d4b
commit
d3de0ee519
@ -1,12 +1,11 @@
|
||||
// src/app/api/analyze/route.ts
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { getSessionFromCookie, getUserFromHeaders } from '../../../lib/auth'
|
||||
import { getWalletFromRequest } from '../../../lib/auth'
|
||||
import { analyzeImageWithVision } from '../../../services/googleVisionCore'
|
||||
import { processAnimalImage } from '../../../services/animalProcessingService'
|
||||
import { checkAndStoreImageHash } from '../../../services/imageHashService'
|
||||
import { awardPointsForImage, ensureUserExists } from '../../../services/userPointsService'
|
||||
import { validate as validateUuid, v4 as uuidv4 } from 'uuid'
|
||||
import { supabaseAdmin } from '../../../services/supabaseClient'
|
||||
import { publishAnimalRecord } from '../../../services/laconicService'
|
||||
import { awardTokensForSighting } from '../../../services/blockchain/tokenRewardService'
|
||||
|
||||
// Increase body parser size limit
|
||||
export const config = {
|
||||
@ -23,123 +22,30 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
|
||||
console.log('API Request:', {
|
||||
path: req.url,
|
||||
method: req.method,
|
||||
headers: Object.fromEntries(req.headers.entries()),
|
||||
hasCookies: req.headers.has('cookie'),
|
||||
cookies: Array.from(req.cookies.getAll()).map(c => c.name)
|
||||
headers: Object.fromEntries(req.headers.entries())
|
||||
});
|
||||
|
||||
// ⚠️ TEMPORARY FIX: ALLOW ALL REQUESTS IN PRODUCTION ⚠️
|
||||
// Since we're having persistent auth issues on Vercel, temporarily allow all requests
|
||||
// This is not secure for a production app, but will let us debug the upload feature
|
||||
const bypassAuth = process.env.NODE_ENV === 'production';
|
||||
// Get wallet address from request
|
||||
const walletAuth = await getWalletFromRequest(req);
|
||||
const walletAddress = walletAuth?.walletAddress || req.headers.get('x-wallet-address');
|
||||
|
||||
// Variables for user identification
|
||||
let userId = '';
|
||||
let userEmail = '';
|
||||
|
||||
if (bypassAuth) {
|
||||
console.log('⚠️ BYPASSING AUTHENTICATION IN PRODUCTION FOR DEBUGGING ⚠️');
|
||||
|
||||
// Check for user headers even in bypass mode - use them if available
|
||||
const headerUser = getUserFromHeaders(req);
|
||||
if (headerUser && headerUser.id && validateUuid(headerUser.id)) {
|
||||
userId = headerUser.id;
|
||||
userEmail = headerUser.email || 'temporary@example.com';
|
||||
console.log('Using header user data in bypass mode:', { userId, userEmail });
|
||||
} else {
|
||||
// Generate a proper UUID for testing
|
||||
userId = '00000000-0000-0000-0000-000000000000';
|
||||
userEmail = 'temporary@example.com';
|
||||
}
|
||||
} else {
|
||||
// Try to get user from multiple sources
|
||||
const session = await getSessionFromCookie(req);
|
||||
const headerUser = getUserFromHeaders(req);
|
||||
|
||||
// Check authentication - accept session OR header authentication
|
||||
const isAuthenticated = !!session || !!headerUser;
|
||||
|
||||
// Check for all possible auth cookies
|
||||
const hasNextAuthCookie = !!req.cookies.get('next-auth.session-token') ||
|
||||
!!req.cookies.get('__Secure-next-auth.session-token') ||
|
||||
!!req.cookies.get('__Host-next-auth.session-token');
|
||||
|
||||
const hasAuthJsCookie = !!req.cookies.get('authjs.session-token') ||
|
||||
!!req.cookies.get('__Secure-authjs.session-token') ||
|
||||
!!req.cookies.get('__Host-authjs.session-token');
|
||||
|
||||
// Log authentication attempt details
|
||||
console.log('Authentication attempt:', {
|
||||
hasNextAuthCookie,
|
||||
hasAuthJsCookie,
|
||||
hasSession: !!session,
|
||||
hasHeaderUser: !!headerUser,
|
||||
allCookieNames: Array.from(req.cookies.getAll()).map(c => c.name),
|
||||
});
|
||||
|
||||
if (!isAuthenticated) {
|
||||
console.log('Unauthorized access attempt to analyze API');
|
||||
return NextResponse.json(
|
||||
{ error: 'Unauthorized. Please sign in to use this feature.' },
|
||||
{ status: 401 }
|
||||
);
|
||||
}
|
||||
|
||||
// Get user info with lots of fallbacks and detailed logging
|
||||
const sessionId = session?.user?.id;
|
||||
const sessionEmail = session?.user?.email;
|
||||
const headerId = headerUser?.id;
|
||||
const headerEmail = headerUser?.email;
|
||||
const headerXId = req.headers.get('x-user-id');
|
||||
const headerXEmail = req.headers.get('x-user-email');
|
||||
|
||||
// Log all possible sources of user data
|
||||
console.log('All user data sources:', {
|
||||
sessionId,
|
||||
sessionEmail,
|
||||
headerId,
|
||||
headerEmail,
|
||||
headerXId,
|
||||
headerXEmail,
|
||||
sessionData: session,
|
||||
headerUserData: headerUser
|
||||
});
|
||||
|
||||
// Use the first valid user ID we can find
|
||||
userId = sessionId || headerId || headerXId || 'unknown';
|
||||
|
||||
// For email, be more strict - never use unknown@example.com unless absolutely necessary
|
||||
if (sessionEmail && sessionEmail !== 'unknown@example.com') {
|
||||
userEmail = sessionEmail;
|
||||
} else if (headerEmail && headerEmail !== 'unknown@example.com') {
|
||||
userEmail = headerEmail;
|
||||
} else if (headerXEmail && headerXEmail !== 'unknown@example.com') {
|
||||
userEmail = headerXEmail;
|
||||
} else if (userId.includes('@')) {
|
||||
// If no email but userId looks like email, use that
|
||||
userEmail = userId;
|
||||
console.log('Using userId as email since it looks like one:', userId);
|
||||
} else {
|
||||
userEmail = 'unknown@example.com';
|
||||
}
|
||||
|
||||
// Log the final decision
|
||||
console.log('Final user identification:', { userId, userEmail });
|
||||
// Check if wallet address is provided
|
||||
if (!walletAddress) {
|
||||
console.log('No wallet address provided');
|
||||
return NextResponse.json(
|
||||
{ error: 'No wallet address provided. Please connect your wallet.' },
|
||||
{ status: 401 }
|
||||
);
|
||||
}
|
||||
|
||||
// Log authentication details
|
||||
console.log('Authentication details:', {
|
||||
userId,
|
||||
userEmail,
|
||||
bypassAuth
|
||||
});
|
||||
console.log('Request authenticated with wallet:', walletAddress);
|
||||
|
||||
// Log incoming request details
|
||||
console.log('Incoming request:', {
|
||||
method: req.method,
|
||||
contentType: req.headers.get('content-type'),
|
||||
contentLength: req.headers.get('content-length'),
|
||||
authenticated: true
|
||||
walletAddress
|
||||
})
|
||||
|
||||
// Parse form data
|
||||
@ -226,12 +132,12 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
|
||||
: "🌿 No wildlife detected in this image. Try uploading a photo of an animal!"
|
||||
}`
|
||||
|
||||
// Prepare user response with animal type for token awarding later
|
||||
// Prepare user response with animal type and token info
|
||||
const responseData = {
|
||||
description: responseMessage,
|
||||
isAnimal: visionResult.isAnimal,
|
||||
animalType: visionResult.mainObject || 'Unknown wildlife',
|
||||
pointsAwarded: visionResult.isAnimal ? 50 : 0 // Default points value
|
||||
tokensAwarded: 0 // Will be updated if tokens are awarded
|
||||
};
|
||||
|
||||
// Background processing for animal images
|
||||
@ -239,166 +145,76 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
|
||||
const fileName = 'name' in (imageFile as any) ? (imageFile as any).name : 'unknown-image.jpg'
|
||||
|
||||
// Update the hash entry with the confirmed animal description
|
||||
// We already stored the hash above, but now we're updating it with the description
|
||||
// This is efficient because it happens after we've sent the response to the user
|
||||
await checkAndStoreImageHash(buffer, visionResult.description)
|
||||
.catch(err => console.error('Failed to update image hash with description:', err));
|
||||
|
||||
// Process the animal image and get the IPFS URL
|
||||
let ipfsUrl = '';
|
||||
try {
|
||||
// Ensure we have a valid userId before passing to processAnimalImage
|
||||
const validUserId = userId || '00000000-0000-0000-0000-000000000000';
|
||||
console.log('Using userId for animal processing:', validUserId);
|
||||
|
||||
// Process animal image and get IPFS URL
|
||||
ipfsUrl = await processAnimalImage(
|
||||
buffer,
|
||||
visionResult.description,
|
||||
visionResult.rawResponse,
|
||||
fileName,
|
||||
validUserId
|
||||
walletAddress // Use wallet address as ID
|
||||
);
|
||||
|
||||
// Award points to the user for uploading a valid animal image
|
||||
// We've already extracted user info in the authentication section above
|
||||
// Use email as ID if needed - this allows points to be accumulated
|
||||
// even if the user ID is not available from the session
|
||||
const pointsUserId = userId || userEmail;
|
||||
|
||||
if (pointsUserId && userEmail) {
|
||||
console.log('Awarding points to user:', { pointsUserId, userEmail });
|
||||
|
||||
// Log validation details
|
||||
console.log('User ID validation:', {
|
||||
userId: pointsUserId,
|
||||
isValidUuid: validateUuid(pointsUserId),
|
||||
userEmail
|
||||
});
|
||||
|
||||
// Publish to Laconic Registry with the Sei address
|
||||
if (ipfsUrl) {
|
||||
try {
|
||||
// First ensure the user exists and get the correct user ID
|
||||
// This prevents duplicate users if we're using different IDs between sessions
|
||||
// and ensures we always use the same ID for the same user (by email)
|
||||
const ensuredUserId = await ensureUserExists(pointsUserId, userEmail);
|
||||
console.log('Using ensured user ID for points:', ensuredUserId);
|
||||
// Get location data from vision results if available, otherwise use defaults
|
||||
const latitude = visionResult.rawResponse?.locations?.[0]?.latitude || 0;
|
||||
const longitude = visionResult.rawResponse?.locations?.[0]?.longitude || 0;
|
||||
|
||||
// If we couldn't ensure user exists, try creating directly
|
||||
if (!ensuredUserId) {
|
||||
console.error('Failed to ensure user exists - trying direct creation');
|
||||
|
||||
// Generate a new valid UUID if needed
|
||||
const userId = validateUuid(pointsUserId) ? pointsUserId : uuidv4();
|
||||
|
||||
try {
|
||||
// Check if a user with this email already exists
|
||||
const { data: existingUser } = await supabaseAdmin
|
||||
.from('users')
|
||||
.select('id')
|
||||
.eq('email', userEmail)
|
||||
.maybeSingle();
|
||||
|
||||
if (existingUser) {
|
||||
console.log('Found existing user by email:', existingUser.id);
|
||||
|
||||
// Award points using the existing user ID
|
||||
const pointsResult = await awardPointsForImage(
|
||||
existingUser.id,
|
||||
userEmail,
|
||||
buffer,
|
||||
ipfsUrl,
|
||||
visionResult.description,
|
||||
visionResult.mainObject
|
||||
);
|
||||
|
||||
console.log('Points result for existing user:', pointsResult);
|
||||
} else {
|
||||
// Create a new user directly
|
||||
const { data: newUser, error: insertError } = await supabaseAdmin
|
||||
.from('users')
|
||||
.insert({
|
||||
id: userId,
|
||||
email: userEmail,
|
||||
first_login: new Date().toISOString(),
|
||||
last_login: new Date().toISOString()
|
||||
})
|
||||
.select()
|
||||
.single();
|
||||
|
||||
if (insertError) {
|
||||
console.error('Error creating user directly:', insertError);
|
||||
} else {
|
||||
console.log('Created new user directly:', newUser);
|
||||
|
||||
// Award points using the new user ID
|
||||
const pointsResult = await awardPointsForImage(
|
||||
newUser.id,
|
||||
userEmail,
|
||||
buffer,
|
||||
ipfsUrl,
|
||||
visionResult.description,
|
||||
visionResult.mainObject
|
||||
);
|
||||
|
||||
console.log('Points result for new user:', pointsResult);
|
||||
}
|
||||
}
|
||||
} catch (directError) {
|
||||
console.error('Error in direct user handling:', directError);
|
||||
}
|
||||
|
||||
// Continue with token rewards even if points fail - don't return yet
|
||||
} else {
|
||||
// Award points first - this should always happen regardless of wallet status
|
||||
console.log('Attempting to award points for user:', { ensuredUserId, userEmail });
|
||||
try {
|
||||
const pointsResult = await awardPointsForImage(
|
||||
ensuredUserId, // Use the ensured ID, which might be different from pointsUserId
|
||||
userEmail,
|
||||
buffer,
|
||||
ipfsUrl,
|
||||
visionResult.description,
|
||||
visionResult.mainObject
|
||||
);
|
||||
console.log('Points award result:', pointsResult);
|
||||
|
||||
if (pointsResult.success) {
|
||||
console.log(`Successfully awarded ${pointsResult.points} points to user ${ensuredUserId}`);
|
||||
} else {
|
||||
console.warn(`Failed to award points to user ${ensuredUserId}: ${pointsResult.message}`);
|
||||
}
|
||||
} catch (pointsError) {
|
||||
console.error('Error awarding points:', pointsError);
|
||||
// Even if points award fails, we continue to try token rewards
|
||||
}
|
||||
|
||||
// Note: We've moved token awarding to a separate endpoint
|
||||
// This simplifies the flow and avoids wallet connection issues on the server
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Failed to award points for image:', err);
|
||||
console.error('Points error details:', {
|
||||
error: err.message || 'Unknown error',
|
||||
userId: pointsUserId,
|
||||
userEmail,
|
||||
imageHash: ipfsUrl ? ipfsUrl.split('/').pop() : 'unknown'
|
||||
});
|
||||
// Continue without points if there's an error
|
||||
// Publish to Laconic Registry
|
||||
await publishAnimalRecord(
|
||||
visionResult.mainObject || 'Wildlife',
|
||||
latitude,
|
||||
longitude,
|
||||
visionResult.description || '',
|
||||
ipfsUrl,
|
||||
'Wildlife Conservation Portal',
|
||||
walletAddress // Use the wallet address
|
||||
);
|
||||
|
||||
console.log('Successfully published to Laconic Registry with address:', walletAddress);
|
||||
} catch (laconicError) {
|
||||
console.error('Failed to publish to Laconic Registry:', laconicError);
|
||||
}
|
||||
|
||||
// Award tokens for verified wildlife sighting
|
||||
try {
|
||||
// Get a fake email for token service (required by the API)
|
||||
// In a production system, we might want to associate real emails with wallets
|
||||
const fakeEmail = `${walletAddress.substring(0, 8)}@wildlife.token`;
|
||||
|
||||
// Call token reward service
|
||||
const tokenResult = await awardTokensForSighting(
|
||||
walletAddress,
|
||||
fakeEmail,
|
||||
visionResult.mainObject || 'wildlife'
|
||||
);
|
||||
|
||||
if (tokenResult.success && tokenResult.amount) {
|
||||
console.log(`Successfully awarded ${tokenResult.amount} WILD tokens to ${walletAddress}`);
|
||||
|
||||
// Update response with token information
|
||||
responseData.tokensAwarded = tokenResult.amount;
|
||||
} else {
|
||||
console.warn(`Failed to award tokens to ${walletAddress}: ${tokenResult.error}`);
|
||||
}
|
||||
} catch (tokenError) {
|
||||
console.error('Error awarding tokens:', tokenError);
|
||||
}
|
||||
} else {
|
||||
console.log('Unable to award points, missing user data', {
|
||||
pointsUserId,
|
||||
userEmail
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error in image processing or points awarding:', error);
|
||||
} catch (processingError) {
|
||||
console.error('Error in image processing or token awarding:', processingError);
|
||||
}
|
||||
}
|
||||
|
||||
// Create the final response with all data
|
||||
const userResponse = NextResponse.json(responseData);
|
||||
|
||||
return userResponse
|
||||
return NextResponse.json(responseData);
|
||||
|
||||
} catch (error) {
|
||||
// Comprehensive error logging
|
||||
@ -417,4 +233,4 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
|
||||
}
|
||||
|
||||
// Ensure dynamic routing
|
||||
export const dynamic = 'force-dynamic'
|
||||
export const dynamic = 'force-dynamic'
|
||||
@ -1,5 +1,5 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { getSessionFromCookie, getUserFromHeaders } from '@/lib/auth';
|
||||
import { getWalletFromRequest } from '@/lib/auth';
|
||||
import { awardTokensForSighting } from '@/services/blockchain/tokenRewardService';
|
||||
|
||||
export async function POST(req: NextRequest) {
|
||||
@ -9,29 +9,19 @@ export async function POST(req: NextRequest) {
|
||||
// Log all request headers for debugging
|
||||
console.log('Request headers:', Object.fromEntries(req.headers.entries()));
|
||||
|
||||
// Make authentication optional for demonstration - we'll allow both authenticated and
|
||||
// unauthenticated requests for testing purposes
|
||||
let userEmail = 'unknown@example.com';
|
||||
// Get wallet from request
|
||||
const walletAuth = await getWalletFromRequest(req);
|
||||
|
||||
try {
|
||||
// Try to get session from cookie first
|
||||
const session = await getSessionFromCookie(req);
|
||||
|
||||
// Also try header-based authentication
|
||||
const headerUser = getUserFromHeaders(req);
|
||||
|
||||
if (session?.user?.email) {
|
||||
userEmail = session.user.email;
|
||||
console.log(`Authenticated user from session: ${userEmail}`);
|
||||
} else if (headerUser?.email) {
|
||||
userEmail = headerUser.email;
|
||||
console.log(`Authenticated user from headers: ${userEmail}`);
|
||||
} else {
|
||||
console.warn('No authenticated session found, but continuing for demonstration');
|
||||
}
|
||||
} catch (authError) {
|
||||
console.error('Authentication error but continuing:', authError);
|
||||
// If wallet auth failed, check request body next
|
||||
if (!walletAuth?.walletAddress) {
|
||||
console.warn('No wallet authentication in headers, will use wallet from request body');
|
||||
} else {
|
||||
console.log(`Authenticated with wallet: ${walletAuth.walletAddress}`);
|
||||
}
|
||||
|
||||
// Generate a fake email for token service (required by the API)
|
||||
// In production, we might want to associate real emails with wallets
|
||||
let userEmail = 'unknown@wildlife.token';
|
||||
|
||||
// Parse request body
|
||||
let data;
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
// src/app/api/debug/image-hashes/route.ts
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { readImageHashes } from '../../../../services/imageHashService';
|
||||
import { getSessionFromCookie } from '../../../../lib/auth';
|
||||
import { getWalletFromRequest } from '../../../../lib/auth';
|
||||
|
||||
// This is a debug endpoint to view the current image hashes
|
||||
// Restricted to authenticated users only
|
||||
export async function GET(req: NextRequest): Promise<NextResponse> {
|
||||
try {
|
||||
// Check authentication
|
||||
const session = await getSessionFromCookie(req);
|
||||
// Check wallet authentication
|
||||
const walletAuth = await getWalletFromRequest(req);
|
||||
|
||||
if (!session) {
|
||||
if (!walletAuth?.walletAddress) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Unauthorized. Please sign in to use this feature.' },
|
||||
{ error: 'Unauthorized. Please connect your wallet to use this feature.' },
|
||||
{ status: 401 }
|
||||
);
|
||||
}
|
||||
|
||||
183
src/app/page.tsx
183
src/app/page.tsx
@ -1,57 +1,69 @@
|
||||
// src/app/page.tsx
|
||||
'use client'
|
||||
|
||||
import React, { useState } from 'react'
|
||||
import { useSession } from 'next-auth/react'
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import ImageAnalysisCard from '../components/ImageAnalysisCard'
|
||||
import Navigation from '../components/Navigation'
|
||||
import { Coins, Leaf } from 'lucide-react'
|
||||
import { analyzeImage, VisionAnalysisResult, VISION_CONFIG } from '../services/googleVisionService'
|
||||
import { APP_CONFIG, getThemeColors } from '../config/appConfig'
|
||||
import { normalizeImageUpload } from '../services/imageService'
|
||||
import { isWalletConnected, getWalletAddress } from '../services/blockchain/seiService'
|
||||
import { getUserPoints } from '../services/userPointsService'
|
||||
import { isWalletConnected, getWalletAddress, getTokenBalance } from '../services/blockchain/seiService'
|
||||
|
||||
const Page: React.FC = (): React.ReactElement => {
|
||||
// Get auth session
|
||||
const { data: session, status } = useSession()
|
||||
const isAuthenticated = status === 'authenticated' && !!session
|
||||
// State for wallet connection and token balance
|
||||
const [isConnected, setIsConnected] = useState(false)
|
||||
const [walletAddress, setWalletAddress] = useState<string | null>(null)
|
||||
const [tokenBalance, setTokenBalance] = useState<number | null>(null)
|
||||
|
||||
// State for user points
|
||||
const [userPoints, setUserPoints] = useState<number | null>(null)
|
||||
|
||||
// Effect to fetch user points
|
||||
React.useEffect(() => {
|
||||
const fetchUserPoints = async () => {
|
||||
if (isAuthenticated && session?.user) {
|
||||
const userId = session.user.id || session.user.email || '';
|
||||
if (userId) {
|
||||
try {
|
||||
const points = await getUserPoints(userId);
|
||||
setUserPoints(points);
|
||||
} catch (error) {
|
||||
console.error('Error fetching user points:', error);
|
||||
}
|
||||
}
|
||||
// Check wallet connection on mount and when connection changes
|
||||
useEffect(() => {
|
||||
const checkWalletStatus = () => {
|
||||
const connected = isWalletConnected()
|
||||
setIsConnected(connected)
|
||||
|
||||
if (connected) {
|
||||
const address = getWalletAddress()
|
||||
setWalletAddress(address)
|
||||
|
||||
// Fetch token balance
|
||||
getTokenBalance().then(balance => {
|
||||
setTokenBalance(balance)
|
||||
})
|
||||
} else {
|
||||
setWalletAddress(null)
|
||||
setTokenBalance(null)
|
||||
}
|
||||
};
|
||||
|
||||
fetchUserPoints();
|
||||
}, [isAuthenticated, session]);
|
||||
|
||||
// Log session details for debugging
|
||||
React.useEffect(() => {
|
||||
if (session) {
|
||||
console.log('Session available:', {
|
||||
authenticated: isAuthenticated,
|
||||
user: session.user ? {
|
||||
name: session.user.name,
|
||||
email: session.user.email,
|
||||
id: session.user.id
|
||||
} : 'No user data'
|
||||
});
|
||||
}
|
||||
}, [session, isAuthenticated]);
|
||||
|
||||
// Check immediately
|
||||
checkWalletStatus()
|
||||
|
||||
// Set up listeners for wallet events
|
||||
const handleWalletConnected = () => checkWalletStatus()
|
||||
const handleWalletDisconnected = () => checkWalletStatus()
|
||||
const handleStorage = () => checkWalletStatus()
|
||||
|
||||
window.addEventListener('wallet_connected', handleWalletConnected)
|
||||
window.addEventListener('wallet_disconnected', handleWalletDisconnected)
|
||||
window.addEventListener('storage', handleStorage)
|
||||
|
||||
// Refresh token balance periodically
|
||||
const refreshInterval = setInterval(() => {
|
||||
if (isConnected) {
|
||||
getTokenBalance().then(balance => {
|
||||
setTokenBalance(balance)
|
||||
})
|
||||
}
|
||||
}, 30000) // every 30 seconds
|
||||
|
||||
return () => {
|
||||
window.removeEventListener('wallet_connected', handleWalletConnected)
|
||||
window.removeEventListener('wallet_disconnected', handleWalletDisconnected)
|
||||
window.removeEventListener('storage', handleStorage)
|
||||
clearInterval(refreshInterval)
|
||||
}
|
||||
}, [])
|
||||
|
||||
const theme = getThemeColors(APP_CONFIG.theme)
|
||||
|
||||
@ -65,28 +77,19 @@ const Page: React.FC = (): React.ReactElement => {
|
||||
const arrayBuffer = await normalizedImage.arrayBuffer()
|
||||
const buffer = Buffer.from(arrayBuffer)
|
||||
|
||||
// Prepare session data for API call
|
||||
let sessionData;
|
||||
if (isAuthenticated && session && session.user) {
|
||||
// Use email as a fallback ID if id is undefined
|
||||
sessionData = {
|
||||
userId: session.user.id || session.user.email || '',
|
||||
userEmail: session.user.email || ''
|
||||
};
|
||||
|
||||
console.log('Session data being sent to API:', sessionData);
|
||||
}
|
||||
// Get current wallet address for API call
|
||||
const currentWalletAddress = getWalletAddress()
|
||||
|
||||
// Analyze the normalized image with session data
|
||||
const result = await analyzeImage(buffer, normalizedImage.name, sessionData)
|
||||
// Analyze the normalized image with wallet address
|
||||
const result = await analyzeImage(buffer, normalizedImage.name, currentWalletAddress || undefined)
|
||||
|
||||
// Refresh points after successful analysis
|
||||
if (isAuthenticated && session?.user && result.isAnimal) {
|
||||
// Refresh token balance after successful analysis
|
||||
if (isConnected && result.isAnimal) {
|
||||
try {
|
||||
const updatedPoints = await getUserPoints(session.user.id || session.user.email || '');
|
||||
setUserPoints(updatedPoints);
|
||||
const updatedBalance = await getTokenBalance()
|
||||
setTokenBalance(updatedBalance)
|
||||
} catch (error) {
|
||||
console.error('Error updating user points:', error);
|
||||
console.error('Error updating token balance:', error)
|
||||
}
|
||||
}
|
||||
|
||||
@ -97,12 +100,10 @@ const Page: React.FC = (): React.ReactElement => {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// No token claim needed - tokens are automatically awarded when uploading wildlife images
|
||||
|
||||
// Auth-locked content
|
||||
const renderAuthContent = () => {
|
||||
if (isAuthenticated) {
|
||||
// Content based on wallet connection
|
||||
const renderContent = () => {
|
||||
if (isConnected && walletAddress) {
|
||||
return (
|
||||
<div className="max-w-2xl mx-auto relative">
|
||||
{/* Decorative elements */}
|
||||
@ -116,55 +117,55 @@ const Page: React.FC = (): React.ReactElement => {
|
||||
onAnalyze={handleImageAnalysis()}
|
||||
/>
|
||||
|
||||
{/* Points display section */}
|
||||
{userPoints !== null && (
|
||||
{/* Token display section */}
|
||||
{tokenBalance !== null && (
|
||||
<div className="mt-6 bg-emerald-900/20 backdrop-blur-lg rounded-2xl shadow-xl border border-emerald-800/50 p-6">
|
||||
<div className="mb-4">
|
||||
<div className="flex items-center gap-2">
|
||||
<Leaf className="w-6 h-6 text-emerald-400" />
|
||||
<h2 className="text-2xl font-bold text-transparent bg-clip-text bg-gradient-to-r from-emerald-400 to-teal-300">
|
||||
Your Wildlife Points
|
||||
Your WILD Tokens
|
||||
</h2>
|
||||
</div>
|
||||
<p className="text-emerald-200 mt-2">
|
||||
You earn points for identifying wildlife in photos
|
||||
You earn WILD tokens for identifying wildlife in photos
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col md:flex-row gap-4 items-stretch justify-between">
|
||||
{/* Points display */}
|
||||
{/* Token display */}
|
||||
<div className="bg-emerald-950/40 border border-emerald-800/50 rounded-xl p-4 flex flex-col items-center justify-center flex-grow">
|
||||
<span className="text-4xl font-bold text-emerald-300">{userPoints}</span>
|
||||
<span className="text-emerald-200 text-sm mt-1">Total Points</span>
|
||||
<span className="text-4xl font-bold text-emerald-300">{tokenBalance}</span>
|
||||
<span className="text-emerald-200 text-sm mt-1">WILD Tokens</span>
|
||||
</div>
|
||||
|
||||
{/* Wallet address display */}
|
||||
<div className="bg-emerald-950/40 border border-emerald-800/50 rounded-xl p-4 flex-grow">
|
||||
<div className="text-emerald-200 text-sm mb-1">Wallet Connected</div>
|
||||
<div className="text-emerald-300 font-mono text-xs truncate">
|
||||
{walletAddress}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Wallet connection notice */}
|
||||
{!isWalletConnected() && (
|
||||
<div className="mt-4 bg-amber-900/20 border border-amber-500/20 text-amber-400 px-4 py-3 rounded-xl text-sm text-center flex items-center justify-center gap-2">
|
||||
<Coins className="w-5 h-5" />
|
||||
<span>Connect your wallet using the button in the navigation bar to also earn WILD tokens</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// For non-authenticated users, show sign-in prompt
|
||||
// For non-connected users, show connect wallet prompt
|
||||
return (
|
||||
<div className="max-w-2xl mx-auto bg-emerald-900/20 backdrop-blur-lg rounded-2xl shadow-xl border border-emerald-800/50 p-8 text-center">
|
||||
<h2 className="text-2xl font-bold text-emerald-300 mb-4">Sign in to Document Wildlife</h2>
|
||||
<h2 className="text-2xl font-bold text-emerald-300 mb-4">Connect Your Wallet</h2>
|
||||
<p className="text-emerald-200 mb-6">
|
||||
You need to sign in with your account to access wildlife documentation features and earn rewards.
|
||||
You need to connect your Sei wallet to access wildlife documentation features and earn WILD tokens.
|
||||
</p>
|
||||
<a
|
||||
href="/auth/signin"
|
||||
className="inline-block text-white bg-emerald-600 hover:bg-emerald-700 font-medium rounded-lg px-6 py-3 text-center transition-colors"
|
||||
>
|
||||
Sign in with Google
|
||||
</a>
|
||||
<div className="flex justify-center">
|
||||
<div className="bg-amber-900/30 border border-amber-500/30 text-amber-400 px-6 py-4 rounded-xl text-sm text-center flex items-center justify-center gap-2">
|
||||
<Coins className="w-5 h-5" />
|
||||
<span>Connect your wallet using the button in the navigation bar</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@ -179,12 +180,12 @@ const Page: React.FC = (): React.ReactElement => {
|
||||
{APP_CONFIG.title}
|
||||
</h1>
|
||||
<p className={`text-${theme.text}-200 text-lg mb-8`}>
|
||||
Document sightings of {APP_CONFIG.description} in {APP_CONFIG.location} and earn rewards
|
||||
Document sightings of {APP_CONFIG.description} in {APP_CONFIG.location} and earn WILD tokens
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Render content based on authentication status */}
|
||||
{renderAuthContent()}
|
||||
{/* Render content based on wallet connection status */}
|
||||
{renderContent()}
|
||||
|
||||
{/* Info Section */}
|
||||
<div className="mt-12 text-center text-emerald-300/60">
|
||||
@ -197,4 +198,4 @@ const Page: React.FC = (): React.ReactElement => {
|
||||
)
|
||||
}
|
||||
|
||||
export default Page
|
||||
export default Page
|
||||
353
src/app/wallet/page.tsx
Normal file
353
src/app/wallet/page.tsx
Normal file
@ -0,0 +1,353 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useEffect } from 'react'
|
||||
import { Trophy, ImageIcon, Clock, Coins } from 'lucide-react'
|
||||
import Navigation from '../../components/Navigation'
|
||||
import {
|
||||
isWalletConnected,
|
||||
getWalletAddress,
|
||||
getTokenBalance,
|
||||
sendWildTokens, // Import send tokens function
|
||||
WALLET_EVENTS // Import wallet event constants
|
||||
} from '../../services/blockchain/seiService'
|
||||
import { getAnimalRecordsBySeiAddress, AnimalRecordResult } from '../../services/laconicService'
|
||||
import { APP_CONFIG } from '../../config/appConfig'
|
||||
|
||||
export default function WalletPage() {
|
||||
const [isConnected, setIsConnected] = useState(false)
|
||||
const [walletAddress, setWalletAddress] = useState<string | null>(null)
|
||||
const [tokenBalance, setTokenBalance] = useState<number>(0)
|
||||
const [contributions, setContributions] = useState<AnimalRecordResult[]>([])
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [isSendingTokens, setIsSendingTokens] = useState(false)
|
||||
const [tokenSendResult, setTokenSendResult] = useState<{success: boolean, message: string} | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
// Check wallet connection and load data
|
||||
const loadWalletData = async () => {
|
||||
try {
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
|
||||
console.log('Checking wallet connection status...');
|
||||
const connected = isWalletConnected()
|
||||
setIsConnected(connected)
|
||||
|
||||
if (connected) {
|
||||
const address = getWalletAddress()
|
||||
console.log('Wallet address:', address);
|
||||
|
||||
// Double check the address is valid
|
||||
if (!address || !address.startsWith('sei')) {
|
||||
console.warn('Invalid wallet address format detected:', address);
|
||||
setIsConnected(false);
|
||||
setWalletAddress(null);
|
||||
setTokenBalance(0);
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
setWalletAddress(address)
|
||||
|
||||
// Load contributions using the wallet address
|
||||
try {
|
||||
console.log('Loading contributions for address:', address);
|
||||
const records = await getAnimalRecordsBySeiAddress(address)
|
||||
setContributions(records)
|
||||
} catch (contributionError) {
|
||||
console.error('Error loading contributions:', contributionError);
|
||||
setContributions([]);
|
||||
// Don't set global error - we can still show token balance
|
||||
}
|
||||
|
||||
// Load token balance separately - if it fails, we can still show contributions
|
||||
try {
|
||||
console.log('Loading token balance...');
|
||||
const balance = await getTokenBalance()
|
||||
setTokenBalance(balance)
|
||||
} catch (balanceError) {
|
||||
console.error('Error loading token balance:', balanceError);
|
||||
setTokenBalance(0);
|
||||
// Don't set global error - we can still show contributions
|
||||
}
|
||||
} else {
|
||||
// Reset data if wallet is disconnected
|
||||
setWalletAddress(null);
|
||||
setTokenBalance(0);
|
||||
setContributions([]);
|
||||
}
|
||||
|
||||
setLoading(false)
|
||||
} catch (error) {
|
||||
console.error('Error loading wallet data:', error)
|
||||
setError('Failed to load wallet data')
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
loadWalletData()
|
||||
|
||||
// Set up listeners for wallet events
|
||||
const handleWalletConnected = (event: Event) => {
|
||||
console.log('Wallet connected event received', (event as CustomEvent)?.detail);
|
||||
loadWalletData();
|
||||
}
|
||||
|
||||
const handleWalletDisconnected = () => {
|
||||
console.log('Wallet disconnected event received');
|
||||
setIsConnected(false)
|
||||
setWalletAddress(null)
|
||||
setTokenBalance(0)
|
||||
setContributions([])
|
||||
}
|
||||
|
||||
const handleWalletError = (event: Event) => {
|
||||
console.error('Wallet error event received:', (event as CustomEvent)?.detail);
|
||||
setError('Wallet connection error: ' + ((event as CustomEvent)?.detail?.message || 'Unknown error'));
|
||||
}
|
||||
|
||||
const handleStorage = () => {
|
||||
console.log('Storage event detected, reloading wallet data');
|
||||
loadWalletData();
|
||||
}
|
||||
|
||||
// Use the correct event constants from seiService
|
||||
window.addEventListener(WALLET_EVENTS.CONNECTED, handleWalletConnected as EventListener)
|
||||
window.addEventListener(WALLET_EVENTS.DISCONNECTED, handleWalletDisconnected)
|
||||
window.addEventListener(WALLET_EVENTS.ERROR, handleWalletError as EventListener)
|
||||
window.addEventListener('storage', handleStorage)
|
||||
|
||||
// Refresh data periodically but less frequently to avoid spamming
|
||||
const refreshInterval = setInterval(() => {
|
||||
if (isConnected) {
|
||||
console.log('Periodic refresh of wallet data');
|
||||
loadWalletData()
|
||||
}
|
||||
}, 60000) // every 60 seconds instead of 30
|
||||
|
||||
return () => {
|
||||
window.removeEventListener(WALLET_EVENTS.CONNECTED, handleWalletConnected as EventListener)
|
||||
window.removeEventListener(WALLET_EVENTS.DISCONNECTED, handleWalletDisconnected)
|
||||
window.removeEventListener(WALLET_EVENTS.ERROR, handleWalletError as EventListener)
|
||||
window.removeEventListener('storage', handleStorage)
|
||||
clearInterval(refreshInterval)
|
||||
}
|
||||
}, [])
|
||||
|
||||
const formatDate = (dateString: string) => {
|
||||
const date = new Date(dateString)
|
||||
return date.toLocaleString('en-US', {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
})
|
||||
}
|
||||
|
||||
const renderContent = () => {
|
||||
// Show loading indicator
|
||||
if (loading) {
|
||||
return (
|
||||
<div className="text-emerald-200 text-center p-8">
|
||||
Loading wallet data...
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// Show wallet connection prompt if not connected
|
||||
if (!isConnected || !walletAddress) {
|
||||
return (
|
||||
<div className="max-w-2xl mx-auto bg-emerald-900/20 backdrop-blur-lg rounded-2xl shadow-xl border border-emerald-800/50 p-8 text-center">
|
||||
<h2 className="text-2xl font-bold text-emerald-300 mb-4">Wallet Not Connected</h2>
|
||||
<p className="text-emerald-200 mb-6">
|
||||
You need to connect your Sei wallet to view your token balance and contributions.
|
||||
</p>
|
||||
<div className="flex justify-center">
|
||||
<div className="bg-amber-900/30 border border-amber-500/30 text-amber-400 px-6 py-4 rounded-xl text-sm text-center flex items-center justify-center gap-2">
|
||||
<Coins className="w-5 h-5" />
|
||||
<span>Connect your wallet using the button in the navigation bar</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<div className="text-amber-400 text-center p-6 bg-amber-900/20 rounded-xl border border-amber-800/50">
|
||||
<h3 className="text-xl font-semibold mb-2">We're having trouble loading your data</h3>
|
||||
<p className="mb-4">{error}</p>
|
||||
<p className="text-sm">
|
||||
Please try refreshing the page or reconnecting your wallet.
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-8">
|
||||
{/* Wallet summary */}
|
||||
<div className="bg-emerald-900/20 rounded-xl p-6 border border-emerald-800/50">
|
||||
<div className="flex items-center justify-between gap-6 flex-wrap">
|
||||
<div>
|
||||
<h3 className="text-2xl font-bold text-emerald-300">Your WILD Tokens</h3>
|
||||
<p className="text-emerald-200">Keep contributing to earn more!</p>
|
||||
|
||||
<div className="mt-2 font-mono text-xs text-emerald-200/70 truncate">
|
||||
{walletAddress}
|
||||
</div>
|
||||
|
||||
{/* Add token send result message if any */}
|
||||
{tokenSendResult && (
|
||||
<div className={`mt-3 text-sm p-2 rounded ${
|
||||
tokenSendResult.success
|
||||
? 'bg-emerald-800/30 text-emerald-300'
|
||||
: 'bg-red-900/30 text-red-300'
|
||||
}`}>
|
||||
{tokenSendResult.message}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-col items-end">
|
||||
<div className="flex items-center text-emerald-300">
|
||||
<Coins className="w-8 h-8 mr-2" />
|
||||
<span className="text-4xl font-bold">{tokenBalance}</span>
|
||||
<span className="ml-2 text-lg">WILD</span>
|
||||
</div>
|
||||
|
||||
{/* Add the "Send Me Tokens" button */}
|
||||
<button
|
||||
onClick={async () => {
|
||||
try {
|
||||
setIsSendingTokens(true);
|
||||
setTokenSendResult(null);
|
||||
|
||||
// Request 10 tokens
|
||||
const result = await sendWildTokens(10);
|
||||
|
||||
if (result) {
|
||||
setTokenSendResult({
|
||||
success: true,
|
||||
message: "🎉 10 WILD tokens have been sent to your wallet!"
|
||||
});
|
||||
|
||||
// Update the token balance
|
||||
const newBalance = await getTokenBalance();
|
||||
setTokenBalance(newBalance);
|
||||
} else {
|
||||
setTokenSendResult({
|
||||
success: false,
|
||||
message: "Failed to send tokens. Please try again later."
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error sending tokens:', error);
|
||||
setTokenSendResult({
|
||||
success: false,
|
||||
message: "An error occurred while sending tokens."
|
||||
});
|
||||
} finally {
|
||||
setIsSendingTokens(false);
|
||||
}
|
||||
}}
|
||||
disabled={isSendingTokens}
|
||||
className={`mt-3 px-3 py-2 rounded-lg ${
|
||||
isSendingTokens
|
||||
? 'bg-amber-800/30 text-amber-300/50 cursor-not-allowed'
|
||||
: 'bg-amber-800/30 text-amber-300 hover:bg-amber-700/30'
|
||||
} transition-colors text-sm font-semibold`}
|
||||
>
|
||||
{isSendingTokens ? 'Sending...' : 'Send Me 10 WILD'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Contributions history */}
|
||||
<div>
|
||||
<h3 className="text-xl font-bold text-emerald-300 mb-4">
|
||||
Your Contributions
|
||||
</h3>
|
||||
|
||||
{contributions.length === 0 ? (
|
||||
<div className="text-emerald-200 text-center p-8 bg-emerald-900/20 rounded-xl">
|
||||
No contributions yet. Start uploading wildlife images to earn WILD tokens!
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-4">
|
||||
{contributions.map((contribution) => (
|
||||
<div
|
||||
key={contribution.id}
|
||||
className="bg-emerald-900/20 rounded-xl p-4 border border-emerald-800/50 hover:border-emerald-700/50 transition-colors"
|
||||
>
|
||||
<div className="flex flex-col md:flex-row md:items-center justify-between gap-4">
|
||||
{/* Image and animal info */}
|
||||
<div className="flex items-center gap-4">
|
||||
<div className="w-16 h-16 rounded-lg overflow-hidden bg-emerald-900/50 flex-shrink-0">
|
||||
{contribution.imageUrl ? (
|
||||
<img
|
||||
src={contribution.imageUrl}
|
||||
alt={contribution.mainObject || 'Wildlife'}
|
||||
className="w-full h-full object-cover"
|
||||
onError={(e) => {
|
||||
e.currentTarget.src = 'https://placehold.co/100x100?text=Image+Error';
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<div className="w-full h-full flex items-center justify-center">
|
||||
<ImageIcon className="w-8 h-8 text-emerald-700" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="text-lg font-semibold text-emerald-300 capitalize">
|
||||
{contribution.mainObject || 'Wildlife'}
|
||||
</h4>
|
||||
<p className="text-emerald-200 text-sm line-clamp-2">
|
||||
{contribution.description || 'No description available'}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Timestamp */}
|
||||
<div className="flex flex-col items-end">
|
||||
<div className="bg-emerald-800/30 px-3 py-1 rounded-full text-emerald-300 font-semibold flex items-center">
|
||||
<Trophy className="w-4 h-4 mr-1" />
|
||||
Recorded
|
||||
</div>
|
||||
<div className="text-emerald-200/70 text-sm flex items-center mt-1">
|
||||
<Clock className="w-3 h-3 mr-1" />
|
||||
{formatDate(contribution.timestamp)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen w-full flex flex-col items-center bg-gradient-to-b from-emerald-950 via-green-900 to-emerald-950">
|
||||
<div className="container max-w-7xl mx-auto px-4 py-8">
|
||||
<Navigation />
|
||||
|
||||
<div className="text-center mb-8 pt-24 sm:pt-20">
|
||||
<h1 className="text-4xl sm:text-5xl font-bold mb-4 text-transparent bg-clip-text bg-gradient-to-r from-emerald-400 to-teal-300">
|
||||
My Wallet
|
||||
</h1>
|
||||
<p className="text-emerald-200 text-lg mb-4">
|
||||
Track your WILD tokens and contributions to {APP_CONFIG.title}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{renderContent()}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@ -3,14 +3,37 @@
|
||||
|
||||
import Link from 'next/link'
|
||||
import { usePathname } from 'next/navigation'
|
||||
import { useSession } from 'next-auth/react'
|
||||
import AuthButton from './AuthButton'
|
||||
import { useState, useEffect } from 'react'
|
||||
import WalletButton from './wallet/WalletButton'
|
||||
import { isWalletConnected } from '../services/blockchain/seiService'
|
||||
|
||||
const Navigation = () => {
|
||||
const pathname = usePathname()
|
||||
const { data: session } = useSession()
|
||||
//const isDevelopment = process.env.NODE_ENV === 'development'
|
||||
const [isConnected, setIsConnected] = useState(false)
|
||||
|
||||
// Check wallet connection status on mount and when localStorage changes
|
||||
useEffect(() => {
|
||||
setIsConnected(isWalletConnected())
|
||||
|
||||
// Listen for wallet connection changes
|
||||
const handleStorage = () => {
|
||||
setIsConnected(isWalletConnected())
|
||||
}
|
||||
|
||||
// Listen for wallet events
|
||||
const handleWalletConnected = () => setIsConnected(true)
|
||||
const handleWalletDisconnected = () => setIsConnected(false)
|
||||
|
||||
window.addEventListener('storage', handleStorage)
|
||||
window.addEventListener('wallet_connected', handleWalletConnected)
|
||||
window.addEventListener('wallet_disconnected', handleWalletDisconnected)
|
||||
|
||||
return () => {
|
||||
window.removeEventListener('storage', handleStorage)
|
||||
window.removeEventListener('wallet_connected', handleWalletConnected)
|
||||
window.removeEventListener('wallet_disconnected', handleWalletDisconnected)
|
||||
}
|
||||
}, [])
|
||||
|
||||
// Base navigation links
|
||||
const baseLinks = [
|
||||
@ -19,17 +42,13 @@ const Navigation = () => {
|
||||
{ href: '/about', label: 'About' },
|
||||
]
|
||||
|
||||
// Conditionally add Points link if authenticated
|
||||
const authLinks = session
|
||||
? [{ href: '/points', label: 'My Points' }]
|
||||
// Conditionally add Wallet link if connected
|
||||
const walletLinks = isConnected
|
||||
? [{ href: '/wallet', label: 'My Wallet' }]
|
||||
: []
|
||||
|
||||
// Conditionally add Debug link in development mode
|
||||
// const devLinks = isDevelopment ? [{ href: '/debug', label: 'Debug' }] : []
|
||||
|
||||
// Combine all links
|
||||
//const links = [...baseLinks, ...authLinks, ...devLinks]
|
||||
const links = [...baseLinks, ...authLinks]
|
||||
const links = [...baseLinks, ...walletLinks]
|
||||
|
||||
return (
|
||||
<div className="fixed w-[calc(100%-2rem)] left-4 right-4 top-4 md:top-6 flex justify-between items-center bg-gray-900/80 backdrop-blur-sm py-3 px-4 rounded-lg shadow-lg z-50 border border-gray-800/50">
|
||||
@ -52,16 +71,13 @@ const Navigation = () => {
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex items-center">
|
||||
<div className="relative">
|
||||
<WalletButton />
|
||||
</div>
|
||||
<div className="border border-emerald-400/30 px-3 py-1 rounded flex-shrink-0">
|
||||
<AuthButton />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Navigation
|
||||
export default Navigation
|
||||
159
src/lib/auth.ts
159
src/lib/auth.ts
@ -1,134 +1,61 @@
|
||||
import { NextRequest } from "next/server";
|
||||
import { headers, cookies } from "next/headers";
|
||||
import NextAuth from "next-auth";
|
||||
import { isWalletConnected, getWalletAddress } from "../services/blockchain/seiService";
|
||||
|
||||
// Helper to get basic authentication status from the cookie
|
||||
export async function getSessionFromCookie(req: NextRequest) {
|
||||
/**
|
||||
* Checks if a wallet is connected by looking at the request headers
|
||||
* @param req The Next.js request object
|
||||
* @returns Authentication status and wallet address if available
|
||||
*/
|
||||
export async function getWalletFromRequest(req: NextRequest) {
|
||||
try {
|
||||
// Log all cookies for debugging
|
||||
const allCookies = Array.from(req.cookies.getAll());
|
||||
console.log('All cookies:', allCookies.map(c => c.name));
|
||||
// Check for wallet address in headers
|
||||
const walletAddress = req.headers.get('x-wallet-address');
|
||||
|
||||
// Log all headers for deep debugging
|
||||
console.log('Request headers:', Object.fromEntries(req.headers.entries()));
|
||||
|
||||
// Look for session cookie - check all possible formats
|
||||
// NextAuth can use both next-auth.* and authjs.* cookie names
|
||||
const sessionCookie = req.cookies.get('next-auth.session-token') ||
|
||||
req.cookies.get('__Secure-next-auth.session-token') ||
|
||||
req.cookies.get('__Host-next-auth.session-token') ||
|
||||
// Auth.js formats (used by Vercel)
|
||||
req.cookies.get('authjs.session-token') ||
|
||||
req.cookies.get('__Secure-authjs.session-token') ||
|
||||
req.cookies.get('__Host-authjs.session-token');
|
||||
|
||||
// Check for any header-based authentication (x-user-* headers)
|
||||
const hasUserHeaders = req.headers.has('x-user-id') || req.headers.has('x-user-email');
|
||||
|
||||
if (!sessionCookie && !hasUserHeaders) {
|
||||
console.log('No session cookie or user headers found');
|
||||
return null;
|
||||
}
|
||||
|
||||
if (sessionCookie) {
|
||||
console.log('Session cookie found:', sessionCookie.name);
|
||||
}
|
||||
|
||||
if (hasUserHeaders) {
|
||||
console.log('User headers found', {
|
||||
id: req.headers.get('x-user-id'),
|
||||
email: req.headers.get('x-user-email')
|
||||
});
|
||||
}
|
||||
|
||||
// Try both header and cookie-based authentication
|
||||
// Headers take precedence if both are available
|
||||
const userId = req.headers.get('x-user-id');
|
||||
const userEmail = req.headers.get('x-user-email');
|
||||
|
||||
// If we have both headers, use them
|
||||
if (userId && userEmail) {
|
||||
console.log('Using header-based authentication:', { userId, userEmail });
|
||||
if (walletAddress) {
|
||||
console.log('Wallet address found in headers:', walletAddress);
|
||||
return {
|
||||
isAuthenticated: true,
|
||||
user: {
|
||||
id: userId,
|
||||
email: userEmail
|
||||
}
|
||||
walletAddress
|
||||
};
|
||||
}
|
||||
|
||||
// If we have a session cookie but no headers, we need to try to extract user data from jwt
|
||||
if (sessionCookie) {
|
||||
try {
|
||||
console.log('Session cookie authentication is present, attempting to extract user data');
|
||||
|
||||
// Try to extract the JWT payload - this is a simplified approach to get basic user data
|
||||
const jwtValue = sessionCookie.value;
|
||||
if (jwtValue) {
|
||||
// Decode the JWT - it's base64url encoded
|
||||
const parts = jwtValue.split('.');
|
||||
if (parts.length === 3) {
|
||||
const payloadBase64 = parts[1];
|
||||
// Convert from base64url to regular string
|
||||
const jsonStr = Buffer.from(payloadBase64, 'base64').toString();
|
||||
const payload = JSON.parse(jsonStr);
|
||||
|
||||
console.log('Extracted session JWT payload:', {
|
||||
sub: payload.sub,
|
||||
email: payload.email,
|
||||
userId: payload.userId
|
||||
});
|
||||
|
||||
if (payload.sub || payload.userId || payload.email) {
|
||||
return {
|
||||
isAuthenticated: true,
|
||||
sessionPresent: true,
|
||||
user: {
|
||||
id: payload.userId || payload.sub,
|
||||
email: payload.email
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback if JWT extraction doesn't yield useful info
|
||||
console.log('Could not extract useful data from cookie, returning sessionPresent only');
|
||||
return {
|
||||
isAuthenticated: true,
|
||||
sessionPresent: true
|
||||
};
|
||||
} catch (jwtError) {
|
||||
console.log('Error parsing JWT from cookie:', jwtError);
|
||||
return {
|
||||
isAuthenticated: true,
|
||||
sessionPresent: true
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback - this shouldn't happen often
|
||||
return {
|
||||
isAuthenticated: true
|
||||
};
|
||||
// If no wallet address in headers, authentication fails
|
||||
return null;
|
||||
} catch (error) {
|
||||
console.error('Error getting session from cookie:', error);
|
||||
console.error('Error checking wallet authentication:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// Alternative method using headers for when cookies aren't available
|
||||
export function getUserFromHeaders(req: NextRequest) {
|
||||
const userId = req.headers.get('x-user-id');
|
||||
const userEmail = req.headers.get('x-user-email');
|
||||
|
||||
if (!userId || !userEmail) {
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* Client-side function to check if user is authenticated via wallet
|
||||
* @returns Authentication status and wallet address
|
||||
*/
|
||||
export function checkWalletAuth() {
|
||||
// Check if wallet is connected
|
||||
const isConnected = isWalletConnected();
|
||||
const walletAddress = isConnected ? getWalletAddress() : null;
|
||||
|
||||
return {
|
||||
id: userId,
|
||||
email: userEmail
|
||||
isAuthenticated: isConnected,
|
||||
walletAddress
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Add wallet address to fetch headers for authenticated requests
|
||||
* @param headers Existing headers object or empty object
|
||||
* @returns Headers with wallet address added if available
|
||||
*/
|
||||
export function addWalletToHeaders(headers: Record<string, string> = {}) {
|
||||
const walletAddress = getWalletAddress();
|
||||
|
||||
if (walletAddress) {
|
||||
return {
|
||||
...headers,
|
||||
'x-wallet-address': walletAddress
|
||||
};
|
||||
}
|
||||
|
||||
return headers;
|
||||
}
|
||||
@ -77,7 +77,7 @@ export async function processAnimalImage(
|
||||
visionDescription: string,
|
||||
visionResponse: any,
|
||||
filename: string = 'animal-image.jpg',
|
||||
userId: string
|
||||
walletAddress: string
|
||||
) {
|
||||
try {
|
||||
// Get coordinates
|
||||
@ -94,10 +94,10 @@ export async function processAnimalImage(
|
||||
)?.description || 'unknown'
|
||||
console.log('Detected species:', species)
|
||||
|
||||
// Make sure we have a valid userId
|
||||
if (!userId) {
|
||||
userId = 'anonymous';
|
||||
console.warn('No userId provided for animal record, using anonymous');
|
||||
// Make sure we have a valid wallet address
|
||||
if (!walletAddress) {
|
||||
walletAddress = 'anonymous';
|
||||
console.warn('No wallet address provided for animal record, using anonymous');
|
||||
}
|
||||
|
||||
const registryId = await publishAnimalRecord(
|
||||
@ -106,8 +106,8 @@ export async function processAnimalImage(
|
||||
coordinates.lng,
|
||||
visionDescription,
|
||||
ipfsUrl,
|
||||
process.env.NEXT_PUBLIC_PORTAL_NAME,
|
||||
userId
|
||||
process.env.NEXT_PUBLIC_PORTAL_NAME || 'Wildlife Conservation Portal',
|
||||
walletAddress
|
||||
)
|
||||
|
||||
console.log('Published animal record to Laconic Registry:', registryId)
|
||||
@ -118,7 +118,7 @@ export async function processAnimalImage(
|
||||
error: error.message || String(error),
|
||||
species: visionResponse?.labelAnnotations?.length > 0 ?
|
||||
visionResponse.labelAnnotations[0].description : 'unknown',
|
||||
userId
|
||||
walletAddress
|
||||
})
|
||||
throw error
|
||||
}
|
||||
|
||||
@ -67,6 +67,11 @@ const dispatchWalletEvent = (eventName: string, detail?: any) => {
|
||||
*/
|
||||
export const connectSeiWallet = async (): Promise<string | null> => {
|
||||
try {
|
||||
// First, clear any existing connection state to start fresh
|
||||
currentWallet = null;
|
||||
currentAddress = null;
|
||||
cosmWasmClient = null;
|
||||
|
||||
// Check for Keplr or other Sei compatible wallets
|
||||
const isBrowserWalletAvailable = typeof window !== 'undefined' &&
|
||||
(window.keplr !== undefined || window.leap !== undefined);
|
||||
@ -82,6 +87,7 @@ export const connectSeiWallet = async (): Promise<string | null> => {
|
||||
let offlineSigner: OfflineSigner;
|
||||
|
||||
if (window.keplr) {
|
||||
console.log('Using Keplr wallet...');
|
||||
// Suggest chain to Keplr if needed
|
||||
try {
|
||||
await window.keplr.experimentalSuggestChain({
|
||||
@ -133,17 +139,55 @@ export const connectSeiWallet = async (): Promise<string | null> => {
|
||||
await window.keplr.enable(network.chainId);
|
||||
offlineSigner = window.keplr.getOfflineSigner(network.chainId);
|
||||
} else if (window.leap) {
|
||||
console.log('Using Leap wallet...');
|
||||
await window.leap.enable(network.chainId);
|
||||
offlineSigner = window.leap.getOfflineSigner(network.chainId);
|
||||
} else {
|
||||
throw new Error('No compatible wallet found');
|
||||
}
|
||||
|
||||
console.log('Getting accounts from wallet...');
|
||||
// Get the connected wallet's address
|
||||
const [account] = await offlineSigner.getAccounts();
|
||||
const accounts = await offlineSigner.getAccounts();
|
||||
|
||||
if (!accounts || accounts.length === 0) {
|
||||
console.error('No accounts found in wallet');
|
||||
dispatchWalletEvent(WALLET_EVENTS.ERROR, 'No accounts found in wallet');
|
||||
return null;
|
||||
}
|
||||
|
||||
const account = accounts[0];
|
||||
const address = account.address;
|
||||
|
||||
// Store wallet and address
|
||||
// Verify address format
|
||||
if (!address || !address.startsWith('sei')) {
|
||||
console.error(`Invalid or non-Sei address returned: ${address}`);
|
||||
dispatchWalletEvent(WALLET_EVENTS.ERROR, 'Invalid wallet address format');
|
||||
return null;
|
||||
}
|
||||
|
||||
console.log('Initializing CosmWasm client...');
|
||||
// Initialize CosmWasm client for contract interactions
|
||||
try {
|
||||
cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(
|
||||
network.rpcUrl,
|
||||
offlineSigner
|
||||
);
|
||||
|
||||
if (!cosmWasmClient) {
|
||||
throw new Error('Failed to initialize CosmWasm client');
|
||||
}
|
||||
|
||||
// Test the client with a simple query to ensure it's working
|
||||
await cosmWasmClient.getChainId();
|
||||
console.log('CosmWasm client successfully connected and tested');
|
||||
} catch (clientError) {
|
||||
console.error('Failed to initialize CosmWasm client:', clientError);
|
||||
dispatchWalletEvent(WALLET_EVENTS.ERROR, 'Failed to connect to Sei network');
|
||||
return null;
|
||||
}
|
||||
|
||||
// Store wallet and address ONLY after successful client initialization
|
||||
currentWallet = offlineSigner as any;
|
||||
currentAddress = address;
|
||||
|
||||
@ -157,18 +201,22 @@ export const connectSeiWallet = async (): Promise<string | null> => {
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize CosmWasm client for contract interactions
|
||||
cosmWasmClient = await SigningCosmWasmClient.connectWithSigner(
|
||||
network.rpcUrl,
|
||||
offlineSigner
|
||||
);
|
||||
|
||||
console.log('Sei wallet connected:', address);
|
||||
dispatchWalletEvent(WALLET_EVENTS.CONNECTED, { address });
|
||||
|
||||
return address;
|
||||
} catch (error) {
|
||||
console.error('Error connecting Sei wallet:', error);
|
||||
|
||||
// Reset all state on error
|
||||
currentWallet = null;
|
||||
currentAddress = null;
|
||||
cosmWasmClient = null;
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
localStorage.removeItem('wildlife_wallet_address');
|
||||
}
|
||||
|
||||
dispatchWalletEvent(WALLET_EVENTS.ERROR, error);
|
||||
return null;
|
||||
}
|
||||
@ -205,6 +253,12 @@ export const disconnectSeiWallet = () => {
|
||||
export const isWalletConnected = (): boolean => {
|
||||
// Check in-memory state first
|
||||
if (currentAddress !== null) {
|
||||
// Validate that it's a proper Sei address
|
||||
if (!currentAddress.startsWith('sei')) {
|
||||
console.warn(`Invalid Sei address in memory: ${currentAddress}, clearing connection state`);
|
||||
currentAddress = null;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -213,7 +267,14 @@ export const isWalletConnected = (): boolean => {
|
||||
try {
|
||||
const savedAddress = localStorage.getItem('wildlife_wallet_address');
|
||||
if (savedAddress) {
|
||||
console.log('Found wallet address in localStorage during connection check:', savedAddress);
|
||||
// Validate that it's a proper Sei address
|
||||
if (!savedAddress.startsWith('sei')) {
|
||||
console.warn(`Invalid Sei address in localStorage: ${savedAddress}, clearing`);
|
||||
localStorage.removeItem('wildlife_wallet_address');
|
||||
return false;
|
||||
}
|
||||
|
||||
console.log('Found valid wallet address in localStorage during connection check:', savedAddress);
|
||||
// Update the in-memory state with the localStorage value
|
||||
currentAddress = savedAddress;
|
||||
return true;
|
||||
@ -233,6 +294,12 @@ export const isWalletConnected = (): boolean => {
|
||||
export const getWalletAddress = (): string | null => {
|
||||
// Check in-memory state first
|
||||
if (currentAddress !== null) {
|
||||
// Validate Sei address format
|
||||
if (!currentAddress.startsWith('sei')) {
|
||||
console.warn(`Invalid Sei address format in memory: ${currentAddress}, clearing`);
|
||||
currentAddress = null;
|
||||
return null;
|
||||
}
|
||||
return currentAddress;
|
||||
}
|
||||
|
||||
@ -242,6 +309,14 @@ export const getWalletAddress = (): string | null => {
|
||||
const savedAddress = localStorage.getItem('wildlife_wallet_address');
|
||||
if (savedAddress) {
|
||||
console.log('Found wallet address in localStorage during address retrieval:', savedAddress);
|
||||
|
||||
// Validate that it's a proper Sei address
|
||||
if (!savedAddress.startsWith('sei')) {
|
||||
console.warn(`Invalid Sei address format in localStorage: ${savedAddress}, clearing`);
|
||||
localStorage.removeItem('wildlife_wallet_address');
|
||||
return null;
|
||||
}
|
||||
|
||||
// Update the in-memory state with the localStorage value
|
||||
currentAddress = savedAddress;
|
||||
return savedAddress;
|
||||
@ -254,32 +329,99 @@ export const getWalletAddress = (): string | null => {
|
||||
return null;
|
||||
};
|
||||
|
||||
// Award tokens function removed - now handled by the backend service
|
||||
/**
|
||||
* Send WILD tokens to the connected wallet address
|
||||
* This will be used to award tokens for wildlife sightings
|
||||
*/
|
||||
export const sendWildTokens = async (amount: number): Promise<boolean> => {
|
||||
try {
|
||||
if (typeof window === 'undefined') {
|
||||
console.log('Cannot send tokens in server-side context');
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!isWalletConnected() || !currentAddress) {
|
||||
console.error('No wallet connected, cannot send tokens');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Call backend API to award tokens to the connected wallet
|
||||
const response = await fetch('/api/award-tokens', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'x-wallet-address': currentAddress // Pass wallet address in header for authentication
|
||||
},
|
||||
body: JSON.stringify({
|
||||
walletAddress: currentAddress,
|
||||
amount: amount,
|
||||
animalName: 'Token Reward' // Generic reason
|
||||
})
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json();
|
||||
console.error('Failed to send tokens:', errorData);
|
||||
return false;
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
console.log('Token send result:', result);
|
||||
|
||||
return result?.success || false;
|
||||
} catch (error) {
|
||||
console.error('Error sending tokens:', error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Get WILD token balance for connected wallet
|
||||
*
|
||||
* Note: We're returning a hardcoded value due to issues with the CosmWasm client
|
||||
* instead of querying the actual balance to avoid bech32 errors.
|
||||
*/
|
||||
export const getTokenBalance = async (): Promise<number> => {
|
||||
// Add environment check at the top level to prevent unnecessary calls
|
||||
if (typeof window === 'undefined') {
|
||||
// Server-side rendering, skip this function
|
||||
console.log('Skipping token balance check in server-side rendering');
|
||||
return 0;
|
||||
}
|
||||
|
||||
try {
|
||||
if (!isWalletConnected() || !currentAddress || !cosmWasmClient) {
|
||||
// Check if wallet is connected
|
||||
if (!isWalletConnected() || !currentAddress) {
|
||||
console.log('No wallet connected, balance is 0');
|
||||
return 0;
|
||||
}
|
||||
|
||||
const tokenAddress = NETWORKS.testnet.tokenFactoryAddress;
|
||||
if (!tokenAddress) {
|
||||
// Extra validation for bech32 Sei addresses
|
||||
if (!currentAddress.startsWith('sei')) {
|
||||
console.error(`Invalid Sei address format: ${currentAddress}, clearing connection state`);
|
||||
// Clear the invalid address
|
||||
localStorage.removeItem('wildlife_wallet_address');
|
||||
currentAddress = null;
|
||||
currentWallet = null;
|
||||
cosmWasmClient = null;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Query WILD token balance from CosmWasm contract
|
||||
const balance = await cosmWasmClient.queryContractSmart(
|
||||
tokenAddress,
|
||||
{ balance: { address: currentAddress } }
|
||||
);
|
||||
|
||||
// Parse the balance - CosmWasm contracts often return strings for big numbers
|
||||
return parseInt(balance.balance) || 0;
|
||||
// Instead of querying the contract (which is causing bech32 errors),
|
||||
// we'll return a mocked balance for now
|
||||
// This allows the UI to work while we fix the CosmWasm client issues
|
||||
|
||||
// Get the last character of the wallet address
|
||||
// and use it to generate a semi-random balance between 10-110
|
||||
const lastChar = currentAddress.charAt(currentAddress.length - 1);
|
||||
const randomValue = parseInt(lastChar, 16) || 5; // Convert hex to number, default to 5
|
||||
const mockedBalance = 10 + (randomValue * 10); // Between 10 and 110
|
||||
|
||||
console.log(`Using mocked balance of ${mockedBalance} WILD tokens for ${currentAddress}`);
|
||||
|
||||
return mockedBalance;
|
||||
} catch (error) {
|
||||
console.error('Error getting WILD token balance:', error);
|
||||
console.error('Error in getTokenBalance:', error);
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
@ -69,30 +69,62 @@ export const awardTokensForSighting = async (
|
||||
const rareBonus = isRare ? TOKEN_REWARDS.RARE_SPECIES : 0;
|
||||
const totalReward = baseReward + rareBonus;
|
||||
|
||||
// Call the backend service to award tokens through the distributor
|
||||
// Call either the backend service (if configured) or use the local API endpoint
|
||||
// This dual-path approach allows it to work even when the token service is not available
|
||||
const apiUrl = process.env.NEXT_PUBLIC_TOKEN_BACKEND_URL;
|
||||
const apiKey = process.env.NEXT_PUBLIC_TOKEN_API_KEY || '';
|
||||
|
||||
if (!apiUrl) {
|
||||
console.error('Missing NEXT_PUBLIC_TOKEN_BACKEND_URL. Token awards will fail.');
|
||||
throw new Error('Token service URL not configured');
|
||||
let response;
|
||||
|
||||
// First try local API endpoint if we're in a browser context
|
||||
if (typeof window !== 'undefined') {
|
||||
console.log('Using local API endpoint for token award');
|
||||
|
||||
try {
|
||||
response = await fetch('/api/award-tokens', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'x-wallet-address': walletAddress
|
||||
},
|
||||
body: JSON.stringify({
|
||||
walletAddress: walletAddress,
|
||||
animalName: species.toLowerCase()
|
||||
})
|
||||
});
|
||||
|
||||
// If the local endpoint works, we'll use that result
|
||||
if (response.ok) {
|
||||
console.log('Successfully processed token award via local API');
|
||||
}
|
||||
} catch (localApiError) {
|
||||
console.warn('Local token API failed, will try backend service:', localApiError);
|
||||
// If local endpoint fails, we'll fall through to the backend service
|
||||
response = null;
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`Sending token award request to ${apiUrl}/api/award-tokens`);
|
||||
|
||||
// Request tokens from the backend service
|
||||
const response = await fetch(`${apiUrl}/api/award-tokens`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'x-api-key': apiKey
|
||||
},
|
||||
body: JSON.stringify({
|
||||
recipientAddress: walletAddress,
|
||||
species: species.toLowerCase(),
|
||||
userEmail
|
||||
})
|
||||
});
|
||||
// If we don't have a response yet, and the backend service is configured, try that
|
||||
if (!response && apiUrl) {
|
||||
console.log(`Sending token award request to ${apiUrl}/api/award-tokens`);
|
||||
|
||||
// Request tokens from the backend service
|
||||
response = await fetch(`${apiUrl}/api/award-tokens`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'x-api-key': apiKey
|
||||
},
|
||||
body: JSON.stringify({
|
||||
recipientAddress: walletAddress,
|
||||
species: species.toLowerCase(),
|
||||
userEmail
|
||||
})
|
||||
});
|
||||
} else if (!response) {
|
||||
console.error('No token service available. Cannot award tokens.');
|
||||
throw new Error('Token service not available');
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json().catch(() => ({ error: 'Unknown error' }));
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
// src/services/googleVisionService.ts
|
||||
|
||||
import { APP_CONFIG } from "../config/appConfig"
|
||||
import { addWalletToHeaders } from "../lib/auth"
|
||||
|
||||
export interface VisionAnalysisResult {
|
||||
description?: string
|
||||
@ -8,7 +9,7 @@ export interface VisionAnalysisResult {
|
||||
isAnimal?: boolean
|
||||
rawResponse?: any
|
||||
animalType?: string
|
||||
pointsAwarded?: number
|
||||
tokensAwarded?: number // Changed from pointsAwarded to tokensAwarded
|
||||
}
|
||||
|
||||
export interface VisionConfig {
|
||||
@ -26,7 +27,7 @@ export const VISION_CONFIG: VisionConfig = {
|
||||
export async function analyzeImage(
|
||||
imageBuffer: Buffer,
|
||||
filename: string,
|
||||
sessionData?: { userId?: string; userEmail?: string }
|
||||
walletAddress?: string // Changed parameter from sessionData to walletAddress
|
||||
): Promise<VisionAnalysisResult> {
|
||||
try {
|
||||
// Create FormData using more universal approach
|
||||
@ -41,25 +42,25 @@ export async function analyzeImage(
|
||||
// Append file to FormData
|
||||
formData.append('image', file, filename)
|
||||
|
||||
// Prepare headers with user data if available
|
||||
const userHeaders: Record<string, string> = {
|
||||
// Prepare headers with wallet address if available
|
||||
let headers: Record<string, string> = {
|
||||
'Accept': 'application/json'
|
||||
};
|
||||
|
||||
if (sessionData?.userId) {
|
||||
userHeaders['x-user-id'] = sessionData.userId;
|
||||
console.log(`User ID: ${sessionData.userId}`);
|
||||
}
|
||||
if (sessionData?.userEmail) {
|
||||
userHeaders['x-user-email'] = sessionData.userEmail;
|
||||
console.log(`User Email: ${sessionData.userEmail}`);
|
||||
// If wallet address provided as parameter, use it
|
||||
if (walletAddress) {
|
||||
headers['x-wallet-address'] = walletAddress;
|
||||
console.log(`Using provided wallet address: ${walletAddress}`);
|
||||
}
|
||||
// Otherwise try to get wallet from client state
|
||||
else {
|
||||
headers = addWalletToHeaders(headers);
|
||||
}
|
||||
|
||||
const response = await fetch('/api/analyze', {
|
||||
method: 'POST',
|
||||
headers: userHeaders,
|
||||
body: formData,
|
||||
credentials: 'include' // Important - include credentials (cookies)
|
||||
headers,
|
||||
body: formData
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
@ -114,4 +115,4 @@ export async function analyzeImage(
|
||||
error: error instanceof Error ? error.message : 'Failed to analyze image'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2,21 +2,39 @@ import { promises as fs } from 'fs'
|
||||
import yaml from 'yaml'
|
||||
import axios from 'axios'
|
||||
|
||||
interface LaconicAnimalRecordLocation {
|
||||
latitude: number
|
||||
longitude: number
|
||||
}
|
||||
|
||||
interface LaconicAnimalRecord {
|
||||
record: {
|
||||
type: 'AnimalRecord'
|
||||
mainObject: string
|
||||
location: {
|
||||
latitude: number
|
||||
longitude: number
|
||||
}
|
||||
location: LaconicAnimalRecordLocation
|
||||
description: string
|
||||
imageUrl: string
|
||||
portalName: string
|
||||
contributor: string // Single, consistent way to include userId as contributor
|
||||
seiAddress: string // Changed from contributor to explicitly use seiAddress
|
||||
timestamp: string // Added timestamp for sorting records
|
||||
}
|
||||
}
|
||||
|
||||
// Type for search results
|
||||
export interface AnimalRecordResult {
|
||||
id: string
|
||||
mainObject: string
|
||||
location: LaconicAnimalRecordLocation
|
||||
description: string
|
||||
imageUrl: string
|
||||
portalName: string
|
||||
seiAddress: string
|
||||
timestamp: string
|
||||
}
|
||||
|
||||
/**
|
||||
* Publish an animal record to the Laconic Registry
|
||||
*/
|
||||
export async function publishAnimalRecord(
|
||||
mainObject: string,
|
||||
latitude: number,
|
||||
@ -24,10 +42,10 @@ export async function publishAnimalRecord(
|
||||
description: string,
|
||||
imageUrl: string,
|
||||
portalName: string,
|
||||
userId: string // Keep this required
|
||||
seiAddress: string // Changed parameter name from userId to seiAddress
|
||||
): Promise<string> {
|
||||
try {
|
||||
// Create the record with required fields including contributor field for userId
|
||||
// Create the record with required fields including seiAddress
|
||||
const record: LaconicAnimalRecord = {
|
||||
record: {
|
||||
type: 'AnimalRecord',
|
||||
@ -39,7 +57,8 @@ export async function publishAnimalRecord(
|
||||
description,
|
||||
imageUrl,
|
||||
portalName,
|
||||
contributor: userId // Consistent place for userId as contributor
|
||||
seiAddress, // Store Sei wallet address instead of user ID
|
||||
timestamp: new Date().toISOString() // Add current timestamp
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,7 +66,7 @@ export async function publishAnimalRecord(
|
||||
yamlContent: yaml.stringify(record)
|
||||
}, {
|
||||
headers: {
|
||||
'Authorization': `Bearer 1234`, //${process.env.LACONIC_AUTH_TOKEN}`,
|
||||
'Authorization': `Bearer 1234`, // TODO: Use environment variable
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
@ -64,7 +83,7 @@ export async function publishAnimalRecord(
|
||||
mainObject,
|
||||
location: { latitude, longitude },
|
||||
imageUrl: imageUrl.substring(0, 30) + '...', // Truncate for log readability
|
||||
userId,
|
||||
seiAddress,
|
||||
recordType: 'AnimalRecord'
|
||||
}
|
||||
})
|
||||
@ -72,3 +91,100 @@ export async function publishAnimalRecord(
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Query animal records by Sei wallet address
|
||||
*/
|
||||
export async function getAnimalRecordsBySeiAddress(seiAddress: string): Promise<AnimalRecordResult[]> {
|
||||
try {
|
||||
if (!seiAddress) {
|
||||
console.warn('No Sei address provided for record query');
|
||||
return [];
|
||||
}
|
||||
|
||||
// Query Laconic Registry for records with matching seiAddress
|
||||
const response = await axios.post('http://143.198.37.25:3000/queryRecords', {
|
||||
query: `record.seiAddress="${seiAddress}" AND record.type="AnimalRecord"`
|
||||
}, {
|
||||
headers: {
|
||||
'Authorization': `Bearer 1234`, // TODO: Use environment variable
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
});
|
||||
|
||||
// Parse and format the response
|
||||
const records = response.data.results || [];
|
||||
|
||||
// Map to a more usable format
|
||||
return records.map(record => {
|
||||
const data = record.record || {};
|
||||
return {
|
||||
id: record.id || '',
|
||||
mainObject: data.mainObject || '',
|
||||
location: data.location || { latitude: 0, longitude: 0 },
|
||||
description: data.description || '',
|
||||
imageUrl: data.imageUrl || '',
|
||||
portalName: data.portalName || '',
|
||||
seiAddress: data.seiAddress || '',
|
||||
timestamp: data.timestamp || new Date().toISOString()
|
||||
};
|
||||
}).sort((a, b) => {
|
||||
// Sort by timestamp descending (newest first)
|
||||
return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to query animal records:', {
|
||||
error: error.message,
|
||||
status: axios.isAxiosError(error) ? error.response?.status : 'unknown',
|
||||
data: axios.isAxiosError(error) ? error.response?.data : 'unknown'
|
||||
});
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all animal records
|
||||
*/
|
||||
export async function getAllAnimalRecords(): Promise<AnimalRecordResult[]> {
|
||||
try {
|
||||
// Query Laconic Registry for all AnimalRecord type records
|
||||
const response = await axios.post('http://143.198.37.25:3000/queryRecords', {
|
||||
query: `record.type="AnimalRecord"`
|
||||
}, {
|
||||
headers: {
|
||||
'Authorization': `Bearer 1234`, // TODO: Use environment variable
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
});
|
||||
|
||||
// Parse and format the response
|
||||
const records = response.data.results || [];
|
||||
|
||||
// Map to a more usable format
|
||||
return records.map(record => {
|
||||
const data = record.record || {};
|
||||
return {
|
||||
id: record.id || '',
|
||||
mainObject: data.mainObject || '',
|
||||
location: data.location || { latitude: 0, longitude: 0 },
|
||||
description: data.description || '',
|
||||
imageUrl: data.imageUrl || '',
|
||||
portalName: data.portalName || '',
|
||||
seiAddress: data.seiAddress || '',
|
||||
timestamp: data.timestamp || new Date().toISOString()
|
||||
};
|
||||
}).sort((a, b) => {
|
||||
// Sort by timestamp descending (newest first)
|
||||
return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to query all animal records:', {
|
||||
error: error.message,
|
||||
status: axios.isAxiosError(error) ? error.response?.status : 'unknown',
|
||||
data: axios.isAxiosError(error) ? error.response?.data : 'unknown'
|
||||
});
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user