Merge pull request #149 from Seluj78/complete-profile

Co-authored-by: gmorer <gmorer@pm.me>

Author: Seluj78

.dockerignore

@@ -1,4 +1,4 @@
-env/
+venv/
 __pycache__/
 .git
 frontend/node_modules

Dockerfile

@@ -6,7 +6,7 @@ ADD .env .
 RUN export $(cat .env | xargs)
 RUN npm run build
 
-FROM python:3.7.7-buster
+FROM python:3.8.3-buster
 WORKDIR /www
 ADD backend .
 ADD .env .

PyMatcha.postman_collection.json

@@ -123,7 +123,7 @@
 									"tests[\"JSON return code is 400\"] = response.code == 400",
 									"",
 									"tests[\"success is true\"] = response.success == false",
-									"tests[\"Message is correct\"] = response.error.message == \"Missing key(s) ['username', 'first_name', 'last_name'] to perform action.\"",
+									"tests[\"Message is correct\"] = response.error.message == \"Missing keys ['username', 'first_name', 'last_name'].\"",
 									"tests[\"Error type is Bad Request\"] = response.error.type == \"BadRequestError\""
 								],
 								"type": "text/javascript"
@@ -804,7 +804,7 @@
 									"tests[\"JSON return code is 400\"] = response.code == 400",
 									"",
 									"tests[\"success is true\"] = response.success == false",
-									"tests[\"Message is correct\"] = response.error.message == \"Missing key(s) ['username'] to perform action.\"",
+									"tests[\"Message is correct\"] = response.error.message == \"Missing keys ['username'].\"",
 									"tests[\"Error type is Bad Request\"] = response.error.type == \"BadRequestError\""
 								],
 								"type": "text/javascript"
@@ -855,8 +855,10 @@
 									"",
 									"tests[\"success is true\"] = response.success == true",
 									"",
-									"pm.collectionVariables.set(\"user_access_token\", response.tokens.access_token);",
-									"pm.collectionVariables.set(\"user_refresh_token\", response.tokens.refresh_token);"
+									"tests[\"Is profile completed is 0\"] = response.return.is_profile_completed == 0",
+									"",
+									"pm.collectionVariables.set(\"user_access_token\", response.return.access_token);",
+									"pm.collectionVariables.set(\"user_refresh_token\", response.return.refresh_token);"
 								],
 								"type": "text/javascript"
 							}
@@ -906,8 +908,10 @@
 									"",
 									"tests[\"success is true\"] = response.success == true",
 									"",
-									"pm.collectionVariables.set(\"user_access_token\", response.tokens.access_token);",
-									"pm.collectionVariables.set(\"user_refresh_token\", response.tokens.refresh_token);"
+									"tests[\"Is profile completed is 0\"] = response.return.is_profile_completed == 0",
+									"",
+									"pm.collectionVariables.set(\"user_access_token\", response.return.access_token);",
+									"pm.collectionVariables.set(\"user_refresh_token\", response.return.refresh_token);"
 								],
 								"type": "text/javascript"
 							}
@@ -1282,6 +1286,114 @@
 			],
 			"protocolProfileBehavior": {}
 		},
