Sākums Izpētīt Palīdzība
Pierakstīties
bux
/
tracim_v2
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Laidieni 0 Vikivietne Aktivitāte
Pārlūkot izejas kodu

rename exception

Guénaël Muller 6 gadus atpakaļ
vecāks
78f26e91ca
revīzija
d055b04c46
6 mainītis faili ar 29 papildinājumiem un 29 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 1
      tracim/exceptions.py
  2. 4 4
      tracim/lib/utils/authorization.py
  3. 4 4
      tracim/views/contents_api/comment_controller.py
  4. 5 5
      tracim/views/contents_api/html_document_controller.py
  5. 5 5
      tracim/views/contents_api/threads_controller.py
  6. 10 10
      tracim/views/core_api/workspace_controller.py

+ 1 - 1
tracim/exceptions.py Parādīt failu 

@@ -69,7 +69,7 @@ class WorkspaceNotFoundInTracimRequest(NotFound):
69 69 
     pass
70 70
71 71
72 
-class InsufficientUserWorkspaceRole(TracimException):
72 
+class InsufficientUserRoleInWorkspace(TracimException):
73 73 
     pass
74 74
75 75

+ 4 - 4
tracim/lib/utils/authorization.py Parādīt failu 

@@ -14,7 +14,7 @@ except ImportError:  # python3.4
14 14 
     JSONDecodeError = ValueError
15 15
16 16 
 from tracim.models.contents import ContentTypeLegacy as ContentType
17 
-from tracim.exceptions import InsufficientUserWorkspaceRole
17 
+from tracim.exceptions import InsufficientUserRoleInWorkspace
18 18 
 from tracim.exceptions import ContentTypeNotAllowed
19 19 
 from tracim.exceptions import InsufficientUserProfile
20 20 
 if TYPE_CHECKING:
 
@@ -105,7 +105,7 @@ def require_workspace_role(minimal_required_role: int) -> typing.Callable:
105 105 
             workspace = request.current_workspace
106 106 
             if workspace.get_user_role(user) >= minimal_required_role:
107 107 
                 return func(self, context, request)
108 
-            raise InsufficientUserWorkspaceRole()
108 
+            raise InsufficientUserRoleInWorkspace()
109 109
110 110 
         return wrapper
111 111 
     return decorator
 
@@ -127,7 +127,7 @@ def require_candidate_workspace_role(minimal_required_role: int) -> typing.Calla
127 127
128 128 
             if workspace.get_user_role(user) >= minimal_required_role:
129 129 
                 return func(self, context, request)
130 
-            raise InsufficientUserWorkspaceRole()
130 
+            raise InsufficientUserRoleInWorkspace()
131 131
132 132 
         return wrapper
133 133 
     return decorator
 
