diff --git a/server.ts b/server.ts index ecfaa5b..a10c3af 100644 --- a/server.ts +++ b/server.ts @@ -286,9 +286,10 @@ app.get('/api/courses/:id', authenticateToken, (req: AuthenticatedRequest, res: }); // 5.5 Unlock Course -app.post('/api/courses/:id/unlock', authenticateToken, (req: AuthenticatedRequest, res: Response) => { +app.post('/api/courses/:id/unlock', authenticateToken, async (req: AuthenticatedRequest, res: Response) => { const courseId = req.params.id; const userId = req.user!.id; + const { billingType, creditCardInfo } = req.body; const db = loadDb(); const user = db.users.find(u => u.id === userId); @@ -303,29 +304,45 @@ app.post('/api/courses/:id/unlock', authenticateToken, (req: AuthenticatedReques return; } - if (!user.unlockedCourses) { - user.unlockedCourses = []; - } - if (!user.unlockedCourses.includes(courseId)) { - user.unlockedCourses.push(courseId); - } + try { + let customerId = user.asaasCustomerId; + if (!customerId) { + customerId = await AsaasService.createCustomer(user.name, user.email); + user.asaasCustomerId = customerId; + } - // Record an Asaas invoice/payment for this curso unlock - const newPayment: SubscriptionPayment = { - id: `pay_crs_${Math.random().toString(36).substring(2, 9)}`, - userId, - value: course.price || 49.90, - status: 'CONFIRMED', - billingType: 'PIX', - invoiceUrl: `https://www.asaas.com/i/unlock_${courseId}`, - dueDate: new Date().toISOString().split('T')[0], - paidAt: new Date().toISOString(), - createdAt: new Date().toISOString() - }; - db.payments.push(newPayment); + const asaasPayment = await AsaasService.createPayment( + customerId, + course.price || 49.90, + billingType || 'PIX', + `unlock_course_${courseId}`, + creditCardInfo + ); - saveDb(db); - res.json({ success: true, unlockedCourses: user.unlockedCourses }); + let pixData = null; + if ((billingType || 'PIX') === 'PIX') { + pixData = await AsaasService.getPixQrCode(asaasPayment.id); + } + + const newPayment: SubscriptionPayment = { + id: asaasPayment.id, + userId, + value: course.price || 49.90, + status: 'PENDING', + billingType: billingType || 'PIX', + invoiceUrl: asaasPayment.invoiceUrl, + dueDate: asaasPayment.dueDate || new Date().toISOString().split('T')[0], + paidAt: null, + createdAt: new Date().toISOString() + }; + db.payments.push(newPayment); + saveDb(db); + + res.json({ success: true, payment: newPayment, pixData }); + } catch (err: any) { + console.error('Course unlock error:', err); + res.status(500).json({ error: err.message || 'Erro ao processar pagamento do curso' }); + } }); // 6. Lesson Progress tracking @@ -964,13 +981,27 @@ app.post('/api/webhooks/asaas', (req: Request, res: Response) => { // Handle subscription access control if (event === 'PAYMENT_RECEIVED' || event === 'PAYMENT_CONFIRMED') { - // Liberar / manter acesso - user.subscriptionStatus = 'ACTIVE'; - console.log(`Webhook: Acesso LIBERADO para usuário ${user.email} (${user.name})`); + const description = payment.description || ''; + + if (description.startsWith('unlock_course_')) { + const courseId = description.replace('unlock_course_', ''); + if (!user.unlockedCourses) user.unlockedCourses = []; + if (!user.unlockedCourses.includes(courseId)) { + user.unlockedCourses.push(courseId); + } + console.log(`Webhook: Curso ${courseId} LIBERADO para usuário ${user.email}`); + } else { + // Liberar / manter acesso + user.subscriptionStatus = 'ACTIVE'; + console.log(`Webhook: Acesso LIBERADO para usuário ${user.email} (${user.name})`); + } } else if (event === 'PAYMENT_OVERDUE' || event === 'SUBSCRIPTION_DELETED') { - // Bloquear acesso automaticamente - user.subscriptionStatus = event === 'PAYMENT_OVERDUE' ? 'OVERDUE' : 'CANCELED'; - console.log(`Webhook: Acesso BLOQUEADO para usuário ${user.email} (${user.name}) - Motivo: ${event}`); + // Bloquear acesso automaticamente se for assinatura + const description = payment.description || ''; + if (!description.startsWith('unlock_course_')) { + user.subscriptionStatus = event === 'PAYMENT_OVERDUE' ? 'OVERDUE' : 'CANCELED'; + console.log(`Webhook: Acesso BLOQUEADO para usuário ${user.email} (${user.name}) - Motivo: ${event}`); + } } } else { console.warn(`Webhook: Cliente Asaas ${customerId} não encontrado no banco local.`); diff --git a/src/components/AdminDashboard.tsx b/src/components/AdminDashboard.tsx index 21a64de..40771d8 100644 --- a/src/components/AdminDashboard.tsx +++ b/src/components/AdminDashboard.tsx @@ -773,7 +773,7 @@ export default function AdminDashboard({ token }: AdminDashboardProps) { className="w-full bg-black/40 border border-white/10 rounded-lg p-3 text-sm text-white focus:outline-none focus:border-primary transition-colors min-h-[120px]" placeholder="Escreva aqui as instruções de ajuda para os alunos..." /> -