+		{
+			"name": "Profile",
+			"item": [
+				{
+					"name": "Complete profile",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "a0f4bed4-f29c-46ff-a16b-66db85d46a87",
+								"exec": [
+									"var response = JSON.parse(responseBody);",
+									"",
+									"",
+									"pm.test(\"Status code is 200\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});",
+									"",
+									"",
+									"tests[\"success is true\"] = response.success == true",
+									"tests[\"Message is correct\"] = response.message == \"Profile completed !\"",
+									""
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n\t\"orientation\": \"heterosexual\",\n\t\"bio\": \"Nunc faucibus velit metus, nec iaculis sem fringilla ut. Nullam vel vulputate diam. Vivamus vehicula, enim at hendrerit tincidunt, leo sapien maximus nisi, nec suscipit arcu nisi a turpis. Suspendisse rutrum quis quam et sollicitudin. Proin commodo justo non dui tempor, at maximus velit vulputate. Integer vitae porta nulla, ut congue est. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin purus ex, venenatis vel aliquet a, interdum sit amet quam. Donec ac volutpat dui. In ornare augue in nisi efficitur varius. Donec hendrerit nunc a pulvinar posuere. Donec malesuada eros quam, eget pharetra nunc elementum in.\"\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{host}}/profile/complete",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"profile",
+								"complete"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Login after profile completed",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "c3bcacc7-f9f6-42ad-8590-2022cfae9c6f",
+								"exec": [
+									"var response = JSON.parse(responseBody);",
+									"",
+									"",
+									"pm.test(\"Status code is 200\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});",
+									"",
+									"tests[\"JSON return code is 200\"] = response.code == 200",
+									"",
+									"tests[\"success is true\"] = response.success == true",
+									"",
+									"tests[\"Is profile completed is 0\"] = response.return.is_profile_completed == 1",
+									"",
+									"pm.collectionVariables.set(\"user_access_token\", response.return.access_token);",
+									"pm.collectionVariables.set(\"user_refresh_token\", response.return.refresh_token);"
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n\t\"password\": \"{{user_password}}\",\n\t\"username\": \"{{user_email}}\"\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{host}}/auth/login",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"auth",
+								"login"
+							]
+						}
+					},
+					"response": []
+				}
+			],
+			"protocolProfileBehavior": {}
+		},
 		{
 			"name": "Delete user after tests",
 			"event": [
@@ -1382,67 +1494,67 @@
 	],
 	"variable": [
 		{
-			"id": "6c8b7fc6-9cc7-4d64-a3a8-6906042342b6",
+			"id": "f4dd475b-c423-4497-a1d7-826619651283",
 			"key": "host",
 			"value": "http://127.0.0.1:5000",
 			"type": "string"
 		},
 		{
-			"id": "ddad86e9-22e5-4a88-b52d-301816ef3a36",
+			"id": "8d82efce-58a4-4ae6-be77-3f9a94c64aa4",
 			"key": "user_id",
 			"value": "",
 			"type": "string"
 		},
 		{
-			"id": "5d18d3f6-eaeb-40d7-8a7c-c7b0d964553c",
+			"id": "54e97677-add0-44ce-b4de-08e78149669d",
 			"key": "user_email",
 			"value": "foo@example.org",
 			"type": "string"
 		},
 		{
-			"id": "faf5a9f1-4700-4834-9c27-828bd5a91ce7",
+			"id": "f13b4302-ae17-4f05-bd3d-0092d7d0e988",
 			"key": "user_username",
 			"value": "bar",
 			"type": "string"
 		},
 		{
-			"id": "ed8d0627-3dca-497c-a0ac-3ea8d91f44ee",
+			"id": "b71e8f9f-9932-4c65-b1b8-88bbe02146c2",
 			"key": "user_password",
 			"value": "admin",
 			"type": "string"
 		},
 		{
-			"id": "0d707d74-159d-44d8-ba14-d6d481e06f36",
+			"id": "d567e6be-d3ae-418d-bc4a-a2b8ec7971a3",
 			"key": "user_firstname",
 			"value": "Foo",
 			"type": "string"
 		},
 		{
-			"id": "af2785be-3f97-4b93-8715-6d3fc078f780",
+			"id": "9f99c685-7bf2-4774-b694-c3fcebb92b84",
 			"key": "user_lastname",
 			"value": "Bar",
 			"type": "string"
 		},
 		{
-			"id": "acc6eed3-ff7a-427e-ad0c-3759ce4d730b",
+			"id": "34adee57-0702-4c96-9efb-58a80542d55d",
 			"key": "debug_token",
 			"value": "xX69jules69Xx",
 			"type": "string"
 		},
 		{
-			"id": "b0753752-b0e6-4772-aefd-c5fb69ea93ff",
+			"id": "dcd1f01b-44a4-4750-a05c-af21292576b6",
 			"key": "user_access_token",
 			"value": "",
 			"type": "string"
 		},
 		{
-			"id": "99791095-2cf9-486c-9573-1e21bb25012b",
+			"id": "633549e9-b8aa-42ed-8178-6a91d38961b8",
 			"key": "user_refresh_token",
 			"value": "",
 			"type": "string"
 		},
 		{
-			"id": "fb718e68-8130-4d40-ab14-4e5816a8f1e7",
+			"id": "b712d83c-9221-4571-9945-6fc52fcd167f",
 			"key": "expired_token",
 			"value": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1OTAyNDIyNjQsIm5iZiI6MTU5MDI0MjI2NCwianRpIjoiNTM0ZGI5NzQtOWE4Ni00MGViLWE1NDEtMDg3N2ZmNzQ3NDVhIiwiZXhwIjoxNTkwMjQyMzI0LCJpZGVudGl0eSI6eyJpZCI6NTEyLCJlbWFpbCI6ImZvb0BleGFtcGxlLm9yZyIsInVzZXJuYW1lIjoiYmFyIiwiaXNfb25saW5lIjp0cnVlLCJkYXRlX2xhc3RzZWVuIjoiU2F0LCAyMyBNYXkgMjAyMCAxMzo1Nzo0NCBHTVQifSwiZnJlc2giOnRydWUsInR5cGUiOiJhY2Nlc3MifQ.NTp2P0WNkXDwzuzrcNIQdeAfizQ57HQgkzBLSvY1yHU",
 			"type": "string"

backend/PyMatcha/__init__.py

@@ -189,11 +189,13 @@ def check_if_token_is_revoked(decrypted_token):
 from PyMatcha.routes.api.ping_pong import ping_pong_bp
 from PyMatcha.routes.api.user import user_bp
 from PyMatcha.routes.api.auth import auth_bp
+from PyMatcha.routes.api.profile import profile_bp
 
 logging.debug("Registering Flask blueprints")
 application.register_blueprint(ping_pong_bp)
 application.register_blueprint(user_bp)
 application.register_blueprint(auth_bp)
+application.register_blueprint(profile_bp)
 
 if application.debug:
     logging.debug("Registering debug route")

backend/PyMatcha/models/user.py

@@ -119,10 +119,12 @@ def create(
             raise ConflictError("Gender must be male, female or other, not {}".format(gender), "Try again")
 
         # Check correct orientation
-        if orientation not in ["heterosexual", "homosexual", "bisexual"]:
-            logging.error("Sexual Orientation must be heterosexual, homosexual or bisexual, not {}".format(orientation))
+        if orientation not in ["heterosexual", "homosexual", "bisexual", "other"]:
+            logging.error(
+                "Sexual Orientation must be heterosexual, homosexual, bisexual or other, not {}".format(orientation)
+            )
             raise ConflictError(
-                "Sexual Orientation must be heterosexual, homosexual or bisexual, not {}".format(orientation),
+                "Sexual Orientation must be heterosexual, homosexual, bisexual or other, not {}".format(orientation),
                 "Try again",
             )
 

backend/PyMatcha/routes/api/auth.py

@@ -40,7 +40,7 @@
 from PyMatcha.utils import hash_password
 from PyMatcha.utils.confirm_token import confirm_token
 from PyMatcha.utils.confirm_token import generate_confirmation_token
-from PyMatcha.utils.decorators import validate_required_params
+from PyMatcha.utils.decorators import validate_params
 from PyMatcha.utils.mail import send_mail_text
 
 User = user.User
@@ -56,7 +56,7 @@
 
 
 @auth_bp.route("/auth/register", methods=["POST"])
-@validate_required_params(REQUIRED_KEYS_USER_CREATION)
+@validate_params(REQUIRED_KEYS_USER_CREATION)
 def api_create_user():
     current_app.logger.debug("/auth/register -> Call")
     data = request.get_json()
@@ -117,7 +117,7 @@ def confirm_email(token):
 
 
 @auth_bp.route("/auth/password/forgot", methods=["POST"])
-@validate_required_params(REQUIRED_KEYS_PASSWORD_FORGOT)
+@validate_params(REQUIRED_KEYS_PASSWORD_FORGOT)
 def forgot_password():
     current_app.logger.debug("/auth/password/forgot -> Call")
     data = request.get_json()
@@ -141,7 +141,7 @@ def forgot_password():
 
 
 @auth_bp.route("/auth/password/reset", methods=["POST"])
-@validate_required_params(REQUIRED_KEYS_PASSWORD_RESET)
+@validate_params(REQUIRED_KEYS_PASSWORD_RESET)
 def reset_password():
     current_app.logger.debug("/auth/password/reset -> Call")
     data = request.get_json()
@@ -174,7 +174,7 @@ def reset_password():
 
 
 @auth_bp.route("/auth/login", methods=["POST"])
-@validate_required_params(REQUIRED_KEYS_LOGIN)
+@validate_params(REQUIRED_KEYS_LOGIN)
 def auth_login():
     current_app.logger.debug("/auth/login -> Call")
     data = request.get_json()
@@ -189,16 +189,9 @@ def auth_login():
         current_app.logger.debug("/auth/login -> Password invalid")
         raise UnauthorizedError("Incorrect username or password", "Try again")
 
-    # access_token = fjwt.create_access_token(
-    #     identity=get_user_safe_dict(user), expires_delta=datetime.timedelta(hours=2)
-    # )
-    # TODO: Handle expiry for token
     if not u.is_confirmed:
         current_app.logger.debug("/auth/login -> User is trying to login unconfirmed")
         raise UnauthorizedError("User needs to be confirmed first.", "Try again when you have confirmed your email")
-    # u.is_online = True
-    # u.date_lastseen = datetime.datetime.utcnow()
-    # u.save()
     access_token = fjwt.create_access_token(identity=u.get_base_info(), fresh=True)
     refresh_token = fjwt.create_refresh_token(identity=u.get_base_info())
     access_jti = fjwt.get_jti(access_token)
@@ -209,22 +202,20 @@ def auth_login():
 
     current_app.logger.debug("/auth/login -> Returning access token for user {}".format(username))
     redis.set("user:" + str(u.id), datetime.datetime.utcnow().timestamp())
-    tokens = {"access_token": access_token, "refresh_token": refresh_token}
-    return SuccessOutput("tokens", tokens)
+    ret = {"access_token": access_token, "refresh_token": refresh_token, "is_profile_completed": u.is_profile_completed}
+    return SuccessOutput("return", ret)
 
 
 @auth_bp.route("/auth/refresh", methods=["POST"])
 @fjwt.jwt_refresh_token_required
 def refresh():
-    # Do the same thing that we did in the login endpoint here
     current_user = fjwt.get_jwt_identity()
     access_token = fjwt.create_access_token(identity=current_user)
     access_jti = fjwt.get_jti(encoded_token=access_token)
     redis.set("jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
     return SuccessOutput("access_token", access_token)
 
 
-# Endpoint for revoking the current users access token
 @auth_bp.route("/auth/access_revoke", methods=["DELETE"])
 @fjwt.jwt_required
 def logout():
@@ -233,7 +224,6 @@ def logout():
     return Success("Access token revoked")
 
 
-# Endpoint for revoking the current users refresh token
 @auth_bp.route("/auth/refresh_revoke", methods=["DELETE"])
 @fjwt.jwt_refresh_token_required
 def logout2():
@@ -243,7 +233,7 @@ def logout2():
 
 
 @auth_bp.route("/auth/confirm/new", methods=["POST"])
-@validate_required_params(REQUIRED_KEYS_NEW_EMAIL_CONF)
+@validate_params(REQUIRED_KEYS_NEW_EMAIL_CONF)
 def request_new_email_conf():
     current_app.logger.debug("/auth/confirm/new -> Call")
     data = request.get_json()
@@ -256,7 +246,7 @@ def request_new_email_conf():
     else:
         if u.is_confirmed:
             current_app.logger.debug("/auth/confirm/new -> User found, Already confirmed.")
-            pass
+            return Success("User already confirmed")
         else:
             current_app.logger.debug("/auth/confirm/new -> User found, sending new confirmation email")
             token = generate_confirmation_token(email=email, token_type="confirm")