Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions apps/api/plane/app/urls/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# See the LICENSE file for details.

from django.urls import path
from plane.app.views import ApiTokenEndpoint, ServiceApiTokenEndpoint
from plane.app.views import ApiTokenEndpoint

urlpatterns = [
# API Tokens
Expand All @@ -17,10 +17,5 @@
ApiTokenEndpoint.as_view(),
name="api-tokens-details",
),
path(
"workspaces/<str:slug>/service-api-tokens/",
ServiceApiTokenEndpoint.as_view(),
name="service-api-tokens",
),
## End API Tokens
]
2 changes: 1 addition & 1 deletion apps/api/plane/app/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@

from .module.archive import ModuleArchiveUnarchiveEndpoint

from .api import ApiTokenEndpoint, ServiceApiTokenEndpoint
from .api import ApiTokenEndpoint

from .page.base import (
PageViewSet,
Expand Down
28 changes: 1 addition & 27 deletions apps/api/plane/app/views/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@

# Module import
from .base import BaseAPIView
from plane.db.models import APIToken, Workspace
from plane.db.models import APIToken
from plane.app.serializers import APITokenSerializer, APITokenReadSerializer
from plane.app.permissions import WorkspaceEntityPermission


class ApiTokenEndpoint(BaseAPIView):
Expand Down Expand Up @@ -61,28 +60,3 @@ def patch(self, request: Request, pk: str) -> Response:
serializer.save()
return Response(serializer.data, status=status.HTTP_200_OK)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)


class ServiceApiTokenEndpoint(BaseAPIView):
permission_classes = [WorkspaceEntityPermission]

def post(self, request: Request, slug: str) -> Response:
workspace = Workspace.objects.get(slug=slug)

api_token = APIToken.objects.filter(workspace=workspace, is_service=True).first()

if api_token:
return Response({"token": str(api_token.token)}, status=status.HTTP_200_OK)
else:
# Check the user type
user_type = 1 if request.user.is_bot else 0

api_token = APIToken.objects.create(
label=str(uuid4().hex),
description="Service Token",
user=request.user,
workspace=workspace,
user_type=user_type,
is_service=True,
)
return Response({"token": str(api_token.token)}, status=status.HTTP_201_CREATED)
Loading