aiokwikset 0.2.1__tar.gz → 0.2.2a1__tar.gz

{aiokwikset-0.2.1 → aiokwikset-0.2.2a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aiokwikset
-Version: 0.2.1
+Version: 0.2.2a1
 Summary: Python interface for Kwikset Smart Locks
 Home-page: https://github.com/explosivo22/aiokwikset
 Author: Brad Barbour

{aiokwikset-0.2.1 → aiokwikset-0.2.2a1}/aiokwikset/api.py

@@ -1,5 +1,6 @@
 import json
 import aioboto3
+import botocore.exceptions
 import attr
 import datetime
 
@@ -17,7 +18,7 @@ from aiohttp.client_exceptions import (
     ClientPayloadError
 )
 
-from .errors import RequestError
+from .errors import RequestError, NotAuthorized
 from .device import Device
 from .user import User
 from .exceptions import TokenVerificationException
@@ -169,7 +170,7 @@ class API(object):
         if not self.access_token:
             raise AttributeError('Access Token Required to Check Token')
         now = datetime.datetime.now()
-        dec_access_token = jwt.get_unverified_claims(self.access_token)
+        dec_access_token = jwt.get_unverified_claims(self.id_token)
 
         if now > datetime.datetime.fromtimestamp(dec_access_token['exp']):
             expired = True
@@ -185,12 +186,13 @@ class API(object):
         """
         auth_params = {'SECRET_HASH': '', 'REFRESH_TOKEN': self.refresh_token}
 
-        async with self.get_client() as client:
-            refresh_response = await client.initiate_auth(
-                ClientId=self.client_id,
-                AuthFlow='REFRESH_TOKEN_AUTH',
-                AuthParameters=auth_params,
-            )
+        try:
+            async with self.get_client() as client:
+                refresh_response = await client.initiate_auth(
+                    ClientId=self.client_id,
+                    AuthFlow='REFRESH_TOKEN_AUTH',
+                    AuthParameters=auth_params,
+                )
 
             self._set_attributes(
                 refresh_response,
@@ -209,6 +211,11 @@ class API(object):
 
             if not self.user:
                 self.user = User(self._request)
+        
+        #attempt to catch the NotAuthorizedException
+        except botocore.exceptions.ClientError as err:
+            if err.response['Error']['Code'] == 'NotAuthorizedException':
+                raise NotAuthorized("Refresh Token has been revoked.")
 
     def _set_attributes(self, response, attribute_dict):
         """
@@ -239,6 +246,26 @@ class API(object):
         self.code_type = code_type
 
         pre_verification = await self.aws.authenticate_user()
+
+        if pre_verification.get('AuthenticationResult'):
+            print("2-step verification disabled")
+            await self.verify_token(pre_verification['AuthenticationResult']['IdToken'],
+                                    'id_token', 'id')
+            self.refresh_token = pre_verification['AuthenticationResult']['RefreshToken']
+            await self.verify_token(pre_verification['AuthenticationResult']['AccessToken'],
+                                    'access_token', 'access')
+            self.token_type = pre_verification['AuthenticationResult']['TokenType']
+
+            if not self.device:
+                self.device = Device(self._request)
+
+            if not self.user:
+                self.user = User(self._request)
+            
+            return
+        
+        print("2-step verification enabled")
+
         return pre_verification
 
     async def verify_user(self, pre_verification, code):

{aiokwikset-0.2.1 → aiokwikset-0.2.2a1}/aiokwikset/aws_kwikset.py

@@ -6,9 +6,12 @@ import hmac
 import re
 
 import aioboto3
+import botocore.exceptions
 import os
 import six
 
+from .errors import NotAuthorized
+
 # https://github.com/aws/amazon-cognito-identity-js/blob/master/src/AuthenticationHelper.js#L22
 n_hex = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1' + \
         '29024E088A67CC74020BBEA63B139B22514A08798E3404DD' + \
@@ -240,35 +243,44 @@ class AWSKWIKSET(object):
         boto_client = self.client or client
         auth_params = self.get_auth_params()
 
-        async with boto_client as client:
-            response = await client.initiate_auth(
-                AuthFlow='CUSTOM_AUTH',
-                AuthParameters=auth_params,
-                ClientId=self.client_id
-            )
-            if response['ChallengeName'] == self.PASSWORD_VERIFIER_CHALLENGE:
-                challenge_response = self.process_challenge(
-                    response['ChallengeParameters'])
-
-                custom_challenge = await client.respond_to_auth_challenge(
-                    ClientId=self.client_id,
-                    ChallengeName=self.PASSWORD_VERIFIER_CHALLENGE,
-                    Session=response['Session'],
-                    ChallengeResponses=challenge_response)
-
-                if custom_challenge['ChallengeName'] == self.CUSTOM_VERIFIER_CHALLENGE:
-                    custom_challenge_response = self.process_custom_challenge()
-
-                    custom_challenge_code = await client.respond_to_auth_challenge(
+        try:
+            async with boto_client as client:
+                response = await client.initiate_auth(
+                    AuthFlow='CUSTOM_AUTH',
+                    AuthParameters=auth_params,
+                    ClientId=self.client_id
+                )
+                if response['ChallengeName'] == self.PASSWORD_VERIFIER_CHALLENGE:
+                    challenge_response = self.process_challenge(
+                        response['ChallengeParameters'])
+
+                    custom_challenge = await client.respond_to_auth_challenge(
                         ClientId=self.client_id,
-                        ChallengeName=self.CUSTOM_VERIFIER_CHALLENGE,
-                        Session=custom_challenge['Session'],
-                        ChallengeResponses=custom_challenge_response)
-
-                    return custom_challenge_code
+                        ChallengeName=self.PASSWORD_VERIFIER_CHALLENGE,
+                        Session=response['Session'],
+                        ChallengeResponses=challenge_response)
+                    
+                    #2-step verification is disabled
+                    if custom_challenge.get('AuthenticationResult'):
+                        return custom_challenge
+
+                    #2-step verification is enabled
+                    if custom_challenge['ChallengeName'] == self.CUSTOM_VERIFIER_CHALLENGE:
+                        custom_challenge_response = self.process_custom_challenge()
+
+                        custom_challenge_code = await client.respond_to_auth_challenge(
+                            ClientId=self.client_id,
+                            ChallengeName=self.CUSTOM_VERIFIER_CHALLENGE,
+                            Session=custom_challenge['Session'],
+                            ChallengeResponses=custom_challenge_response)
+
+                        return custom_challenge_code
+                    else:
+                        raise NotImplementedError('The %s challenge is not supported'
+                                            % response['ChallengeName'])
                 else:
                     raise NotImplementedError('The %s challenge is not supported'
-                                          % response['ChallengeName'])
-            else:
-                raise NotImplementedError('The %s challenge is not supported'
-                                          % response['ChallengeName'])
+                                            % response['ChallengeName'])
+        except botocore.exceptions.ClientError as err:
+            if err.response['Error']['Code'] == 'NotAuthorizedException':
+                raise NotAuthorized("Refresh Token has been revoked")

