remove add/delete comment apis

Author: AlexCXC

seatable_api/exception.py

@@ -4,8 +4,3 @@ class AuthExpiredError(ConnectionError):
 
     def __str__(self):
         return "The authorization has been expired"
-
-class UserAuthMissingError(Exception):
-
-    def __str__(self):
-        return 'User authorization is missing'

seatable_api/main.py

@@ -64,10 +64,8 @@ def __init__(self, token, server_url):
         self.dtable_server_url = None
         self.dtable_db_url = None
         self.jwt_token = None
-        self.user_jwt_token = None
         self.jwt_exp = None
         self.headers = None
-        self.user_headers = None
         self.workspace_id = None
         self.dtable_uuid = None
         self.dtable_name = None
@@ -120,24 +118,6 @@ def auth(self, with_socket_io=False):
             self.socketIO = SocketIO(base)
             self.socketIO._connect()
 
-    def auth_as_user(self, login, password):
-        """Auth to SeaTable as user
-        """
-        self.jwt_exp = datetime.now() + timedelta(days=3)
-        url = self.server_url + '/api/v2.1/dtable/app-user-access-token/'
-        headers = parse_headers(self.token)
-        data = {'login': login, 'password': password}
-        response = requests.post(url, json=data, headers=headers, timeout=self.timeout)
-        data = parse_response(response)
-
-        self.dtable_server_url = parse_server_url(data.get('dtable_server'))
-        self.dtable_db_url = parse_server_url(data.get('dtable_db', ''))
-        self.user_jwt_token = data.get('access_token')
-        self.user_headers = parse_headers(self.user_jwt_token)
-        self.workspace_id = data.get('workspace_id')
-        self.dtable_uuid = data.get('dtable_uuid')
-        self.dtable_name = data.get('dtable_name')
-
     def _metadata_server_url(self):
         return self.dtable_server_url + '/api/v1/dtables/' + self.dtable_uuid + '/metadata/'
 
@@ -221,13 +201,6 @@ def _get_account_detail(self, account_name):
         data = parse_response(response)
         return data.get('account')
 
-    def _add_comment_url(self):
-        url = '%(server_url)s/api/v1/dtables/%(dtable_uuid)s/comments/' % {
-            'server_url': self.dtable_server_url,
-            'dtable_uuid': self.dtable_uuid
-        }
-        return url
-
     def _get_comments_url(self):
         url = '%(server_url)s/api/v2.1/dtables/%(dtable_uuid)s/comments/' % {
             'server_url': self.server_url,
@@ -242,7 +215,7 @@ def _get_comments_count_url(self):
         }
         return url
 
-    def _update_or_delete_comment_url(self, comment_id):
+    def _update_comment_url(self, comment_id):
         url = '%(server_url)s/api/v2.1/dtables/%(dtable_uuid)s/comments/%(comment_id)s/' % {
             'server_url': self.server_url,
             'dtable_uuid': self.dtable_uuid,
@@ -1009,30 +982,14 @@ def big_data_insert_rows(self, table_name, rows_data):
         response = requests.post(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
-    def add_comment(self, table_id, row_id, comment):
-        """
-        :param table_id: str
-        :param row_id: str
-        :param comment: str
-        :return: success response dict {'success': True}
-        """
-        if not self.user_headers:
-            raise UserAuthMissingError('Please call Base.auth_as_user before call this method')
-        url = self._add_comment_url()
-        params = {'table_id': table_id, 'row_id': row_id}
-        json_data = {'comment': str(comment)}
-        response = requests.post(url, params=params, json=json_data, headers=self.user_headers, timeout=self.timeout)
-        return parse_response(response)
-
     def get_comments_count(self, row_id):
         """
         :param row_id: str
         :return: int
         """
         url = self._get_comments_count_url()
         params = {'row_id': row_id}
-        headers = self.headers or self.user_headers or None
-        response = requests.get(url, params=params, headers=headers, timeout=self.timeout)
+        response = requests.get(url, params=params, headers=self.headers, timeout=self.timeout)
         return parse_response(response)['count']
 
     def get_comments(self, row_id, page=1, per_page=25):
@@ -1048,8 +1005,7 @@ def get_comments(self, row_id, page=1, per_page=25):
             'page': page,
             'per_page': per_page
         }
-        headers = self.headers or self.user_headers or None
-        response = requests.get(url, params=params, headers=headers, timeout=self.timeout)
+        response = requests.get(url, params=params, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
     def resolve_comment(self, comment_id, resolved=True):
@@ -1058,23 +1014,10 @@ def resolve_comment(self, comment_id, resolved=True):
         :param resolved: bool
         :return: success response dict {'success': True}
         """
-        if not self.user_headers:
-            raise UserAuthMissingError('Please call Base.auth_as_user before call this method')
-        url = self._update_or_delete_comment_url(comment_id)
+        url = self._update_comment_url(comment_id)
         options = {'resolved': 'true' if resolved else 'false'}
         data = {'options': options}
-        response = requests.put(url, json=data, headers=self.user_headers, timeout=self.timeout)
-        return parse_response(response)
-
-    def delete_comment(self, comment_id):
-        """
-        :param comment_id: str
-        :return: success response dict {'success': True}
-        """
-        if not self.user_headers:
-            raise UserAuthMissingError('Please call Base.auth_as_user before call this method')
-        url = self._update_or_delete_comment_url(comment_id)
-        response = requests.delete(url, headers=self.user_headers, timeout=self.timeout)
+        response = requests.put(url, json=data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
     def get_comments_within_days(self, days=3):
@@ -1084,8 +1027,7 @@ def get_comments_within_days(self, days=3):
         """
         url = self._get_comments_within_days_url()
         params = {'days': days}
-        headers = self.headers or self.user_headers or None
-        response = requests.get(url, params=params, headers=headers, timeout=self.timeout)
+        response = requests.get(url, params=params, headers=self.headers, timeout=self.timeout)
         return parse_response(response)['comment_list']