pyntcli 0.1.112__py3-none-any.whl → 0.1.113__py3-none-any.whl

ignoreTests/auth/login.py

@@ -59,7 +59,7 @@ class TestLogin():
         with pytest.raises(Timeout):
             with requests_mock.mock() as m:
                 m.add_matcher(self.poll_matcher)
-                l.get_token_using_request_id("some_id")
+                l.claim_token_using_device_code("some_id")
 
     def test_is_jwt_expired(self):
 

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.112"
+__version__ = "0.1.113"

pyntcli/auth/login.py

@@ -1,6 +1,7 @@
+import random
+import string
 from base64 import b64decode
 import webbrowser
-import uuid
 import urllib.parse
 import datetime
 import time
@@ -28,6 +29,8 @@ PYNT_ID = "PYNT_ID"
 PYNT_CREDENTIALS = "PYNT_CREDENTIALS"
 PYNT_SAAS = os.environ.get("PYNT_SAAS_URL") if os.environ.get(
     "PYNT_SAAS_URL") else "https://api.pynt.io/v1"
+PYNT_APP_URL = os.environ.get("PYNT_APP_URL") if os.environ.get(
+    "PYNT_APP_URL") else "https://app.pynt.io"
 PYNT_BUCKET_NAME = os.environ.get(
     "PYNT_BUCKET_NAME") if os.environ.get("PYNT_BUCKET_NAME") else ""
 PYNT_PARAM1 = os.environ.get(
@@ -36,18 +39,24 @@ PYNT_PARAM2 = os.environ.get(
     "PYNT_PARAM2") if os.environ.get("PYNT_PARAM2") else ""
 
 
+def generate_device_code() -> str:
+    """
+    Generates a random 8 alphanumeric string of pattern `XXXX-XXXX`
+    """
+    part_one = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(4))
+    part_two = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(4))
+    return f"{part_one}-{part_two}"
+
+
 class Login():
     def __init__(self) -> None:
         self.delay = 5
-        self.base_authorization_url = "https://pynt.io/login?"
-        self.poll_url = "https://n592meacjj.execute-api.us-east-1.amazonaws.com/default/cli_validate_login"
         self.login_wait_period = (60 * 3)  # 3 minutes
 
-    def create_login_request(self):
-        request_id = uuid.uuid4()
-        request_url = self.base_authorization_url + \
-                      urllib.parse.urlencode(
-                          {"request_id": request_id, "utm_source": "cli"})
+    def create_login_request(self) -> str:
+        device_code = generate_device_code()
+        request_url = f"{PYNT_APP_URL}/login?" + urllib.parse.urlencode(
+            {"device_code": device_code, "utm_source": "cli"})
         webbrowser.open(request_url)
 
         ui_thread.print(ui_thread.PrinterText("To continue, you need to log in to your account.")
@@ -55,22 +64,22 @@ class Login():
                         .with_line("")
                         .with_line("If you are not automatically redirected, please click on the link provided below (or copy to your web browser)")
                         .with_line(request_url))
-        return request_id
+        return device_code
 
-    def get_token_using_request_id(self, request_id):
+    def claim_token_using_device_code(self, device_code: str):
+        poll_url = f"{PYNT_SAAS}/auth/device-code/{device_code}"
         with ui_thread.spinner("Waiting...", "point"):
             start = time.time()
             while start + self.login_wait_period > time.time():
-                response = pynt_requests.get(self.poll_url, params={
-                    "request_id": request_id})
+                response = pynt_requests.get(poll_url)
                 if response.status_code == 200:
                     return response.json()
                 time.sleep(self.delay)
             raise Timeout()
 
     def login(self):
-        id = self.create_login_request()
-        token = self.get_token_using_request_id(id)
+        device_code = self.create_login_request()
+        token = self.claim_token_using_device_code(device_code)
         with CredStore() as store:
             store.put("token", token)
 

{pyntcli-0.1.112.dist-info → pyntcli-0.1.113.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyntcli
-Version: 0.1.112
+Version: 0.1.113
 Summary: Command line utility to handle all of Pynt's different integrations
 Author-email: Pynt-io <support@pynt.io>
 Project-URL: Homepage, https://pynt.io

{pyntcli-0.1.112.dist-info → pyntcli-0.1.113.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ignoreTests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
-ignoreTests/auth/login.py,sha256=KFlzWhXBAuwdi7GXf16gCB3ya94LQG2wjcSChE149rQ,3798
+ignoreTests/auth/login.py,sha256=7GeBirHTD9t6EassLYsegCw1FZHkfjvVW1Z5uybHzgM,3801
 ignoreTests/store/cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli/__init__.py,sha256=NcX8fgfLWWXa9SmAPHplHcOIvbX0m3-mYipZHIVAlvg,24
+pyntcli/__init__.py,sha256=j3sjtalrZ7qzajUh_46Une0yUZprSFiTpVECCQnsaGI,24
 pyntcli/main.py,sha256=RD0W2_0ogYBCXubo-YewxHYkiIXxNv6NkZOh3n1VujE,5964
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=0hJ0WJNFHLqyohtRr_xOg5WEXzxHrUOlcePPg-k65Hk,3846
 pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/auth/login.py,sha256=dnjDT4_3RLzOT3zknUic3iRYHS8D6y00xWwNoaxOL2U,5524
+pyntcli/auth/login.py,sha256=Oz1DtEZje0afgJcHSwEFHcH78X-QD5Mjn0CQ9ZgCfQU,5844
 pyntcli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/commands/burp.py,sha256=AUJU2cIJ-PSUATxYoHRwDy0K5feqCs-mGdkGle2WcDw,14173
 pyntcli/commands/command.py,sha256=3egvDDr68sTUnyJpUE0bO9TfVy_rgeuM2C4zkMA-9GQ,10903
@@ -40,8 +40,8 @@ pyntcli/ui/report.py,sha256=W-icPSZrGLOubXgam0LpOvHLl_aZg9Zx9qIkL8Ym5PE,1930
 pyntcli/ui/ui_thread.py,sha256=XUBgLpYQjVhrilU-ofw7VSXgTiwneSdTxm61EvC3x4Q,5091
 tests/test_utils.py,sha256=t5fTQUk1U_Js6iMxcGYGqt4C-crzOJ0CqCKtLkRtUi0,2050
 tests/commands/test_pynt_cmd.py,sha256=BjGFCFACcSziLrNA6_27t6TjSmvdu54wx9njwLpRSJY,8379
-pyntcli-0.1.112.dist-info/METADATA,sha256=f4PXxcRTkaLVSvJiaGUickD5MC1-8MNtmVF8YFbOVXE,427
-pyntcli-0.1.112.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyntcli-0.1.112.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.112.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.112.dist-info/RECORD,,
+pyntcli-0.1.113.dist-info/METADATA,sha256=8sdhJod-t85esbW4yJ0okltq4ljGEX1_4sQ2u5p5Mhg,427
+pyntcli-0.1.113.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyntcli-0.1.113.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.113.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.113.dist-info/RECORD,,