aiokwikset-0.2.2a1/aiokwikset/errors.py

@@ -0,0 +1,19 @@
+"""Define package errors."""
+from typing import Any
+
+class KwiksetError(Exception):
+    """Define a base error."""
+
+    pass
+
+
+class RequestError(KwiksetError):
+    """Define an error related to invalid requests."""
+
+    pass
+
+class NotAuthorized(Exception):
+    """Raised when the refresh token has been revoked"""
+
+    def __init__(self, *args: Any) -> None:
+        Exception.__init__(self, *args)

{aiokwikset-0.2.1 → aiokwikset-0.2.2a1}/aiokwikset/exceptions.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 class WarrantException(Exception):
     """Base class for all Warrant exceptions"""
 

{aiokwikset-0.2.1 → aiokwikset-0.2.2a1}/aiokwikset.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aiokwikset
-Version: 0.2.1
+Version: 0.2.2a1
 Summary: Python interface for Kwikset Smart Locks
 Home-page: https://github.com/explosivo22/aiokwikset
 Author: Brad Barbour

{aiokwikset-0.2.1 → aiokwikset-0.2.2a1}/setup.py

@@ -13,7 +13,7 @@ except FileNotFoundError:
 
 setup(
     name="aiokwikset",
-    version="0.2.1",
+    version="0.2.2a1",
     description="Python interface for Kwikset Smart Locks",
     long_description=long_description,
     long_description_content_type='text/markdown',

aiokwikset-0.2.1/aiokwikset/errors.py

@@ -1,13 +0,0 @@
-"""Define package errors."""
-
-
-class KwiksetError(Exception):
-    """Define a base error."""
-
-    pass
-
-
-class RequestError(KwiksetError):
-    """Define an error related to invalid requests."""
-
-    pass