send user_id with cli requests

ishaan-jaff · ishaan-jaff · commit f3147d20fb3b · 2023-01-02T02:41:13.000Z
diff --git a/call_clerkie.py b/call_clerkie.py
@@ -6,6 +6,18 @@
 # Set the base URL of the Flask app
 base_url = "https://clerkieserverchromeextensionv1.krrishdholakia.repl.co/"
 error_log_path = os.path.expanduser("~") + "/.clerkie-cli/clerkie-src/c.log"
+user_email_path = os.path.expanduser("~") + "/.clerkie-cli/clerkie-src/clerkie.txt"
+
+def get_user_id():
+  if not os.path.exists(user_email_path): # if user has not gone through email setup
+    return "default_user"
+  user_id_file = open(user_email_path, 'r')
+  email = ""
+  for line in user_id_file:
+    line = line.strip()
+    if line != "":
+      email = line
+  return email
 
 def debug_terminal():
   f = open(error_log_path,'r')
@@ -22,15 +34,15 @@ def debug_terminal():
   f = open(error_log_path,'w')
   f.seek(0)
   f.close()
+  if len(error_msg.strip())==0: # don't send empty stacktraces
+    return
 
-  #print("sending to clerk", len(error_msg))
-  #print("sending to clerk", error_msg)
   # Send a GET request to the app with the user_query argument
   console = Console()
   returned = False
   with console.status("[bold green] Clerkie noticed an error. Thinking :robot:") as status:
       while not returned:
-        response = requests.get(base_url + "/term", params={"user_query": error_msg})
+        response = requests.get(base_url + "/term", params={"user_query": error_msg, "user_id": get_user_id()})
         returned = True
 
   # Check the status code of the response
diff --git a/install.sh b/install.sh
@@ -7,6 +7,23 @@ python3 -m pip install rich
 
 echo "Done pip installs"
 
+read_email() {
+  valid=0
+  while [ $valid -eq 0 ]; do
+    tput setaf 2
+    echo "Please enter your email address:"
+    tput sgr0
+    read email
+    if [[ $email =~ ^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$ ]]; then
+      valid=1
+      echo "Thank you. The email address $email is valid."
+      echo "$email" >>$HOME/.clerkie-cli/clerkie-src/clerkie.txt
+    else
+      echo "Error: The email address $email is not valid. Please try again."
+    fi
+  done
+}
+
 main() {
     CLERKIE_DIR=$HOME/.clerkie-cli
     START=$PWD
@@ -32,6 +49,7 @@ main() {
     fi
 
     echo "# clerkie-cli configs" >>$HOME/.zshrc
+    read_email
     echo "export CLERKIE_SRC=$CLERKIE_DIR/clerkie-src" >>$HOME/.zshrc
     echo '[[ -f "$HOME/.clerkie-cli/clerkie-src/setup.sh" ]] && builtin source "$HOME/.clerkie-cli/clerkie-src/setup.sh"' >>$HOME/.zshrc
     echo "Clerkie Installed. Open a new Terminal Window to start using"
