feat: remove attributes from oauth resources

Author: tdstein

src/posit/connect/oauth/integrations.py

@@ -6,35 +6,13 @@
 
 
 class Integration(Resource):
-    """OAuth integration resource.
-
-    Attributes
-    ----------
-    id : str
-        The internal numeric identifier of this OAuth integration.
-    guid : str
-        The unique identifier of this OAuth integration which is used in REST API requests.
-    name : str
-        A descriptive name to identify each OAuth integration.
-    description : Optional[str]
-        A brief text to describe each OAuth integration
-    template : str
-        The template to use to configure this OAuth integration.
-    config : dict
-        The OAuth integration configuration based on the template.
-    created_time : str
-        The timestamp (RFC3339) indicating when this OAuth integration was created.
-    updated_time : str
-        The timestamp (RFC3339) indicating when this OAuth integration was last updated.
-    """
-
-    # CRUD Methods
+    """OAuth integration resource."""
 
     def delete(self) -> None:
         """Delete the OAuth integration."""
-        path = f"v1/oauth/integrations/{self.guid}"
-        url = self.url + path
-        self.session.delete(url)
+        path = f"v1/oauth/integrations/{self['guid']}"
+        url = self.params.url + path
+        self.params.session.delete(url)
 
     @overload
     def update(
@@ -63,44 +41,10 @@ def update(self, *args, **kwargs) -> None:
     def update(self, *args, **kwargs) -> None:
         """Update the OAuth integration."""
         body = dict(*args, **kwargs)
-        url = self.url + f"v1/oauth/integrations/{self.guid}"
-        response = self.session.patch(url, json=body)
+        url = self.params.url + f"v1/oauth/integrations/{self['guid']}"
+        response = self.params.session.patch(url, json=body)
         super().update(**response.json())
 
-    # Properties
-
-    @property
-    def id(self) -> str:
-        return self.get("id")  # type: ignore
-
-    @property
-    def guid(self) -> str:
-        return self.get("guid")  # type: ignore
-
-    @property
-    def name(self) -> str:
-        return self.get("name")  # type: ignore
-
-    @property
-    def description(self) -> Optional[str]:
-        return self.get("description")  # type: ignore
-
-    @property
-    def template(self) -> str:
-        return self.get("template")  # type: ignore
-
-    @property
-    def config(self) -> dict:
-        return self.get("config")  # type: ignore
-
-    @property
-    def created_time(self) -> str:
-        return self.get("created_time")  # type: ignore
-
-    @property
-    def updated_time(self) -> str:
-        return self.get("updated_time")  # type: ignore
-
 
 class Integrations(Resources):
     """Integrations resource."""
@@ -155,8 +99,8 @@ def create(self, **kwargs) -> Integration:
         """
         ...
         path = "v1/oauth/integrations"
-        url = self.url + path
-        response = self.session.post(url, json=kwargs)
+        url = self.params.url + path
+        response = self.params.session.post(url, json=kwargs)
         return Integration(self.params, **response.json())
 
     def find(self) -> List[Integration]:
@@ -167,9 +111,9 @@ def find(self) -> List[Integration]:
         List[Integration]
         """
         path = "v1/oauth/integrations"
-        url = self.url + path
+        url = self.params.url + path
 
-        response = self.session.get(url)
+        response = self.params.session.get(url)
         return [
             Integration(
                 self.params,
@@ -190,6 +134,6 @@ def get(self, guid: str) -> Integration:
         Integration
         """
         path = f"v1/oauth/integrations/{guid}"
-        url = self.url + path
-        response = self.session.get(url)
+        url = self.params.url + path
+        response = self.params.session.get(url)
         return Integration(self.params, **response.json())

src/posit/connect/oauth/oauth.py

@@ -32,7 +32,7 @@ def get_credentials(
         if user_session_token:
             data["subject_token"] = user_session_token
 
-        response = self.session.post(url, data=data)
+        response = self.params.session.post(url, data=data)
         return Credentials(**response.json())
 
 

src/posit/connect/oauth/sessions.py

@@ -6,62 +6,12 @@
 
 
 class Session(Resource):
-    """OAuth session resource.
-
-    Attributes
-    ----------
-    id : str
-        The internal numeric identifier of this OAuth session.
-    guid : str
-        The unique identifier of this OAuth session which is used in REST API requests.
-    user_guid : str
-        The unique identifier of the user that is associatid with this OAuth session.
-    oauth_integration_guid : str
-        The unique identifier of the OAuth integration that is associated with this OAuth session.
-    has_refresh_token : bool
-        Indicates whether this OAuth session has a refresh token.
-    created_time : str
-        The timestamp (RFC3339) indicating when this OAuth session was created.
-    updated_time : str
-        The timestamp (RFC3339) indicating when this OAuth session was last updated.
-    """
-
-    # Properties
-
-    @property
-    def id(self) -> str:
-        return self.get("id")  # type: ignore
-
-    @property
-    def guid(self) -> str:
-        return self.get("guid")  # type: ignore
-
-    @property
-    def user_guid(self) -> str:
-        return self.get("user_guid")  # type: ignore
-
-    @property
-    def oauth_integration_guid(self) -> str:
-        return self.get("oauth_integration_guid")  # type: ignore
-
-    @property
-    def has_refresh_token(self) -> bool:
-        return self.get("has_refresh_token")  # type: ignore
-
-    @property
-    def created_time(self) -> str:
-        return self.get("created_time")  # type: ignore
-
-    @property
-    def updated_time(self) -> str:
-        return self.get("updated_time")  # type: ignore
-
-    # CRUD Methods
+    """OAuth session resource."""
 
     def delete(self) -> None:
-        path = f"v1/oauth/sessions/{self.guid}"
-        url = self.url + path
-        self.session.delete(url)
+        path = f"v1/oauth/sessions/{self['guid']}"
+        url = self.params.url + path
+        self.params.session.delete(url)
 
 
 class Sessions(Resources):
@@ -77,7 +27,7 @@ def find(self, **kwargs) -> List[Session]: ...
 
     def find(self, **kwargs) -> List[Session]:
         url = self.params.url + "v1/oauth/sessions"
-        response = self.session.get(url, params=kwargs)
+        response = self.params.session.get(url, params=kwargs)
         results = response.json()
         return [Session(self.params, **result) for result in results]
 
@@ -93,6 +43,6 @@ def get(self, guid: str) -> Session:
         Session
         """
         path = f"v1/oauth/sessions/{guid}"
-        url = self.url + path
-        response = self.session.get(url)
+        url = self.params.url + path
+        response = self.params.session.get(url)
         return Session(self.params, **response.json())

src/posit/connect/resources.py

@@ -43,5 +43,3 @@ def update(self, *args, **kwargs):
 class Resources:
     def __init__(self, params: ResourceParameters) -> None:
         self.params = params
-        self.session = params.session
-        self.url = params.url