janishutz/libreevent
1
0
Fork 0
mirror of https://github.com/janishutz/libreevent.git synced 2025-11-25 21:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Janis Hutz
2023-10-14 10:50:50 +02:00
parent b31667a77f
commit 02dee5ad0d
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/backend/plugins/payments/payrexx/payrexxRoutes.js
View File

@@ -13,6 +13,7 @@ const ticket = require( '../../../tickets/ticketGenerator.js' );
const payrexxModule = require( './module.payrexx.js' ); const payrexxModule = require( './module.payrexx.js' );
const payrexx = payrexxModule.init(); const payrexx = payrexxModule.init();
const TicketGenerator = new ticket(); const TicketGenerator = new ticket();
const generator = require( '../../../token.js' );
let sessionReference = {}; let sessionReference = {};
let waitingClients = {}; let waitingClients = {};
@@ -101,6 +102,7 @@ module.exports = ( app, settings ) => {
response.write( 'data: ready\n\n' ); response.write( 'data: ready\n\n' );
response.end(); response.end();
delete waitingClients[ request.session.id ]; delete waitingClients[ request.session.id ];
request.session.id = generator.generateToken( 30 );
}, 2000 ); }, 2000 );
} else if ( stat === 'noTicket' ) { } else if ( stat === 'noTicket' ) {
clearInterval( ping ); clearInterval( ping );
@@ -120,6 +122,7 @@ module.exports = ( app, settings ) => {
if ( !pendingPayments[ request.session.id ] ) { if ( !pendingPayments[ request.session.id ] ) {
const stat = TicketGenerator.getGenerationStatus( request.session.id ); const stat = TicketGenerator.getGenerationStatus( request.session.id );
if ( stat === 'done' ) { if ( stat === 'done' ) {
request.session.id = generator.generateToken( 30 );
response.send( { 'status': 'ticketOk' } ); response.send( { 'status': 'ticketOk' } );
} else if ( stat === 'noTicket' ) { } else if ( stat === 'noTicket' ) {
response.send( { 'status': 'noTicket' } ); response.send( { 'status': 'noTicket' } );

3
src/server/backend/plugins/payments/stripe/stripeRoutes.js
View File

@@ -16,6 +16,7 @@ const stripe = require( 'stripe' )( stripeConfig[ 'APIKey' ] );
const bodyParser = require( 'body-parser' ); const bodyParser = require( 'body-parser' );
const ticket = require( '../../../tickets/ticketGenerator.js' ); const ticket = require( '../../../tickets/ticketGenerator.js' );
const TicketGenerator = new ticket(); const TicketGenerator = new ticket();
const generator = require( '../../../token.js' );
const endpointSecret = stripeConfig[ 'endpointSecret' ]; const endpointSecret = stripeConfig[ 'endpointSecret' ];
@@ -103,6 +104,7 @@ module.exports = ( app, settings ) => {
response.write( 'data: ready\n\n' ); response.write( 'data: ready\n\n' );
response.end(); response.end();
delete waitingClients[ request.session.id ]; delete waitingClients[ request.session.id ];
request.session.id = generator.generateToken( 30 );
}, 2000 ); }, 2000 );
} else if ( stat === 'noTicket' ) { } else if ( stat === 'noTicket' ) {
clearInterval( ping ); clearInterval( ping );
@@ -122,6 +124,7 @@ module.exports = ( app, settings ) => {
if ( !pendingPayments[ request.session.id ] ) { if ( !pendingPayments[ request.session.id ] ) {
const stat = TicketGenerator.getGenerationStatus( request.session.id ); const stat = TicketGenerator.getGenerationStatus( request.session.id );
if ( stat === 'done' ) { if ( stat === 'done' ) {
request.session.id = generator.generateToken( 30 );
response.send( { 'status': 'ticketOk' } ); response.send( { 'status': 'ticketOk' } );
} else if ( stat === 'noTicket' ) { } else if ( stat === 'noTicket' ) {
response.send( { 'status': 'noTicket' } ); response.send( { 'status': 'noTicket' } );

4
src/server/backend/userRoutes.js
View File

@@ -178,7 +178,7 @@ module.exports = ( app, settings ) => {
'name': request.body.name, 'name': request.body.name,
'two_fa': 'disabled', 'two_fa': 'disabled',
'user_data': JSON.stringify( { 'country': request.body.country } ), 'user_data': JSON.stringify( { 'country': request.body.country } ),
'marketing': request.body.newsletter ? generator.generateToken( 60 ) : null 'marketing': request.body.newsletter ?? null
} ).then( () => { } ).then( () => {
request.session.loggedInUser = true; request.session.loggedInUser = true;
request.session.username = request.body.mail; request.session.username = request.body.mail;
@@ -215,6 +215,8 @@ module.exports = ( app, settings ) => {
if ( call === '2fa' ) { if ( call === '2fa' ) {
db.writeDataSimple( 'users', 'email', request.session.username, { 'two_fa': request.body.twoFA } ); db.writeDataSimple( 'users', 'email', request.session.username, { 'two_fa': request.body.twoFA } );
response.send( 'ok' ); response.send( 'ok' );
} else {
response.status( 404 ).send( 'Not found' );
} }
} else { } else {
response.status( 403 ).send( 'unauthorised' ); response.status( 403 ).send( 'unauthorised' );

5
src/server/ui/en/signup/allowTwoFA.html
View File

@@ -90,11 +90,10 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
<script> <script>
function submitFunction () { function submitFunction () {
let code = document.getElementById( '2fa' ).value; let mode = document.getElementById( '2fa' ).value;
let data = '';
let fetchOptions = { let fetchOptions = {
method: 'post', method: 'post',
body: JSON.stringify( { 'twoFA': data } ), body: JSON.stringify( { 'twoFA': mode } ),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'charset': 'utf-8' 'charset': 'utf-8'

5
src/server/ui/en/signup/enforceTwoFA.html
View File

@@ -89,11 +89,10 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
<script> <script>
function submitFunction () { function submitFunction () {
let code = document.getElementById( '2fa' ).value; let mode = document.getElementById( '2fa' ).value;
let data = '';
let fetchOptions = { let fetchOptions = {
method: 'post', method: 'post',
body: JSON.stringify( { 'twoFA': data } ), body: JSON.stringify( { 'twoFA': mode } ),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'charset': 'utf-8' 'charset': 'utf-8'