v0.15.0

.github/stale.yml

@@ -0,0 +1,30 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+ - Priority
+ - bug
+ - Help Wanted
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+ This issue has been automatically marked as stale because it has not had
+ recent activity. It will be closed if no further activity occurs within seven days. Thank you
+ for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+ This issue is now being closed due to inactivity.

.github/workflows/tests.yml

@@ -10,11 +10,11 @@ jobs:
  build:
  runs-on: ${{ matrix.platform }}
  strategy:
- max-parallel: 4
+ max-parallel: 3
  matrix:
  platform:
  - ubuntu-latest
- python-version: [3.5, 3.6, 3.7, 3.8]
+ python-version: [3.6, 3.7, 3.8]
 
  steps:
  - uses: actions/checkout@v2

.gitignore

@@ -3,7 +3,7 @@
 .tox/*
 __pycache__/*
 htmlcov/*
-.coverage
+.coverage.*
 coverage.xml
 *.pyc
 *.egg*/*

README.rst

@@ -1,6 +1,6 @@
-blinkpy |Build Status| |Coverage Status| |Docs| |PyPi Version| |Python Version|
-================================================================================
-A Python library for the Blink Camera system
+blinkpy |Build Status| |Coverage Status| |Docs| |PyPi Version| |Codestyle|
+=============================================================================================
+A Python library for the Blink Camera system (Python 3.6+)
 
 Like the library? Consider buying me a cup of coffee!
 
