From 0e1201603f554c87668da178fa71e54696bac68f Mon Sep 17 00:00:00 2001
From: KRAIEM Taha Yassine <tahayk2@gmail.com>
Date: Fri, 21 May 2021 20:58:02 +0200
Subject: [PATCH] Changes: - changed version number - fixed duplicate endpoint

---
 api/.chalice/config.json                | 3 ++-
 api/chalicelib/blueprints/bp_core.py    | 8 --------
 api/chalicelib/core/signup.py           | 3 ++-
 ee/api/.chalice/config.json             | 3 ++-
 ee/api/chalicelib/blueprints/bp_core.py | 8 --------
 ee/api/chalicelib/ee/signup.py          | 3 ++-
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/api/.chalice/config.json b/api/.chalice/config.json
index 8385a17e7..e97247b6c 100644
--- a/api/.chalice/config.json
+++ b/api/.chalice/config.json
@@ -51,7 +51,8 @@
         "jwt_exp_delta_seconds": "2592000",
         "S3_HOST": "",
         "S3_KEY": "",
-        "S3_SECRET": ""
+        "S3_SECRET": "",
+        "version_number": "1.0.0"
       },
       "lambda_timeout": 150,
       "lambda_memory_size": 400,
diff --git a/api/chalicelib/blueprints/bp_core.py b/api/chalicelib/blueprints/bp_core.py
index bd42b2254..c12a2f412 100644
--- a/api/chalicelib/blueprints/bp_core.py
+++ b/api/chalicelib/blueprints/bp_core.py
@@ -670,14 +670,6 @@ def delete_alert(projectId, alertId, context):
     return alerts.delete(projectId, alertId)
 
 
-@app.route('/alerts/notifications', methods=['POST', 'PUT'], authorizer=None)
-def send_alerts_notifications():
-    data = app.current_request.json_body
-    if data.get("token", "") != "nF46JdQqAM5v9KI9lPMpcu8o9xiJGvNNWOGL7TJP":
-        return {"errors": ["missing token"]}
-    return {"data": alerts.process_notifications(data.get("notifications", []))}
-
-
 @app.route('/{projectId}/funnels', methods=['POST', 'PUT'])
 def add_funnel(projectId, context):
     data = app.current_request.json_body
diff --git a/api/chalicelib/core/signup.py b/api/chalicelib/core/signup.py
index 9acd5c7e5..3daed1ae7 100644
--- a/api/chalicelib/core/signup.py
+++ b/api/chalicelib/core/signup.py
@@ -4,6 +4,7 @@ from chalicelib.core import users, telemetry
 from chalicelib.utils import captcha
 import json
 from chalicelib.utils.TimeUTC import TimeUTC
+from chalicelib.utils.helper import environ
 
 
 def get_signed_ups():
@@ -74,7 +75,7 @@ def create_step1(data):
         "projectName": project_name,
         "data": json.dumps({"lastAnnouncementView": TimeUTC.now()}),
         "organizationName": company_name,
-        "versionNumber": "0.0.0"
+        "versionNumber": environ["version_number"]
     }
     if data.get("tenantId") is not None:
         update_user = """
diff --git a/ee/api/.chalice/config.json b/ee/api/.chalice/config.json
index 5cda73bd3..4bf859fdb 100644
--- a/ee/api/.chalice/config.json
+++ b/ee/api/.chalice/config.json
@@ -54,7 +54,8 @@
         "jwt_exp_delta_seconds": "2592000",
         "S3_HOST": "",
         "S3_KEY": "",
-        "S3_SECRET": ""
+        "S3_SECRET": "",
+        "version_number": "1.0.0"
       },
       "lambda_timeout": 150,
       "lambda_memory_size": 400,
diff --git a/ee/api/chalicelib/blueprints/bp_core.py b/ee/api/chalicelib/blueprints/bp_core.py
index bd42b2254..c12a2f412 100644
--- a/ee/api/chalicelib/blueprints/bp_core.py
+++ b/ee/api/chalicelib/blueprints/bp_core.py
@@ -670,14 +670,6 @@ def delete_alert(projectId, alertId, context):
     return alerts.delete(projectId, alertId)
 
 
-@app.route('/alerts/notifications', methods=['POST', 'PUT'], authorizer=None)
-def send_alerts_notifications():
-    data = app.current_request.json_body
-    if data.get("token", "") != "nF46JdQqAM5v9KI9lPMpcu8o9xiJGvNNWOGL7TJP":
-        return {"errors": ["missing token"]}
-    return {"data": alerts.process_notifications(data.get("notifications", []))}
-
-
 @app.route('/{projectId}/funnels', methods=['POST', 'PUT'])
 def add_funnel(projectId, context):
     data = app.current_request.json_body
diff --git a/ee/api/chalicelib/ee/signup.py b/ee/api/chalicelib/ee/signup.py
index 3c4030e0d..5edee35de 100644
--- a/ee/api/chalicelib/ee/signup.py
+++ b/ee/api/chalicelib/ee/signup.py
@@ -4,6 +4,7 @@ from chalicelib.ee import users, telemetry
 from chalicelib.utils import captcha
 import json
 from chalicelib.utils.TimeUTC import TimeUTC
+from chalicelib.utils.helper import environ
 
 
 def get_signed_ups():
@@ -69,7 +70,7 @@ def create_step1(data):
     params = {"email": email, "password": password,
               "fullname": fullname, "companyName": company_name,
               "projectName": project_name,
-              "versionNumber": "0.0.0",
+              "versionNumber": environ["version_number"],
               "data": json.dumps({"lastAnnouncementView": TimeUTC.now()})}
     if tenant_id is not None:
         query = """\