mirror of
https://github.com/janishutz/libreevent.git
synced 2025-11-25 05:14:23 +00:00
payments fully integrated
This commit is contained in:
@@ -57,7 +57,7 @@ class SQLDB {
|
||||
} );
|
||||
this.sqlConnection.query( 'CREATE TABLE libreevent_users ( account_id INT ( 10 ) NOT NULL AUTO_INCREMENT, email TINYTEXT NOT NULL, pass TEXT, name TEXT, first_name TEXT, two_fa TINYTEXT, user_data VARCHAR( 60000 ), mail_confirmed TINYTEXT, marketing_ok TINYTEXT, PRIMARY KEY ( account_id ) ) ENGINE=INNODB;', ( error ) => {
|
||||
if ( error ) if ( error.code !== 'ER_TABLE_EXISTS_ERROR' ) throw error;
|
||||
this.sqlConnection.query( 'CREATE TABLE libreevent_orders ( order_id INT ( 10 ) NOT NULL AUTO_INCREMENT, order_name TINYTEXT, account_id INT ( 10 ) NOT NULL, tickets VARCHAR( 60000 ), PRIMARY KEY ( order_id ), FOREIGN KEY ( account_id ) REFERENCES libreevent_users( account_id ) ) ENGINE=INNODB;', ( error ) => {
|
||||
this.sqlConnection.query( 'CREATE TABLE libreevent_orders ( order_id INT ( 10 ) NOT NULL AUTO_INCREMENT, order_name TINYTEXT, account_id INT ( 10 ) NOT NULL, tickets VARCHAR( 60000 ), processed TINYTEXT, PRIMARY KEY ( order_id ), FOREIGN KEY ( account_id ) REFERENCES libreevent_users( account_id ) ) ENGINE=INNODB;', ( error ) => {
|
||||
if ( error ) if ( error.code !== 'ER_TABLE_EXISTS_ERROR' ) throw error;
|
||||
this.sqlConnection.query( 'CREATE TABLE libreevent_admin ( account_id INT NOT NULL AUTO_INCREMENT, email TINYTEXT, pass TEXT, permissions VARCHAR( 1000 ), username TINYTEXT, two_fa TINYTEXT, PRIMARY KEY ( account_id ) );', ( error ) => {
|
||||
if ( error ) if ( error.code !== 'ER_TABLE_EXISTS_ERROR' ) throw error;
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
const path = require( 'path' );
|
||||
const fs = require( 'fs' );
|
||||
// const ph = require( './paymentHandler.js' );
|
||||
// const paymentHandler = new ph();
|
||||
|
||||
@@ -15,4 +16,13 @@ module.exports = ( app, settings ) => {
|
||||
app.get( '/payments/canceled', ( req, res ) => {
|
||||
res.sendFile( path.join( __dirname + '/../../ui/en/payments/canceled.html' ) );
|
||||
} );
|
||||
|
||||
app.get( '/tickets/tickets.pdf', ( req, res ) => {
|
||||
if ( req.session.id ) {
|
||||
fs.readFile( path.join( __dirname + '/../tickets/store/' + req.session.id + '.pdf' ), ( error, data ) => {
|
||||
if ( error ) res.sendFile( path.join( __dirname + '/../../ui/en/errors/404.html' ) );
|
||||
else res.send( data );
|
||||
} );
|
||||
}
|
||||
} );
|
||||
};
|
||||
@@ -82,15 +82,38 @@ module.exports = ( app, settings ) => {
|
||||
response.flushHeaders();
|
||||
response.write( 'data: connected\n\n' );
|
||||
waitingClients[ request.session.id ] = response;
|
||||
const ping = setInterval( () => {
|
||||
const stat = TicketGenerator.getGenerationStatus( request.session.id );
|
||||
if ( stat === 'done' ) {
|
||||
clearInterval( ping );
|
||||
setTimeout( () => {
|
||||
response.write( 'data: ready\n\n' );
|
||||
response.end();
|
||||
delete waitingClients[ request.session.id ];
|
||||
}, 2000 );
|
||||
} else if ( stat === 'noTicket' ) {
|
||||
clearInterval( ping );
|
||||
response.write( 'data: noData\n\n' );
|
||||
response.end();
|
||||
delete waitingClients[ request.session.id ];
|
||||
}
|
||||
}, 2000 );
|
||||
} );
|
||||
|
||||
app.get( '/user/2fa/ping', ( request, response ) => {
|
||||
if ( paymentOk[ request.session.token ] === 'ok' ) {
|
||||
delete paymentOk[ request.session.token ];
|
||||
response.send( { 'status': 'ok' } );
|
||||
if ( paymentOk[ request.session.id ] === 'ok' ) {
|
||||
delete paymentOk[ request.session.id ];
|
||||
response.send( { 'status': 'paymentOk' } );
|
||||
} else {
|
||||
const stat = TicketGenerator.getGenerationStatus( request.session.id );
|
||||
if ( stat === 'done' ) {
|
||||
response.send( { 'status': 'ticketOk' } );
|
||||
} else if ( stat === 'noTicket' ) {
|
||||
response.send( { 'status': 'noTicket' } );
|
||||
} else {
|
||||
response.send( '' );
|
||||
}
|
||||
}
|
||||
} );
|
||||
|
||||
app.post( '/payments/webhook', bodyParser.raw( { type: 'application/json' } ), ( req, res ) => {
|
||||
@@ -108,8 +131,10 @@ module.exports = ( app, settings ) => {
|
||||
|
||||
if ( event.type === 'checkout.session.completed' ) {
|
||||
setTimeout( () => {
|
||||
if ( waitingClients[ sessionReference[ event.data.object.id ][ 'tok' ] ] ) {
|
||||
waitingClients[ sessionReference[ event.data.object.id ][ 'tok' ] ].write( 'data: paymentOk\n\n' );
|
||||
}, 2000 );
|
||||
}
|
||||
}, 1000 );
|
||||
db.getDataSimple( 'temp', 'user_id', sessionReference[ event.data.object.id ][ 'tok' ] ).then( dat => {
|
||||
db.getDataSimple( 'users', 'email', sessionReference[ event.data.object.id ][ 'email' ] ).then( user => {
|
||||
if ( user[ 0 ] ) {
|
||||
|
||||
@@ -32,16 +32,31 @@ class TicketGenerator {
|
||||
db.getJSONData( 'events' ).then( events => {
|
||||
this.events = events;
|
||||
} );
|
||||
this.runningTickets = {};
|
||||
}
|
||||
|
||||
// TODO: Save to disk in case of crash of server / reboot / whatever
|
||||
// and continue processing once back online
|
||||
generateTickets ( order ) {
|
||||
this.ticketQueue[ this.jobId ] = { 'order': order };
|
||||
this.runningTickets[ order ] = 'processing';
|
||||
this.jobId += 1;
|
||||
this.queueHandler();
|
||||
}
|
||||
|
||||
getGenerationStatus ( order ) {
|
||||
if ( this.runningTickets[ order ] ) {
|
||||
if ( this.runningTickets[ order ] === 'done' ) {
|
||||
delete this.runningTickets[ order ];
|
||||
return 'done';
|
||||
} else {
|
||||
return 'processing';
|
||||
}
|
||||
} else {
|
||||
return 'noTicket';
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Maybe move to subprocesses
|
||||
queueHandler () {
|
||||
if ( !this.isRunning ) {
|
||||
@@ -63,7 +78,8 @@ class TicketGenerator {
|
||||
template: '' + fs.readFileSync( path.join( __dirname + '/../../ui/en/payments/ticketMail.html' ) )
|
||||
} );
|
||||
|
||||
console.log( dat[ 0 ].email );
|
||||
this.runningTickets[ res.order ] = 'done';
|
||||
|
||||
mailManager.sendMailWithAttachment( dat[ 0 ].email, await renderToString( app ), 'Thank you for your order', [
|
||||
{
|
||||
'filename': 'tickets.pdf',
|
||||
@@ -71,7 +87,7 @@ class TicketGenerator {
|
||||
}
|
||||
], settings.mailSender
|
||||
);
|
||||
// db.writeDataSimple( 'orders', 'order_name', res.order, { 'processed': 'true' } );
|
||||
db.writeDataSimple( 'orders', 'order_name', res.order, { 'processed': 'true' } );
|
||||
} )();
|
||||
}
|
||||
} );
|
||||
|
||||
11
src/server/ui/en/errors/404.html
Normal file
11
src/server/ui/en/errors/404.html
Normal file
@@ -0,0 +1,11 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>404</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>404</h1>
|
||||
</body>
|
||||
</html>
|
||||
@@ -44,8 +44,14 @@
|
||||
let self = this;
|
||||
|
||||
source.onmessage = ( e ) => {
|
||||
console.log( e );
|
||||
if ( e.data === 'ready' ) {
|
||||
open( '/tickets/get' );
|
||||
self.$refs.notification.cancelNotification( startNotification );
|
||||
self.$refs.notification.createNotification( 'Your tickets are ready! Starting download...', 10, 'progress', 'normal' );
|
||||
setTimeout( () => {
|
||||
open( '/tickets/tickets.pdf' );
|
||||
source.close();
|
||||
}, 500 );
|
||||
} else if ( e.data === 'paymentOk' ) {
|
||||
self.$refs.notification.createNotification( 'Your payment has been marked as completed!', 5, 'ok', 'normal' );
|
||||
}
|
||||
@@ -63,7 +69,7 @@
|
||||
self.$refs.notification.cancelNotification( startNotification );
|
||||
self.$refs.notification.createNotification( 'Could not connect to status service', 5, 'error', 'normal' );
|
||||
}
|
||||
}, false)
|
||||
}, false );
|
||||
}, 300 );
|
||||
} else {
|
||||
setTimeout( () => {
|
||||
|
||||
Reference in New Issue
Block a user