Developed stack Implementation

Author: sunil-lakshman

.talismanrc

@@ -20,4 +20,11 @@ fileignoreconfig:
   checksum: d2ea9ae192ae0f1b75ff2b68b6bcd9d40eb86d589fb2177535b93194d69a9e0e
 - filename: tests/test_user_session.py
   checksum: f5000644a471e6ac4ee5bfcb5cfc73762e53fa97980951063f787a83e97244f9
+version: ""
+
+fileignoreconfig:
+- filename: tests/test_users.py
+  checksum: 7c278a3b24fdcf01a30561326fbdadf45dffd52edcbbe421d192c360dc4be1e1
+- filename: contentstack_management/stack/stack.py
+  checksum: 480b855afcc96875ce49f4da6cb433e0ba10183e1b73297c2d1c66565602ff0b
 version: ""

contentstack_management/core/client.py

@@ -5,8 +5,6 @@
 
 import requests
 import json
-import logging
-
 from ..organizations.organizations import Organization
 from ..users.user import User
 from ..stack.stack import Stack
@@ -48,7 +46,7 @@ def get(self, url, headers=None, params=None):
         """
         return self._call_request('GET', url, headers=headers, params=params)
 
-    def put(self, url, headers=None, params=None, data=None, json=None):
+    def put(self, url, headers=None, params=None, data=None, json_data=None):
         """
         Perform an HTTP PUT request with the specified URL and parameters.
 
@@ -59,9 +57,9 @@ def put(self, url, headers=None, params=None, data=None, json=None):
         :param json: Optional JSON data to include in the body of the request.
         :return: The response from the server.
         """
-        return self._call_request('PUT', url, headers=headers, params=params, data=data, json=json)
+        return self._call_request('PUT', url, headers=headers, params=params, data=data, json_data=json)
 
-    def post(self, url, headers=None, params=None, data=None, json=None):
+    def post(self, url, headers=None, params=None, data=None, json_data=None):
         """
         Perform an HTTP POST request with the specified URL and parameters.
 
@@ -72,7 +70,7 @@ def post(self, url, headers=None, params=None, data=None, json=None):
         :param json: Optional JSON data to include in the body of the request.
         :return: The response from the server.
         """
-        return self._call_request('POST', url, headers=headers, params=params, data=data, json=json)
+        return self._call_request('POST', url, headers=headers, params=params, data=data, json_data=json_data)
 
     def delete(self, url, headers=None, params=None):
         """
@@ -87,19 +85,16 @@ def delete(self, url, headers=None, params=None):
 
 
 
-    def _call_request(self, method, url_path, headers=None, params=None, data=None, json=None):
+    def _call_request(self, method, url_path, headers=None, params=None, data=None, json_data=None):
         url = f"{self.endpoint}/{url_path}"
         retries = self.failure_retry + 1
 
         while retries > 0:
             try:
-                response = requests.request(method, url, data=data, headers=headers, params=params, json=json)
-
+                response = requests.request(method, url, data=data, headers=headers, params=params, json=json_data)
                 if response.status_code >= 400:
                     if self.errors:
-
-                        return (response)
-
+                        return response
                     elif retries > 1:
                         retries -= 1
                     else:
@@ -162,13 +157,10 @@ def user(self):
         return User(self.endpoint, self.auth_token, self.headers,self.api_client)
 
 
-    def organizations(self):
-        return Organization(self.endpoint, self.auth_token, self.headers,self.api_client)
+    def organizations(self, organization_uid = None):
+        return Organization(self.endpoint, self.auth_token, self.headers,self.api_client, organization_uid)
 
     def stack(self, api_key = None):
-        if api_key is None or api_key == '':
-            raise PermissionError(
-                'You are not permitted to the stack without valid api key')
         return Stack(self.endpoint, self.auth_token, self.headers,self.api_client, api_key)
 
 

contentstack_management/organizations/organizations.py

@@ -1,7 +1,5 @@
-import platform
-import os
-import contentstack_management
 
+import json
 
 class Organization:
     """
@@ -11,51 +9,50 @@ class Organization:
     methods each correspond to the CRUD 
     operations that can be performed on the API """
 
