proxygen-cli 2.1.9__tar.gz → 2.1.11__tar.gz

{proxygen_cli-2.1.9 → proxygen_cli-2.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proxygen-cli
-Version: 2.1.9
+Version: 2.1.11
 Summary: CLI for interacting with NHSD APIM's proxygen service
 Home-page: https://github.com/NHSDigital/proxygen-cli
 Author: Ben Strutt
@@ -109,4 +109,3 @@ Use the following command to obtain the pytest-nhsd-apim token:
 ```
 $(proxygen pytest_nhsd_apim get_token)
 ```
-

{proxygen_cli-2.1.9 → proxygen_cli-2.1.11}/README.md

@@ -83,4 +83,4 @@ When testing using the pytest-nhsd-apim python testing package, an apigee manage
 Use the following command to obtain the pytest-nhsd-apim token:
 ```
 $(proxygen pytest_nhsd_apim get_token)
-```
+```

{proxygen_cli-2.1.9 → proxygen_cli-2.1.11}/proxygen_cli/lib/auth.py

@@ -1,5 +1,4 @@
 """Proxygen test utility functions"""
-import functools
 import hashlib
 import json
 import uuid
@@ -72,9 +71,7 @@ def access_token():
     return token_data["access_token"]
 
 
-def _get_token_data_from_refresh_token(
-        refresh_token: str
-):
+def _get_token_data_from_refresh_token(refresh_token: str):
     CREDENTIALS = get_credentials()
     token_response = requests.post(
         f"{CREDENTIALS.base_url}/protocol/openid-connect/token",
@@ -92,7 +89,7 @@ def _get_token_data_from_refresh_token(
 def _get_token_data_from_user_login():
     session = requests.Session()
     CREDENTIALS = get_credentials()
-    redirect_uri = f"{CREDENTIALS.base_url}/protocol/openid-connect/callback"
+    redirect_uri = f"{CREDENTIALS.base_url}/callback"
     login_page_resp = session.get(
         f"{CREDENTIALS.base_url}/protocol/openid-connect/auth",
         params={
@@ -105,7 +102,9 @@ def _get_token_data_from_user_login():
     )
 
     if login_page_resp.status_code != 200:
-        raise RuntimeError(f"Login page get request status was {login_page_resp.status_code} expected to be 200")
+        raise RuntimeError(
+            f"Login page get request status was {login_page_resp.status_code} expected to be 200"
+        )
 
     login_form = html.fromstring(login_page_resp.content.decode()).get_element_by_id(
         "kc-form-login"
@@ -118,7 +117,11 @@ def _get_token_data_from_user_login():
             "Accept": "application/json",
             "Content-Type": "application/x-www-form-urlencoded",
         },
-        data={"username": CREDENTIALS.username, "password": CREDENTIALS.password, "credentialId": ""},
+        data={
+            "username": CREDENTIALS.username,
+            "password": CREDENTIALS.password,
+            "credentialId": "",
+        },
     )
 
     http_error_msg = "Invalid username or password"
@@ -147,9 +150,6 @@ def _get_token_data_from_user_login():
     return token_response.json()
 
 
-
-
-
 def _get_token_data_from_machine_user():
     CREDENTIALS = get_credentials()
     aud = CREDENTIALS.base_url
@@ -164,10 +164,10 @@ def _get_token_data_from_machine_user():
         "exp": int(time()) + 300,  # 5mins in the future
     }
 
-    additional_jwt_headers = {
-        'kid': CREDENTIALS.key_id
-    }
-    client_assertion = jwt.encode(claims, private_key, algorithm="RS512", headers=additional_jwt_headers)
+    additional_jwt_headers = {"kid": CREDENTIALS.key_id}
+    client_assertion = jwt.encode(
+        claims, private_key, algorithm="RS512", headers=additional_jwt_headers
+    )
     token_response = requests.post(
         token_endpoint,
         data={
@@ -177,5 +177,7 @@ def _get_token_data_from_machine_user():
         },
     )
     if token_response.status_code != 200:
-        raise RuntimeError(f"Token response was {token_response.status_code} expected 200")
-    return token_response.json()
+        raise RuntimeError(
+            f"Token response was {token_response.status_code} expected 200"
+        )
+    return token_response.json()

{proxygen_cli-2.1.9 → proxygen_cli-2.1.11}/proxygen_cli/lib/constants.py

@@ -16,3 +16,6 @@ LITERAL_SECRET_TYPES = Literal[
     "apikey",
     "mtls"
 ]
+
+PROXYGEN_CLIENT_ID = ""
+PROXYGEN_CLIENT_SECRET = ""

{proxygen_cli-2.1.9 → proxygen_cli-2.1.11}/proxygen_cli/lib/credentials.py

@@ -5,7 +5,6 @@ import yaml
 import sys
 import os
 
-import click
 from pydantic import (
     BaseSettings,
     validator,
@@ -14,11 +13,12 @@ from pydantic import (
 )
 
 from . import dot_proxygen
+from . import constants
 
-CLIENT_ID = os.environ["proxygen_client_id"]
-CLIENT_SECRET = os.environ["proxygen_client_secret"]
-
-data = {"client_id": CLIENT_ID, "client_secret": CLIENT_SECRET}
+data = {
+    "client_id": constants.PROXYGEN_CLIENT_ID,
+    "client_secret": constants.PROXYGEN_CLIENT_SECRET,
+}
 
 
 def _yaml_credentials_file_source(_):

{proxygen_cli-2.1.9 → proxygen_cli-2.1.11}/proxygen_cli/test/command_credentials_test.py

@@ -8,8 +8,8 @@ from pydantic.error_wrappers import ValidationError
 
 import proxygen_cli.cli.command_credentials as cmd_credentials
 from proxygen_cli.lib.credentials import Credentials
-CLIENT_ID = os.environ["proxygen_client_id"]
-CLIENT_SECRET = os.environ["proxygen_client_secret"]
+CLIENT_ID = os.environ["PROXYGEN_CLIENT_ID"]
+CLIENT_SECRET = os.environ["PROXYGEN_CLIENT_SECRET"]
 
 def get_test_credentials(**kwargs):
     base_credentials = {
@@ -321,4 +321,4 @@ def test_remove_invalid_setting(patch_config):
         runner = CliRunner()
         result = runner.invoke(cmd_credentials.rm, ["invalid"])
 
-        assert "'invalid' is not one of 'base_url'" in result.output.strip()
+        assert "'invalid' is not one of 'base_url'" in result.output.strip()

{proxygen_cli-2.1.9 → proxygen_cli-2.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "proxygen-cli"
-version = "2.1.9"
+version = "2.1.11"
 description = "CLI for interacting with NHSD APIM's proxygen service"
 authors = ["Ben Strutt <ben.strutt1@nhs.net>"]
 readme = "README.md"