@@ -180,6 +180,6 @@ def require_comment_ownership_or_role(
180 180 
             # INFO - G.M - 2018-06-178 - normal role test
181 181 
             if workspace.get_user_role(user) >= minimal_required_role:
182 182 
                 return func(self, context, request)
183 
-            raise InsufficientUserWorkspaceRole()
183 
+            raise InsufficientUserRoleInWorkspace()
184 184 
         return wrapper
185 185 
     return decorator

+ 4 - 4
tracim/views/contents_api/comment_controller.py Parādīt failu 

@@ -20,7 +20,7 @@ from tracim.views.core_api.schemas import SetCommentSchema
20 20 
 from tracim.views.core_api.schemas import WorkspaceAndContentIdPathSchema
21 21 
 from tracim.views.core_api.schemas import NoContentSchema
22 22 
 from tracim.exceptions import WorkspaceNotFound
23 
-from tracim.exceptions import InsufficientUserWorkspaceRole
23 
+from tracim.exceptions import InsufficientUserRoleInWorkspace
24 24 
 from tracim.exceptions import NotAuthenticated
25 25 
 from tracim.exceptions import AuthenticationFailed
26 26 
 from tracim.models.contents import ContentTypeLegacy as ContentType
 
@@ -34,7 +34,7 @@ class CommentController(Controller):
34 34
35 35 
     @hapic.with_api_doc(tags=[COMMENT_ENDPOINTS_TAG])
36 36 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
37 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
37 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
38 38 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
39 39 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
40 40 
     @require_workspace_role(UserRoleInWorkspace.READER)
 
@@ -64,7 +64,7 @@ class CommentController(Controller):
64 64
65 65 
     @hapic.with_api_doc(tags=[COMMENT_ENDPOINTS_TAG])
66 66 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
67 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
67 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
68 68 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
69 69 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
70 70 
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
 
@@ -96,7 +96,7 @@ class CommentController(Controller):
96 96
97 97 
     @hapic.with_api_doc(tags=[COMMENT_ENDPOINTS_TAG])
98 98 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
99 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
99 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
100 100 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
101 101 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
102 102 
     @require_comment_ownership_or_role(

+ 5 - 5
tracim/views/contents_api/html_document_controller.py Parādīt failu 

@@ -25,7 +25,7 @@ from tracim.lib.utils.authorization import require_content_types
25 25 
 from tracim.lib.utils.authorization import require_workspace_role
26 26 
 from tracim.exceptions import WorkspaceNotFound
27 27 
 from tracim.exceptions import ContentTypeNotAllowed
28 
-from tracim.exceptions import InsufficientUserWorkspaceRole
28 
+from tracim.exceptions import InsufficientUserRoleInWorkspace
29 29 
 from tracim.exceptions import NotAuthenticated
30 30 
 from tracim.exceptions import AuthenticationFailed
31 31 
 from tracim.models.context_models import ContentInContext
 
@@ -41,7 +41,7 @@ class HTMLDocumentController(Controller):
41 41
42 42 
     @hapic.with_api_doc(tags=[HTML_DOCUMENT_ENDPOINTS_TAG])
43 43 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
44 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
44 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
45 45 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
46 46 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
47 47 
     @hapic.handle_exception(ContentTypeNotAllowed, HTTPStatus.BAD_REQUEST)
 
@@ -67,7 +67,7 @@ class HTMLDocumentController(Controller):
67 67
68 68 
     @hapic.with_api_doc(tags=[HTML_DOCUMENT_ENDPOINTS_TAG])
69 69 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
70 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
70 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
71 71 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
72 72 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
73 73 
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
 
@@ -105,7 +105,7 @@ class HTMLDocumentController(Controller):
105 105
106 106 
     @hapic.with_api_doc(tags=[HTML_DOCUMENT_ENDPOINTS_TAG])
107 107 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
108 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
108 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
109 109 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
110 110 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
111 111 
     @require_workspace_role(UserRoleInWorkspace.READER)
 
@@ -139,7 +139,7 @@ class HTMLDocumentController(Controller):
139 139
140 140 
     @hapic.with_api_doc(tags=[HTML_DOCUMENT_ENDPOINTS_TAG])
141 141 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
142 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
142 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
143 143 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
144 144 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
145 145 
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)

+ 5 - 5
tracim/views/contents_api/threads_controller.py Parādīt failu 

@@ -23,7 +23,7 @@ from tracim.views.core_api.schemas import NoContentSchema
23 23 
 from tracim.lib.utils.authorization import require_content_types
24 24 
 from tracim.lib.utils.authorization import require_workspace_role
25 25 
 from tracim.exceptions import WorkspaceNotFound, ContentTypeNotAllowed
26 
-from tracim.exceptions import InsufficientUserWorkspaceRole
26 
+from tracim.exceptions import InsufficientUserRoleInWorkspace
27 27 
 from tracim.exceptions import NotAuthenticated
28 28 
 from tracim.exceptions import AuthenticationFailed
29 29 
 from tracim.models.context_models import ContentInContext
 
@@ -39,7 +39,7 @@ class ThreadController(Controller):
39 39
40 40 
     @hapic.with_api_doc(tags=[THREAD_ENDPOINTS_TAG])
41 41 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
42 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
42 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
43 43 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
44 44 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
45 45 
     @hapic.handle_exception(ContentTypeNotAllowed, HTTPStatus.BAD_REQUEST)
 
@@ -65,7 +65,7 @@ class ThreadController(Controller):
65 65
66 66 
     @hapic.with_api_doc(tags=[THREAD_ENDPOINTS_TAG])
67 67 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
68 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
68 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
69 69 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
70 70 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
71 71 
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
 
@@ -103,7 +103,7 @@ class ThreadController(Controller):
103 103
104 104 
     @hapic.with_api_doc(tags=[THREAD_ENDPOINTS_TAG])
105 105 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
106 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
106 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
107 107 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
108 108 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
109 109 
     @require_workspace_role(UserRoleInWorkspace.READER)
 
@@ -137,7 +137,7 @@ class ThreadController(Controller):
137 137
138 138 
     @hapic.with_api_doc(tags=[THREAD_ENDPOINTS_TAG])
139 139 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
140 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
140 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
141 141 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
142 142 
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.FORBIDDEN)
143 143 
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)

