added/updated tests

Author: mconflitti-pbc

src/posit/connect/external/connect_api.py

@@ -27,17 +27,18 @@ class ConnectAPIKeyProvider:
     from posit.connect import Client
     from posit.connect.external.connect_api import ConnectAPIKeyProvider
 
-    client = Client()
-
     app_ui = ui.page_fixed(
         ui.h1("My Shiny App"),
         # ...
     )
 
     def server(input, output, session):
+        client = Client()
         user_session_token = session.http_conn.headers.get("Posit-Connect-User-Session-Token")
         provider = ConnectAPIKeyProvider(client, user_session_token)
-        viewer_api_key = provider.viewer_key
+        viewer_client = Client(api_key=provider.viewer)
+
+        assert client.me() != viewer_client.me()
 
         # your app logic...
 
@@ -54,7 +55,7 @@ def __init__(
         self._user_session_token = user_session_token
 
     @property
-    def viewer_key(self) -> Optional[str]:
+    def viewer(self) -> Optional[str]:
         """
         The viewer key is retrieved through an OAuth exchange process using the user session token.
         The issued API key is associated with the viewer of your app and can be used on their behalf

tests/posit/connect/external/test_connect_api.py

@@ -0,0 +1,52 @@
+from unittest.mock import patch
+
+import responses
+
+from posit.connect import Client
+from posit.connect.external.connect_api import ConnectAPIKeyProvider
+
+
+def register_mocks():
+    responses.post(
+        "https://connect.example/__api__/v1/oauth/integrations/credentials",
+        match=[
+            responses.matchers.urlencoded_params_matcher(
+                {
+                    "grant_type": "urn:ietf:params:oauth:grant-type:token-exchange",
+                    "subject_token_type": "urn:posit:connect:user-session-token",
+                    "subject_token": "cit",
+                    "requested_token_type": "urn:posit:connect:api-key"
+                },
+            ),
+        ],
+        json={
+            "access_token": "viewer-api-key",
+            "issued_token_type": "urn:posit:connect:api-key",
+            "token_type": "Key",
+        },
+    )
+
+
+class TestConnectAPIKeyProvider:
+    @responses.activate
+    @patch.dict("os.environ", {"RSTUDIO_PRODUCT": "CONNECT"})
+    def test_provider(self):
+        register_mocks()
+
+        client = Client(api_key="12345", url="https://connect.example/")
+        client._ctx.version = None
+        auth = ConnectAPIKeyProvider(
+            client=client,
+            user_session_token="cit",
+        )
+        assert auth.viewer == "viewer-api-key"
+
+    def test_provider_fallback(self):
+        # local_authenticator is used when the content is running locally
+        client = Client(api_key="12345", url="https://connect.example/")
+        client._ctx.version = None
+        auth = ConnectAPIKeyProvider(
+            client=client,
+            user_session_token="cit",
+        )
+        assert auth.viewer is None

tests/posit/connect/oauth/test_oauth.py

@@ -4,7 +4,7 @@
 import responses
 
 from posit.connect import Client
-from posit.connect.oauth.oauth import _get_content_session_token
+from posit.connect.oauth.oauth import API_KEY_TOKEN_TYPE, _get_content_session_token
 
 
 class TestOAuthIntegrations:
@@ -63,7 +63,7 @@ def test_get_credentials_api_key(self):
         )
         c = Client(api_key="12345", url="https://connect.example/")
         c._ctx.version = None
-        creds = c.oauth.get_credentials("cit")
+        creds = c.oauth.get_credentials("cit", API_KEY_TOKEN_TYPE)
         assert "access_token" in creds
         assert creds["access_token"] == "viewer-api-key"
         assert "issued_token_type" in creds