From 642d69edf5cd48cc256c7acc458fc153e8c2423c Mon Sep 17 00:00:00 2001
From: IakMastro <cse242017102@uniwa.gr>
Date: Mon, 24 May 2021 14:20:49 +0300
Subject: [PATCH] CORS error fixed

---
 backend/app.py                  | 26 ++++++++++----------------
 client/src/components/Login.vue |  9 ++++++---
 db/init-db.d/seed.js            |  6 +++---
 docker-compose.yml              | 17 +++++++++++++----
 restart.sh                      |  2 +-
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/backend/app.py b/backend/app.py
index d866f84..7d71e5c 100644
--- a/backend/app.py
+++ b/backend/app.py
@@ -14,7 +14,7 @@
 app.config.from_object(__name__)
 
 # Mongodb connection initialization to database gameStore'
-app.config['MONGO_URI'] = "mongodb://datinguser:datinguserpasswd@mongodb:27017/tinderClone?authSource=admin"
+app.config['MONGO_URI'] = "mongodb://datinguser:datinguserpasswd@mongodb_tinder:27017/tinderClone?authSource=admin"
 mongo = PyMongo(app)
 
 # Enable CORS (CORS is a library that enables cross-origin requests)
@@ -56,15 +56,16 @@ def register():
     response_object = {'status': 'success'}
     post_data = request.get_json()
 
-    if mongo.db.users.find_one({'email': post_data['email']}) is None:
+    email = post_data.get('email')
+    if mongo.db.users.find_one({'email': email}) is None:
         mongo.db.users.insert({
             '_id': uuid.uuid4().hex,
-            'email': post_data['email'],
-            'username': post_data['username'],
-            'name': post_data['name'],
-            'surname': post_data['surname'],
-            'password': post_data['password'],
-            'birthday': post_data['birthday'],
+            'email': email,
+            'username': post_data.get('username'),
+            'name': post_data.get('name'),
+            'surname': post_data.get('surname'),
+            'password': post_data.get('password'),
+            'birthday': post_data.get('birthday'),
             'type': 'free'
         })
 
@@ -73,14 +74,7 @@ def register():
     else:
         response_object['message'] = 'Email already exists'
 
-    return jsonify(response_object)
-
-
-@app.after_request
-def add_headers(response):
-    response.headers.add('Access-Control-Allow-Origins', '*')
-    response.headers.add('Access-Control-Allow-Headers', 'Content-Type,Authorization')
-    return response
+    return jsonify(response_object, success=True)
 
 
 if __name__ == '__main__':
diff --git a/client/src/components/Login.vue b/client/src/components/Login.vue
index ca6a096..5e2c424 100644
--- a/client/src/components/Login.vue
+++ b/client/src/components/Login.vue
@@ -121,7 +121,7 @@ export default {
       },
       message: '',
       showMessage: false,
-      path: 'http://tinder_api:5000',
+      path: 'http://localhost:5000',
     };
   },
 
@@ -132,9 +132,10 @@ export default {
   methods: {
     onLogin() {
       const payload = {
-        username: $('#inputUsername').val(),
-        password: $('#inputPassword').val(),
+        email: $('#email').val(),
+        password: $('#pwd').val(),
       };
+      console.log(payload)
 
       this.login(payload);
     },
@@ -184,6 +185,8 @@ export default {
           birthday: this.registerForm.birthday
         };
 
+        console.log(payload)
+
         this.signup(payload);
       } else {
         this.message = 'Passwords must match';
diff --git a/db/init-db.d/seed.js b/db/init-db.d/seed.js
index efa15ec..78cbc1f 100644
--- a/db/init-db.d/seed.js
+++ b/db/init-db.d/seed.js
@@ -2,9 +2,9 @@ db.users.drop();
 db.users.insertMany([
     {
         _id: 1,
-        email: 'foo.bar@email.com',
-        name: "foo.bar",
-        password: 'lol password ez',
+        email: 'foo@email.com',
+        name: "foo",
+        password: 'bar',
         birthday: "1970/01/01",
         gender: "Male",
         weight: '80kg',
diff --git a/docker-compose.yml b/docker-compose.yml
index e386baa..7085e3a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,10 @@ services:
     environment:
       NODE_APP: client
       NODE_ENV: development
-    links:
+    depends_on:
       - backend
+    networks:
+      - tinder_net
 
   backend:
     build: backend
@@ -25,12 +27,13 @@ services:
       FLASK_APP: app
       FLASK_RUN_HOST: 0.0.0.0
       FLASK_ENV: development
-    links:
+    depends_on:
       - mongo
+    networks:
+      - tinder_net
 
   mongo-express:
     image: mongo-express
-    restart: always
     container_name: mongo-express_tinder
     ports:
       - "8081:8081"
@@ -39,11 +42,12 @@ services:
       ME_CONFIG_MONGODB_ADMINPASSWORD: datinguserpasswd
     links:
       - mongo
+    networks:
+      - tinder_net
 
   mongo:
     build: db
     container_name: mongodb_tinder
-    restart: always
     ports:
       - "27017:27017"
     volumes:
@@ -52,3 +56,8 @@ services:
       MONGO_INITDB_ROOT_USERNAME: datinguser
       MONGO_INITDB_ROOT_PASSWORD: datinguserpasswd
       MONGO_INITDB_DATABASE: tinderClone
+    networks:
+      - tinder_net
+
+networks:
+  tinder_net:
diff --git a/restart.sh b/restart.sh
index 7157efe..4e2e6ac 100755
--- a/restart.sh
+++ b/restart.sh
@@ -2,4 +2,4 @@
 
 docker-compose down
 sudo rm -rf db/data
-docker-compose up -d --force-recreate
\ No newline at end of file
+docker-compose up -d --force-recreate --build
\ No newline at end of file