Merge pull request #107 from DNO-inc/bodya

version 0.7.1
DNO-inc · Jul 31, 2023 · d394d9d · d394d9d
2 parents 0c99053 + e7deef9
commit d394d9d
Show file tree

Hide file tree

Showing 18 changed files with 341 additions and 334 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/burrito/__init__.py b/burrito/__init__.py
@@ -1 +1 @@
-__version__ = "0.7.0 indev"
+__version__ = "0.7.1 indev"
diff --git a/burrito/apps/about/__main__.py b/burrito/apps/about/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", about_router)
 
 

diff --git a/burrito/apps/admin/__main__.py b/burrito/apps/admin/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", admin_router)
 
 

diff --git a/burrito/apps/admin/views.py b/burrito/apps/admin/views.py
@@ -50,7 +50,7 @@ async def admin__update_ticket_data(
     __auth_obj: BurritoJWT = Depends(get_auth_core())
 ):
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"ADMIN"})
 
     ticket: Tickets | None = is_ticket_exist(
         admin_updates.ticket_id
@@ -152,7 +152,7 @@ async def admin__get_ticket_list_by_filter(
     __auth_obj: BurritoJWT = Depends(get_auth_core())
 ):
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"ADMIN"})
 
     available_filters = {
         "hidden": q_is_hidden(filters.hidden),
@@ -204,7 +204,7 @@ async def admin__show_detail_ticket_info(
 ):
     """Show detail ticket info"""
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"ADMIN"})
 
     ticket: Tickets | None = is_ticket_exist(
         ticket_id_info.ticket_id
@@ -231,7 +231,7 @@ async def admin__delete_ticket(
     __auth_obj: BurritoJWT = Depends(get_auth_core())
 ):
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"ADMIN"})
 
     ticket: Tickets | None = is_ticket_exist(
         deletion_ticket_data.ticket_id

diff --git a/burrito/apps/anon/__main__.py b/burrito/apps/anon/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", anon_router)
 
 

diff --git a/burrito/apps/auth/__main__.py b/burrito/apps/auth/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", auth_router)
 
 

diff --git a/burrito/apps/comments/__main__.py b/burrito/apps/comments/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", comments_router)
 
 

diff --git a/burrito/apps/comments/views.py b/burrito/apps/comments/views.py
@@ -31,7 +31,7 @@ async def comments__create(
     __auth_obj: BurritoJWT = Depends(get_auth_core())
 ):
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"SEND_MESSAGE"})
 
     ticket: Tickets | None = is_ticket_exist(creation_comment_data.ticket_id)
     if ticket.hidden:
@@ -67,7 +67,7 @@ async def comments__edit(
     __auth_obj: BurritoJWT = Depends(get_auth_core())
 ):
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"SEND_MESSAGE"})
 
     comment: Comments | None = is_comment_exist_with_error(edit_comment_data.comment_id)
     is_allowed_to_interact(comment, token_payload.user_id)
@@ -90,7 +90,7 @@ async def comments__delete(
     __auth_obj: BurritoJWT = Depends(get_auth_core())
 ):
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"SEND_MESSAGE"})
 
     comment: Comments | None = is_comment_exist_with_error(deletion_comment_data.comment_id)
     is_allowed_to_interact(comment, token_payload.user_id)
@@ -112,7 +112,7 @@ async def comments__get_related_comments(
     """Obtain comments related to the ticket"""
 
     token_payload: AuthTokenPayload = await __auth_obj.verify_access_token()
-    check_permission(token_payload)
+    check_permission(token_payload, {"SEND_MESSAGE"})
 
     ticket: Tickets | None = is_ticket_exist(filters.ticket_id)
     if ticket.hidden:

diff --git a/burrito/apps/iofiles/__main__.py b/burrito/apps/iofiles/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", iofiles_router)
 
 

diff --git a/burrito/apps/meta/__main__.py b/burrito/apps/meta/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", meta_router)
 
 

diff --git a/burrito/apps/notifications/__main__.py b/burrito/apps/notifications/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", notifications_router)
 
 

diff --git a/burrito/apps/profile/__main__.py b/burrito/apps/profile/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", profile_router)
 
 

diff --git a/burrito/apps/registration/__main__.py b/burrito/apps/registration/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", registration_router)
 
 

diff --git a/burrito/apps/tickets/__main__.py b/burrito/apps/tickets/__main__.py
@@ -12,7 +12,7 @@
 
 _APP_NAME = get_current_app_name()
 
-app = get_current_app(docs_url=f"/{_APP_NAME}/docs", openapi_url=f"/{_APP_NAME}/openapi.json")
+app = get_current_app(docs_url=f"/{_APP_NAME}/", openapi_url=f"/{_APP_NAME}/openapi.json")
 connect_app(app, f"/{_APP_NAME}", tickets_router)
 
 

diff --git a/burrito/utils/auth.py b/burrito/utils/auth.py
@@ -9,6 +9,11 @@
 from burrito.utils.redis_utils import get_redis_connector
 
 
+_JWT_SECRET = get_config().BURRITO_JWT_SECRET
+_TOKEN_TTL = get_config().BURRITO_JWT_TTL
+_KEY_TEMPLATE = "{}_{}_{}"
+
+
 class AuthTokenError(HTTPException):
     ...
 
@@ -18,11 +23,7 @@ class AuthTokenPayload(BaseModel):
     token_type: str = ""
     user_id: int
     role: str
-
-
-_JWT_SECRET = get_config().BURRITO_JWT_SECRET
-_TOKEN_TTL = get_config().BURRITO_JWT_TTL
-_KEY_TEMPLATE = "{}_{}_{}"
+    exp: int = _TOKEN_TTL
 
 
 def _make_redis_key(data: AuthTokenPayload) -> str:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Burrito"
-version = "0.7.0.dev2"
+version = "0.7.1.dev2"
 description = "API for the issue tracker"
 authors = ["DimonBor", "m-o-d-e-r"]
 readme = "README.md"

diff --git a/scripts/generate_changelog.sh b/scripts/generate_changelog.sh
@@ -1,4 +1,4 @@
 
-echo -e "\t==============================\n\tGenerated $(date '+%F %T')\n\t==============================\n\n" > \
+echo -e "\t============================================\n\tGenerated $(date '+%F %T\t%Z %z')\n\t============================================\n\n" > \
     CHANGELOG.md & git log --all --date=relative --pretty=format:"%x09 %h %ad %d %s (%aN)" >> \
     CHANGELOG.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "0.7.0 indev"
		__version__ = "0.7.1 indev"