Merge pull request #85 from adam111316/feature/FixApiLogin

Removed requirement for http login for API when an API key is provided

CHANGES.md

@@ -35,6 +35,7 @@
 * Fix proxy_indexers setting not loading from config file
 * Add subtitle information to the cmd show and cmd shows api output
 * Added network logo for SVT
+* Removed requirement for http login for API when an API key is provided
 
 [develop changelog]
 * Improve display of progress bars in the Downloads columns of the show list page

sickbeard/webserve.py

@@ -95,9 +95,11 @@ def authenticated(handler_class):
             try:
                 if not (sickbeard.WEB_USERNAME and sickbeard.WEB_PASSWORD):
                     return True
-                elif (handler.request.uri.startswith('/api') and '/api/builder' not in handler.request.uri):
+                elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/api') and
+                              '/api/builder' not in handler.request.uri):
                     return True
-                elif (handler.request.uri.startswith('/calendar') and sickbeard.CALENDAR_UNPROTECTED):
+                elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/calendar') and
+                        sickbeard.CALENDAR_UNPROTECTED):
                     return True
 
                 auth_hdr = handler.request.headers.get('Authorization')