Removed Firefox and Safari support

Author: tdorssers

README.md

@@ -153,7 +153,7 @@ with teslapy.Tesla('[email protected]', authenticator=custom_auth) as tesla:
 
 #### selenium
 
-Example using selenium to automate web browser interaction.
+Example using selenium to automate web browser interaction. The SSO page returns a 403 when `navigator.webdriver` is set and currently only Chrome, Opera and Edge Chromium can prevent this.
 
 ```python
 import teslapy
@@ -349,8 +349,6 @@ As of September 3, 2021, Tesla has added ReCaptcha to the login form. This cause
 
 As of January 12, 2022, Tesla has deprecated the use of [RFC 7523](https://tools.ietf.org/html/rfc7523) tokens and requires the SSO tokens to be used for API access. If you get a `requests.exceptions.HTTPError: 401 Client Error: Unauthorized for url: https://owner-api.teslamotors.com/api/1/vehicles` and you are using correct credentials then you are probably using an old version of this module.
 
-As of March 1, 2022, Tesla no longer supports the login_hint parameter in the V3 authorization URL. If you get a `requests.exceptions.HTTPError: 500 Server Error: Internal Server Error for url: https://auth.tesla.com/oauth2/v3/authorize` then you are probably using an old version of this module.
-
 ## Demo applications
 
 The source repository contains three demo applications that *optionally* use [pywebview](https://pypi.org/project/pywebview/) version 3.0 or higher or [selenium](https://pypi.org/project/selenium/) version 3.13.0 or higher to automate weblogin. Selenium 4.0.0 or higher is required for Edge Chromium.
@@ -361,7 +359,7 @@ The source repository contains three demo applications that *optionally* use [py
 usage: cli.py [-h] -e EMAIL [-f FILTER] [-a API [KEYVALUE ...]] [-k KEYVALUE]
               [-c COMMAND] [-t TIMEOUT] [-p PROXY] [-R REFRESH] [-U URL] [-l]
               [-o] [-v] [-w] [-g] [-b] [-n] [-m] [-s] [-d] [-r] [-S] [-H] [-V]
-              [-L] [-u] [--chrome] [--edge] [--firefox] [--opera] [--safari]
+              [-L] [-u] [--chrome] [--opera] [--edge]
 
 Tesla Owner API CLI
 
@@ -394,10 +392,8 @@ optional arguments:
   -L, --logout          clear token from cache and logout
   -u, --user            get user account details
   --chrome              use Chrome WebDriver
-  --edge                use Edge WebDriver
-  --firefox             use Firefox WebDriver
   --opera               use Opera WebDriver
-  --safari              use Safari WebDriver
+  --edge                use Edge WebDriver
 ```
 
 Example usage of [cli.py](https://github.com/tdorssers/TeslaPy/blob/master/cli.py):
@@ -709,7 +705,3 @@ Make sure you have [Python](https://www.python.org/) 2.7+ or 3.5+ installed on y
 and install [ChromeDriver](https://sites.google.com/chromium.org/driver/) to use Selenium or on Ubuntu as follows:
 
 `sudo apt-get install python3-requests-oauthlib python3-geopy python3-webview python3-selenium python3-websocket`
-
-If you prefer Firefox, install [GeckoDriver](https://github.com/mozilla/geckodriver/releases) or on Ubuntu as follows:
-
-`sudo apt-get install firefox-geckodriver`

cli.py

@@ -33,14 +33,11 @@ def on_loaded():
         webview.start()
         return result[0]
     # Use selenium to control specified web browser
-    # Prevent Selenium from being detected (works for Chrome and Edge only, for now)
-    if args.web < 2:
-        options = [webdriver.chrome, webdriver.edge][args.web].options.Options()
-        options.add_argument("--disable-blink-features=AutomationControlled")
-    else:
-        options = None
-    with [webdriver.Chrome, webdriver.Edge, webdriver.Firefox, webdriver.Opera,
-          webdriver.Safari][args.web](options=options) as browser:
+    options = [webdriver.chrome, webdriver.opera,
+               webdriver.edge][args.web].options.Options()
+    options.add_argument('--disable-blink-features=AutomationControlled')
+    with [webdriver.Chrome, webdriver.Opera,
+          webdriver.Edge][args.web](options=options) as browser:
         logging.info('Selenium opened %s', browser.capabilities['browserName'])
         browser.get(url)
         WebDriverWait(browser, 300).until(EC.url_contains('void/callback'))
@@ -168,10 +165,13 @@ def main():
     parser.add_argument('-u', '--user', action='store_true',
                         help='get user account details')
     if webdriver:
-        for c, s in enumerate(('chrome', 'edge', 'firefox', 'opera', 'safari')):
-            d, h = (0, ' (default)') if not webview and c == 0 else (None, '')
-            parser.add_argument('--' + s, action='store_const', dest='web',
-                                help='use %s WebDriver' % s.title() + h,
-                                const=c, default=d)
+        h = 'use Chrome browser' if webview else 'use Chrome browser (default)'
+        parser.add_argument('--chrome', action='store_const', dest='web',
+                            help=h, const=0, default=None if webview else 0)
+        parser.add_argument('--opera', action='store_const', dest='web',
+                                help='use Opera browser', const=1)
+        if hasattr(webdriver.edge, 'options'):
+            parser.add_argument('--edge', action='store_const', dest='web',
+                                help='use Edge browser', const=2)
     args = parser.parse_args()
     main()

gui.py

@@ -611,9 +611,11 @@ def __init__(self, **kwargs):
         web_menu = Menu(menu, tearoff=0)
         opt_menu.add_cascade(label='Web browser', menu=web_menu,
                              state=NORMAL if webdriver else DISABLED)
-        self.browser = IntVar()
-        for v, l in enumerate(('Chrome', 'Edge', 'Firefox', 'Opera', 'Safari')):
-            web_menu.add_radiobutton(label=l, value=v, variable=self.browser)
+        self.browser = IntVar(0)
+        web_menu.add_radiobutton(label='Chrome', value=0, variable=self.browser)
+        web_menu.add_radiobutton(label='Opera', value=1, variable=self.browser)
+        if hasattr(webdriver.edge, 'options'):
+            web_menu.add_radiobutton(label='Edge', value=2, variable=self.browser)
         self.selenium = BooleanVar()
         opt_menu.add_checkbutton(label='Use selenium', variable=self.selenium,
                                  state=NORMAL if webdriver else DISABLED,
@@ -662,15 +664,11 @@ def custom_auth(self, url):
             return pool.apply(show_webview, (url, ))  # Run in separate process
         # Use selenium if available and selected
         if webdriver and self.selenium.get():
-            # Prevent Selenium from being detected (works for Chrome and Edge only, for now)
-            if self.browser.get() < 2:
-                options = [webdriver.chrome, webdriver.edge][self.browser.get()].options.Options()
-                options.add_argument("--disable-blink-features=AutomationControlled")
-            else:
-                options = None
-            with [webdriver.Chrome, webdriver.Edge,
-                  webdriver.Firefox, webdriver.Opera,
-                  webdriver.Safari][self.browser.get()](options=options) as browser:
+            options = [webdriver.chrome, webdriver.opera,
+                       webdriver.edge][self.browser.get()].options.Options()
+            options.add_argument('--disable-blink-features=AutomationControlled')
+            with [webdriver.Chrome, webdriver.Opera,
+                  webdriver.Edge][self.browser.get()](options=options) as browser:
                 browser.get(url)
                 wait = WebDriverWait(browser, 300)
                 wait.until(EC.url_contains('void/callback'))

menu.py

@@ -280,14 +280,11 @@ def on_loaded():
         webview.start()
         return result[0]
     # Use selenium to control specified web browser
-    # Prevent Selenium from being detected (works for Chrome and Edge only, for now)
-    if args.web < 2:
-        options = [webdriver.chrome, webdriver.edge][args.web].options.Options()
-        options.add_argument("--disable-blink-features=AutomationControlled")
-    else:
-        options = None
-    with [webdriver.Chrome, webdriver.Edge, webdriver.Firefox, webdriver.Opera,
-          webdriver.Safari][args.web](options=options) as browser:
+    options = [webdriver.chrome, webdriver.opera,
+               webdriver.edge][args.web].options.Options()
+    options.add_argument('--disable-blink-features=AutomationControlled')
+    with [webdriver.Chrome, webdriver.Opera,
+          webdriver.Edge][args.web](options=options) as browser:
         logging.info('Selenium opened %s', browser.capabilities['browserName'])
         browser.get(url)
         WebDriverWait(browser, 300).until(EC.url_contains('void/callback'))
@@ -334,11 +331,14 @@ def main():
                         help='disable verify SSL certificate')
     parser.add_argument('--timeout', type=int, help='connect/read timeout')
     if webdriver:
-        for c, s in enumerate(('chrome', 'edge', 'firefox', 'opera', 'safari')):
-            d, h = (0, ' (default)') if not webview and c == 0 else (None, '')
-            parser.add_argument('--' + s, action='store_const', dest='web',
-                                help='use %s browser' % s.title() + h,
-                                const=c, default=d)
+        h = 'use Chrome browser' if webview else 'use Chrome browser (default)'
+        parser.add_argument('--chrome', action='store_const', dest='web',
+                            help=h, const=0, default=None if webview else 0)
+        parser.add_argument('--opera', action='store_const', dest='web',
+                                help='use Opera browser', const=1)
+        if hasattr(webdriver.edge, 'options'):
+            parser.add_argument('--edge', action='store_const', dest='web',
+                                help='use Edge browser', const=2)
     parser.add_argument('--proxy', help='proxy server URL')
     args = parser.parse_args()
     main()