@@ -53,7 +53,12 @@ The simplest way to use this package from a terminal is to call ``Blink.start()`
  blink = blinkpy.Blink(username='YOUR USER NAME', password='YOUR PASSWORD', refresh_rate=30)
  blink.start()
 
-If you would like to log in without setting up the cameras or system, you can simply call the ``Blink.login()`` function which will prompt for a username and password and then authenticate with the server. This is useful if you want to avoid use of the ``start()`` function which simply acts as a wrapper for more targeted API methods.
+At startup, you may be prompted for a verification key. Just enter this in the command-line prompt. If you just receive a verification email asking to validate access for your device, enter nothing at this prompt. To avoid any command-line interaction, call the ``Blink`` class with the ``no_prompt=True`` flag. Instead, once you receive the verification email, call the following functions:
+
+.. code:: python
+
+ blink.login_handler.send_auth_key(blink, VERIFICATION_KEY)
+ blink.setup_post_verify()
 
 In addition, you can also save your credentials in a json file and initialize Blink with the credential file as follows:
 
@@ -124,9 +129,8 @@ Example usage, which downloads all videos recorded since July 4th, 2018 at 9:34a
 .. |PyPi Version| image:: https://img.shields.io/pypi/v/blinkpy.svg
  :target: https://pypi.python.org/pypi/blinkpy
 .. |Docs| image:: https://readthedocs.org/projects/blinkpy/badge/?version=latest
- :target: http://blinkpy.readthedocs.io/en/latest/?badge=latest
-.. |Python Version| image:: https://img.shields.io/pypi/pyversions/blinkpy.svg
- :target: https://img.shields.io/pypi/pyversions/blinkpy.svg
-
+ :target: http://blinkpy.readthedocs.io/en/latest/?badge=latest 
 .. |Donate| image:: https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif
  :target: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UR6Z2B8GXYUCC
+.. |Codestyle| image:: https://img.shields.io/badge/code%20style-black-000000.svg
+ :target: https://github.com/psf/black

app/app.py

@@ -4,17 +4,17 @@
 from blinkpy import blinkpy
 
 
-USERNAME = environ.get('USERNAME')
-PASSWORD = environ.get('PASSWORD')
-TIMEDELTA = timedelta(environ.get('TIMEDELTA', 1))
+USERNAME = environ.get("USERNAME")
+PASSWORD = environ.get("PASSWORD")
+TIMEDELTA = timedelta(environ.get("TIMEDELTA", 1))
 
 
 def get_date():
  """Return now - timedelta for blinkpy."""
  return (datetime.now() - TIMEDELTA).isoformat()
 
 
-def download_videos(blink, save_dir='/media'):
+def download_videos(blink, save_dir="/media"):
  """Make request to download videos."""
  blink.download_videos(save_dir, since=get_date())
 
@@ -26,6 +26,6 @@ def start():
  return blink
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
  BLINK = start()
  download_videos(BLINK)

blinkpy/api.py

@@ -11,27 +11,69 @@
 MIN_THROTTLE_TIME = 2
 
 
-def request_login(blink, url, username, password, is_retry=False):
+def request_login(
+ blink,
+ url,
+ username,
+ password,
+ notification_key,
+ uid,
+ is_retry=False,
+ device_id="Blinkpy",
+):
  """
  Login request.
 
  :param blink: Blink instance.
  :param url: Login url.
  :param username: Blink username.
  :param password: Blink password.
+ :param notification_key: Randomly genereated key.
+ :param uid: Randomly generated unique id key.
  :param is_retry: Is this part of a re-authorization attempt?
- """
- headers = {
- 'Host': DEFAULT_URL,
- 'Content-Type': 'application/json'
- }
- data = dumps({
- 'email': username,
- 'password': password,
- 'client_specifier': 'iPhone 9.2 | 2.2 | 222'
- })
- return http_req(blink, url=url, headers=headers, data=data,
- json_resp=False, reqtype='post', is_retry=is_retry)
+ :param device_id: Name of application to send at login.
+ """
+ headers = {"Host": DEFAULT_URL, "Content-Type": "application/json"}
+ data = dumps(
+ {
+ "email": username,
+ "password": password,
+ "notification_key": notification_key,
+ "unique_id": uid,
+ "app_version": "6.0.7 (520300) #afb0be72a",
+ "client_name": "Computer",
+ "client_type": "android",
+ "device_identifier": device_id,
+ "device_name": "Blinkpy",
+ "os_version": "5.1.1",
+ "reauth": "true",
+ }
+ )
+ return http_req(
+ blink,
+ url=url,
+ headers=headers,
+ data=data,
+ json_resp=False,
+ reqtype="post",
+ is_retry=is_retry,
+ )
+
+
+def request_verify(blink, verify_key):
+ """Send verification key to blink servers."""
+ url = "{}/api/v4/account/{}/client/{}/pin/verify".format(
+ blink.urls.base_url, blink.account_id, blink.client_id
+ )
+ data = dumps({"pin": verify_key})
+ return http_req(
+ blink,
+ url=url,
+ headers=blink.auth_header,
+ data=data,
+ json_resp=False,
+ reqtype="post",
+ )
 
 
 def request_networks(blink):
@@ -94,17 +136,16 @@ def request_command_status(blink, network, command_id):
  :param network: Sync module network id.
  :param command_id: Command id to check.
  """
- url = "{}/network/{}/command/{}".format(blink.urls.base_url,
- network,
- command_id)
+ url = "{}/network/{}/command/{}".format(blink.urls.base_url, network, command_id)
  return http_get(blink, url)
 
 
 @Throttle(seconds=MIN_THROTTLE_TIME)
 def request_homescreen(blink):
  """Request homescreen info."""
- url = "{}/api/v3/accounts/{}/homescreen".format(blink.urls.base_url,
- blink.account_id)
+ url = "{}/api/v3/accounts/{}/homescreen".format(
+ blink.urls.base_url, blink.account_id
+ )
  return http_get(blink, url)
 
 
@@ -129,9 +170,9 @@ def request_new_image(blink, network, camera_id):
  :param network: Sync module network id.
  :param camera_id: Camera ID of camera to request new image from.
  """
- url = "{}/network/{}/camera/{}/thumbnail".format(blink.urls.base_url,
-  network,
-  camera_id)
+ url = "{}/network/{}/camera/{}/thumbnail".format(
+ blink.urls.base_url, network, camera_id
+ )
  return http_post(blink, url)
 
 
@@ -144,9 +185,7 @@ def request_new_video(blink, network, camera_id):
  :param network: Sync module network id.
  :param camera_id: Camera ID of camera to request new video from.
  """
- url = "{}/network/{}/camera/{}/clip".format(blink.urls.base_url,
- network,
- camera_id)
+ url = "{}/network/{}/camera/{}/clip".format(blink.urls.base_url, network, camera_id)
  return http_post(blink, url)
 
 
@@ -167,7 +206,8 @@ def request_videos(blink, time=None, page=0):
  """
  timestamp = get_time(time)
  url = "{}/api/v1/accounts/{}/media/changed?since={}&page={}".format(
- blink.urls.base_url, blink.account_id, timestamp, page)
+ blink.urls.base_url, blink.account_id, timestamp, page
+ )
  return http_get(blink, url)
 
 
@@ -190,9 +230,9 @@ def request_camera_info(blink, network, camera_id):
  :param network: Sync module network id.
  :param camera_id: Camera ID of camera to request info from.
  """
- url = "{}/network/{}/camera/{}/config".format(blink.urls.base_url,
-  network,
-  camera_id)
+ url = "{}/network/{}/camera/{}/config".format(
+ blink.urls.base_url, network, camera_id
+ )
  return http_get(blink, url)
 
 
@@ -204,9 +244,9 @@ def request_camera_sensors(blink, network, camera_id):
  :param network: Sync module network id.
  :param camera_id: Camera ID of camera to request sesnor info from.
  """
- url = "{}/network/{}/camera/{}/signals".format(blink.urls.base_url,
-  network,
-  camera_id)
+ url = "{}/network/{}/camera/{}/signals".format(
+ blink.urls.base_url, network, camera_id
+ )
  return http_get(blink, url)
 
 
@@ -219,9 +259,9 @@ def request_motion_detection_enable(blink, network, camera_id):
  :param network: Sync module network id.
  :param camera_id: Camera ID of camera to enable.
  """
- url = "{}/network/{}/camera/{}/enable".format(blink.urls.base_url,
-  network,
-  camera_id)
+ url = "{}/network/{}/camera/{}/enable".format(
+ blink.urls.base_url, network, camera_id
+ )
  return http_post(blink, url)
 
 
@@ -233,9 +273,9 @@ def request_motion_detection_disable(blink, network, camera_id):
  :param network: Sync module network id.
  :param camera_id: Camera ID of camera to disable.
  """
- url = "{}/network/{}/camera/{}/disable".format(blink.urls.base_url,
-  network,
-  camera_id)
+ url = "{}/network/{}/camera/{}/disable".format(
+ blink.urls.base_url, network, camera_id
+ )
  return http_post(blink, url)
 
 
@@ -251,9 +291,15 @@ def http_get(blink, url, stream=False, json=True, is_retry=False):
  if blink.auth_header is None:
  raise BlinkException(ERROR.AUTH_TOKEN)
  _LOGGER.debug("Making GET request to %s", url)
- return http_req(blink, url=url, headers=blink.auth_header,
- reqtype='get', stream=stream, json_resp=json,
- is_retry=is_retry)
+ return http_req(
+ blink,
+ url=url,
+ headers=blink.auth_header,
+ reqtype="get",
+ stream=stream,
+ json_resp=json,
+ is_retry=is_retry,
+ )
 
 
 def http_post(blink, url, is_retry=False):
@@ -266,5 +312,6 @@ def http_post(blink, url, is_retry=False):
  if blink.auth_header is None:
  raise BlinkException(ERROR.AUTH_TOKEN)
  _LOGGER.debug("Making POST request to %s", url)
- return http_req(blink, url=url, headers=blink.auth_header,
- reqtype='post', is_retry=is_retry)
+ return http_req(
+ blink, url=url, headers=blink.auth_header, reqtype="post", is_retry=is_retry
+ )