Remove option to log in with username/password

Author: NeverMendel

README.md

@@ -98,28 +98,11 @@ optional arguments:
 
 ## Login
 
-To download your submissions you need to log in your LeetCode account. There are two ways to log in, by inserting
-username/password or by cookies.
+To download your submissions you need to log in your LeetCode account by providing the cookies.
 
-You can either use the interactive menu to supply the required information or you can pass them as program arguments
-when lunching the script.
-
-The former option is to be preferred as it will avoid storing your password or your cookies in the command history.
-
-### Username/Password
-
-To log in using username and password, insert them using the interactive menu (preferred) or pass them as arguments when
-lunching the script, like in the following example:
-
-```bash
-python leetcode-export --username {USERNAME} --password {PASSWORD}
-```
-
-### Cookies
-
-To log in using cookies, you first need to get them from a session where you are already logged in. Login in your
-browser, open the browser's Dev Tool, click on the Network tab and copy the cookie header that is sent when you visit
-any leetcode webpage.
+To log in using cookies, you need to get them from a session where you are already logged in. Login in your LeetCode
+account in your browser, open the browser's Dev Tool, click on the Network tab and copy the cookie header that is sent
+when you visit any leetcode webpage.
 
 You can insert the cookie string that you have just copied in the interactive menu (recommended) or you can pass it as a
 program argument when lunching the script, like in the following example:
@@ -128,6 +111,8 @@ program argument when lunching the script, like in the following example:
 python leetcode-export --cookies {COOKIES}
 ```
 
+Using the interactive menu is to be preferred as it will avoid storing your cookies in the command history.
+
 ## Filename template arguments
 
 ### Problem description filename template
@@ -150,7 +135,7 @@ title: str
 title_slug: str
 ```
 
-Default problem description filename template: `${questionId} - ${titleSlug}.txt`
+Default problem description filename template: `${question_id} - ${title_slug}.txt`
 
 ### Submission filename template
 

leetcode_export/__main__.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import argparse
-import getpass
 import logging
 import os
 from string import Template
@@ -18,8 +17,6 @@
 
 def parse_args():
     parser = argparse.ArgumentParser(description='Export LeetCode solutions')
-    parser.add_argument('--username', type=str, help='Set LeetCode username')
-    parser.add_argument('--password', type=str, help='Set LeetCode password')
     parser.add_argument('--cookies', type=str, help='Set LeetCode cookies')
     parser.add_argument('--folder', type=str, default='.', help='Output folder')
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', help='Enable verbose logging details')
@@ -58,35 +55,16 @@ def main():
     submission_template = Template(args.submission_filename)
 
     leetcode = LeetCode()
-    username = ''
-    password = ''
-    cookies = ''
-
-    # Login into leetcode
-    if (not args.username or not args.password) and not args.cookies:
-        choice = input("How do you want to login?\n  1 - Username and Password\n  2 - Cookies\n")
-        while choice != '1' and choice != '2':
-            print("Choice not valid, input 1 or 2")
-            choice = input("How do you want to login?\n  1 - Username and Password\n  2 - Cookies\n")
-
-        if choice == '1':
-            username = input("Insert LeetCode username: ")
-            password = getpass.getpass(prompt="Insert LeetCode password: ")
-        else:
-            cookies = input("Insert LeetCode cookies: ")
-    else:
-        username = args.username
-        password = args.password
-        cookies = args.cookies
+    cookies = args.cookies
+
+    if not cookies:
+        cookies = input("Insert LeetCode cookies: ")
 
-    if username and password and not leetcode.log_in(args.username, args.password):
+    if not leetcode.set_cookies(cookies):
         print(
-            "Login not successful! You might have entered the wrong username/password or you need to complete the reCAPTCHA. If you need to complete the reCAPTCHA, log in with the cookies instead. Check the log for more information.")
+            "Cookies not valid. Copy them from the Network tab of your browser by clicking on any leetcode.com request and going in Request Headers > cookie.")
         exit(1)
 
-    if cookies:
-        leetcode.set_cookies(cookies)
-
     # Create output folder if it doesn't already exist
     if not os.path.exists(args.folder):
         os.mkdir(args.folder)

leetcode_export/leetcode.py

@@ -36,15 +36,17 @@ def log_in(self, username: str, password: str) -> bool:
             logging.warning(response_post.json())
             return False
 
-    def set_cookies(self, cookies: str):
+    def set_cookies(self, cookies: str) -> bool:
         cookies_list = cookies.split(';')
         cookies_list = map(lambda el: el.split('='), cookies_list)
         for cookies in cookies_list:
             self.session.cookies.set(cookies[0].strip(), cookies[1].strip())
         if self.is_user_logged():
             logging.info("Cookies set successful")
+            return True
         else:
             logging.warning("Cookies set failed")
+            return False
 
     def is_user_logged(self) -> bool:
         if self.user_logged and datetime.datetime.now() < self.user_logged_expiration: