README.md

@@ -29,11 +29,12 @@ To set up the server, consult some of the comprehensive guides on various hostin
 Here is a [good starting point on setting up a server](https://www.digitalocean.com/community/tutorials/initial-server-setup-with-ubuntu-22-04).
 
 To install Docker and Docker Compose, consult the respective documentation:
-
   - [Install on Ubuntu](https://docs.docker.com/engine/install/ubuntu/) or [Install on Debian](https://docs.docker.com/engine/install/debian/)
   - Docker Compose should be installed as part of that.
 
-> At the time of writing, there has been an upgrade to Docker and Docker Compose, meaning the syntax below might be different between versions.
+```
+At the time of writing, there has been an upgrade to Docker and Docker Compose, meaning the syntax below might be different between versions.
+```
 
 Check if Git is installed on your server using the `git --version` command.
 If it isn't installed, install it.
@@ -71,13 +72,13 @@ Also make sure that the various entries for usernames and passwords match.
 
 There are some values in the following four files you will need to configure to reflect the domain you are installing this app.
 
-```sh
+```
 # .env
 
 SERVER_NAME= # URL where this will be hosted.
 ```
 
-```sh
+```
 # install-script.sh
 
 domains=(example.org www.example.org)
@@ -86,7 +87,7 @@ email="" # Adding a valid address is strongly recommended
 
 Substitute the domain name `domain_name` in the two file paths in the following file:
 
-```sh
+```
 # nginx/ssl.conf
 
 ssl_certificate /etc/letsencrypt/live/domain_name/fullchain.pem;
@@ -94,9 +95,9 @@ ssl_certificate_key /etc/letsencrypt/live/domain_name/privkey.pem;
 ...
 ```
 
-And **six** locations in the following file, two for the regular version of the domain and four for the www version (remember to keep the www. prefix where present):
+And **six** locations in the following file, two for the regular version of the domain and two for the www version:
 
-```nginx
+```
 # nginx/conf.d/ref-test-app.conf
 
 server {
@@ -139,9 +140,9 @@ This will be set up automatically.
 However, there is a specific chicken-and-egg problem as the web server, Nginx, won't run without certificates, Certbot, the certificate generator, won't run without the web server.
 So to solve this, there is an automation script we can run that will set up a dummy certificate and then issue the appropriate certificates for us.
 
-```sh
+```
-chmod +x install-script.sh
+$ chmod +x install-script.sh
-sudo ./install-script.sh
+$ sudo ./install-script.sh
 ```
 
 This will take a long time to run the first time because it will try and generate a fairly sizeable cypher.

ref-test/app/models/entry.py

@@ -6,7 +6,6 @@ from .test import Test
 
 from flask_login import current_user
 from flask_mail import Message
-from smtplib import SMTPException
 
 from datetime import datetime, timedelta
 from uuid import uuid4
@@ -175,7 +174,4 @@ class Entry(db.Model):
             <p>Best wishes, <br/> SKA Refereeing</p>
             """
         )
-        try: 
         mail.send(email)
-        except SMTPException as exception:
-            write('system.log', f'SMTP Error when trying to notify results to {self.get_surname()}, {self.get_first_name()} with error: {exception}')

ref-test/app/models/user.py

@@ -6,7 +6,6 @@ from flask import flash, jsonify, session
 from flask.helpers import url_for
 from flask_login import current_user, login_user, logout_user, UserMixin
 from flask_mail import Message
-from smtplib import SMTPException
 from werkzeug.security import check_password_hash, generate_password_hash
 
 import secrets
@@ -91,10 +90,7 @@ class User(UserMixin, db.Model):
                 <p>SKA Refereeing</p>
                 """
             )
-            try:
             mail.send(email)
-            except SMTPException as exception:
-                write('system.log', f'SMTP Error while trying to notify new user account creation to {self.get_username()} with error: {exception}')
         return True, f'User {self.get_username()} was created successfully.'
 
     def login(self, remember:bool=False):
@@ -113,6 +109,7 @@ class User(UserMixin, db.Model):
         self.set_password(new_password)
         self.reset_token = secrets.token_urlsafe(16)
         self.verification_token = secrets.token_urlsafe(16)
+        db.session.commit()
         email = Message(
             subject='RefTest | Password Reset',
             recipients=[self.get_email()],
@@ -145,12 +142,11 @@ class User(UserMixin, db.Model):
             <p>SKA Refereeing</p>
             """
         )
-        try:
         mail.send(email)
-        except SMTPException as exception:
+        print('Password', new_password)
-            write('system.log', f'SMTP Error while trying to reset password for {self.get_username()} with error: {exception}')
+        print('Reset Token', self.reset_token)
-            return jsonify({'error': f'SMTP Error: {exception}'}), 500
+        print('Verification Token', self.verification_token)
-        db.session.commit()
+        print('Reset Link', f'{url_for("admin._reset", token=self.reset_token, verification=self.verification_token, _external=True)}')
         return jsonify({'success': 'Your password reset link has been generated.'}), 200
 
     def clear_reset_tokens(self):
@@ -186,10 +182,7 @@ class User(UserMixin, db.Model):
                 <p>SKA Refereeing</p>
                 """
             )
-            try:
             mail.send(email)
-            except SMTPException as exception:
-                write('system.log', f'SMTP Error when trying to delete account {username} with error: {exception}')
         return True, message
 
     def update(self, password:str=None, email:str=None, notify:bool=False):
@@ -230,8 +223,5 @@ class User(UserMixin, db.Model):
                 <p>SKA Refereeing</p>
                 """
             )
-            try:
             mail.send(message)
-            except SMTPException as exception:
-                write('system.log', f'SMTP Error when trying to update account {self.get_username()} with error: {exception}')
         return True, f'Account {self.get_username()} has been updated.'

ref-test/requirements.txt

@@ -1,13 +1,13 @@
-blinker==1.5
+blinker==1.4
-cffi==1.15.1
+cffi==1.15.0
 click==8.1.3
-cryptography==37.0.4
+cryptography==37.0.2
 dnspython==2.2.1
-dominate==2.7.0
+dominate==2.6.0
 email-validator==1.2.1
-Flask==2.2.2
+Flask==2.1.2
 Flask-Bootstrap==3.3.7.1
-Flask-Login==0.6.2
+Flask-Login==0.6.1
 Flask-Mail==0.9.1
 Flask-SQLAlchemy==2.5.1
 Flask-WTF==1.0.1
@@ -20,8 +20,8 @@ MarkupSafe==2.1.1
 pycparser==2.21
 python-dotenv==0.20.0
 six==1.16.0
-SQLAlchemy==1.4.40
+SQLAlchemy==1.4.37
-SQLAlchemy-Utils==0.38.3
+SQLAlchemy-Utils==0.38.2
 visitor==0.1.3
-Werkzeug==2.2.2
+Werkzeug==2.1.2
 WTForms==3.0.1