Fixed 238

Author: Seluj78

backend/PyMatcha/__init__.py

@@ -61,7 +61,22 @@
     if item not in os.environ:
         raise EnvironmentError(f"{item} is not set in the server's environment or .env file. It is required.")
 
-if os.getenv("ENABLE_LOGGING") == "True":
+from PyMatcha.utils.static import (
+    ENABLE_LOGGING,
+    FLASK_SECRET_KEY,
+    CELERY_RESULT_BACKEND,
+    CELERY_BROKER_URL,
+    DB_NAME,
+    DB_USER,
+    DB_PASSWORD,
+    DB_PORT,
+    DB_HOST,
+    MAIL_PASSWORD,
+    REDIS_PORT,
+    REDIS_HOST,
+)
+
+if ENABLE_LOGGING == "True":
     setup_logging()
 
 application = Flask(__name__)
@@ -71,13 +86,11 @@
 else:
     application.debug = False
 
-application.secret_key = os.getenv("FLASK_SECRET_KEY")
-application.config.update(FLASK_SECRET_KEY=os.getenv("FLASK_SECRET_KEY"))
-application.config["JWT_SECRET_KEY"] = os.environ.get("FLASK_SECRET_KEY")
+application.secret_key = FLASK_SECRET_KEY
+application.config.update(FLASK_SECRET_KEY=FLASK_SECRET_KEY)
+application.config["JWT_SECRET_KEY"] = FLASK_SECRET_KEY
 
 logging.debug("Configuring Celery Redis URLs")
-CELERY_BROKER_URL = os.getenv("CELERY_BROKER_URL")
-CELERY_RESULT_BACKEND = os.getenv("CELERY_RESULT_BACKEND")
 # Celery configuration
 application.config["CELERY_BROKER_URL"] = CELERY_BROKER_URL
 application.config["CELERY_RESULT_BACKEND"] = CELERY_RESULT_BACKEND
@@ -120,18 +133,13 @@ def expired_token_callback(expired_token):
 logging.debug("Configuring CORS")
 CORS(application, expose_headers="Authorization", supports_credentials=True)
 
-if os.getenv("CI"):
-    database_password = ""
-else:
-    database_password = os.getenv("DB_PASSWORD")
-
 logging.debug("Setting database config from environment variables")
 database_config = {
-    "host": os.getenv("DB_HOST"),
-    "port": int(os.getenv("DB_PORT")),
-    "user": os.getenv("DB_USER"),
-    "password": database_password,
-    "db": os.getenv("DB_NAME"),
+    "host": DB_HOST,
+    "port": int(DB_PORT),
+    "user": DB_USER,
+    "password": DB_PASSWORD,
+    "db": DB_NAME,
     "charset": "utf8mb4",
     "cursorclass": DictCursor,
 }
@@ -148,14 +156,14 @@ def expired_token_callback(expired_token):
     MAIL_PORT=465,
     MAIL_USE_SSL=True,
     MAIL_USERNAME="pymatcha@gmail.com",
-    MAIL_PASSWORD=os.getenv("MAIL_PASSWORD"),
+    MAIL_PASSWORD=MAIL_PASSWORD,
     MAIL_DEBUG=False,
     MAIL_DEFAULT_SENDER="pymatcha@gmail.com",
 )
 logging.debug("Configuring mail")
 mail = Mail(application)
 
-redis = StrictRedis(host=os.getenv("REDIS_HOST"), port=os.getenv("REDIS_PORT"), decode_responses=True, db=2)
+redis = StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True, db=2)
 
 redis.flushdb()
 

backend/PyMatcha/routes/api/auth/email.py

@@ -17,11 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 import datetime
-import os
 
 from flask import Blueprint
 from flask import current_app
-from flask import redirect
 from flask import render_template
 from flask import request
 from itsdangerous import BadSignature
@@ -30,8 +28,10 @@
 from PyMatcha.utils.confirm_token import confirm_token
 from PyMatcha.utils.confirm_token import generate_confirmation_token
 from PyMatcha.utils.decorators import validate_params
+from PyMatcha.utils.errors import BadRequestError
 from PyMatcha.utils.errors import NotFoundError
 from PyMatcha.utils.mail import send_mail_html