-    def __init__(self, endpoint, authtoken, headers, api_client):
+    def __init__(self, endpoint, authtoken, headers, api_client, organization_uid):
         self.api_client = api_client
         self.endpoint = endpoint
         self.authtoken = authtoken
         self.headers = headers
+        self.organization_uid = organization_uid
 
 
     def get(self):
         url = "organizations"
-        self.headers['authtoken'] = self.authtoken
-        return self.api_client.get(url, headers = self.headers)
-
-
-
-    def get_organization(self, organization_uid):
-        url = f"organizations/{organization_uid}"
+        if self.organization_uid is None:
+            url = "organizations"
+        else:
+            url = f"organizations/{self.organization_uid}"
         self.headers['authtoken'] = self.authtoken
         return self.api_client.get(url, headers = self.headers)
 
 
-    def get_organization_roles(self, organization_uid):
-        url = f"organizations/{organization_uid}/roles"
+    def get_organization_roles(self):
+        url = f"organizations/{self.organization_uid}/roles"
         self.headers['authtoken'] = self.authtoken
         return self.api_client.get(url, headers = self.headers)
 
 
-    def organization_add_users(self, organization_uid):
-        url = f"organizations/{organization_uid}/share"
+    def organization_add_users(self):
+        url = f"organizations/{self.organization_uid}/share"
         self.headers['authtoken'] = self.authtoken
         return self.api_client.get(url, headers = self.headers)
 
-    def transfer_organizations_ownership(self, organization_uid, data):
-        url = f"organizations/{organization_uid}/transfer-ownership"
+    def transfer_organizations_ownership(self, data):
+        url = f"organizations/{self.organization_uid}/transfer-ownership"
         self.headers['authtoken'] = self.authtoken
+        data = json.dumps(data)
         return self.api_client.post(url, headers = self.headers, data=data)
 
 
-    def organization_stacks(self, organization_uid):
-        url = f"organizations/{organization_uid}/stacks"
+    def organization_stacks(self):
+        url = f"organizations/{self.organization_uid}/stacks"
         self.headers['authtoken'] = self.authtoken
         return self.api_client.get(url, headers = self.headers)
 
 
-    def organization_logs(self, organization_uid):
-        url = f"organizations/{organization_uid}/logs"
+    def organization_logs(self):
+        url = f"organizations/{self.organization_uid}/logs"
         self.headers['authtoken'] = self.authtoken
         return self.api_client.get(url, headers = self.headers)
 

contentstack_management/stack/stack.py

@@ -4,13 +4,6 @@
 the CRUD operations that can be performed on the API """
 
 import json
-from json import JSONDecodeError
-import requests
-from requests.adapters import HTTPAdapter
-from requests.exceptions import HTTPError, Timeout
-import contentstack_management
-
-
 
 class Stack:
     """
@@ -33,5 +26,99 @@ def fetch(self):
         self.headers['api_key'] = self.api_key
         return self.api_client.get(url, headers = self.headers)
 
