Merge branch 'master' of github.com:weskerfoot/DeleteFB into remove-likes

deletefb/deletefb.py

@@ -35,6 +35,15 @@ def run_delete():
         help="The link to your Facebook profile, e.g. https://www.facebook.com/your.name"
     )
 
+    parser.add_argument(
+        "-F",
+        "--two-factor",
+        required=False,
+        dest="two_factor_token",
+        type=str,
+        help="The code generated by your 2FA device for Facebook"
+    )
+
     parser.add_argument(
         "-H",
         "--headless",
@@ -52,9 +61,10 @@ def run_delete():
         user_email_address=args.email,
         user_password=args_user_password,
         user_profile_url=args.profile_url,
-        is_headless=args.is_headless
+        is_headless=args.is_headless,
+        two_factor_token=args.two_factor_token
     )
-    
+
     wall.delete_posts(driver)
 
 if __name__ == "__main__":

deletefb/tools/login.py

@@ -6,7 +6,8 @@ from seleniumrequests import Chrome
 def login(user_email_address,
           user_password,
           user_profile_url,
-          is_headless):
+          is_headless,
+          two_factor_token):
     """
     Attempts to log into Facebook
     Returns a driver object
@@ -35,21 +36,35 @@ def login(user_email_address,
     email = "email"
     password = "pass"
     login = "loginbutton"
+    approvals_code = "approvals_code"
 
-    email_element = driver.find_element_by_name(email)
-    password_element = driver.find_element_by_name(password)
+    emailelement = driver.find_element_by_name(email)
+    passwordelement = driver.find_element_by_name(password)
 
-    email_element.send_keys(user_email_address)
-    password_element.send_keys(user_password)
+    emailelement.send_keys(user_email_address)
+    passwordelement.send_keys(user_password)
 
-    login_element = driver.find_element_by_id(login)
-    login_element.click()
+    loginelement = driver.find_element_by_id(login)
+    loginelement.click()
 
-    if "Two-factor authentication" in driver.page_source:
-        # Allow time to enter 2FA code
-        print("Pausing to enter 2FA code")
-        time.sleep(20)
-        print("Continuing execution")
-    driver.get(user_profile_url)
+    if "two-factor authentication" in driver.page_source.lower():
+        if two_factor_token:
+
+            twofactorelement = driver.find_element_by_name(approvals_code)
+            twofactorelement.send_keys(two_factor_token)
+
+            # Submits after the code is passed into the form, does not validate 2FA code.
+            contelement = driver.find_element_by_id("checkpointSubmitButton")
+            contelement.click()
 
+            # Defaults to saving this new browser, this occurs on each new automated login.
+            save_browser = driver.find_element_by_id("checkpointSubmitButton")
+            save_browser.click()
+        else:
+            # Allow time to enter 2FA code
+            print("Pausing to enter 2FA code")
+            time.sleep(20)
+            print("Continuing execution")
+
+    driver.get(user_profile_url)
     return driver