+ 10 - 10
tracim/views/core_api/workspace_controller.py Parādīt failu 

@@ -17,7 +17,7 @@ from tracim.models.data import UserRoleInWorkspace
17 17 
 from tracim.models.data import ActionDescription
18 18 
 from tracim.models.context_models import UserRoleWorkspaceInContext
19 19 
 from tracim.models.context_models import ContentInContext
20 
-from tracim.exceptions import NotAuthenticated, InsufficientUserWorkspaceRole
20 
+from tracim.exceptions import NotAuthenticated, InsufficientUserRoleInWorkspace
21 21 
 from tracim.exceptions import WorkspaceNotFoundInTracimRequest
22 22 
 from tracim.exceptions import WorkspacesDoNotMatch
23 23 
 from tracim.exceptions import WorkspaceNotFound
 
@@ -41,7 +41,7 @@ class WorkspaceController(Controller):
41 41
42 42 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
43 43 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
44 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
44 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
45 45 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
46 46 
     @require_workspace_role(UserRoleInWorkspace.READER)
47 47 
     @hapic.input_path(WorkspaceIdPathSchema())
 
@@ -61,7 +61,7 @@ class WorkspaceController(Controller):
61 61
62 62 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
63 63 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
64 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
64 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
65 65 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
66 66 
     @require_workspace_role(UserRoleInWorkspace.READER)
67 67 
     @hapic.input_path(WorkspaceIdPathSchema())
 
@@ -90,7 +90,7 @@ class WorkspaceController(Controller):
90 90
91 91 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
92 92 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
93 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
93 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
94 94 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
95 95 
     @require_workspace_role(UserRoleInWorkspace.READER)
96 96 
     @hapic.input_path(WorkspaceIdPathSchema())
 
@@ -126,7 +126,7 @@ class WorkspaceController(Controller):
126 126
127 127 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
128 128 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
129 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
129 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
130 130 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
131 131 
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
132 132 
     @hapic.input_path(WorkspaceIdPathSchema())
 
@@ -160,7 +160,7 @@ class WorkspaceController(Controller):
160 160 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
161 161 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
162 162 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
163 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
163 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
164 164 
     @hapic.handle_exception(WorkspacesDoNotMatch, HTTPStatus.BAD_REQUEST)
165 165 
     @require_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
166 166 
     @require_candidate_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
 
@@ -214,7 +214,7 @@ class WorkspaceController(Controller):
214 214
215 215 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
216 216 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
217 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
217 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
218 218 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
219 219 
     @require_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
220 220 
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
 
@@ -249,7 +249,7 @@ class WorkspaceController(Controller):
249 249
250 250 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
251 251 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
252 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
252 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
253 253 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
254 254 
     @require_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
255 255 
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
 
@@ -285,7 +285,7 @@ class WorkspaceController(Controller):
285 285
286 286 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
287 287 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
288 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
288 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
289 289 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
290 290 
     @require_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
291 291 
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
 
@@ -317,7 +317,7 @@ class WorkspaceController(Controller):
317 317
318 318 
     @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
319 319 
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
320 
-    @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
320 
+    @hapic.handle_exception(InsufficientUserRoleInWorkspace, HTTPStatus.FORBIDDEN)
321 321 
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
322 322 
     @require_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
323 323 
     @hapic.input_path(WorkspaceAndContentIdPathSchema())