+    def all(self):
+        url = "stacks"
+        self.headers['authtoken'] = self.authtoken
+        return self.api_client.get(url, headers = self.headers)
+    
+    def create(self, organization_uid, data):
+        url = "stacks"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['organization_uid'] = organization_uid
+        data = json.dumps(data)
+        return self.api_client.post(url, headers = self.headers, data=data)
+    
+    def update(self, data):
+        url = "stacks"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        data = json.dumps(data)
+        return self.api_client.put(url, headers = self.headers, data=data)
+    
+    def delete(self):
+        url = "stacks"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        return self.api_client.delete(url, headers = self.headers)
+    
+    def fetch_all_user(self):
+        url = "stacks/users"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        return self.api_client.get(url, headers = self.headers)
+    
+    def update_user_role(self, data):
+        url = "stacks/users/roles"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        data = json.dumps(data)
+        return self.api_client.put(url, headers = self.headers, data=data)
+    
+    def stack_transfer_ownership(self, data):
+        url = "stacks/transfer_ownership"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        data = json.dumps(data)
+        return self.api_client.post(url, headers = self.headers, data=data)
+    
+    def accept_ownership(self, user_id, ownership_token):
+        url = f"stacks/accept_ownership/{ownership_token}"
+        self.headers['authtoken'] = self.authtoken
+        params = {'api_key': self.api_key, 'uid': user_id}
+        return self.api_client.get(url, headers = self.headers, params = params)
+    
+    def get_stack_settings(self):
+        url = "stacks/settings"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        return self.api_client.get(url, headers = self.headers)
+    
+
+    def create_stack_settings(self, data):
+        url = "stacks/settings"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        data = json.dumps(data)
+        return self.api_client.post(url, headers = self.headers, data=data)
+
+    def reset_stack_settings(self, data):
+        url = "stacks/settings/reset"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        data = json.dumps(data)
+        return self.api_client.post(url, headers = self.headers, data=data)
+    
+    def share_stack(self, data):
+        url = "stacks/share"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        data = json.dumps(data)
+        return self.api_client.post(url, headers = self.headers, data=data)
+    
+    def unshare_stack(self, data):
+        url = "stacks/share"
+        self.headers['authtoken'] = self.authtoken
+        self.headers['api_key'] = self.api_key
+        data = json.dumps(data)
+        return self.api_client.post(url, headers = self.headers, data=data)
+
+
+    
+    
+    
+
+    
+
+    
 
 

contentstack_management/user_session/user_session.py

@@ -22,7 +22,7 @@ def __init__(self, url = None, headers=None, data=None, api_client=None, endpoin
 
 
     def login(self):
-        response =  self.api_client._call_request('POST', self.url, headers=self.headers, params=None, data=self.data, json=None)
+        response =  self.api_client._call_request('POST', self.url, headers=self.headers, params=None, data=self.data, json_data=None)
         if response.status_code == 200:
             response_dict = response.json()
             token = response_dict['user']['authtoken']
@@ -55,7 +55,7 @@ def login(self):
 
     def logout(self):
 
-        response =  self.api_client._call_request('DELETE', self.url, headers=self.headers, params=None, data=self.data, json=None)
+        response =  self.api_client._call_request('DELETE', self.url, headers=self.headers, params=None, data=self.data, json_data=None)
         if response.status_code == 200:
             return response.json()
         return response

contentstack_management/users/user.py

@@ -1,8 +1,3 @@
-import platform
-import json
-import contentstack_management
-
-
 
 class User:
     """
@@ -22,25 +17,25 @@ def __init__(self, endpoint, authtoken, headers, api_client):
     def get(self):
         url = "user"
         self.headers['authtoken'] = self.authtoken
-        return self.api_client.get(url, headers = self.headers).json()
+        return self.api_client.get(url, headers = self.headers)
 
 
     def update_user(self, user_data):
         url = "user"
         self.headers['authtoken'] = self.authtoken
-        return self.api_client.put(url, headers = self.headers, data = user_data, params = None).json()
+        return self.api_client.put(url, headers = self.headers, data = user_data, params = None)
 
     def active_user(self, user_activation_token, user_data):
         url = f"user/activate/{user_activation_token}"
         self.headers['authtoken'] = self.authtoken
-        return self.api_client.post(url, headers = self.headers, data = user_data).json()
+        return self.api_client.post(url, headers = self.headers, data = user_data)
 
     def request_password(self, user_data):
         url = "user/forgot_password"
         self.headers['authtoken'] = self.authtoken
-        return self.api_client.post(url, headers = self.headers, data = user_data).json()
+        return self.api_client.post(url, headers = self.headers, data = user_data)
 
     def reset_password(self, user_data):
         url = "user/reset_password"
         self.headers['authtoken'] = self.authtoken
-        return self.api_client.post(url, headers = self.headers, data = user_data).json()
+        return self.api_client.post(url, headers = self.headers, data = user_data)

tests/test_contentstack.py

@@ -11,7 +11,7 @@ def setUp(self):
 
     def test_contentstack(self):
         client = contentstack.client(host=config.host.host, endpoint=None)
-        self.assertEqual('eu-api.contentstack.com', client.host)  # add assertion here
+        self.assertEqual('api.contentstack.io', client.host)  # add assertion here
 
 
     def test_successful_get_login(self):