+from PyMatcha.utils.static import FRONTEND_EMAIL_CONFIRMATION_URL
 from PyMatcha.utils.success import Success
 
 
@@ -40,36 +40,36 @@
 auth_email_bp = Blueprint("auth_email", __name__)
 
 
-@auth_email_bp.route("/auth/confirm/<token>", methods=["GET"])
+@auth_email_bp.route("/auth/confirm/<token>", methods=["POST"])
 def confirm_email(token):
     current_app.logger.debug("/auth/confirm/{} -> Call".format(token))
     try:
         email, token_type = confirm_token(token, expiration=7200)
     except (SignatureExpired, BadSignature) as e:
         if e == SignatureExpired:
             current_app.logger.debug("/auth/confirm -> Signature Expired")
-            return redirect("/?type=confirm&success=false&message=Signature expired")
+            raise BadRequestError("Signature Expired.", "Request another email confirmation and try again.")
         else:
             current_app.logger.debug("/auth/confirm -> Bad Expired")
-            return redirect("/?type=confirm&success=false&message=Bad Signature")
+            raise BadRequestError("Bad Signature.", "Request another password reset and try again.")
     else:
         if token_type != "confirm":
             current_app.logger.debug("/auth/confirm -> Wrong token type")
-            return redirect("/?type=confirm&success=false&message=Wrong token type")
+            raise BadRequestError("Wrong token type.")
         try:
             u = get_user(email)
         except NotFoundError:
             current_app.logger.debug("/auth/confirm -> User not found")
-            return redirect("/?type=confirm&success=false&message=User not found")
+            raise NotFoundError("User not found.")
         if u.is_confirmed:
             current_app.logger.debug("/auth/confirm -> User already confirmed")
-            return redirect("/?type=confirm&success=false&message=User already confirmed")
+            raise BadRequestError("Email already confirmed", "")
         else:
             u.is_confirmed = True
             u.confirmed_on = datetime.datetime.utcnow()
             u.save()
         current_app.logger.debug("/auth/confirm -> User {} confirmed.".format(u.id))
-        return redirect("/?type=confirm&success=true&message=User confirmed")
+        return Success("Confirmation successfull")
 
 
 @auth_email_bp.route("/auth/confirm/new", methods=["POST"])
@@ -90,7 +90,7 @@ def request_new_email_conf():
         else:
             current_app.logger.debug("/auth/confirm/new -> User found, sending new confirmation email")
             token = generate_confirmation_token(email=email, token_type="confirm")
-            link = os.getenv("FRONTEND_BASE_URL") + "/auth/confirm/" + token
+            link = FRONTEND_EMAIL_CONFIRMATION_URL + token
             rendered_html = render_template("confirm_email.html", link=link)
             send_mail_html.delay(dest=data["email"], subject="Confirm your email on PyMatcha", html=rendered_html)
     current_app.logger.debug("/auth/confirm/new -> New confirmation email sent if user exists in database")

backend/PyMatcha/routes/api/auth/password.py

@@ -16,8 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
-import os
-
 from flask import Blueprint
 from flask import current_app
 from flask import render_template
@@ -32,9 +30,9 @@
 from PyMatcha.utils.errors import BadRequestError
 from PyMatcha.utils.errors import NotFoundError
 from PyMatcha.utils.mail import send_mail_html
+from PyMatcha.utils.static import FRONTEND_PASSWORD_RESET_URL
 from PyMatcha.utils.success import Success
 
-
 REQUIRED_KEYS_PASSWORD_FORGOT = {"email": str}
 REQUIRED_KEYS_PASSWORD_RESET = {"token": str, "password": str}
 
@@ -55,7 +53,7 @@ def forgot_password():
         pass
     else:
         token = generate_confirmation_token(email=data["email"], token_type="reset")
-        link = f"{os.getenv('FRONTEND_BASE_URL')}/accounts/password/reset?token={token}"
+        link = FRONTEND_PASSWORD_RESET_URL + token
         rendered_html = render_template("password_reset.html", link=link)
         current_app.logger.debug("/auth/password/forgot -> Sending worker request to send email")
         send_mail_html.delay(dest=data["email"], subject="Reset your password on PyMatcha", html=rendered_html)

