some typecheck fixes

Author: edavidaja

rsconnect/api.py

@@ -282,7 +282,7 @@ def fmt_payload(self) -> str:
         payload = urlencode(payload)
         return payload
 
-    def exchange_token(self) -> str | bytes:
+    def exchange_token(self) -> str:
         try:
             server = HTTPServer(url=self.token_endpoint())
             payload = self.fmt_payload()
@@ -313,6 +313,9 @@ def exchange_token(self) -> str | bytes:
             if not response.response_body:
                 raise RSConnectException("Token exchange returned empty response")
 
+            # Ensure we return a string
+            if isinstance(response.response_body, bytes):
+                return response.response_body.decode("utf-8")
             return response.response_body
 
         except RSConnectException as e:
@@ -354,7 +357,7 @@ def __init__(self, server: PositConnectServer, cookies: Optional[CookieJar] = No
         if server.bootstrap_jwt:
             self.bootstrap_authorization(server.bootstrap_jwt)
 
-        if server.snowflake_connection_name:
+        if server.snowflake_connection_name and isinstance(server, SPCSConnectServer):
             token = server.exchange_token()
             self.snowflake_authorization(token)
 

rsconnect/main.py

@@ -636,7 +636,9 @@ def list_servers(verbose: int):
                 if server.get("ca_cert"):
                     click.echo("    Client TLS certificate data provided")
                 if server.get("snowflake_connection_name"):
-                    click.echo('    Snowflake Connection Name: "%s"' % server["snowflake_connection_name"])
+                    snowflake_connection_name = server.get("snowflake_connection_name")
+                    if snowflake_connection_name:
+                        click.echo('    Snowflake Connection Name: "%s"' % snowflake_connection_name)
                 click.echo()