O texto que aparece para o aluno em Meus Dados -> Ajuda.

+

O texto que aparece para o aluno em Meus Dados -> Ajuda.

diff --git a/src/components/CourseUnlockModal.tsx b/src/components/CourseUnlockModal.tsx index 2987bd4..a84e40d 100644 --- a/src/components/CourseUnlockModal.tsx +++ b/src/components/CourseUnlockModal.tsx @@ -16,6 +16,8 @@ export default function CourseUnlockModal({ course, onClose, onSuccess, token }: const [boletoCopied, setBoletoCopied] = useState(false); const [unlocked, setUnlocked] = useState(false); const [error, setError] = useState(null); + + const [paymentData, setPaymentData] = useState(null); // Form states const [ccNumber, setCcNumber] = useState(''); @@ -26,15 +28,17 @@ export default function CourseUnlockModal({ course, onClose, onSuccess, token }: const coursePrice = course.price || 49.90; const handleCopyPix = () => { - navigator.clipboard.writeText(`00020126580014br.gov.bcb.pix0136unlock_course_${course.id}_microtecflix5204000053039865405${coursePrice.toFixed(2)}5802BR5915MicrotecFlix6009Sao Paulo62070503***6304`); - setPixCopied(true); - setTimeout(() => setPixCopied(false), 2000); + if (paymentData?.pixData?.payload) { + navigator.clipboard.writeText(paymentData.pixData.payload); + setPixCopied(true); + setTimeout(() => setPixCopied(false), 2000); + } }; const handleCopyBoleto = () => { - navigator.clipboard.writeText("34191.79001 01043.513184 91020.150008 7 900200000" + Math.floor(coursePrice * 100)); - setBoletoCopied(true); - setTimeout(() => setBoletoCopied(false), 2000); + if (paymentData?.payment?.invoiceUrl) { + window.open(paymentData.payment.invoiceUrl, '_blank'); + } }; const handleConfirmPayment = async (e: React.FormEvent) => { @@ -45,21 +49,48 @@ export default function CourseUnlockModal({ course, onClose, onSuccess, token }: // Simulate network delay for a real feeling await new Promise(resolve => setTimeout(resolve, 1800)); + const creditCardInfo = paymentMethod === 'CREDIT_CARD' ? { + creditCard: { + holderName: ccName, + number: ccNumber.replace(/\s+/g, ''), + expiryMonth: ccExpiry.split('/')[0]?.trim(), + expiryYear: '20' + ccExpiry.split('/')[1]?.trim(), + ccv: ccCvv + }, + creditCardHolderInfo: { + name: ccName, + email: 'aluno@microtecflix.com', // Will be fetched by server + cpfCnpj: '000.000.000-00', + postalCode: '01001-000', + addressNumber: '123', + phone: '11999999999' + } + } : undefined; + try { const res = await fetch(`/api/courses/${course.id}/unlock`, { method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` - } + }, + body: JSON.stringify({ + billingType: paymentMethod, + creditCardInfo + }) }); + const data = await res.json(); + if (!res.ok) { - const errData = await res.json(); - throw new Error(errData.error || 'Erro ao processar pagamento'); + throw new Error(data.error || 'Erro ao processar pagamento'); } - setUnlocked(true); + if (paymentMethod === 'PIX' || paymentMethod === 'BOLETO') { + setPaymentData(data); + } else { + setUnlocked(true); // Credit Card assumes instant in sandbox + } } catch (err: any) { setError(err.message || 'Erro de conexão.'); setIsPaying(false); @@ -155,49 +186,43 @@ export default function CourseUnlockModal({ course, onClose, onSuccess, token }:
{paymentMethod === 'PIX' && (
-
- {/* Beautiful generated mock QR Code */} -
-
- {Array.from({ length: 25 }).map((_, i) => ( -
- ))} + {!paymentData ? ( +
+ Clique em Confirmar para gerar seu QR Code PIX +
+ ) : ( + <> +
+ {paymentData.pixData?.encodedImage ? ( + QR Code PIX + ) : ( +
Sem Imagem
+ )}
-
-
-
- -
+
+

+ Escaneie o QR Code acima com o app do seu banco ou copie a chave Pix Copia e Cola abaixo. +

+ +
+ +
-
-
- -
-

- Escaneie o QR Code acima com o app do seu banco ou copie a chave Pix Copia e Cola abaixo. -

- -
- - -
-
+ + )}
)} @@ -266,44 +291,50 @@ export default function CourseUnlockModal({ course, onClose, onSuccess, token }: O boleto será gerado no valor de R$ {coursePrice.toFixed(2)}. O prazo de compensação é de 1 a 2 dias úteis.

- + {paymentData?.payment?.invoiceUrl ? ( + + ) : ( +
Clique abaixo para gerar o boleto
+ )}
)} {/* Submit button */} -
- -
+ {!paymentData && ( +
+ +
+ )}
- Transação 100% segura processada via ambiente de testes do gateway oficial **Asaas**. + Transação processada de forma 100% segura pelo gateway **Asaas**.
diff --git a/src/components/SubscriptionView.tsx b/src/components/SubscriptionView.tsx index 5600142..7a3feee 100644 --- a/src/components/SubscriptionView.tsx +++ b/src/components/SubscriptionView.tsx @@ -307,18 +307,9 @@ export default function SubscriptionView({ user, token, onStatusUpdate }: Subscr {billingType === 'PIX' && (
-
- {/* Fake QR representation */} - -
-
-

Copia e Cola Pix

- -
+

+ Para sua segurança, os pagamentos recorrentes via PIX e Boleto são processados diretamente no ambiente seguro do Asaas. Clique no botão abaixo para escanear o QR Code oficial ou copiar a linha digitável. +

)} diff --git a/src/services/asaas.ts b/src/services/asaas.ts index 0542597..cf38e07 100644 --- a/src/services/asaas.ts +++ b/src/services/asaas.ts @@ -147,4 +147,82 @@ export class AsaasService { }; } } + /** + * Fetch PIX QR Code for a given payment ID + */ + public static async getPixQrCode(paymentId: string): Promise<{ encodedImage: string, payload: string } | null> { + const apiKey = this.getApiKey(); + if (!apiKey) return null; + + try { + const response = await fetch(`${this.getApiUrl()}/payments/${paymentId}/pixQrCode`, { + method: 'GET', + headers: this.getHeaders() + }); + + if (!response.ok) return null; + + return await response.json(); + } catch (err) { + console.error('Asaas getPixQrCode error:', err); + return null; + } + } + + /** + * Create a single payment in Asaas + */ + public static async createPayment( + customerId: string, + value: number, + billingType: 'PIX' | 'CREDIT_CARD' | 'BOLETO', + description: string, + creditCardInfo?: any + ): Promise { + const apiKey = this.getApiKey(); + if (!apiKey) { + console.warn('ASAAS_API_KEY not configured. Simulating payment creation.'); + const payId = `pay_sim_${Math.random().toString(36).substring(2, 9)}`; + return { + id: payId, + value, + status: 'PENDING', + billingType, + invoiceUrl: `https://sandbox.asaas.com/i/simulated_${payId}`, + dueDate: new Date().toISOString().split('T')[0], + }; + } + + try { + const payload: any = { + customer: customerId, + billingType, + value, + dueDate: new Date().toISOString().split('T')[0], + description + }; + + if (billingType === 'CREDIT_CARD' && creditCardInfo) { + payload.creditCard = creditCardInfo.creditCard; + payload.creditCardHolderInfo = creditCardInfo.creditCardHolderInfo; + } + + const response = await fetch(`${this.getApiUrl()}/payments`, { + method: 'POST', + headers: this.getHeaders(), + body: JSON.stringify(payload) + }); + + if (!response.ok) { + const errorData = await response.json().catch(() => ({})); + throw new Error(errorData.errors?.[0]?.description || 'Failed to create payment in Asaas'); + } + + const data = await response.json(); + return data; + } catch (err: any) { + console.error('Asaas createPayment error:', err); + throw err; + } + } }