backend/PyMatcha/routes/api/auth/register.py

@@ -16,8 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
-import os
-
 from flask import Blueprint
 from flask import current_app
 from flask import render_template
@@ -27,9 +25,9 @@
 from PyMatcha.utils.decorators import validate_params
 from PyMatcha.utils.errors import ConflictError
 from PyMatcha.utils.mail import send_mail_html
+from PyMatcha.utils.static import FRONTEND_EMAIL_CONFIRMATION_URL
 from PyMatcha.utils.success import SuccessOutputMessage
 
-
 REQUIRED_KEYS_USER_CREATION = {"username": str, "email": str, "password": str, "first_name": str, "last_name": str}
 
 auth_register_bp = Blueprint("auth_register", __name__)
@@ -55,7 +53,7 @@ def api_create_user():
         raise e
     else:
         token = generate_confirmation_token(email=data["email"], token_type="confirm")
-        link = os.getenv("FRONTEND_BASE_URL") + "/auth/confirm/" + token
+        link = FRONTEND_EMAIL_CONFIRMATION_URL + token
         rendered_html = render_template("confirm_email.html", link=link)
         send_mail_html.delay(dest=data["email"], subject="Confirm your email on PyMatcha", html=rendered_html)
         return SuccessOutputMessage("email", new_user.email, "New user successfully created.")

backend/PyMatcha/routes/api/profile/edit.py

@@ -17,7 +17,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 import datetime
-import os
 
 import Geohash
 from flask import Blueprint
@@ -36,6 +35,7 @@
 from PyMatcha.utils.mail import send_mail_html
 from PyMatcha.utils.mail import send_mail_text
 from PyMatcha.utils.password import check_password
+from PyMatcha.utils.static import FRONTEND_EMAIL_CONFIRMATION_URL
 from PyMatcha.utils.success import Success
 
 profile_edit_bp = Blueprint("profile_edit", __name__)
@@ -114,7 +114,7 @@ def edit_email():
     current_user.is_confirmed = False
     current_user.save()
     token = generate_confirmation_token(email=new_email, token_type="confirm")
-    link = os.getenv("FRONTEND_BASE_URL") + "/auth/confirm/" + token
+    link = FRONTEND_EMAIL_CONFIRMATION_URL + token
     rendered_html = render_template("confirm_email.html", link=link)
     send_mail_html.delay(dest=data["email"], subject="Confirm your email on PyMatcha", html=rendered_html)
     return Success("Email sent for new email")

backend/PyMatcha/utils/static.py

@@ -0,0 +1,30 @@
+import os
+
+FLASK_PORT = os.getenv("FLASK_PORT")
+FLASK_SECRET_KEY = os.getenv("FLASK_DEBUG")
+
+ENABLE_LOGGING = os.getenv("FLASK_HOST")
+
+CELERY_BROKER_URL = os.getenv("FLASK_SECRET_KEY")
+CELERY_RESULT_BACKEND = os.getenv("ENABLE_LOGGING")
+
+DB_HOST = os.getenv("CELERY_BROKER_URL")
+DB_PORT = os.getenv("CELERY_RESULT_BACKEND")
+DB_USER = os.getenv("DB_HOST")
+DB_PASSWORD = os.getenv("DB_PORT")
+DB_NAME = os.getenv("DB_USER")
+
+MAIL_PASSWORD = os.getenv("DB_PASSWORD")
+
+REDIS_HOST = os.getenv("DB_NAME")
+REDIS_PORT = os.getenv("MAIL_PASSWORD")
+
+DEBUG_AUTH_TOKEN = os.getenv("REDIS_HOST")
+
+FRONTEND_BASE_URL = os.getenv("REDIS_PORT")
+
+FRONTEND_EMAIL_CONFIRMATION_URL = FRONTEND_BASE_URL + "/accounts/verify?token="
+FRONTEND_PASSWORD_RESET_URL = FRONTEND_BASE_URL + "/accounts/password/reset?token="
+
+PYMATCHA_ROOT = os.path.join(os.path.dirname(__file__), "../..")
+BACKEND_ROOT = os.path.join(os.path.dirname(__file__), "../")