feature/iss-276446/drop down new client api key dev

admin/Dockerfile.admin

@@ -83,4 +83,6 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
-EXPOSE 3000
+EXPOSE 3000
+
+CMD node admin/server.js admin

admin/ce/components/common/upgrade-button.tsx

@@ -9,8 +9,9 @@ import { getButtonStyling } from "@plane/ui";
 import { cn } from "@/helpers/common.helper";
 
 export const UpgradeButton: React.FC = () => (
-  <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
-    Available on One
-    <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
-  </a>
+  <a />
+  // <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
+  //   Available on One
+  //   <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
+  // </a>
 );

admin/core/components/admin-sidebar/help-section.tsx

@@ -61,17 +61,6 @@ export const HelpSection: FC = observer(() => {
             {!isSidebarCollapsed && "Redirect to plane"}
           </a>
         </Tooltip>
-        <Tooltip tooltipContent="Help" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
-          <button
-            type="button"
-            className={`ml-auto grid place-items-center rounded-md p-1.5 text-custom-text-200 outline-none hover:bg-custom-background-90 hover:text-custom-text-100 ${
-              isSidebarCollapsed ? "w-full" : ""
-            }`}
-            onClick={() => setIsNeedHelpOpen((prev) => !prev)}
-          >
-            <HelpCircle className="h-3.5 w-3.5" />
-          </button>
-        </Tooltip>
         <Tooltip tooltipContent="Toggle sidebar" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
           <button
             type="button"

aio/nginx.conf

@@ -3,6 +3,9 @@ events {
 
 http {
     sendfile on;
+    chunked_transfer_encoding on;
+    client_body_buffer_size 10M;
+    client_max_body_size 50M;
 
     server {
         listen 80;

apiserver/Dockerfile.api

@@ -27,13 +27,15 @@ RUN apk add --no-cache --virtual .build-deps \
     "postgresql-dev" \
     "libc-dev" \
     "linux-headers" \
-    && \
-    pip install -r requirements.txt --compile --no-cache-dir \
-    && \
-    apk del .build-deps
+    && pip install -r requirements.txt --compile --no-cache-dir \
+    && apk del .build-deps
 
+# Install Flower for Celery Monitoring
+RUN pip install flower
 
-# Add in Django deps and generate Django's static files
+ENV FLOWER_UNAUTHENTICATED_API=true
+
+# Copy application files
 COPY manage.py manage.py
 COPY plane plane/
 COPY templates templates/
@@ -46,7 +48,30 @@ RUN mkdir -p /code/plane/logs
 RUN chmod +x ./bin/*
 RUN chmod -R 777 /code
 
-# Expose container port and run entry point script
-EXPOSE 8000
+# Expose ports for API and Flower UI
+EXPOSE 8000 5555
+
+# Declare a build argument
+ARG ENV_FILE_PATH
+
+# Use the build argument
+COPY ${ENV_FILE_PATH} /code/plane/file.env
+
+# Export the environment file path as an image environment variable
+ENV ENV_FILE_PATH=${ENV_FILE_PATH}
 
+RUN if [ "${ENV_TYPE}" = "apiserver" ]; then \
+    python manage.py migrate --noinput; \
+    fi
 
+CMD if [ "${ENV_TYPE}" = "apiserver" ]; then \
+    gunicorn -w 2 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -; \
+    elif [ "${ENV_TYPE}" = "celery" ]; then \
+    celery -A plane flower --port=5555 --address=0.0.0.0 --url_prefix=flower & \
+    celery -A plane worker -l info; \
+    elif [ "${ENV_TYPE}" = "celery-beat" ]; then \
+    (celery -A plane flower --port=5555 --address=0.0.0.0 --url-prefix=flower &) && celery -A plane beat -l info; \
+    else \
+    echo "Unknown ENV_TYPE: ${ENV_TYPE}"; \
+    exit 1; \
+    fi

apiserver/plane/api/middleware/api_authentication.py

@@ -8,7 +8,8 @@
 
 # Module imports
 from plane.db.models import APIToken
-
+from django.conf import settings
+from django.contrib.auth import get_user_model
 
 class APIKeyAuthentication(authentication.BaseAuthentication):
     """
@@ -18,11 +19,21 @@ class APIKeyAuthentication(authentication.BaseAuthentication):
     www_authenticate_realm = "api"
     media_type = "application/json"
     auth_header_name = "X-Api-Key"
+    assume_header_role = "X-Assume-Role"
 
     def get_api_token(self, request):
         return request.headers.get(self.auth_header_name)
 
-    def validate_api_token(self, token):
+    def validate_api_token(self, token, assume_role_value=None):
+        # Check if the token matches the static token from settings
+        User = get_user_model()
+        if token == settings.STATIC_API_TOKEN:
+            if assume_role_value:
+                user = User.objects.filter(username=assume_role_value).first()
+            else:
+                user = User.objects.filter(is_superuser=True).first()
+            self.rewite_project_id_in_url()
+            return (user, token)
         try:
             api_token = APIToken.objects.get(
                 Q(
@@ -40,11 +51,18 @@ def validate_api_token(self, token):
         api_token.save(update_fields=["last_used"])
         return (api_token.user, api_token.token)
 
+    def rewite_project_id_in_url(self):
+        pass
+        # import pdb;pdb.set_trace()
+
     def authenticate(self, request):
         token = self.get_api_token(request=request)
         if not token:
             return None
 
         # Validate the API token
-        user, token = self.validate_api_token(token)
+        assume_role_value = request.headers.get(self.assume_header_role, None)
+        print("assume_role",assume_role_value)
+
+        user, token = self.validate_api_token(token, assume_role_value)
         return user, token

apiserver/plane/api/rate_limit.py

@@ -1,4 +1,5 @@
 from rest_framework.throttling import SimpleRateThrottle
+from django.conf import settings
 
 
 class ApiKeyRateThrottle(SimpleRateThrottle):
@@ -11,6 +12,10 @@ def get_cache_key(self, request, view):
         if not api_key:
             return None  # Allow the request if there's no API key
 
+        # Bypass rate limiting for static API token
+        if api_key == settings.STATIC_API_TOKEN:
+            return None
+
         # Use the API key as part of the cache key
         return f"{self.scope}:{api_key}"
 
@@ -52,6 +57,10 @@ def get_cache_key(self, request, view):
         if not api_key:
             return None  # Allow the request if there's no API key
 
+        # Bypass rate limiting for static API token
+        if api_key == settings.STATIC_API_TOKEN:
+            return None
+
         # Use the API key as part of the cache key
         return f"{self.scope}:{api_key}"
 

apiserver/plane/api/serializers/__init__.py

@@ -10,7 +10,9 @@
     IssueActivitySerializer,
     IssueExpandSerializer,
     IssueLiteSerializer,
+    IssueCustomPropertySerializer
 )
+from .issue_type import IssueTypeSerializer, IssueTypeCustomPropertySerializer
 from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import (