Merge pull request #228 from Seluj78/feature/openapi-doc

Author: Seluj78

README.md

@@ -0,0 +1,5 @@
+## API Docs:
+
+```
+docker run -p 80:8080 -e SWAGGER_JSON=/foo/swagger.yaml -v app:/foo swaggerapi/swagger-ui
+```

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

@@ -55,7 +55,8 @@ def forgot_password():
         pass
     else:
         token = generate_confirmation_token(email=data["email"], token_type="reset")
-        link = os.getenv("APP_URL") + "/auth/password/forgot/" + token
+        # link = os.getenv("APP_URL") + "/auth/password/forgot/" + token
+        link = f"{os.getenv('FRONT_URL')}/accounts/password/reset?token={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)
@@ -96,3 +97,20 @@ def reset_password():
         u.save()
         current_app.logger.debug("/auth/password/reset -> Password reset successfully")
         return Success("Password reset successful.")
+
+
+@auth_password_bp.route("/auth/password/check_token", methods=["POST"])
+@validate_params({"token": str})
+def check_token_validity():
+    data = request.get_json()
+    try:
+        confirm_token(data["token"], expiration=7200)
+    except (SignatureExpired, BadSignature) as e:
+        if e == SignatureExpired:
+            current_app.logger.debug("/auth/password/reset -> Signature Expired")
+            raise BadRequestError("Signature Expired.", "Request another password reset and try again.")
+        else:
+            current_app.logger.debug("/auth/password/reset -> Bad Signature")
+            raise BadRequestError("Bad Signature.", "Request another password reset and try again.")
+    else:
+        return Success("Reset token is correct")

backend/PyMatcha/routes/api/messages.py

@@ -148,6 +148,7 @@ def unlike_message(message_id):
 def get_new_messages():
     message_list = Message.get_multis(to_id=current_user.id, is_seen=False)
     if not message_list:
-        return Success("No new messages.")
-    new_messages = [m.to_dict() for m in message_list]
+        new_messages = []
+    else:
+        new_messages = [m.to_dict() for m in message_list]
     return SuccessOutput("new_messages", new_messages)

backend/PyMatcha/routes/api/recommendations.py

@@ -16,6 +16,8 @@
     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 json
+
 from flask import Blueprint
 from flask_jwt_extended import current_user
 from flask_jwt_extended import jwt_required
@@ -32,4 +34,4 @@ def get_recommendations():
     recommendations = redis.get(f"user_recommendations:{str(current_user.id)}")
     if not recommendations:
         raise NotFoundError("Recommendations not calculated yet", "Please come back later")
-    return SuccessOutput("recommendations", recommendations)
+    return SuccessOutput("recommendations", json.loads(recommendations))

backend/PyMatcha/utils/tasks.py

@@ -107,7 +107,7 @@ def update_user_recommendations():
     for user_to_update in User.select_all():
         count += 1
         user_to_update_recommendations = []
-
+        # TODO: Find a way to bypass that
         if not user_to_update.birthdate:
             continue
         if not user_to_update.geohash: