Code Optimized

Author: sunil-lakshman

.talismanrc

@@ -27,4 +27,11 @@ fileignoreconfig:
   checksum: 7c278a3b24fdcf01a30561326fbdadf45dffd52edcbbe421d192c360dc4be1e1
 - filename: contentstack_management/stack/stack.py
   checksum: 480b855afcc96875ce49f4da6cb433e0ba10183e1b73297c2d1c66565602ff0b
+version: ""
+
+fileignoreconfig:
+- filename: contentstack_management/core/client.py
+  checksum: 253a6e6a0234745cd5d194f6023d207acfb0259a8751d77c67fb8275a723d551
+- filename: contentstack_management/user_session/user_session.py
+  checksum: 8f8353a3f658cd894fce7bee1d0211a612b18a639d1f8006548e89a5f5e32a17
 version: ""

contentstack_management/core/client.py

@@ -8,6 +8,7 @@
 from ..organizations.organizations import Organization
 from ..users.user import User
 from ..stack.stack import Stack
+import http.cookiejar
 
 from ..user_session.user_session import UserSession
 
@@ -110,53 +111,26 @@ def _call_request(self, method, url_path, headers=None, params=None, data=None,
                 else:
                     return None
 
-
-
     def login(self,  email=None, password=None):
-        if email is None or email == '':
-            raise PermissionError(
-                'You are not permitted to the stack without valid email id')
-        
-        if password is None or password == '':
-            raise PermissionError(
-                'You are not permitted to the stack without valid password')
-        
-        url = "user-session"
-        data = {
-            "user": {
-                "email": email,
-                "password": password
-
-            }
-        }
-        data = json.dumps(data)
         self.api_client = ApiClient(
                     host=self.host, endpoint=self.endpoint, authtoken=self.authtoken,
                      headers=self.headers, authorization=self.authorization,
                      timeout=self.timeout, failure_retry=self.failure_retry, exceptions=self.exceptions, errors=self.errors,
                      max_requests=self.max_requests, retry_on_error=self.retry_on_error
         )
-
-        response =  UserSession(url = url,headers = self.headers, data = data, api_client=self.api_client, endpoint=self.endpoint).login()
-        if response.status_code == 200:
-            self.auth_token = self.get_authtoken(response.json())
-            return response
-        return response.status_code
-        
-
-    def logout(self):
-        url = "user-session"
-        self.headers['authtoken'] = self.auth_token
-        response =  UserSession(url = url,headers = self.headers, api_client = self.api_client, endpoint=self.endpoint).logout()
+        response = UserSession(username=email, password= password, api_client=self.api_client).login()
+        self.auth_token = self.get_authtoken(response.json())  if response.status_code == 200 else self.authtoken 
         return response
-        
+       
+    def logout(self):
+        return UserSession(api_client = self.api_client).logout()
+
     def get_authtoken(self, response):
-        return response['user']['authtoken']
+        return response['user']['authtoken']      
 
     def user(self):
         return User(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)
 

contentstack_management/user_session/user_session.py

@@ -2,6 +2,9 @@
 import http.cookiejar
 import urllib.request
 import contentstack_management
+import json
+import http.cookies as cookies
+from http.server import BaseHTTPRequestHandler, HTTPServer
 
 
 class UserSession:
@@ -12,51 +15,44 @@ class UserSession:
     methods each correspond to the CRUD 
     operations that can be performed on the API """
 
-    def __init__(self, url = None, headers=None, data=None, api_client=None, endpoint=None):
-        self.data = data
-        self.url = url
-        self.headers = headers
+    def __init__(self,  username=None, password = None, api_client=None):
+        self.headers = api_client.headers
         self.api_client = api_client
-        self.endpoint= endpoint
+        self.endpoint= api_client.endpoint
+        self.email = username
+        self.password = password
+        self.authtoken = api_client.authtoken
+
 
 
 
     def login(self):
-        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']
-            if token:
-               # Create a CookieJar
-                cookie_jar = http.cookiejar.CookieJar()
-                # Set a cookie
-                cookie =  cookie_jar.set_cookie(http.cookiejar.Cookie(
-                    version=0,
-                    name='auth_token',
-                    value=token,
-                    port=None,
-                    port_specified=False,
-                    domain=self.endpoint,
-                    domain_specified=True,
-                    domain_initial_dot=False,
-                    path='/',
-                    path_specified=True,
-                    secure=False,
-                    expires=None,
-                    discard=False,
-                    comment=None,
-                    comment_url=None,
-                    rest=None,
-                    rfc2109=False,
-                ))
-                return response
+        if self.email is None or self.email == '':
+            raise PermissionError(
+                'You are not permitted to the stack without valid email id')
+        
+        if self.password is None or self.password == '':
+            raise PermissionError(
+                'You are not permitted to the stack without valid password')
+        
+        url = "user-session"
+        data = {
+            "user": {
+                "email": self.email,
+                "password": self.password
 
+            }
+        }
+        data = json.dumps(data)
+        response = self.api_client.post(url, headers = self.headers, data = data, json_data=None)
+        self.auth_token = self.get_authtoken(response.json())  if response.status_code == 200 else self.authtoken 
         return response
 
-    def logout(self):
-       
-        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()
+    def logout(self):    
+        url = "user-session"
+        self.headers['authtoken']=self.auth_token
+        response =  self.api_client.delete(url, headers=self.headers, params=None, json_data=None)
         return response
 
+    def get_authtoken(self, response):
+        return response['user']['authtoken']

tests/test_organizations.py

@@ -16,51 +16,51 @@ def setUp(self):
     def test_organization_get(self):    
         response = self.client.organizations().get() 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.request.url, "https://api.contentstack.io/v3/organizations")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations")
         self.assertEqual(response.request.method, "GET")
 
 
     def test_get_organization(self):    
         response = self.client.organizations(config.organization.org_uid).get()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.request.url, f"https://api.contentstack.io/v3/organizations/{config.organization.org_uid}")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations/{config.organization.org_uid}")
         self.assertEqual(response.request.method, "GET")
 
     def test_get_organizations(self):    
         response = self.client.organizations().get()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.request.url, f"https://api.contentstack.io/v3/organizations")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations")
         self.assertEqual(response.request.method, "GET")
 
     def test_get_organization_roles(self):    
         response = self.client.organizations(config.organization.org_uid).get_organization_roles()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.request.url, f"https://api.contentstack.io/v3/organizations/{config.organization.org_uid}/roles")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations/{config.organization.org_uid}/roles")
         self.assertEqual(response.request.method, "GET")
 
     def test_organization_add_users(self):    
         response = self.client.organizations(config.organization.org_uid).organization_add_users()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.request.url, f"https://api.contentstack.io/v3/organizations/{config.organization.org_uid}/share")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations/{config.organization.org_uid}/share")
         self.assertEqual(response.request.method, "GET")
 
     def test_transfer_organizations_ownership(self):    
         data = {"transfer_to": "abc@sample.com"}
         response= self.client.organizations(config.organization.org_uid).transfer_organizations_ownership(json.dumps(data))
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(response.request.url, f"https://api.contentstack.io/v3/organizations/{config.organization.org_uid}/transfer-ownership")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations/{config.organization.org_uid}/transfer-ownership")
         self.assertEqual(response.request.method, "POST")
 
     def test_organization_stacks(self):    
         response = self.client.organizations(config.organization.org_uid).organization_stacks()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.request.url, f"https://api.contentstack.io/v3/organizations/{config.organization.org_uid}/stacks")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations/{config.organization.org_uid}/stacks")
         self.assertEqual(response.request.method, "GET")
 
     def test_organization_logs(self):    
         response = self.client.organizations(config.organization.org_uid).organization_logs()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.request.url, f"https://api.contentstack.io/v3/organizations/{config.organization.org_uid}/logs")
+        self.assertEqual(response.request.url, f"{self.client.endpoint}/organizations/{config.organization.org_uid}/logs")
         self.assertEqual(response.request.method, "GET")