main: Cleaned up code

This commit is contained in:
Nathan Woodburn 2023-08-24 17:18:24 +10:00
parent 38526d5e08
commit fc8a0c3193
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
2 changed files with 5 additions and 10 deletions

View File

@ -60,7 +60,7 @@ SMTP_HOST: smtp-server
SMTP_PORT: smtp-port SMTP_PORT: smtp-port
SMTP_USER: smtp-user SMTP_USER: smtp-user
SMTP_PASS: smtp-pass SMTP_PASS: smtp-pass
SMTP_FROM: smtp-from <Optional> SMTP_FROM: smtp-from (eg. HNSHosting <hosting@nathan.woodburn.au>) This is optional
``` ```

View File

@ -251,8 +251,7 @@ def stripeapi():
return jsonify({'success': 'false'}) return jsonify({'success': 'false'})
except stripe.error.SignatureVerificationError as e: except stripe.error.SignatureVerificationError as e:
return jsonify({'success': 'false'}) return jsonify({'success': 'false'})
# Handle the event
if event.type == 'payment_intent.succeeded': if event.type == 'payment_intent.succeeded':
payment_intent = event.data.object payment_intent = event.data.object
# Get email # Get email
@ -270,12 +269,12 @@ def stripeapi():
password = os.getenv('SMTP_PASS') password = os.getenv('SMTP_PASS')
from_email = os.getenv('SMTP_FROM') from_email = os.getenv('SMTP_FROM')
if from_email == None: if from_email == None:
from_email = user from_email = "Hosting <"+user + ">"
context = ssl.create_default_context() context = ssl.create_default_context()
with smtplib.SMTP_SSL(host, port, context=context) as server: with smtplib.SMTP_SSL(host, port, context=context) as server:
server.login(user, password) server.login(user, password)
message = "From: Hosting <" + from_email + ">\nTo: " + email + \ message = "From: " + from_email + "\nTo: " + email + \
"\nSubject: Your Licence key\n\nHello,\n\n"\ "\nSubject: Your Licence key\n\nHello,\n\n"\
+"This email contains your licence key for your new wordpress site.\n" \ +"This email contains your licence key for your new wordpress site.\n" \
+"You can redeem this key via the discord bot or api.\n\n"\ +"You can redeem this key via the discord bot or api.\n\n"\
@ -283,16 +282,12 @@ def stripeapi():
server.sendmail(from_email, email, message) server.sendmail(from_email, email, message)
print('Licence sent via email for stripe payment', flush=True)
print('PaymentIntent was successful!', flush=True)
else: else:
print('Unhandled event type {}'.format(event.type)) print('Unhandled event type {}'.format(event.type))
return jsonify({'success': 'true'}) return jsonify({'success': 'true'})
def get_sites_count(): def get_sites_count():
# If file doesn't exist, create it # If file doesn't exist, create it
try: try: