dev: update takeoff script to take custom port values

[ FEATURE ] New Issue Widget for displaying issues inside document-editor (#2920 )
* feat: added heading 3 in the editor summary markings * feat: fixed editor and summary bar sizing * feat: added `issue-embed` extension * feat: exposed issue embed extension * feat: added main embed config configuration to document editor body * feat: added peek overview and issue embed fetch function * feat: enabled slash commands to take additonal suggestions from editors * chore: replaced `IssueEmbedWidget` into widget extension * chore: removed issue embed from previous places * feat: added issue embed suggestion extension * feat: added issue embed suggestion renderer * feat: added issue embed suggestions into extensions module * feat: added issues in issueEmbedConfiguration in document editor * chore: package fixes * chore: removed log statements * feat: added title updation logic into document editor * fix: issue suggestion items, not rendering issue widget on enter * feat: added error card for issue widget * feat: improved focus logic for issue search and navigate * feat: appended transactionid for issueWidgetTransaction * chore: packages update * feat: disabled editing of title in readonly mode * feat: added issueEmbedConfig in readonly editor * fix: issue suggestions not loading after structure changed to object * feat: added toast messages for success/error messages from doc editor * fix: issue suggestions sorting issue * fix: formatting errors resolved * fix: infinite reloading of the readonly document editor * fix: css in avatar of issue widget card * feat: added show alert on pages reload * feat: added saving state for the pages editor * fix: issue with heading 3 in side bar view * style: updated issue suggestions dropdown ui * fix: Pages intiliazation and mutation with updated MobX store * fixed image uploads being cancelled on refocus due to swr * fix: issue with same description rerendering empty content fixed * fix: scroll in issue suggestion view * fix: added submission prop * fix: Updated the comment update to take issue id in inbox issues * feat:changed date representation in IssueEmbedCard * fix: page details mutation with optimistic updates using swr * fix: menu options in read only editor with auth fixed * fix: add error handling for title and page desc * fixed yarn.lock * fix: read-only editor title wrapping * fix: build error with rich text editor --------- Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> Co-authored-by: Palanikannan1437 <73993394+Palanikannan1437@users.noreply.github.com>
2023-12-07 14:04:47 +05:30 · 2023-12-07 12:04:21 +05:30 · 2023-12-07 11:59:46 +05:30 · 2023-12-06 20:31:42 +05:30 · 2023-12-06 20:07:39 +05:30 · 2023-12-06 19:58:47 +05:30
1002 changed files with 11636 additions and 16283 deletions
@@ -2,16 +2,5 @@
 *.pyc
 .env
 venv
-node_modules/
-**/node_modules/
-npm-debug.log
-.next/
-**/.next/
-.turbo/
-**/.turbo/
-build/
-**/build/
-out/
-**/out/
-dist/
-**/dist/
+node_modules
+npm-debug.log
@@ -9,7 +9,6 @@ on:
      - preview
      - qa
      - develop
-      - release-*
  release:
    types: [released, prereleased]

@@ -63,14 +62,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Frontend Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:stable
          else
            TAG=${{ env.FRONTEND_TAG }}
          fi
@@ -105,14 +104,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Space Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:stable
          else
            TAG=${{ env.SPACE_TAG }}
          fi
@@ -147,14 +146,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Backend Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:stable
          else
            TAG=${{ env.BACKEND_TAG }}
          fi
@@ -189,14 +188,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Proxy Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:stable
          else
            TAG=${{ env.PROXY_TAG }}
          fi
@@ -1,13 +1,11 @@
-name: Create Sync Action
+name: Create PR in Plane EE Repository to sync the changes

 on:
  pull_request:
    branches:
-      - preview 
+      - master
    types:
      - closed
-env: 
-  SOURCE_BRANCH_NAME: ${{github.event.pull_request.base.ref}}

 jobs:
  create_pr:
@@ -18,13 +16,27 @@ jobs:
      pull-requests: write
      contents: read
    steps:
+      - name: Check SOURCE_REPO
+        id: check_repo
+        env:
+          SOURCE_REPO: ${{ secrets.SOURCE_REPO_NAME }}
+        run: |
+          echo "::set-output name=is_correct_repo::$(if [[ "$SOURCE_REPO" == "makeplane/plane" ]]; then echo 'true'; else echo 'false'; fi)"
+
      - name: Checkout Code
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
        uses: actions/checkout@v2
        with:
          persist-credentials: false
          fetch-depth: 0

+      - name: Set up Branch Name
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
+        run: |
+          echo "SOURCE_BRANCH_NAME=${{ github.head_ref }}" >> $GITHUB_ENV
+
      - name: Setup GH CLI
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
        run: |
          type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
@@ -33,14 +45,35 @@ jobs:
          sudo apt update
          sudo apt install gh -y

-      - name: Push Changes to Target Repo
+      - name: Create Pull Request
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
        env:
          GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
        run: |
-          TARGET_REPO="${{ secrets.SYNC_TARGET_REPO_NAME }}"
-          TARGET_BRANCH="${{ secrets.SYNC_TARGET_BRANCH_NAME }}"
+          TARGET_REPO="${{ secrets.TARGET_REPO_NAME }}"
+          TARGET_BRANCH="${{ secrets.TARGET_REPO_BRANCH }}"
          SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"

          git checkout $SOURCE_BRANCH
-          git remote add target-origin "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
-          git push target-origin $SOURCE_BRANCH:$TARGET_BRANCH
+          git remote add target "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
+          git push target $SOURCE_BRANCH:$SOURCE_BRANCH
+
+          PR_TITLE="${{ github.event.pull_request.title }}"
+          PR_BODY="${{ github.event.pull_request.body }}"
+
+          # Remove double quotes
+          PR_TITLE_CLEANED="${PR_TITLE//\"/}"
+          PR_BODY_CLEANED="${PR_BODY//\"/}"
+
+          # Construct PR_BODY_CONTENT using a here-document
+          PR_BODY_CONTENT=$(cat <<EOF
+          $PR_BODY_CLEANED
+          EOF
+          )
+
+          gh pr create \
+            --base $TARGET_BRANCH \
+            --head $SOURCE_BRANCH \
+            --title "[SYNC] $PR_TITLE_CLEANED" \
+            --body "$PR_BODY_CONTENT" \
+            --repo $TARGET_REPO
@@ -80,6 +80,3 @@ tmp/
 ## packages
 dist
 .temp/
-
-# logs
-combined.log
@@ -33,8 +33,8 @@ The backend is a django project which is kept inside apiserver
 1. Clone the repo

 ```bash
-git clone https://github.com/makeplane/plane.git [folder-name]
-cd [folder-name]
+git clone https://github.com/makeplane/plane
+cd plane
 chmod +x setup.sh
 ```

@@ -44,12 +44,33 @@ chmod +x setup.sh
 ./setup.sh
 ```

-3. Start the containers
+3. Define `NEXT_PUBLIC_API_BASE_URL=http://localhost` in **web/.env** and **space/.env** file

 ```bash
-docker compose -f docker-compose-local.yml up
+echo "\nNEXT_PUBLIC_API_BASE_URL=http://localhost\n" >> ./web/.env
 ```

+```bash
+echo "\nNEXT_PUBLIC_API_BASE_URL=http://localhost\n" >> ./space/.env
+```
+
+4. Run Docker compose up
+
+```bash
+docker compose up -d
+```
+
+5. Install dependencies
+
+```bash
+yarn install
+```
+
+6. Run the web app in development mode
+
+```bash
+yarn dev
+```

 ## Missing a Feature?

@@ -49,10 +49,24 @@ NGINX_PORT=80


 ```
+# Enable/Disable OAUTH - default 0 for selfhosted instance
+NEXT_PUBLIC_ENABLE_OAUTH=0
 # Public boards deploy URL
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
 ```

+
+
+## {PROJECT_FOLDER}/spaces/.env.example
+
+
+
+```
+# Flag to toggle OAuth
+NEXT_PUBLIC_ENABLE_OAUTH=0
+```
+
+

 ## {PROJECT_FOLDER}/apiserver/.env

@@ -37,7 +37,7 @@ Meet [Plane](https://plane.so). An open-source software development tool to mana

 > Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.

-The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting/docker-compose).
+The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting).

 ## ⚡️ Contributors Quick Start

@@ -63,7 +63,7 @@ Thats it!

 ## 🍙 Self Hosting

-For self hosting environment setup, visit the [Self Hosting](https://docs.plane.so/self-hosting/docker-compose) documentation page
+For self hosting environment setup, visit the [Self Hosting](https://docs.plane.so/self-hosting) documentation page

 ## 🚀 Features

@@ -27,8 +27,7 @@ WORKDIR /code
 COPY requirements.txt ./requirements.txt
 ADD requirements ./requirements

-# Install the local development settings
-RUN pip install -r requirements/local.txt --compile --no-cache-dir
+RUN pip install -r requirements.txt --compile --no-cache-dir

 RUN addgroup -S plane && \
    adduser -S captain -G plane
@@ -49,5 +48,5 @@ USER captain
 # Expose container port and run entry point script
 EXPOSE 8000

-CMD [ "./bin/takeoff.local" ]
+# CMD [ "./bin/takeoff" ]

@@ -1,3 +1,3 @@
 web: gunicorn -w 4 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:$PORT --max-requests 10000 --max-requests-jitter 1000 --access-logfile -
-worker: celery -A plane worker -l info -Q internal_tasks,external_tasks
+worker: celery -A plane worker -l info
 beat: celery -A plane beat -l INFO
@@ -1,31 +0,0 @@
-#!/bin/bash
-set -e
-python manage.py wait_for_db
-python manage.py migrate
-
-# Create the default bucket
-#!/bin/bash
-
-# Collect system information
-HOSTNAME=$(hostname)
-MAC_ADDRESS=$(ip link show | awk '/ether/ {print $2}' | head -n 1)
-CPU_INFO=$(cat /proc/cpuinfo)
-MEMORY_INFO=$(free -h)
-DISK_INFO=$(df -h)
-
-# Concatenate information and compute SHA-256 hash
-SIGNATURE=$(echo "$HOSTNAME$MAC_ADDRESS$CPU_INFO$MEMORY_INFO$DISK_INFO" | sha256sum | awk '{print $1}')
-
-# Export the variables
-export MACHINE_SIGNATURE=$SIGNATURE
-
-# Register instance
-python manage.py register_instance $MACHINE_SIGNATURE
-# Load the configuration variable
-python manage.py configure_instance
-
-# Create the default bucket
-python manage.py create_bucket
-
-python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local
-
@@ -1,4 +1,4 @@
 {
-  "name": "plane-api",
-  "version": "0.14.0"
-}
+    "name": "plane-api",
+    "version": "0.13.2"
+}
@@ -281,22 +281,20 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
        )
        cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)

-        issue_activity.apply_async(
-            args=[],
-            kwargs={
-                'type': "cycle.activity.deleted",
-                'requested_data': json.dumps({
+        issue_activity.delay(
+            type="cycle.activity.deleted",
+            requested_data=json.dumps(
+                {
                    "cycle_id": str(pk),
                    "cycle_name": str(cycle.name),
                    "issues": [str(issue_id) for issue_id in cycle_issues],
-                }),
-                'actor_id': str(request.user.id),
-                'issue_id': None,
-                'project_id': str(project_id),
-                'current_instance': None,
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='external',
+                }
+            ),
+            actor_id=str(request.user.id),
+            issue_id=None,
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
        )
        # Delete the cycle
        cycle.delete()
@@ -456,21 +454,21 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
        )

        # Capture Issue Activity
-        issue_activity.apply_async(
-            args=[],
-            kwargs={
-                'type': "cycle.activity.created",
-                'requested_data': json.dumps({"cycles_list": str(issues)}),
-                'actor_id': str(self.request.user.id),
-                'issue_id': None,
-                'project_id': str(self.kwargs.get("project_id", None)),
-                'current_instance': json.dumps({
+        issue_activity.delay(
+            type="cycle.activity.created",
+            requested_data=json.dumps({"cycles_list": str(issues)}),
+            actor_id=str(self.request.user.id),
+            issue_id=None,
+            project_id=str(self.kwargs.get("project_id", None)),
+            current_instance=json.dumps(
+                {
                    "updated_cycle_issues": update_cycle_issue_activity,
-                    "created_cycle_issues": serializers.serialize("json", record_to_create),
-                }),
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='external',
+                    "created_cycle_issues": serializers.serialize(
+                        "json", record_to_create
+                    ),
+                }
+            ),
+            epoch=int(timezone.now().timestamp()),
        )

        # Return all Cycle Issues
@@ -485,21 +483,19 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
        )
        issue_id = cycle_issue.issue_id
        cycle_issue.delete()
-        issue_activity.apply_async(
-            args=[],
-            kwargs={
-                'type': "cycle.activity.deleted",
-                'requested_data': json.dumps({
+        issue_activity.delay(
+            type="cycle.activity.deleted",
+            requested_data=json.dumps(
+                {
                    "cycle_id": str(self.kwargs.get("cycle_id")),
                    "issues": [str(issue_id)],
-                }),
-                'actor_id': str(self.request.user.id),
-                'issue_id': str(issue_id),
-                'project_id': str(self.kwargs.get("project_id", None)),
-                'current_instance': None,
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='external',
+                }
+            ),
+            actor_id=str(self.request.user.id),
+            issue_id=str(issue_id),
+            project_id=str(self.kwargs.get("project_id", None)),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

@@ -142,18 +142,14 @@ class InboxIssueAPIEndpoint(BaseAPIView):
        )

        # Create an Issue Activity
-        issue_activity.apply_async(
-            args=[],  # If no positional arguments are required
-            kwargs={
-                "type": "issue.activity.created",
-                "requested_data": json.dumps(request.data, cls=DjangoJSONEncoder),
-                "actor_id": str(request.user.id),
-                "issue_id": str(issue.id),
-                "project_id": str(project_id),
-                "current_instance": None,
-                "epoch": int(timezone.now().timestamp()),
-            },
-            routing_key="external",
+        issue_activity.delay(
+            type="issue.activity.created",
+            requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+            actor_id=str(request.user.id),
+            issue_id=str(issue.id),
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
        )

        # create an inbox issue
@@ -236,21 +232,17 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                # Log all the updates
                requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
                if issue is not None:
-                    issue_activity.apply_async(
-                        args=[],
-                        kwargs={
-                            "type": "issue.activity.updated",
-                            "requested_data": requested_data,
-                            "actor_id": str(request.user.id),
-                            "issue_id": str(issue_id),
-                            "project_id": str(project_id),
-                            "current_instance": json.dumps(
-                                IssueSerializer(current_instance).data,
-                                cls=DjangoJSONEncoder,
-                            ),
-                            "epoch": int(timezone.now().timestamp()),
-                        },
-                        routing_key="external",
+                    issue_activity.delay(
+                        type="issue.activity.updated",
+                        requested_data=requested_data,
+                        actor_id=str(request.user.id),
+                        issue_id=str(issue_id),
+                        project_id=str(project_id),
+                        current_instance=json.dumps(
+                            IssueSerializer(current_instance).data,
+                            cls=DjangoJSONEncoder,
+                        ),
+                        epoch=int(timezone.now().timestamp()),
                    )
                issue_serializer.save()
            else:
@@ -207,18 +207,14 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
            serializer.save()

            # Track the issue
-            issue_activity.apply_async(
-                args=[],  # If no positional arguments are required
-                kwargs={
-                    'type': "issue.activity.created",
-                    'requested_data': json.dumps(self.request.data, cls=DjangoJSONEncoder),
-                    'actor_id': str(request.user.id),
-                    'issue_id': str(serializer.data.get("id", None)),
-                    'project_id': str(project_id),
-                    'current_instance': None,
-                    'epoch': int(timezone.now().timestamp()),
-                },
-                routing_key='external',
+            issue_activity.delay(
+                type="issue.activity.created",
+                requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
+                actor_id=str(request.user.id),
+                issue_id=str(serializer.data.get("id", None)),
+                project_id=str(project_id),
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
            )
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -232,18 +228,14 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
        serializer = IssueSerializer(issue, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
-            issue_activity.apply_async(
-                args=[],
-                kwargs={
-                    'type': "issue.activity.updated",
-                    'requested_data': requested_data,
-                    'actor_id': str(request.user.id),
-                    'issue_id': str(pk),
-                    'project_id': str(project_id),
-                    'current_instance': current_instance,
-                    'epoch': int(timezone.now().timestamp()),
-                },
-                routing_key='external',
+            issue_activity.delay(
+                type="issue.activity.updated",
+                requested_data=requested_data,
+                actor_id=str(request.user.id),
+                issue_id=str(pk),
+                project_id=str(project_id),
+                current_instance=current_instance,
+                epoch=int(timezone.now().timestamp()),
            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -254,19 +246,14 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
        issue.delete()
-        issue_activity.apply_async(
-            args=[],
-            kwargs={
-                'type': "issue.activity.deleted",
-                'requested_data': json.dumps({"issue_id": str(pk)}),
-                'actor_id': str(request.user.id),
-                'issue_id': str(pk),
-                'project_id': str(project_id),
-                'current_instance': current_instance,
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='your_routing_key',
-            queue='your_queue_name'
+        issue_activity.delay(
+            type="issue.activity.deleted",
+            requested_data=json.dumps({"issue_id": str(pk)}),
+            actor_id=str(request.user.id),
+            issue_id=str(pk),
+            project_id=str(project_id),
+            current_instance=current_instance,
+            epoch=int(timezone.now().timestamp()),
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

@@ -322,11 +309,7 @@ class LabelAPIEndpoint(BaseAPIView):
                ).data,
            )
        label = self.get_queryset().get(pk=pk)
-        serializer = LabelSerializer(
-            label,
-            fields=self.fields,
-            expand=self.expand,
-        )
+        serializer = LabelSerializer(label, fields=self.fields, expand=self.expand,)
        return Response(serializer.data, status=status.HTTP_200_OK)

    def patch(self, request, slug, project_id, pk=None):
@@ -336,6 +319,7 @@ class LabelAPIEndpoint(BaseAPIView):
            serializer.save()
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    

    def delete(self, request, slug, project_id, pk=None):
        label = self.get_queryset().get(pk=pk)
@@ -400,18 +384,14 @@ class IssueLinkAPIEndpoint(BaseAPIView):
                project_id=project_id,
                issue_id=issue_id,
            )
-            issue_activity.apply_async(
-                args=[],  # If no positional arguments are required
-                kwargs={
-                    'type': "link.activity.created",
-                    'requested_data': json.dumps(serializer.data, cls=DjangoJSONEncoder),
-                    'actor_id': str(self.request.user.id),
-                    'issue_id': str(self.kwargs.get("issue_id")),
-                    'project_id': str(self.kwargs.get("project_id")),
-                    'current_instance': None,
-                    'epoch': int(timezone.now().timestamp()),
-                },
-                routing_key='external',
+            issue_activity.delay(
+                type="link.activity.created",
+                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id")),
+                project_id=str(self.kwargs.get("project_id")),
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
            )
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -428,18 +408,14 @@ class IssueLinkAPIEndpoint(BaseAPIView):
        serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
-            issue_activity.apply_async(
-                args=[],  # If no positional arguments are required
-                kwargs={
-                    'type': "link.activity.updated",
-                    'requested_data': requested_data,
-                    'actor_id': str(request.user.id),
-                    'issue_id': str(issue_id),
-                    'project_id': str(project_id),
-                    'current_instance': current_instance,
-                    'epoch': int(timezone.now().timestamp()),
-                },
-                routing_key='external',
+            issue_activity.delay(
+                type="link.activity.updated",
+                requested_data=requested_data,
+                actor_id=str(request.user.id),
+                issue_id=str(issue_id),
+                project_id=str(project_id),
+                current_instance=current_instance,
+                epoch=int(timezone.now().timestamp()),
            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -452,18 +428,14 @@ class IssueLinkAPIEndpoint(BaseAPIView):
            IssueLinkSerializer(issue_link).data,
            cls=DjangoJSONEncoder,
        )
-        issue_activity.apply_async(
-            args=[],  # If no positional arguments are required
-            kwargs={
-                'type': "link.activity.deleted",
-                'requested_data': json.dumps({"link_id": str(pk)}),
-                'actor_id': str(request.user.id),
-                'issue_id': str(issue_id),
-                'project_id': str(project_id),
-                'current_instance': current_instance,
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='external',
+        issue_activity.delay(
+            type="link.activity.deleted",
+            requested_data=json.dumps({"link_id": str(pk)}),
+            actor_id=str(request.user.id),
+            issue_id=str(issue_id),
+            project_id=str(project_id),
+            current_instance=current_instance,
+            epoch=int(timezone.now().timestamp()),
        )
        issue_link.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -535,20 +507,14 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
                issue_id=issue_id,
                actor=request.user,
            )
-            issue_activity.apply_async(
-                args=[],
-                kwargs={
-                    "type": "comment.activity.created",
-                    "requested_data": json.dumps(
-                        serializer.data, cls=DjangoJSONEncoder
-                    ),
-                    "actor_id": str(self.request.user.id),
-                    "issue_id": str(self.kwargs.get("issue_id")),
-                    "project_id": str(self.kwargs.get("project_id")),
-                    "current_instance": None,
-                    "epoch": int(timezone.now().timestamp()),
-                },
-                routing_key="external",
+            issue_activity.delay(
+                type="comment.activity.created",
+                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id")),
+                project_id=str(self.kwargs.get("project_id")),
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
            )
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -567,18 +533,14 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
        )
        if serializer.is_valid():
            serializer.save()
-            issue_activity.apply_async(
-                args=[],
-                kwargs={
-                    "type": "comment.activity.updated",
-                    "requested_data": requested_data,
-                    "actor_id": str(request.user.id),
-                    "issue_id": str(issue_id),
-                    "project_id": str(project_id),
-                    "current_instance": current_instance,
-                    "epoch": int(timezone.now().timestamp()),
-                },
-                routing_key="external",
+            issue_activity.delay(
+                type="comment.activity.updated",
+                requested_data=requested_data,
+                actor_id=str(request.user.id),
+                issue_id=str(issue_id),
+                project_id=str(project_id),
+                current_instance=current_instance,
+                epoch=int(timezone.now().timestamp()),
            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -592,18 +554,14 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
            cls=DjangoJSONEncoder,
        )
        issue_comment.delete()
-        issue_activity.apply_async(
-            args=[],  # If no positional arguments are required
-            kwargs={
-                "type": "comment.activity.deleted",
-                "requested_data": json.dumps({"comment_id": str(pk)}),
-                "actor_id": str(request.user.id),
-                "issue_id": str(issue_id),
-                "project_id": str(project_id),
-                "current_instance": current_instance,
-                "epoch": int(timezone.now().timestamp()),
-            },
-            routing_key="external",
+        issue_activity.delay(
+            type="comment.activity.deleted",
+            requested_data=json.dumps({"comment_id": str(pk)}),
+            actor_id=str(request.user.id),
+            issue_id=str(issue_id),
+            project_id=str(project_id),
+            current_instance=current_instance,
+            epoch=int(timezone.now().timestamp()),
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

@@ -624,7 +582,7 @@ class IssueActivityAPIEndpoint(BaseAPIView):
            )
            .select_related("actor", "workspace", "issue", "project")
        ).order_by(request.GET.get("order_by", "created_at"))
-
+ 
        if pk:
            issue_activities = issue_activities.get(pk=pk)
            serializer = IssueActivitySerializer(issue_activities)
@@ -166,22 +166,20 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
        module_issues = list(
            ModuleIssue.objects.filter(module_id=pk).values_list("issue", flat=True)
        )
-        issue_activity.apply_async(
-            args=[],
-            kwargs={
-                'type': "module.activity.deleted",
-                'requested_data': json.dumps({
+        issue_activity.delay(
+            type="module.activity.deleted",
+            requested_data=json.dumps(
+                {
                    "module_id": str(pk),
                    "module_name": str(module.name),
                    "issues": [str(issue_id) for issue_id in module_issues],
-                }),
-                'actor_id': str(request.user.id),
-                'issue_id': None,
-                'project_id': str(project_id),
-                'current_instance': None,
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='external',
+                }
+            ),
+            actor_id=str(request.user.id),
+            issue_id=None,
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
        )
        module.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -332,21 +330,21 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
        )

        # Capture Issue Activity
-        issue_activity.apply_async(
-            args=[],
-            kwargs={
-                'type': "module.activity.created",
-                'requested_data': json.dumps({"modules_list": str(issues)}),
-                'actor_id': str(self.request.user.id),
-                'issue_id': None,
-                'project_id': str(self.kwargs.get("project_id", None)),
-                'current_instance': json.dumps({
+        issue_activity.delay(
+            type="module.activity.created",
+            requested_data=json.dumps({"modules_list": str(issues)}),
+            actor_id=str(self.request.user.id),
+            issue_id=None,
+            project_id=str(self.kwargs.get("project_id", None)),
+            current_instance=json.dumps(
+                {
                    "updated_module_issues": update_module_issue_activity,
-                    "created_module_issues": serializers.serialize("json", record_to_create),
-                }),
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='external',
+                    "created_module_issues": serializers.serialize(
+                        "json", record_to_create
+                    ),
+                }
+            ),
+            epoch=int(timezone.now().timestamp()),
        )

        return Response(
@@ -359,20 +357,18 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
            workspace__slug=slug, project_id=project_id, module_id=module_id, issue_id=issue_id
        )
        module_issue.delete()
-        issue_activity.apply_async(
-            args=[],  # If no positional arguments are required
-            kwargs={
-                'type': "module.activity.deleted",
-                'requested_data': json.dumps({
+        issue_activity.delay(
+            type="module.activity.deleted",
+            requested_data=json.dumps(
+                {
                    "module_id": str(module_id),
                    "issues": [str(module_issue.issue_id)],
-                }),
-                'actor_id': str(request.user.id),
-                'issue_id': str(issue_id),
-                'project_id': str(project_id),
-                'current_instance': None,
-                'epoch': int(timezone.now().timestamp()),
-            },
-            routing_key='external',
+                }
+            ),
+            actor_id=str(request.user.id),
+            issue_id=str(issue_id),
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
        )
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -95,16 +95,6 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):
    class Meta:
        model = WorkspaceMemberInvite
        fields = "__all__"
-        read_only_fields = [
-            "id",
-            "email",
-            "token",
-            "workspace",
-            "message",
-            "responded_at",
-            "created_at",
-            "updated_at",
-        ]


 class TeamSerializer(BaseSerializer):
@@ -13,7 +13,6 @@ from plane.app.views import (
    UserProjectInvitationsViewset,
    ProjectPublicCoverImagesEndpoint,
    ProjectDeployBoardViewSet,
-    UserProjectRolesEndpoint,
 )


@@ -75,11 +74,6 @@ urlpatterns = [
        ),
        name="user-project-invitations",
    ),
-    path(
-        "users/me/workspaces/<str:slug>/project-roles/",
-        UserProjectRolesEndpoint.as_view(),
-        name="user-project-roles",
-    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/join/<uuid:pk>/",
        ProjectJoinEndpoint.as_view(),
@@ -65,7 +65,6 @@ urlpatterns = [
            {
                "delete": "destroy",
                "get": "retrieve",
-                "patch": "partial_update",
            }
        ),
        name="workspace-invitations",
@@ -11,7 +11,6 @@ from .project import (
    ProjectFavoritesViewSet,
    ProjectPublicCoverImagesEndpoint,
    ProjectDeployBoardViewSet,
-    UserProjectRolesEndpoint,
 )
 from .user import (
    UserEndpoint,
@@ -34,7 +34,7 @@ from plane.app.serializers import (
 from plane.db.models import User, WorkspaceMemberInvite
 from plane.license.utils.instance_value import get_configuration_value
 from plane.bgtasks.forgot_password_task import forgot_password
-from plane.license.models import Instance
+from plane.license.models import Instance, InstanceConfiguration
 from plane.settings.redis import redis_instance
 from plane.bgtasks.magic_link_code_task import magic_link
 from plane.bgtasks.event_tracking_task import auth_events
@@ -321,19 +321,8 @@ class EmailCheckEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        # Get configuration values
-        ENABLE_SIGNUP, ENABLE_MAGIC_LINK_LOGIN = get_configuration_value(
-            [
-                {
-                    "key": "ENABLE_SIGNUP",
-                    "default": os.environ.get("ENABLE_SIGNUP"),
-                },
-                {
-                    "key": "ENABLE_MAGIC_LINK_LOGIN",
-                    "default": os.environ.get("ENABLE_MAGIC_LINK_LOGIN"),
-                },
-            ]
-        )
+        # Get the configurations
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")

        email = request.data.get("email", False)

@@ -358,7 +347,12 @@ class EmailCheckEndpoint(BaseAPIView):
        if user is None:
            # Create the user
            if (
-                ENABLE_SIGNUP == "0"
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_SIGNUP",
+                    os.environ.get("ENABLE_SIGNUP", "0"),
+                )
+                == "0"
                and not WorkspaceMemberInvite.objects.filter(
                    email=email,
                ).exists()
@@ -378,8 +372,13 @@ class EmailCheckEndpoint(BaseAPIView):
                is_password_autoset=True,
            )

+
            if not bool(
-                ENABLE_MAGIC_LINK_LOGIN,
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_MAGIC_LINK_LOGIN",
+                    os.environ.get("ENABLE_MAGIC_LINK_LOGIN"),
+                ),
            ):
                return Response(
                    {"error": "Magic link sign in is disabled."},
@@ -387,15 +386,16 @@ class EmailCheckEndpoint(BaseAPIView):
                )

            # Send event
-            auth_events.delay(
-                user=user.id,
-                email=email,
-                user_agent=request.META.get("HTTP_USER_AGENT"),
-                ip=request.META.get("REMOTE_ADDR"),
-                event_name="SIGN_IN",
-                medium="MAGIC_LINK",
-                first_time=True,
-            )
+            if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                auth_events.delay(
+                    user=user.id,
+                    email=email,
+                    user_agent=request.META.get("HTTP_USER_AGENT"),
+                    ip=request.META.get("REMOTE_ADDR"),
+                    event_name="SIGN_IN",
+                    medium="MAGIC_LINK",
+                    first_time=True,
+                )
            key, token, current_attempt = generate_magic_token(email=email)
            if not current_attempt:
                return Response(
@@ -413,21 +413,28 @@ class EmailCheckEndpoint(BaseAPIView):
        else:
            if user.is_password_autoset:
                ## Generate a random token
-                if not bool(ENABLE_MAGIC_LINK_LOGIN):
+                if not bool(
+                    get_configuration_value(
+                        instance_configuration,
+                        "ENABLE_MAGIC_LINK_LOGIN",
+                        os.environ.get("ENABLE_MAGIC_LINK_LOGIN"),
+                    ),
+                ):
                    return Response(
                        {"error": "Magic link sign in is disabled."},
                        status=status.HTTP_400_BAD_REQUEST,
                    )

-                auth_events.delay(
-                    user=user.id,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="SIGN_IN",
-                    medium="MAGIC_LINK",
-                    first_time=False,
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    auth_events.delay(
+                        user=user.id,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="SIGN_IN",
+                        medium="MAGIC_LINK",
+                        first_time=False,
+                    )

                # Generate magic token
                key, token, current_attempt = generate_magic_token(email=email)
@@ -447,15 +454,16 @@ class EmailCheckEndpoint(BaseAPIView):
                    status=status.HTTP_200_OK,
                )
            else:
-                auth_events.delay(
-                    user=user.id,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="SIGN_IN",
-                    medium="EMAIL",
-                    first_time=False,
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    auth_events.delay(
+                        user=user.id,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="SIGN_IN",
+                        medium="EMAIL",
+                        first_time=False,
+                    )

                # User should enter password to login
                return Response(
@@ -27,7 +27,7 @@ from plane.db.models import (
    ProjectMember,
 )
 from plane.settings.redis import redis_instance
-from plane.license.models import Instance
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_configuration_value
 from plane.bgtasks.event_tracking_task import auth_events

@@ -52,6 +52,8 @@ class SignUpEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+
        email = request.data.get("email", False)
        password = request.data.get("password", False)
        ## Raise exception if any of the above are missing
@@ -71,20 +73,14 @@ class SignUpEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        # get configuration values
-        # Get configuration values
-        ENABLE_SIGNUP, = get_configuration_value(
-            [
-                {
-                    "key": "ENABLE_SIGNUP",
-                    "default": os.environ.get("ENABLE_SIGNUP"),
-                },
-            ]
-        )
-
        # If the sign up is not enabled and the user does not have invite disallow him from creating the account
        if (
-            ENABLE_SIGNUP == "0"
+            get_configuration_value(
+                instance_configuration,
+                "ENABLE_SIGNUP",
+                os.environ.get("ENABLE_SIGNUP", "0"),
+            )
+            == "0"
            and not WorkspaceMemberInvite.objects.filter(
                email=email,
            ).exists()
@@ -173,17 +169,16 @@ class SignInEndpoint(BaseAPIView):

        # Create the user
        else:
-            ENABLE_SIGNUP, = get_configuration_value(
-                [
-                    {
-                        "key": "ENABLE_SIGNUP",
-                        "default": os.environ.get("ENABLE_SIGNUP"),
-                    },
-                ]
-            )
+            # Get the configurations
+            instance_configuration = InstanceConfiguration.objects.values("key", "value")
            # Create the user
            if (
-                ENABLE_SIGNUP == "0"
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_SIGNUP",
+                    os.environ.get("ENABLE_SIGNUP", "0"),
+                )
+                == "0"
                and not WorkspaceMemberInvite.objects.filter(
                    email=email,
                ).exists()
@@ -269,15 +264,16 @@ class SignInEndpoint(BaseAPIView):
        workspace_member_invites.delete()
        project_member_invites.delete()
        # Send event
-        auth_events.delay(
-            user=user.id,
-            email=email,
-            user_agent=request.META.get("HTTP_USER_AGENT"),
-            ip=request.META.get("REMOTE_ADDR"),
-            event_name="SIGN_IN",
-            medium="EMAIL",
-            first_time=False,
-        )
+        if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+            auth_events.delay(
+                user=user.id,
+                email=email,
+                user_agent=request.META.get("HTTP_USER_AGENT"),
+                ip=request.META.get("REMOTE_ADDR"),
+                event_name="SIGN_IN",
+                medium="EMAIL",
+                first_time=False,
+            )

        access_token, refresh_token = get_tokens_for_user(user)
        data = {
@@ -343,16 +339,24 @@ class MagicSignInEndpoint(BaseAPIView):

            if str(token) == str(user_token):
                user = User.objects.get(email=email)
+                if not user.is_active:
+                    return Response(
+                        {
+                            "error": "Your account has been deactivated. Please contact your site administrator."
+                        },
+                        status=status.HTTP_403_FORBIDDEN,
+                    )
                # Send event
-                auth_events.delay(
-                    user=user.id,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="SIGN_IN",
-                    medium="MAGIC_LINK",
-                    first_time=False,
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    auth_events.delay(
+                        user=user.id,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="SIGN_IN",
+                        medium="MAGIC_LINK",
+                        first_time=False,
+                    )

                user.is_active = True
                user.is_email_verified = True
@@ -11,6 +11,7 @@ from rest_framework.response import Response

 # Module imports
 from .base import BaseAPIView
+from plane.license.models import InstanceConfiguration
 from plane.license.utils.instance_value import get_configuration_value


@@ -20,101 +21,89 @@ class ConfigurationEndpoint(BaseAPIView):
    ]

    def get(self, request):
-
-        # Get all the configuration
-        (
-            GOOGLE_CLIENT_ID,
-            GITHUB_CLIENT_ID,
-            GITHUB_APP_NAME,
-            EMAIL_HOST_USER,
-            EMAIL_HOST_PASSWORD,
-            ENABLE_MAGIC_LINK_LOGIN,
-            ENABLE_EMAIL_PASSWORD,
-            SLACK_CLIENT_ID,
-            POSTHOG_API_KEY,
-            POSTHOG_HOST,
-            UNSPLASH_ACCESS_KEY,
-            OPENAI_API_KEY,
-        ) = get_configuration_value(
-            [
-                {
-                    "key": "GOOGLE_CLIENT_ID",
-                    "default": os.environ.get("GOOGLE_CLIENT_ID", None),
-                },
-                {
-                    "key": "GITHUB_CLIENT_ID",
-                    "default": os.environ.get("GITHUB_CLIENT_ID", None),
-                },
-                {
-                    "key": "GITHUB_APP_NAME",
-                    "default": os.environ.get("GITHUB_APP_NAME", None),
-                },
-                {
-                    "key": "EMAIL_HOST_USER",
-                    "default": os.environ.get("EMAIL_HOST_USER", None),
-                },
-                {
-                    "key": "EMAIL_HOST_PASSWORD",
-                    "default": os.environ.get("EMAIL_HOST_PASSWORD", None),
-                },
-                {
-                    "key": "ENABLE_MAGIC_LINK_LOGIN",
-                    "default": os.environ.get("ENABLE_MAGIC_LINK_LOGIN", "1"),
-                },
-                {
-                    "key": "ENABLE_EMAIL_PASSWORD",
-                    "default": os.environ.get("ENABLE_EMAIL_PASSWORD", "1"),
-                },
-                {
-                    "key": "SLACK_CLIENT_ID",
-                    "default": os.environ.get("SLACK_CLIENT_ID", "1"),
-                },
-                {
-                    "key": "POSTHOG_API_KEY",
-                    "default": os.environ.get("POSTHOG_API_KEY", "1"),
-                },
-                {
-                    "key": "POSTHOG_HOST",
-                    "default": os.environ.get("POSTHOG_HOST", "1"),
-                },
-                {
-                    "key": "UNSPLASH_ACCESS_KEY",
-                    "default": os.environ.get("UNSPLASH_ACCESS_KEY", "1"),
-                },
-                {
-                    "key": "OPENAI_API_KEY",
-                    "default": os.environ.get("OPENAI_API_KEY", "1"),
-                },
-            ]
-        )
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")

        data = {}
        # Authentication
-        data["google_client_id"] = GOOGLE_CLIENT_ID if GOOGLE_CLIENT_ID and GOOGLE_CLIENT_ID != "\"\"" else None
-        data["github_client_id"] = GITHUB_CLIENT_ID if GITHUB_CLIENT_ID and GITHUB_CLIENT_ID != "\"\"" else None
-        data["github_app_name"] = GITHUB_APP_NAME
+        data["google_client_id"] = get_configuration_value(
+            instance_configuration,
+            "GOOGLE_CLIENT_ID",
+            os.environ.get("GOOGLE_CLIENT_ID", None),
+        )
+        data["github_client_id"] = get_configuration_value(
+            instance_configuration,
+            "GITHUB_CLIENT_ID",
+            os.environ.get("GITHUB_CLIENT_ID", None),
+        )
+        data["github_app_name"] = get_configuration_value(
+            instance_configuration,
+            "GITHUB_APP_NAME",
+            os.environ.get("GITHUB_APP_NAME", None),
+        )
        data["magic_login"] = (
-            bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
-        ) and ENABLE_MAGIC_LINK_LOGIN == "1"
+            bool(
+                get_configuration_value(
+                    instance_configuration,
+                    "EMAIL_HOST_USER",
+                    os.environ.get("EMAIL_HOST_USER", None),
+                ),
+            )
+            and bool(
+                get_configuration_value(
+                    instance_configuration,
+                    "EMAIL_HOST_PASSWORD",
+                    os.environ.get("EMAIL_HOST_PASSWORD", None),
+                )
+            )
+        ) and get_configuration_value(
+            instance_configuration, "ENABLE_MAGIC_LINK_LOGIN", "1"
+        ) == "1"

-        data["email_password_login"] = ENABLE_EMAIL_PASSWORD == "1"
+        data["email_password_login"] = (
+            get_configuration_value(
+                instance_configuration, "ENABLE_EMAIL_PASSWORD", "1"
+            )
+            == "1"
+        )
        # Slack client
-        data["slack_client_id"] = SLACK_CLIENT_ID
+        data["slack_client_id"] = get_configuration_value(
+            instance_configuration,
+            "SLACK_CLIENT_ID",
+            os.environ.get("SLACK_CLIENT_ID", None),
+        )

        # Posthog
-        data["posthog_api_key"] = POSTHOG_API_KEY
-        data["posthog_host"] = POSTHOG_HOST
+        data["posthog_api_key"] = get_configuration_value(
+            instance_configuration,
+            "POSTHOG_API_KEY",
+            os.environ.get("POSTHOG_API_KEY", None),
+        )
+        data["posthog_host"] = get_configuration_value(
+            instance_configuration,
+            "POSTHOG_HOST",
+            os.environ.get("POSTHOG_HOST", None),
+        )

        # Unsplash
-        data["has_unsplash_configured"] = bool(UNSPLASH_ACCESS_KEY)
+        data["has_unsplash_configured"] = bool(
+            get_configuration_value(
+                instance_configuration,
+                "UNSPLASH_ACCESS_KEY",
+                os.environ.get("UNSPLASH_ACCESS_KEY", None),
+            )
+        )

        # Open AI settings
-        data["has_openai_configured"] = bool(OPENAI_API_KEY)
+        data["has_openai_configured"] = bool(
+            get_configuration_value(
+                instance_configuration,
+                "OPENAI_API_KEY",
+                os.environ.get("OPENAI_API_KEY", None),
+            )
+        )

-        # File size settings
        data["file_size_limit"] = float(os.environ.get("FILE_SIZE_LIMIT", 5242880))

-        # is self managed
        data["is_self_managed"] = bool(int(os.environ.get("IS_SELF_MANAGED", "1")))

        return Response(data, status=status.HTTP_200_OK)
@@ -1,7 +1,6 @@
 # Python imports
 import requests
 import os
-
 # Third party imports
 from openai import OpenAI
 from rest_framework.response import Response
@@ -16,31 +15,23 @@ from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import Workspace, Project
 from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
 from plane.utils.integrations.github import get_release_notes
+from plane.license.models import InstanceConfiguration
 from plane.license.utils.instance_value import get_configuration_value

-
 class GPTIntegrationEndpoint(BaseAPIView):
    permission_classes = [
        ProjectEntityPermission,
    ]

    def post(self, request, slug, project_id):
-        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
-            [
-                {
-                    "key": "OPENAI_API_KEY",
-                    "default": os.environ.get("OPENAI_API_KEY", None),
-                },
-                {
-                    "key": "GPT_ENGINE",
-                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
-                },
-            ]
-        )

        # Get the configuration value
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+        api_key = get_configuration_value(instance_configuration, "OPENAI_API_KEY", os.environ.get("OPENAI_API_KEY"))
+        gpt_engine = get_configuration_value(instance_configuration, "GPT_ENGINE", os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"))
+
        # Check the keys
-        if not OPENAI_API_KEY or not GPT_ENGINE:
+        if not api_key or not gpt_engine:
            return Response(
                {"error": "OpenAI API key and engine is required"},
                status=status.HTTP_400_BAD_REQUEST,
@@ -57,11 +48,11 @@ class GPTIntegrationEndpoint(BaseAPIView):
        final_text = task + "\n" + prompt

        client = OpenAI(
-            api_key=OPENAI_API_KEY,
+            api_key=api_key,
        )

        response = client.chat.completions.create(
-            model=GPT_ENGINE,
+            model=gpt_engine,
            messages=[{"role": "user", "content": final_text}],
        )

@@ -88,17 +79,13 @@ class ReleaseNotesEndpoint(BaseAPIView):


 class UnsplashEndpoint(BaseAPIView):
+
    def get(self, request):
-        UNSPLASH_ACCESS_KEY, = get_configuration_value(
-            [
-                {
-                    "key": "UNSPLASH_ACCESS_KEY",
-                    "default": os.environ.get("UNSPLASH_ACCESS_KEY"),
-                }
-            ]
-        )
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+        unsplash_access_key = get_configuration_value(instance_configuration, "UNSPLASH_ACCESS_KEY", os.environ.get("UNSPLASH_ACCESS_KEY"))
+
        # Check unsplash access key
-        if not UNSPLASH_ACCESS_KEY:
+        if not unsplash_access_key:
            return Response([], status=status.HTTP_200_OK)

        # Query parameters
@@ -107,9 +94,9 @@ class UnsplashEndpoint(BaseAPIView):
        per_page = request.GET.get("per_page", 20)

        url = (
-            f"https://api.unsplash.com/search/photos/?client_id={UNSPLASH_ACCESS_KEY}&query={query}&page=${page}&per_page={per_page}"
+            f"https://api.unsplash.com/search/photos/?client_id={unsplash_access_key}&query={query}&page=${page}&per_page={per_page}"
            if query
-            else f"https://api.unsplash.com/photos/?client_id={UNSPLASH_ACCESS_KEY}&page={page}&per_page={per_page}"
+            else f"https://api.unsplash.com/photos/?client_id={unsplash_access_key}&page={page}&per_page={per_page}"
        )

        headers = {
@@ -1,7 +1,5 @@
 # Python imports
 import uuid
-import json
-import requests

 # Third party imports
 from rest_framework import status
@@ -9,7 +7,7 @@ from rest_framework.response import Response

 # Django imports
 from django.db.models import Max, Q
-from django.conf import settings
+
 # Module imports
 from plane.app.views import BaseAPIView
 from plane.db.models import (
@@ -36,15 +34,20 @@ from plane.app.serializers import (
    IssueFlatSerializer,
    ModuleSerializer,
 )
+from plane.utils.integrations.github import get_github_repo_details
+from plane.utils.importers.jira import jira_project_issue_summary
+from plane.bgtasks.importer_task import service_importer
 from plane.utils.html_processor import strip_tags
 from plane.app.permissions import WorkSpaceAdminPermission
-from plane.bgtasks.importer_task import service_importer
+

 class ServiceIssueImportSummaryEndpoint(BaseAPIView):
+
    def get(self, request, slug, service):
        if service == "github":
            owner = request.GET.get("owner", False)
            repo = request.GET.get("repo", False)
+
            if not owner or not repo:
                return Response(
                    {"error": "Owner and repo are required"},
@@ -55,10 +58,11 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
                integration__provider="github", workspace__slug=slug
            )

-            installtion_id = workspace_integration.config.get("installation_id", False)
+            access_tokens_url = workspace_integration.metadata.get(
+                "access_tokens_url", False
+            )

-            # Check for the installation id
-            if not installtion_id:
+            if not access_tokens_url:
                return Response(
                    {
                        "error": "There was an error during the installation of the GitHub app. To resolve this issue, we recommend reinstalling the GitHub app."
@@ -66,33 +70,18 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
                    status=status.HTTP_400_BAD_REQUEST,
                )

-            # Request segway for the required information
-            if settings.SEGWAY_BASE_URL:
-                headers = {
-                    "Content-Type": "application/json",
-                    "x-api-key": settings.SEGWAY_KEY,
-                }
-                data = {
-                    "owner": owner,
-                    "repo": repo,
-                    "installationId": installtion_id,
-                }
-                res = requests.post(
-                    f"{settings.SEGWAY_BASE_URL}/api/github",
-                    data=json.dumps(data),
-                    headers=headers,
-                )
-                if "error" in res.json():
-                    return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
-                else:
-                    return Response(
-                        res.json(),
-                        status=status.HTTP_200_OK,
-                    )
-            return Response(
-                {"error": "Inetgration service is not available please try later"},
-                status=status.HTTP_400_BAD_REQUEST,
+            issue_count, labels, collaborators = get_github_repo_details(
+                access_tokens_url, owner, repo
            )
+            return Response(
+                {
+                    "issue_count": issue_count,
+                    "labels": labels,
+                    "collaborators": collaborators,
+                },
+                status=status.HTTP_200_OK,
+            )
+
        if service == "jira":
            # Check for all the keys
            params = {
@@ -113,35 +102,16 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
            email = request.GET.get("email", "")
            cloud_hostname = request.GET.get("cloud_hostname", "")

-            if settings.SEGWAY_BASE_URL:
-                headers = {
-                    "Content-Type": "application/json",
-                    "x-api-key": settings.SEGWAY_KEY,
-                }
-                data = {
-                    "project_key": project_key,
-                    "api_token": api_token,
-                    "email": email,
-                    "cloud_hostname": cloud_hostname,
-                }
-                res = requests.post(
-                    f"{settings.SEGWAY_BASE_URL}/api/jira",
-                    data=json.dumps(data),
-                    headers=headers,
-                )
-
-                if "error" in res.json():
-                    return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
-                else:
-                    return Response(
-                        res.json(),
-                        status=status.HTTP_200_OK,
-                    )
-
-            return Response(
-                {"error": "Inetgration service is not available please try later"},
-                status=status.HTTP_400_BAD_REQUEST,
+            response = jira_project_issue_summary(
+                email, api_token, project_key, cloud_hostname
            )
+            if "error" in response:
+                return Response(response, status=status.HTTP_400_BAD_REQUEST)
+            else:
+                return Response(
+                    response,
+                    status=status.HTTP_200_OK,
+                )
        return Response(
            {"error": "Service not supported yet"},
            status=status.HTTP_400_BAD_REQUEST,
@@ -152,21 +122,7 @@ class ImportServiceEndpoint(BaseAPIView):
    permission_classes = [
        WorkSpaceAdminPermission,
    ]
-
    def post(self, request, slug, service):
-        if service not in ["github", "jira"]:
-            return Response(
-                {"error": "Servivce not supported yet"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        if service == "github":
-            workspace_integration = WorkspaceIntegration.objects.get(
-                integration__provider="github", workspace__slug=slug
-            )
-
-            installation_id = workspace_integration.config.get("installation_id", False)
-
        project_id = request.data.get("project_id", False)

        if not project_id:
@@ -174,84 +130,87 @@ class ImportServiceEndpoint(BaseAPIView):
                {"error": "Project ID is required"},
                status=status.HTTP_400_BAD_REQUEST,
            )
+
        workspace = Workspace.objects.get(slug=slug)

-        # Validate the data
-        data = request.data.get("data", False)
-        metadata = request.data.get("metadata", False)
-        config = request.data.get("config", False)
-        if not data or not metadata or not config:
-            return Response(
-                {"error": "Data, config and metadata are required"},
-                status=status.HTTP_400_BAD_REQUEST,
+        if service == "github":
+            data = request.data.get("data", False)
+            metadata = request.data.get("metadata", False)
+            config = request.data.get("config", False)
+            if not data or not metadata or not config:
+                return Response(
+                    {"error": "Data, config and metadata are required"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            api_token = APIToken.objects.filter(
+                user=request.user, workspace=workspace
+            ).first()
+            if api_token is None:
+                api_token = APIToken.objects.create(
+                    user=request.user,
+                    label="Importer",
+                    workspace=workspace,
+                )
+
+            importer = Importer.objects.create(
+                service=service,
+                project_id=project_id,
+                status="queued",
+                initiated_by=request.user,
+                data=data,
+                metadata=metadata,
+                token=api_token,
+                config=config,
+                created_by=request.user,
+                updated_by=request.user,
            )

-        # Update config
-        if config and service == "github":
-            config.update({"installation_id": installation_id})
+            service_importer.delay(service, importer.id)
+            serializer = ImporterSerializer(importer)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)

-        # Get the api token -- # derecated
-        api_token = APIToken.objects.filter(
-            user=request.user, workspace=workspace
-        ).first()
-        if api_token is None:
-            api_token = APIToken.objects.create(
-                user=request.user,
-                label="Importer",
-                workspace=workspace,
+        if service == "jira":
+            data = request.data.get("data", False)
+            metadata = request.data.get("metadata", False)
+            config = request.data.get("config", False)
+            if not data or not metadata:
+                return Response(
+                    {"error": "Data, config and metadata are required"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+            api_token = APIToken.objects.filter(
+                user=request.user, workspace=workspace
+            ).first()
+            if api_token is None:
+                api_token = APIToken.objects.create(
+                    user=request.user,
+                    label="Importer",
+                    workspace=workspace,
+                )
+
+            importer = Importer.objects.create(
+                service=service,
+                project_id=project_id,
+                status="queued",
+                initiated_by=request.user,
+                data=data,
+                metadata=metadata,
+                token=api_token,
+                config=config,
+                created_by=request.user,
+                updated_by=request.user,
            )

-        # Create an import
-        importer = Importer.objects.create(
-            service=service,
-            project_id=project_id,
-            status="queued",
-            initiated_by=request.user,
-            data=data,
-            metadata=metadata,
-            token=api_token,
-            config=config,
-            created_by=request.user,
-            updated_by=request.user,
+            service_importer.delay(service, importer.id)
+            serializer = ImporterSerializer(importer)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+        return Response(
+            {"error": "Servivce not supported yet"},
+            status=status.HTTP_400_BAD_REQUEST,
        )

-        # Push it to segway
-        if settings.SEGWAY_BASE_URL:
-            headers = {
-                "Content-Type": "application/json",
-                "x-api-key": settings.SEGWAY_KEY,
-            }
-            data = {
-                "metadata": metadata,
-                "data": data,
-                "config": config,
-                "workspace_id": str(workspace.id),
-                "project_id": str(project_id),
-                "created_by": str(request.user.id),
-                "importer_id": str(importer.id),
-            }
-            res = requests.post(
-                f"{settings.SEGWAY_BASE_URL}/api/github/import",
-                data=json.dumps(data),
-                headers=headers,
-            )
-
-            if "error" in res.json():
-                importer.status = "failed"
-                importer.reason = str(res.json())
-                importer.save()
-            else:
-                importer.status = "processing"
-                importer.save(update_fields=["status"])
-        else:
-            importer.status = "failed"
-            importer.reason = "Segway base url is not present"
-            importer.save(update_fields=["status", "reason"])
-
-        # return the response
-        serializer = ImporterSerializer(importer)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
    def get(self, request, slug):
        imports = (
            Importer.objects.filter(workspace__slug=slug)
@@ -262,7 +221,9 @@ class ImportServiceEndpoint(BaseAPIView):
        return Response(serializer.data)

    def delete(self, request, slug, service, pk):
-        importer = Importer.objects.get(pk=pk, service=service, workspace__slug=slug)
+        importer = Importer.objects.get(
+            pk=pk, service=service, workspace__slug=slug
+        )

        if importer.imported_data is not None:
            # Delete all imported Issues
@@ -280,7 +241,9 @@ class ImportServiceEndpoint(BaseAPIView):
        return Response(status=status.HTTP_204_NO_CONTENT)

    def patch(self, request, slug, service, pk):
-        importer = Importer.objects.get(pk=pk, service=service, workspace__slug=slug)
+        importer = Importer.objects.get(
+            pk=pk, service=service, workspace__slug=slug
+        )
        serializer = ImporterSerializer(importer, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
@@ -516,7 +479,9 @@ class BulkImportModulesEndpoint(BaseAPIView):
                [
                    ModuleLink(
                        module=module,
-                        url=module_data.get("link", {}).get("url", "https://plane.so"),
+                        url=module_data.get("link", {}).get(
+                            "url", "https://plane.so"
+                        ),
                        title=module_data.get("link", {}).get(
                            "title", "Original Issue"
                        ),
@@ -1,11 +1,8 @@
 # Python improts
 import uuid
 import requests
-import json
-
 # Django imports
 from django.contrib.auth.hashers import make_password
-from django.conf import settings

 # Third party imports
 from rest_framework.response import Response
@@ -30,7 +27,6 @@ from plane.utils.integrations.github import (
 from plane.app.permissions import WorkSpaceAdminPermission
 from plane.utils.integrations.slack import slack_oauth

-
 class IntegrationViewSet(BaseViewSet):
    serializer_class = IntegrationSerializer
    model = Integration
@@ -50,7 +46,9 @@ class IntegrationViewSet(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        serializer = IntegrationSerializer(integration, data=request.data, partial=True)
+        serializer = IntegrationSerializer(
+            integration, data=request.data, partial=True
+        )

        if serializer.is_valid():
            serializer.save()
@@ -96,30 +94,14 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
                    {"error": "Installation ID is required"},
                    status=status.HTTP_400_BAD_REQUEST,
                )
-            # Push it to segway
-            if settings.SEGWAY_BASE_URL:
-                headers = {
-                    "Content-Type": "application/json",
-                    "x-api-key": settings.SEGWAY_KEY,
-                }
-                data = {"installationId": installation_id}
-                res = requests.post(
-                    f"{settings.SEGWAY_BASE_URL}/api/github/metadata",
-                    data=json.dumps(data),
-                    headers=headers,
-                )
-                if "error" in res.json():
-                    return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
-                metadata = res.json()
+            metadata = get_github_metadata(installation_id)
            config = {"installation_id": installation_id}

        if provider == "slack":
            code = request.data.get("code", False)

            if not code:
-                return Response(
-                    {"error": "Code is required"}, status=status.HTTP_400_BAD_REQUEST
-                )
+                return Response({"error": "Code is required"}, status=status.HTTP_400_BAD_REQUEST)

            slack_response = slack_oauth(code=code)

@@ -141,7 +123,9 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
            is_password_autoset=True,
            is_bot=True,
            first_name=integration.title,
-            avatar=integration.avatar_url if integration.avatar_url is not None else "",
+            avatar=integration.avatar_url
+            if integration.avatar_url is not None
+            else "",
        )

        # Create an API Token for the bot user
@@ -177,7 +161,9 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
        )

        if workspace_integration.integration.provider == "github":
-            installation_id = workspace_integration.config.get("installation_id", False)
+            installation_id = workspace_integration.config.get(
+                "installation_id", False
+            )
            if installation_id:
                delete_github_installation(installation_id=installation_id)

@@ -1,15 +1,8 @@
-# Python imports
-import json
-import requests
-
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
 from sentry_sdk import capture_exception

-# Django imports
-from django.conf import settings
-
 # Module imports
 from plane.app.views import BaseViewSet, BaseAPIView
 from plane.db.models import (
@@ -42,32 +35,19 @@ class GithubRepositoriesEndpoint(BaseAPIView):
            workspace__slug=slug, pk=workspace_integration_id
        )

-        installation_id = workspace_integration.config.get("installation_id")
-
-        if not installation_id:
+        if workspace_integration.integration.provider != "github":
            return Response(
                {"error": "Not a github integration"},
                status=status.HTTP_400_BAD_REQUEST,
            )
-        # Push it to segway
-        if settings.SEGWAY_BASE_URL:
-            headers = {
-                "Content-Type": "application/json",
-                "x-api-key": settings.SEGWAY_KEY,
-            }
-            data = {
-                "installationId": installation_id,
-                "page": page,
-            }
-            res = requests.post(
-                f"{settings.SEGWAY_BASE_URL}/api/github/repos",
-                data=json.dumps(data),
-                headers=headers,
-            )
-            if "error" in res.json():
-                return Response(res.json(), status=status.HTTP_400_BAD_REQUEST)
-            else:
-                return Response(res.json(), status=status.HTTP_200_OK)
+
+        access_tokens_url = workspace_integration.metadata["access_tokens_url"]
+        repositories_url = (
+            workspace_integration.metadata["repositories_url"]
+            + f"?per_page=100&page={page}"
+        )
+        repositories = get_github_repos(access_tokens_url, repositories_url)
+        return Response(repositories, status=status.HTTP_200_OK)


 class GithubRepositorySyncViewSet(BaseViewSet):
@@ -30,7 +30,7 @@ from plane.db.models import (
 )
 from plane.bgtasks.event_tracking_task import auth_events
 from .base import BaseAPIView
-from plane.license.models import Instance
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_configuration_value


@@ -86,14 +86,7 @@ def get_access_token(request_token: str, client_id: str) -> str:
    if not request_token:
        raise ValueError("The request token has to be supplied!")

-    (CLIENT_SECRET,) = get_configuration_value(
-        [
-            {
-                "key": "GITHUB_CLIENT_SECRET",
-                "default": os.environ.get("GITHUB_CLIENT_SECRET", None),
-            },
-        ]
-    )
+    CLIENT_SECRET = os.environ.get("GITHUB_CLIENT_SECRET")

    url = f"https://github.com/login/oauth/access_token?client_id={client_id}&client_secret={CLIENT_SECRET}&code={request_token}"
    headers = {"accept": "application/json"}
@@ -154,18 +147,22 @@ class OauthEndpoint(BaseAPIView):
            id_token = request.data.get("credential", False)
            client_id = request.data.get("clientId", False)

-            GOOGLE_CLIENT_ID, GITHUB_CLIENT_ID = get_configuration_value(
-                [
-                    {
-                        "key": "GOOGLE_CLIENT_ID",
-                        "default": os.environ.get("GOOGLE_CLIENT_ID"),
-                    },
-                    {
-                        "key": "GITHUB_CLIENT_ID",
-                        "default": os.environ.get("GITHUB_CLIENT_ID"),
-                    },
-                ]
+            instance_configuration = InstanceConfiguration.objects.values(
+                "key", "value"
            )
+            if not get_configuration_value(
+                instance_configuration,
+                "GOOGLE_CLIENT_ID",
+                os.environ.get("GOOGLE_CLIENT_ID"),
+            ) or not get_configuration_value(
+                instance_configuration,
+                "GITHUB_CLIENT_ID",
+                os.environ.get("GITHUB_CLIENT_ID"),
+            ):
+                return Response(
+                    {"error": "Github or Google login is not configured"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            if not medium or not id_token:
                return Response(
@@ -176,19 +173,9 @@ class OauthEndpoint(BaseAPIView):
                )

            if medium == "google":
-                if not GOOGLE_CLIENT_ID:
-                    return Response(
-                        {"error": "Google login is not configured"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
                data = validate_google_token(id_token, client_id)

            if medium == "github":
-                if not GITHUB_CLIENT_ID:
-                    return Response(
-                        {"error": "Github login is not configured"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
                access_token = get_access_token(id_token, client_id)
                data = get_user_data(access_token)

@@ -291,15 +278,16 @@ class OauthEndpoint(BaseAPIView):
            )

            # Send event
-            auth_events.delay(
-                user=user.id,
-                email=email,
-                user_agent=request.META.get("HTTP_USER_AGENT"),
-                ip=request.META.get("REMOTE_ADDR"),
-                event_name="SIGN_IN",
-                medium=medium.upper(),
-                first_time=False,
-            )
+            if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                auth_events.delay(
+                    user=user.id,
+                    email=email,
+                    user_agent=request.META.get("HTTP_USER_AGENT"),
+                    ip=request.META.get("REMOTE_ADDR"),
+                    event_name="SIGN_IN",
+                    medium=medium.upper(),
+                    first_time=False,
+                )

            access_token, refresh_token = get_tokens_for_user(user)

@@ -310,16 +298,17 @@ class OauthEndpoint(BaseAPIView):
            return Response(data, status=status.HTTP_200_OK)

        except User.DoesNotExist:
-            (ENABLE_SIGNUP,) = get_configuration_value(
-                [
-                    {
-                        "key": "ENABLE_SIGNUP",
-                        "default": os.environ.get("ENABLE_SIGNUP", "0"),
-                    }
-                ]
+            ## Signup Case
+            instance_configuration = InstanceConfiguration.objects.values(
+                "key", "value"
            )
            if (
-                ENABLE_SIGNUP == "0"
+                get_configuration_value(
+                    instance_configuration,
+                    "ENABLE_SIGNUP",
+                    os.environ.get("ENABLE_SIGNUP", "0"),
+                )
+                == "0"
                and not WorkspaceMemberInvite.objects.filter(
                    email=email,
                ).exists()
@@ -422,15 +411,16 @@ class OauthEndpoint(BaseAPIView):
            project_member_invites.delete()

            # Send event
-            auth_events.delay(
-                user=user.id,
-                email=email,
-                user_agent=request.META.get("HTTP_USER_AGENT"),
-                ip=request.META.get("REMOTE_ADDR"),
-                event_name="SIGN_IN",
-                medium=medium.upper(),
-                first_time=True,
-            )
+            if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                auth_events.delay(
+                    user=user.id,
+                    email=email,
+                    user_agent=request.META.get("HTTP_USER_AGENT"),
+                    ip=request.META.get("REMOTE_ADDR"),
+                    event_name="SIGN_IN",
+                    medium=medium.upper(),
+                    first_time=True,
+                )

            SocialLoginConnection.objects.update_or_create(
                medium=medium,
@@ -39,10 +39,8 @@ from plane.app.serializers import (
 )

 from plane.app.permissions import (
-    WorkspaceUserPermission,
    ProjectBasePermission,
    ProjectMemberPermission,
-    ProjectLitePermission,
 )

 from plane.db.models import (
@@ -145,16 +143,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
                    )
                )
            )
-            .prefetch_related(
-                Prefetch(
-                    "project_projectmember",
-                    queryset=ProjectMember.objects.filter(
-                        workspace__slug=self.kwargs.get("slug"),
-                        is_active=True,
-                    ).select_related("member"),
-                    to_attr="members_list",
-                )
-            )
            .distinct()
        )

@@ -170,6 +158,16 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
        projects = (
            self.get_queryset()
            .annotate(sort_order=Subquery(sort_order_query))
+            .prefetch_related(
+                Prefetch(
+                    "project_projectmember",
+                    queryset=ProjectMember.objects.filter(
+                        workspace__slug=slug,
+                        is_active=True,
+                    ).select_related("member"),
+                    to_attr='members_list'
+                )
+            )
            .order_by("sort_order", "name")
        )
        if request.GET.get("per_page", False) and request.GET.get("cursor", False):
@@ -603,18 +601,6 @@ class ProjectMemberViewSet(BaseViewSet):
        ProjectMemberPermission,
    ]

-    def get_permissions(self):
-        if self.action == "leave":
-            self.permission_classes = [
-                ProjectLitePermission,
-            ]
-        else:
-            self.permission_classes = [
-                ProjectMemberPermission,
-            ]
-
-        return super(ProjectMemberViewSet, self).get_permissions()
-
    search_fields = [
        "member__display_name",
        "member__first_name",
@@ -679,25 +665,6 @@ class ProjectMemberViewSet(BaseViewSet):
                )
            )

-            # Check if the user is already a member of the project and is inactive
-            if ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member_id=member.get("member_id"),
-                is_active=False,
-            ).exists():
-                member_detail = ProjectMember.objects.get(
-                    workspace__slug=slug,
-                    project_id=project_id,
-                    member_id=member.get("member_id"),
-                    is_active=False,
-                )
-                # Check if the user has not deactivated the account
-                user = User.objects.filter(pk=member.get("member_id")).first()
-                if user.is_active:
-                    member_detail.is_active = True
-                    member_detail.save(update_fields=["is_active"])
-
        project_members = ProjectMember.objects.bulk_create(
            bulk_project_members,
            batch_size=10,
@@ -1010,18 +977,11 @@ class ProjectPublicCoverImagesEndpoint(BaseAPIView):

    def get(self, request):
        files = []
-        s3_client_params = {
-            "service_name": "s3",
-            "aws_access_key_id": settings.AWS_ACCESS_KEY_ID,
-            "aws_secret_access_key": settings.AWS_SECRET_ACCESS_KEY,
-        }
-
-        # Use AWS_S3_ENDPOINT_URL if it is present in the settings
-        if hasattr(settings, "AWS_S3_ENDPOINT_URL") and settings.AWS_S3_ENDPOINT_URL:
-            s3_client_params["endpoint_url"] = settings.AWS_S3_ENDPOINT_URL
-
-        s3 = boto3.client(**s3_client_params)
-
+        s3 = boto3.client(
+            "s3",
+            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
+            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
+        )
        params = {
            "Bucket": settings.AWS_STORAGE_BUCKET_NAME,
            "Prefix": "static/project-cover/",
@@ -1034,19 +994,9 @@ class ProjectPublicCoverImagesEndpoint(BaseAPIView):
                if not content["Key"].endswith(
                    "/"
                ):  # This line ensures we're only getting files, not "sub-folders"
-                    if (
-                        hasattr(settings, "AWS_S3_CUSTOM_DOMAIN")
-                        and settings.AWS_S3_CUSTOM_DOMAIN
-                        and hasattr(settings, "AWS_S3_URL_PROTOCOL")
-                        and settings.AWS_S3_URL_PROTOCOL
-                    ):
-                        files.append(
-                            f"{settings.AWS_S3_URL_PROTOCOL}//{settings.AWS_S3_CUSTOM_DOMAIN}/{content['Key']}"
-                        )
-                    else:
-                        files.append(
-                            f"https://{settings.AWS_STORAGE_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
-                        )
+                    files.append(
+                        f"https://{settings.AWS_STORAGE_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
+                    )

        return Response(files, status=status.HTTP_200_OK)

@@ -1099,20 +1049,3 @@ class ProjectDeployBoardViewSet(BaseViewSet):

        serializer = ProjectDeployBoardSerializer(project_deploy_board)
        return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class UserProjectRolesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceUserPermission,
-    ]
-
-    def get(self, request, slug):
-        project_members = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member_id=request.user.id,
-        ).values("project_id", "role")
-
-        project_members = {
-            str(member["project_id"]): member["role"] for member in project_members
-        }
-        return Response(project_members, status=status.HTTP_200_OK)
@@ -49,10 +49,6 @@ class UserEndpoint(BaseViewSet):
        # Check all workspace user is active
        user = self.get_object()

-        # Instance admin check
-        if InstanceAdmin.objects.filter(user=user).exists():
-            return Response({"error": "You cannot deactivate your account since you are an instance admin"}, status=status.HTTP_400_BAD_REQUEST)
-
        projects_to_deactivate = []
        workspaces_to_deactivate = []

@@ -70,7 +70,6 @@ from plane.app.permissions import (
    WorkSpaceAdminPermission,
    WorkspaceEntityPermission,
    WorkspaceViewerPermission,
-    WorkspaceUserPermission,
 )
 from plane.bgtasks.workspace_invitation_task import workspace_invitation
 from plane.utils.issue_filters import issue_filters
@@ -409,14 +408,15 @@ class WorkspaceJoinEndpoint(BaseAPIView):
                    workspace_invite.delete()
                
                # Send event
-                workspace_invite_event.delay(
-                    user=user.id if user is not None else None,
-                    email=email,
-                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=request.META.get("REMOTE_ADDR"),
-                    event_name="MEMBER_ACCEPTED",
-                    accepted_from="EMAIL",
-                )
+                if settings.POSTHOG_API_KEY and settings.POSTHOG_HOST:
+                    workspace_invite_event.delay(
+                        user=user.id if user is not None else None,
+                        email=email,
+                        user_agent=request.META.get("HTTP_USER_AGENT"),
+                        ip=request.META.get("REMOTE_ADDR"),
+                        event_name="MEMBER_ACCEPTED",
+                        accepted_from="EMAIL",
+                    )

                return Response(
                    {"message": "Workspace Invitation Accepted"},
@@ -496,18 +496,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
        WorkspaceEntityPermission,
    ]

-    def get_permissions(self):
-        if self.action == "leave":
-            self.permission_classes = [
-                WorkspaceUserPermission,
-            ]
-        else:
-            self.permission_classes = [
-                WorkspaceEntityPermission,
-            ]
-
-        return super(WorkSpaceMemberViewSet, self).get_permissions()
-
    search_fields = [
        "member__display_name",
        "member__first_name",
@@ -1 +0,0 @@
-from .issue_sync_task import issue_sync
@@ -18,6 +18,7 @@ from sentry_sdk import capture_exception
 from plane.db.models import Issue
 from plane.utils.analytics_plot import build_graph_plot
 from plane.utils.issue_filters import issue_filters
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_email_configuration

 row_mapping = {
@@ -51,6 +52,11 @@ def send_export_email(email, slug, csv_buffer, rows):

    csv_buffer.seek(0)

+    # Configure email connection from the database
+    instance_configuration = InstanceConfiguration.objects.filter(
+        key__startswith="EMAIL_"
+    ).values("key", "value")
+
    (
        EMAIL_HOST,
        EMAIL_HOST_USER,
@@ -58,14 +64,14 @@ def send_export_email(email, slug, csv_buffer, rows):
        EMAIL_PORT,
        EMAIL_USE_TLS,
        EMAIL_FROM,
-    ) = get_email_configuration()
+    ) = get_email_configuration(instance_configuration=instance_configuration)

    connection = get_connection(
        host=EMAIL_HOST,
        port=int(EMAIL_PORT),
        username=EMAIL_HOST_USER,
        password=EMAIL_HOST_PASSWORD,
-        use_tls=EMAIL_USE_TLS == "1",
+        use_tls=bool(EMAIL_USE_TLS),
    )

    msg = EmailMultiAlternatives(
@@ -373,7 +379,7 @@ def generate_non_segmented_rows(
    return [tuple(row_zero)] + rows


-@shared_task(queue='internal_tasks')
+@shared_task
 def analytic_export_task(email, data, slug):
    try:
        filters = issue_filters(data, "POST")
@@ -1,78 +1,50 @@
 import uuid
-import os

-# third party imports
+from posthog import Posthog
+from django.conf import settings
+
+#third party imports
 from celery import shared_task
 from sentry_sdk import capture_exception
-from posthog import Posthog
-
-# module imports
-from plane.license.utils.instance_value import get_configuration_value


-def posthogConfiguration():
-    POSTHOG_API_KEY, POSTHOG_HOST = get_configuration_value(
-        [
-            {
-                "key": "POSTHOG_API_KEY",
-                "default": os.environ.get("POSTHOG_API_KEY", None),
-            },
-            {
-                "key": "POSTHOG_HOST",
-                "default": os.environ.get("POSTHOG_HOST", None),
-            },
-        ]
-    )
-    if POSTHOG_API_KEY and POSTHOG_HOST:
-        return POSTHOG_API_KEY, POSTHOG_HOST
-    else:
-        return None, None
-
-
-@shared_task(queue='internal_tasks')
+@shared_task
 def auth_events(user, email, user_agent, ip, event_name, medium, first_time):
    try:
-        POSTHOG_API_KEY, POSTHOG_HOST = posthogConfiguration()
-
-        if POSTHOG_API_KEY and POSTHOG_HOST:
-            posthog = Posthog(POSTHOG_API_KEY, host=POSTHOG_HOST)
-            posthog.capture(
-                email,
-                event=event_name,
-                properties={
-                        "event_id": uuid.uuid4().hex,
-                        "user": {"email": email, "id": str(user)},
-                        "device_ctx": {
-                            "ip": ip,
-                            "user_agent": user_agent,
-                        },
-                        "medium": medium,
-                        "first_time": first_time
-                }
-            )
+        posthog = Posthog(settings.POSTHOG_API_KEY, host=settings.POSTHOG_HOST)
+        posthog.capture(
+            email,
+            event=event_name,
+            properties={
+                    "event_id": uuid.uuid4().hex,
+                    "user": {"email": email, "id": str(user)},
+                    "device_ctx": {
+                        "ip": ip,
+                        "user_agent": user_agent,
+                    },
+                    "medium": medium,
+                    "first_time": first_time
+            }
+        )
    except Exception as e:
        capture_exception(e)
 
-
-@shared_task(queue='internal_tasks')
+@shared_task
 def workspace_invite_event(user, email, user_agent, ip, event_name, accepted_from):
    try:
-        POSTHOG_API_KEY, POSTHOG_HOST = posthogConfiguration()
-
-        if POSTHOG_API_KEY and POSTHOG_HOST:
-            posthog = Posthog(POSTHOG_API_KEY, host=POSTHOG_HOST)
-            posthog.capture(
-                email,
-                event=event_name,
-                properties={
-                        "event_id": uuid.uuid4().hex,
-                        "user": {"email": email, "id": str(user)},
-                        "device_ctx": {
-                            "ip": ip,
-                            "user_agent": user_agent,
-                        },
-                        "accepted_from": accepted_from
-                }
-            )
+        posthog = Posthog(settings.POSTHOG_API_KEY, host=settings.POSTHOG_HOST)
+        posthog.capture(
+            email,
+            event=event_name,
+            properties={
+                    "event_id": uuid.uuid4().hex,
+                    "user": {"email": email, "id": str(user)},
+                    "device_ctx": {
+                        "ip": ip,
+                        "user_agent": user_agent,
+                    },
+                    "accepted_from": accepted_from
+            }
+        )
    except Exception as e:
        capture_exception(e)
@@ -259,7 +259,7 @@ def generate_xlsx(header, project_id, issues, files):
    files.append((f"{project_id}.xlsx", xlsx_file))


-@shared_task(queue='internal_tasks')
+@shared_task
 def issue_export_task(provider, workspace_id, project_ids, token_id, multiple, slug):
    try:
        exporter_instance = ExporterHistory.objects.get(token=token_id)
@@ -15,7 +15,7 @@ from botocore.client import Config
 from plane.db.models import ExporterHistory


-@shared_task(queue='internal_tasks')
+@shared_task
 def delete_old_s3_link():
    # Get a list of keys and IDs to process
    expired_exporter_history = ExporterHistory.objects.filter(
@@ -12,7 +12,7 @@ from celery import shared_task
 from plane.db.models import FileAsset


-@shared_task(queue='internal_tasks')
+@shared_task
 def delete_file_asset():

    # file assets to delete
@@ -14,10 +14,11 @@ from celery import shared_task
 from sentry_sdk import capture_exception

 # Module imports
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_email_configuration


-@shared_task(queue='internal_tasks')
+@shared_task
 def forgot_password(first_name, email, uidb64, token, current_site):
    try:
        relative_link = (
@@ -25,6 +26,10 @@ def forgot_password(first_name, email, uidb64, token, current_site):
        )
        abs_url = str(current_site) + relative_link

+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
+
        (
            EMAIL_HOST,
            EMAIL_HOST_USER,
@@ -32,7 +37,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
            EMAIL_PORT,
            EMAIL_USE_TLS,
            EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)

        subject = "A new password to your Plane account has been requested"

@@ -46,12 +51,15 @@ def forgot_password(first_name, email, uidb64, token, current_site):

        text_content = strip_tags(html_content)

+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
        connection = get_connection(
            host=EMAIL_HOST,
            port=int(EMAIL_PORT),
            username=EMAIL_HOST_USER,
            password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
        )

        msg = EmailMultiAlternatives(
@@ -1,467 +1,200 @@
 # Python imports
+import json
+import requests
 import uuid

 # Django imports
-from django.db.models import Q, Max
+from django.conf import settings
+from django.core.serializers.json import DjangoJSONEncoder
 from django.contrib.auth.hashers import make_password

 # Third Party imports
 from celery import shared_task
-from celery.exceptions import MaxRetriesExceededError
+from sentry_sdk import capture_exception

 # Module imports
+from plane.app.serializers import ImporterSerializer
 from plane.db.models import (
    Importer,
    WorkspaceMember,
+    GithubRepositorySync,
+    GithubRepository,
    ProjectMember,
+    WorkspaceIntegration,
    Label,
    User,
    IssueProperty,
-    IssueAssignee,
-    IssueLabel,
-    IssueSequence,
-    IssueActivity,
-    IssueComment,
-    IssueLink,
-    ModuleIssue,
-    State,
-    Module,
-    Issue,
-    Cycle,
 )
 from plane.bgtasks.user_welcome_task import send_welcome_slack


-@shared_task(queue="internal_tasks")
+@shared_task
 def service_importer(service, importer_id):
-    pass
-
-
-## Utility functions
-def get_label_id(name, data):
    try:
-        existing_label = (
-            Label.objects.filter(
-                project_id=data.get("project_id"),
-                workspace_id=data.get("workspace_id"),
-                name__iexact=name,
-            )
-            .values("id")
-            .first()
-        )
-        return existing_label
-    except Label.DoesNotExist:
-        return None
+        importer = Importer.objects.get(pk=importer_id)
+        importer.status = "processing"
+        importer.save()

+        users = importer.data.get("users", [])

-def get_state_id(name, data):
-    try:
-        existing_state = (
-            State.objects.filter(
-                name__iexact=name,
-                project_id=data.get("project_id"),
-                workspace_id=data.get("workspace_id"),
-            )
-            .values("id")
-            .first()
-        )
-        return existing_state
-    except State.DoesNotExist:
-        return None
-
-
-def get_user_id(name):
-    try:
-        existing_user = User.objects.filter(email=name).values("id").first()
-        return existing_user
-    except User.DoesNotExist:
-        return None
-
-
-def update_imported_items(importer_id, entity, entity_id):
-    importer = Importer.objects.get(pk=importer_id)
-    if importer.imported_data:
-        importer.imported_data.setdefault(str(entity), []).append(str(entity_id))
-    else:
-        importer.imported_data = {
-            str(entity): [str(entity_id)]
-        }
-    importer.save()
-
-
-## Sync functions
-def members_sync(data):
-    try:
-        user = User.objects.get(email=data.get("email"))
-        _ = WorkspaceMember.objects.get_or_create(
-            member_id=user.id, workspace_id=data.get("workspace_id")
-        )
-        _ = ProjectMember.objects.get_or_create(
-            member_id=user.id,
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-        )
-        _ = IssueProperty.objects.get_or_create(
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            user_id=user.id,
-            created_by_id=data.get("created_by"),
-        )
-
-    except User.DoesNotExist:
-        # For all invited users create the users
-        new_user = User.objects.create(
-            email=data.get("email").strip().lower(),
-            username=uuid.uuid4().hex,
-            password=make_password(uuid.uuid4().hex),
-            is_password_autoset=True,
-        )
-
-        service = data.get("external_source")
-
-        WorkspaceMember.objects.create(
-            member_id=new_user.id,
-            workspace_id=data.get("workspace_id"),
-            created_by_id=data.get("created_by"),
-        )
-
-        ProjectMember.objects.create(
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            member_id=new_user.id,
-            created_by_id=data.get("created_by"),
-        )
-
-        IssueProperty.objects.create(
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            user_id=new_user.id,
-            created_by_id=data.get("created_by"),
-        )
-        if data.get("source", False) == "slack":
-            send_welcome_slack.delay(
-                str(new_user.id),
-                True,
-                f"{new_user.email} was imported to Plane from {service}",
+        # Check if we need to import users as well
+        if len(users):
+            # For all invited users create the users
+            new_users = User.objects.bulk_create(
+                [
+                    User(
+                        email=user.get("email").strip().lower(),
+                        username=uuid.uuid4().hex,
+                        password=make_password(uuid.uuid4().hex),
+                        is_password_autoset=True,
+                    )
+                    for user in users
+                    if user.get("import", False) == "invite"
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
            )

+            _ = [
+                send_welcome_slack.delay(
+                    str(user.id),
+                    True,
+                    f"{user.email} was imported to Plane from {service}",
+                )
+                for user in new_users
+            ]

-def label_sync(data):
-    existing_label = Label.objects.filter(
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-        name__iexact=data.get("name"),
-        external_id=data.get("external_id", None),
-        external_source=data.get("external_source"),
-    )
-
-    if not existing_label.exists() and data.get("name"):
-        label = Label.objects.create(
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            name=data.get("name"),
-            color=data.get("color"),
-            created_by_id=data.get("created_by"),
-            external_id=data.get("external_id", None),
-            external_source=data.get("external_source"),
-        )
-        update_imported_items(data.get("importer_id"), "labels", label.id)
-
-
-def state_sync(data):
-    try:
-        state = State.objects.get(
-            external_id=data.get("external_id"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-        )
-
-    except State.DoesNotExist:
-        existing_states = State.objects.filter(
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            group=data.get("state_group"),
-            name__iexact=data.get("state_name"),
-        )
-
-        if existing_states.exists():
-            existing_state = existing_states.first()
-            existing_state.external_id = data.get("external_id")
-            existing_state.external_source = data.get("external_source")
-            existing_state.save()
-        else:
-            state = State.objects.create(
-                project_id=data.get("project_id"),
-                workspace_id=data.get("workspace_id"),
-                name=data.get("state_name"),
-                group=data.get("state_group"),
-                created_by_id=data.get("created_by"),
-                external_id=data.get("external_id"),
-                external_source=data.get("external_source"),
+            workspace_users = User.objects.filter(
+                email__in=[
+                    user.get("email").strip().lower()
+                    for user in users
+                    if user.get("import", False) == "invite"
+                    or user.get("import", False) == "map"
+                ]
            )
-            update_imported_items(data.get("importer_id"), "states", state.id)

+            # Check if any of the users are already member of workspace
+            _ = WorkspaceMember.objects.filter(
+                member__in=[user for user in workspace_users],
+                workspace_id=importer.workspace_id,
+            ).update(is_active=True)

-def issue_sync(data):
-    try:
-        issue = Issue.objects.get(
-            external_id=data.get("external_id"),
-            external_source=data.get("external_source"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-        )
-    except Issue.DoesNotExist:
-        # Get the default state
-        default_state = State.objects.filter(
-            ~Q(name="Triage"), project_id=data.get("project_id"), default=True
-        ).first()
+            # Add new users to Workspace and project automatically
+            WorkspaceMember.objects.bulk_create(
+                [
+                    WorkspaceMember(
+                        member=user,
+                        workspace_id=importer.workspace_id,
+                        created_by=importer.created_by,
+                    )
+                    for user in workspace_users
+                ],
+                batch_size=100,
+                ignore_conflicts=True,
+            )

-        # if there is no default state assign any random state
-        if default_state is None:
-            default_state = State.objects.filter(
-                ~Q(name="Triage"), project_id=data.get("project_id")
+            ProjectMember.objects.bulk_create(
+                [
+                    ProjectMember(
+                        project_id=importer.project_id,
+                        workspace_id=importer.workspace_id,
+                        member=user,
+                        created_by=importer.created_by,
+                    )
+                    for user in workspace_users
+                ],
+                batch_size=100,
+                ignore_conflicts=True,
+            )
+
+            IssueProperty.objects.bulk_create(
+                [
+                    IssueProperty(
+                        project_id=importer.project_id,
+                        workspace_id=importer.workspace_id,
+                        user=user,
+                        created_by=importer.created_by,
+                    )
+                    for user in workspace_users
+                ],
+                batch_size=100,
+                ignore_conflicts=True,
+            )
+
+        # Check if sync config is on for github importers
+        if service == "github" and importer.config.get("sync", False):
+            name = importer.metadata.get("name", False)
+            url = importer.metadata.get("url", False)
+            config = importer.metadata.get("config", {})
+            owner = importer.metadata.get("owner", False)
+            repository_id = importer.metadata.get("repository_id", False)
+
+            workspace_integration = WorkspaceIntegration.objects.get(
+                workspace_id=importer.workspace_id, integration__provider="github"
+            )
+
+            # Delete the old repository object
+            GithubRepositorySync.objects.filter(project_id=importer.project_id).delete()
+            GithubRepository.objects.filter(project_id=importer.project_id).delete()
+
+            # Create a Label for github
+            label = Label.objects.filter(
+                name="GitHub", project_id=importer.project_id
            ).first()

-        # Get the maximum sequence_id
-        last_id = IssueSequence.objects.filter(
-            project_id=data.get("project_id")
-        ).aggregate(largest=Max("sequence"))["largest"]
+            if label is None:
+                label = Label.objects.create(
+                    name="GitHub",
+                    project_id=importer.project_id,
+                    description="Label to sync Plane issues with GitHub issues",
+                    color="#003773",
+                )
+            # Create repository
+            repo = GithubRepository.objects.create(
+                name=name,
+                url=url,
+                config=config,
+                repository_id=repository_id,
+                owner=owner,
+                project_id=importer.project_id,
+            )

-        last_id = 1 if last_id is None else last_id + 1
+            # Create repo sync
+            _ = GithubRepositorySync.objects.create(
+                repository=repo,
+                workspace_integration=workspace_integration,
+                actor=workspace_integration.actor,
+                credentials=importer.data.get("credentials", {}),
+                project_id=importer.project_id,
+                label=label,
+            )

-        # Get the maximum sort order
-        largest_sort_order = Issue.objects.filter(
-            project_id=data.get("project_id"), state=default_state
-        ).aggregate(largest=Max("sort_order"))["largest"]
+            # Add bot as a member in the project
+            _ = ProjectMember.objects.get_or_create(
+                member=workspace_integration.actor,
+                role=20,
+                project_id=importer.project_id,
+            )

-        largest_sort_order = (
-            65535 if largest_sort_order is None else largest_sort_order + 10000
-        )
-        parent_id = None
-        if data.get("parent_id", False):
-            parent_id = Issue.objects.filter(
-                external_id=data.get("parent_id"),
-                external_source=data.get("external_source"),
-                project_id=data.get("project_id"),
-                workspace_id=data.get("workspace_id"),
-            ).values("id")
+        if settings.PROXY_BASE_URL:
+            headers = {"Content-Type": "application/json"}
+            import_data_json = json.dumps(
+                ImporterSerializer(importer).data,
+                cls=DjangoJSONEncoder,
+            )
+            _ = requests.post(
+                f"{settings.PROXY_BASE_URL}/hooks/workspaces/{str(importer.workspace_id)}/projects/{str(importer.project_id)}/importers/{str(service)}/",
+                json=import_data_json,
+                headers=headers,
+            )

-        # Issues
-        issue = Issue.objects.create(
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            state_id=get_state_id(data.get("state"), data).get("id")
-            if get_state_id(data.get("state"), data)
-            else default_state.id,
-            name=data.get("name", "Issue Created through Importer")[:255],
-            description_html=data.get("description_html", "<p></p>"),
-            sequence_id=last_id,
-            sort_order=largest_sort_order,
-            start_date=data.get("start_date", None),
-            target_date=data.get("target_date", None),
-            priority=data.get("priority", "none"),
-            created_by_id=data.get("created_by_id"),
-            external_id=data.get("external_id"),
-            external_source=data.get("external_source"),
-            parent_id=parent_id,
-        )
-
-        # Sequences
-        _ = IssueSequence.objects.create(
-            issue=issue,
-            sequence=issue.sequence_id,
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-        )
-
-        # Attach Links
-        _ = IssueLink.objects.create(
-            issue=issue,
-            url=data.get("link", {}).get("url", "https://github.com"),
-            title=data.get("link", {}).get("title", "Original Issue"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            created_by_id=data.get("created_by_id"),
-        )
-
-        # Track the issue activities
-        _ = IssueActivity.objects.create(
-            issue=issue,
-            actor_id=data.get("created_by_id"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            comment=f"imported the issue from {data.get('external_source')}",
-            verb="created",
-            created_by_id=data.get("created_by_id"),
-        )
-
-        update_imported_items(data.get("importer_id"), "issues", issue.id)
-
-
-def issue_label_sync(data):
-    issue = Issue.objects.get(
-        external_source=data.get("external_issue_source"),
-        external_id=data.get("external_issue_id"),
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-    )
-    if get_label_id(data.get("name"), data):
-        IssueLabel.objects.create(
-            issue=issue,
-            label_id=get_label_id(data.get("name"), data).get("id"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            created_by_id=data.get("created_by_id"),
-        )
-
-
-def issue_assignee_sync(data):
-    issue = Issue.objects.get(
-        external_source=data.get("external_issue_source"),
-        external_id=data.get("external_issue_id"),
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-    )
-    user = User.objects.filter(email=data.get("email")).values("id")
-
-    IssueAssignee.objects.create(
-        issue=issue,
-        assignee_id=user,
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-        created_by_id=data.get("created_by_id"),
-    )
-
-
-def issue_comment_sync(data):
-    # Create Comments
-    issue = Issue.objects.get(
-        external_source=data.get("external_issue_source"),
-        external_id=data.get("external_issue_id"),
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-    )
-    IssueComment.objects.create(
-        issue=issue,
-        comment_html=data.get("comment_html", "<p></p>"),
-        actor_id=data.get("created_by_id"),
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-        created_by_id=get_user_id(data.get("created_by_id")).get("id")
-        if get_user_id(data.get("created_by_id"))
-        else data.get("created_by_id"),
-        external_id=data.get("external_id"),
-        external_source=data.get("external_source"),
-    )
-
-
-def cycles_sync(data):
-    try:
-        _ = Cycle.objects.get(
-            external_id=data.get("external_id"),
-            external_source=data.get("external_source"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-        )
-    except Cycle.DoesNotExist:
-        cycle = Cycle.objects.create(
-            name=data.get("name"),
-            description_html=data.get("description_html", "<p></p>"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            created_by_id=data.get("created_by"),
-            external_id=data.get("external_id"),
-            external_source=data.get("external_source"),
-        )
-        update_imported_items(data.get("importer_id"), "cycles", cycle.id)
-
-
-def module_sync(data):
-    try:
-        _ = Module.objects.get(
-            external_id=data.get("external_id"),
-            external_source=data.get("external_source"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-        )
-    except Module.DoesNotExist:
-        module = Module.objects.create(
-            name=data.get("name"),
-            description_html=data.get("description_html", "<p></p>"),
-            project_id=data.get("project_id"),
-            workspace_id=data.get("workspace_id"),
-            created_by_id=data.get("created_by"),
-            external_id=data.get("external_id"),
-            external_source=data.get("external_source"),
-        )
-        update_imported_items(data.get("importer_id"), "modules", module.id)
-
-
-def modules_issue_sync(data):
-    module = Module.objects.get(
-        external_id=data.get("module_id"),
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-        external_source=data.get("external_source"),
-    )
-    issue = Issue.objects.get(
-        external_id=data.get("issue_id"),
-        external_source=data.get("external_source"),
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-    )
-
-    _ = ModuleIssue.objects.create(
-        module=module,
-        issue=issue,
-        project_id=data.get("project_id"),
-        workspace_id=data.get("workspace_id"),
-        created_by_id=data.get("created_by"),
-    )
-
-
-def import_sync(data):
-    importer = Importer.objects.get(pk=data.get("importer_id"))
-    importer.status = data.get("status")
-    importer.save(update_fields=["status"])
-
-
-@shared_task(bind=True, queue="segway_task", max_retries=5)
-def import_task(self, data):
-    type = data.get("type")
-
-    if type is None:
-        return
-
-    TYPE_MAPPER = {
-        "member.sync": members_sync,
-        "label.sync": label_sync,
-        "state.sync": state_sync,
-        "issue.sync": issue_sync,
-        "issue.label.sync": issue_label_sync,
-        "issue.assignee.sync": issue_assignee_sync,
-        "issue.comment.sync": issue_comment_sync,
-        "cycle.sync": cycles_sync,
-        "module.sync": module_sync,
-        "module.issue.sync": modules_issue_sync,
-        "import.sync": import_sync,
-    }
-    try:
-        func = TYPE_MAPPER.get(type)
-        if func is None:
-            return
-        # Call the function
-        func(data)
        return
    except Exception as e:
-        try:
-            # Retry with exponential backoff
-            self.retry(exc=e, countdown=50, backoff=2)
-        except MaxRetriesExceededError:
-            # For max retries reached items fail the import
-            importer = Importer.objects.get(pk=data.get("importer_id"))
-            importer.status = "failed"
-            importer.reason = e
-            importer.save()
-
+        importer = Importer.objects.get(pk=importer_id)
+        importer.status = "failed"
+        importer.save()
+        # Print logs if in DEBUG mode
+        if settings.DEBUG:
+            print(e)
+        capture_exception(e)
        return
@@ -1460,7 +1460,7 @@ def delete_draft_issue_activity(


 # Receive message from room group
-@shared_task(queue='internal_tasks')
+@shared_task
 def issue_activity(
    type,
    requested_data,
@@ -16,7 +16,7 @@ from plane.db.models import Issue, Project, State
 from plane.bgtasks.issue_activites_task import issue_activity


-@shared_task(queue='internal_tasks')
+@shared_task
 def archive_and_close_old_issues():
    archive_old_issues()
    close_old_issues()
@@ -1,5 +0,0 @@
-from celery import shared_task
-
-@shared_task(queue="segway_tasks")
-def issue_sync(data):
-    print(f"Received data from Segway: {data}")
@@ -14,12 +14,17 @@ from celery import shared_task
 from sentry_sdk import capture_exception

 # Module imports
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_email_configuration


-@shared_task(queue='internal_tasks')
+@shared_task
 def magic_link(email, key, token, current_site):
    try:
+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
+
        (
            EMAIL_HOST,
            EMAIL_HOST_USER,
@@ -27,7 +32,7 @@ def magic_link(email, key, token, current_site):
            EMAIL_PORT,
            EMAIL_USE_TLS,
            EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)

        # Send the mail
        subject = f"Your unique Plane login code is {token}"
@@ -41,7 +46,7 @@ def magic_link(email, key, token, current_site):
            port=int(EMAIL_PORT),
            username=EMAIL_HOST_USER,
            password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
        )

        msg = EmailMultiAlternatives(
@@ -183,7 +183,7 @@ def createMentionNotification(project, notification_comment, issue, actor_id, me
    )


-@shared_task(queue='internal_tasks')
+@shared_task
 def notifications(type, issue_id, project_id, actor_id, subscriber, issue_activities_created, requested_data, current_instance):
    issue_activities_created = (
        json.loads(
@@ -13,9 +13,10 @@ from sentry_sdk import capture_exception

 # Module imports
 from plane.db.models import Project, User, ProjectMemberInvite
+from plane.license.models import InstanceConfiguration
 from plane.license.utils.instance_value import get_email_configuration

-@shared_task(queue='internal_tasks')
+@shared_task
 def project_invitation(email, project_id, token, current_site, invitor):
    try:
        user = User.objects.get(email=invitor)
@@ -46,6 +47,7 @@ def project_invitation(email, project_id, token, current_site, invitor):
        project_member_invite.save()

        # Configure email connection from the database
+        instance_configuration = InstanceConfiguration.objects.filter(key__startswith='EMAIL_').values("key", "value")
        (
            EMAIL_HOST,
            EMAIL_HOST_USER,
@@ -53,14 +55,14 @@ def project_invitation(email, project_id, token, current_site, invitor):
            EMAIL_PORT,
            EMAIL_USE_TLS,
            EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)

        connection = get_connection(
            host=EMAIL_HOST,
            port=int(EMAIL_PORT),
            username=EMAIL_HOST_USER,
            password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
        )

        msg = EmailMultiAlternatives(
@@ -11,7 +11,7 @@ from slack_sdk.errors import SlackApiError
 from plane.db.models import User


-@shared_task(queue='internal_tasks')
+@shared_task
 def send_welcome_slack(user_id, created, message):
    try:
        instance = User.objects.get(pk=user_id)
@@ -71,7 +71,6 @@ def get_model_data(event, event_id, many=False):
    retry_backoff=600,
    max_retries=5,
    retry_jitter=True,
-    queue='internal_tasks'
 )
 def webhook_task(self, webhook, slug, event, event_data, action):
    try:
@@ -162,7 +161,7 @@ def webhook_task(self, webhook, slug, event, event_data, action):
        return


-@shared_task(queue='internal_tasks')
+@shared_task()
 def send_webhook(event, payload, kw, action, slug, bulk):
    try:
        webhooks = Webhook.objects.filter(workspace__slug=slug, is_active=True)
@@ -17,10 +17,11 @@ from slack_sdk.errors import SlackApiError

 # Module imports
 from plane.db.models import Workspace, WorkspaceMemberInvite, User
+from plane.license.models import InstanceConfiguration, Instance
 from plane.license.utils.instance_value import get_email_configuration


-@shared_task(queue='internal_tasks')
+@shared_task
 def workspace_invitation(email, workspace_id, token, current_site, invitor):
    try:
        user = User.objects.get(email=invitor)
@@ -36,6 +37,9 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
        # The complete url including the domain
        abs_url = str(current_site) + relative_link

+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")

        (
            EMAIL_HOST,
@@ -44,7 +48,7 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
            EMAIL_PORT,
            EMAIL_USE_TLS,
            EMAIL_FROM,
-        ) = get_email_configuration()
+        ) = get_email_configuration(instance_configuration=instance_configuration)

        # Subject of the email
        subject = f"{user.first_name or user.display_name or user.email} has invited you to join them in {workspace.name} on Plane"
@@ -65,12 +69,15 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
        workspace_member_invite.message = text_content
        workspace_member_invite.save()

+        instance_configuration = InstanceConfiguration.objects.filter(
+            key__startswith="EMAIL_"
+        ).values("key", "value")
        connection = get_connection(
            host=EMAIL_HOST,
            port=int(EMAIL_PORT),
            username=EMAIL_HOST_USER,
            password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
+            use_tls=bool(EMAIL_USE_TLS),
        )

        msg = EmailMultiAlternatives(
@@ -8,7 +8,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")

 ri = redis_instance()

-app = Celery('tasks', broker='pyamqp://guest:guest@localhost:5672//')
+app = Celery("plane")

 # Using a string here means the worker will not have to
 # pickle the object when using Windows.
@@ -28,6 +28,10 @@ app.conf.beat_schedule = {
        "task": "plane.bgtasks.file_asset_task.delete_file_asset",
        "schedule": crontab(hour=0, minute=0),
    },
+    "check-instance-verification": {
+        "task": "plane.license.bgtasks.instance_verification_task.instance_verification_task",
+        "schedule": crontab(minute=0, hour='*/4'),
+    },
 }

 # Load task modules from all registered Django app configs.
@@ -1,78 +0,0 @@
-# Generated by Django 4.2.7 on 2023-12-20 14:33
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0050_user_use_case_alter_workspace_organization_size'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cycle',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='cycle',
-            name='external_source',
-            field=models.CharField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='importer',
-            name='reason',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='issue',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='issue',
-            name='external_source',
-            field=models.CharField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='issuecomment',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='issuecomment',
-            name='external_source',
-            field=models.CharField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='label',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='label',
-            name='external_source',
-            field=models.CharField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='module',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='module',
-            name='external_source',
-            field=models.CharField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='state',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='state',
-            name='external_source',
-            field=models.CharField(blank=True, null=True),
-        ),
-    ]
@@ -22,6 +22,8 @@ class BaseModel(AuditModel):
        user = get_current_user()

        if user is None or user.is_anonymous:
+            self.created_by = None
+            self.updated_by = None
            super(BaseModel, self).save(*args, **kwargs)
        else:
            # Check if the model is being created or updated
@@ -18,8 +18,6 @@ class Cycle(ProjectBaseModel):
    )
    view_props = models.JSONField(default=dict)
    sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)

    class Meta:
        verbose_name = "Cycle"
@@ -29,9 +27,9 @@ class Cycle(ProjectBaseModel):

    def save(self, *args, **kwargs):
        if self._state.adding:
-            smallest_sort_order = Cycle.objects.filter(project=self.project).aggregate(
-                smallest=models.Min("sort_order")
-            )["smallest"]
+            smallest_sort_order = Cycle.objects.filter(
+                project=self.project
+            ).aggregate(smallest=models.Min("sort_order"))["smallest"]

            if smallest_sort_order is not None:
                self.sort_order = smallest_sort_order - 10000
@@ -34,7 +34,6 @@ class Importer(ProjectBaseModel):
        "db.APIToken", on_delete=models.CASCADE, related_name="importer"
    )
    imported_data = models.JSONField(null=True)
-    reason = models.TextField(blank=True)

    class Meta:
        verbose_name = "Importer"
@@ -102,8 +102,6 @@ class Issue(ProjectBaseModel):
    completed_at = models.DateTimeField(null=True)
    archived_at = models.DateField(null=True)
    is_draft = models.BooleanField(default=False)
-    external_source = models.CharField(null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)

    objects = models.Manager()
    issue_objects = IssueManager()
@@ -134,6 +132,7 @@ class Issue(ProjectBaseModel):
            except ImportError:
                pass

+
        if self._state.adding:
            # Get the maximum display_id value from the database
            last_id = IssueSequence.objects.filter(project=self.project).aggregate(
@@ -211,9 +210,8 @@ class IssueRelation(ProjectBaseModel):
        ordering = ("-created_at",)

    def __str__(self):
-        return f"{self.issue.name} {self.related_issue.name}"
-
-
+        return f"{self.issue.name} {self.related_issue.name}"    
+    
 class IssueMention(ProjectBaseModel):
    issue = models.ForeignKey(
        Issue, on_delete=models.CASCADE, related_name="issue_mention"
@@ -223,7 +221,6 @@ class IssueMention(ProjectBaseModel):
        on_delete=models.CASCADE,
        related_name="issue_mention",
    )
-
    class Meta:
        unique_together = ["issue", "mention"]
        verbose_name = "Issue Mention"
@@ -232,7 +229,7 @@ class IssueMention(ProjectBaseModel):
        ordering = ("-created_at",)

    def __str__(self):
-        return f"{self.issue.name} {self.mention.email}"
+        return f"{self.issue.name} {self.mention.email}" 


 class IssueAssignee(ProjectBaseModel):
@@ -369,8 +366,6 @@ class IssueComment(ProjectBaseModel):
        default="INTERNAL",
        max_length=100,
    )
-    external_source = models.CharField(null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)

    def save(self, *args, **kwargs):
        self.comment_stripped = (
@@ -421,8 +416,6 @@ class Label(ProjectBaseModel):
    description = models.TextField(blank=True)
    color = models.CharField(max_length=255, blank=True)
    sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)

    class Meta:
        unique_together = ["name", "project"]
@@ -41,8 +41,6 @@ class Module(ProjectBaseModel):
    )
    view_props = models.JSONField(default=dict)
    sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)

    class Meta:
        unique_together = ["name", "project"]
@@ -24,8 +24,6 @@ class State(ProjectBaseModel):
        max_length=20,
    )
    default = models.BooleanField(default=False)
-    external_source = models.CharField(null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)

    def __str__(self):
        """Return name of the state"""
@@ -30,7 +30,7 @@ from plane.license.api.serializers import (
 from plane.license.api.permissions import (
    InstanceAdminPermission,
 )
-from plane.db.models import User, WorkspaceMember, ProjectMember
+from plane.db.models import User
 from plane.license.utils.encryption import encrypt_data


@@ -0,0 +1,136 @@
+# Python imports
+import os
+import json
+import requests
+
+# Django imports
+from django.conf import settings
+
+# Third party imports
+from celery import shared_task
+
+# Module imports
+from plane.db.models import User
+from plane.license.models import Instance, InstanceAdmin
+
+
+def instance_verification(instance):
+    with open("package.json", "r") as file:
+        # Load JSON content from the file
+        data = json.load(file)
+
+    headers = {"Content-Type": "application/json"}
+    payload = {
+        "instance_key": settings.INSTANCE_KEY,
+        "version": data.get("version", 0.1),
+        "machine_signature": os.environ.get("MACHINE_SIGNATURE", "machine-signature"),
+        "user_count": User.objects.filter(is_bot=False).count(),
+    }
+    # Register the instance
+    response = requests.post(
+        f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+        headers=headers,
+        data=json.dumps(payload),
+        timeout=30,
+    )
+
+    # check response status
+    if response.status_code == 201:
+        data = response.json()
+        # Update instance
+        instance.instance_id = data.get("id")
+        instance.license_key = data.get("license_key")
+        instance.api_key = data.get("api_key")
+        instance.version = data.get("version")
+        instance.user_count = data.get("user_count", 0)
+        instance.is_verified = True
+        instance.save()
+    else:
+        return
+
+
+def admin_verification(instance):
+    # Save the user in control center
+    headers = {
+        "Content-Type": "application/json",
+        "x-instance-id": instance.instance_id,
+        "x-api-key": instance.api_key,
+    }
+
+    # Get all the unverified instance admins
+    instance_admins = InstanceAdmin.objects.filter(is_verified=False).select_related(
+        "user"
+    )
+    updated_instance_admin = []
+
+    # Verify the instance admin
+    for instance_admin in instance_admins:
+        instance_admin.is_verified = True
+        # Create the admin
+        response = requests.post(
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/users/register/",
+            headers=headers,
+            data=json.dumps(
+                {
+                    "email": str(instance_admin.user.email),
+                    "signup_mode": "EMAIL",
+                    "is_admin": True,
+                }
+            ),
+            timeout=30,
+        )
+        updated_instance_admin.append(instance_admin)
+
+    # update all the instance admins
+    InstanceAdmin.objects.bulk_update(
+        updated_instance_admin, ["is_verified"], batch_size=10
+    )
+    return
+
+def instance_user_count(instance):
+    try:
+        instance_users = User.objects.filter(is_bot=False).count()
+
+        # Update the count in the license engine
+        payload = {
+            "user_count": instance_users,
+        }
+
+        # Save the user in control center
+        headers = {
+            "Content-Type": "application/json",
+            "x-instance-id": instance.instance_id,
+            "x-api-key": instance.api_key,
+        }
+
+        # Update the license engine
+        _ = requests.post(
+            f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+            headers=headers,
+            data=json.dumps(payload),
+            timeout=30,
+        )
+        return
+    except requests.RequestException:
+        return
+
+
+@shared_task
+def instance_verification_task():
+    try:
+        # Get the first instance
+        instance = Instance.objects.first()
+
+        # Only register instance if it is not verified
+        if not instance.is_verified:
+            instance_verification(instance=instance)
+
+        # Admin verifications
+        admin_verification(instance=instance)
+
+        # Update user count
+        instance_user_count(instance=instance)
+
+        return
+    except requests.RequestException:
+        return
@@ -30,11 +30,13 @@ class Command(BaseCommand):
                # Load JSON content from the file
                data = json.load(file)

-            machine_signature = options.get("machine_signature", "machine-signature")
+            machine_signature = options.get("machine_signature", False)

            if not machine_signature:
                raise CommandError("Machine signature is required")

+            # Check if machine is online
+            headers = {"Content-Type": "application/json"}
            payload = {
                "instance_key": settings.INSTANCE_KEY,
                "version": data.get("version", 0.1),
@@ -42,21 +44,51 @@ class Command(BaseCommand):
                "user_count": User.objects.filter(is_bot=False).count(),
            }

-            instance = Instance.objects.create(
-                instance_name="Plane Free",
-                instance_id=secrets.token_hex(12),
-                license_key=None,
-                api_key=secrets.token_hex(8),
-                version=payload.get("version"),
-                last_checked_at=timezone.now(),
-                user_count=payload.get("user_count", 0),
-            )
-
-            self.stdout.write(
-                self.style.SUCCESS(
-                    f"Instance registered"
+            try:
+                response = requests.post(
+                    f"{settings.LICENSE_ENGINE_BASE_URL}/api/instances/",
+                    headers=headers,
+                    data=json.dumps(payload),
+                    timeout=30
                )
-            )        
+
+                if response.status_code == 201:
+                    data = response.json()
+                    # Create instance
+                    instance = Instance.objects.create(
+                        instance_name="Plane Free",
+                        instance_id=data.get("id"),
+                        license_key=data.get("license_key"),
+                        api_key=data.get("api_key"),
+                        version=data.get("version"),
+                        last_checked_at=timezone.now(),
+                        user_count=data.get("user_count", 0),
+                        is_verified=True,
+                    )
+
+                    self.stdout.write(
+                        self.style.SUCCESS(
+                            f"Instance successfully registered and verified"
+                        )
+                    )
+                    return
+            except requests.RequestException as _e:
+                instance = Instance.objects.create(
+                    instance_name="Plane Free",
+                    instance_id=secrets.token_hex(12),
+                    license_key=None,
+                    api_key=secrets.token_hex(8),
+                    version=payload.get("version"),
+                    last_checked_at=timezone.now(),
+                    user_count=payload.get("user_count", 0),
+                )
+                self.stdout.write(
+                    self.style.SUCCESS(
+                        f"Instance successfully registered"
+                    )
+                )
+                return
+            raise CommandError("Instance could not be registered")
        else:
            self.stdout.write(
                self.style.SUCCESS(
@@ -9,20 +9,14 @@ def derive_key(secret_key):
    dk = hashlib.pbkdf2_hmac('sha256', secret_key.encode(), b'salt', 100000)
    return base64.urlsafe_b64encode(dk)

-# Encrypt data
-def encrypt_data(data):
-    if data:
-        cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
-        encrypted_data = cipher_suite.encrypt(data.encode())
-        return encrypted_data.decode()  # Convert bytes to string
-    else:
-        return ""

-# Decrypt data 
+def encrypt_data(data):
+    cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
+    encrypted_data = cipher_suite.encrypt(data.encode())
+    return encrypted_data.decode()  # Convert bytes to string
+
+
 def decrypt_data(encrypted_data):
-    if encrypted_data:
-        cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
-        decrypted_data = cipher_suite.decrypt(encrypted_data.encode())  # Convert string back to bytes
-        return decrypted_data.decode()
-    else:
-        return ""
+    cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
+    decrypted_data = cipher_suite.decrypt(encrypted_data.encode())  # Convert string back to bytes
+    return decrypted_data.decode()
@@ -1,71 +1,63 @@
-# Python imports
 import os

-# Django imports
-from django.conf import settings
-
-# Module imports
-from plane.license.models import InstanceConfiguration
-from plane.license.utils.encryption import decrypt_data
-

 # Helper function to return value from the passed key
-def get_configuration_value(keys):
-    environment_list = []
-    if settings.SKIP_ENV_VAR:
-        # Get the configurations
-        instance_configuration = InstanceConfiguration.objects.values(
-            "key", "value", "is_encrypted"
-        )
-
-        for key in keys:
-            for item in instance_configuration:
-                if key.get("key") == item.get("key"):
-                    if item.get("is_encrypted", False):
-                        environment_list.append(decrypt_data(item.get("value")))
-                    else:
-                        environment_list.append(item.get("value"))
-
-                    break
-            else:
-                environment_list.append(key.get("default"))
-    else:
-        # Get the configuration from os
-        for key in keys:
-            environment_list.append(os.environ.get(key.get("key"), key.get("default")))
-
-    return tuple(environment_list)
+def get_configuration_value(query, key, default=None):
+    for item in query:
+        if item["key"] == key:
+            return item.get("value", default)
+    return default


-def get_email_configuration():
-    return (
-        get_configuration_value(
-            [
-                {
-                    "key": "EMAIL_HOST",
-                    "default": os.environ.get("EMAIL_HOST"),
-                },
-                {
-                    "key": "EMAIL_HOST_USER",
-                    "default": os.environ.get("EMAIL_HOST_USER"),
-                },
-                {
-                    "key": "EMAIL_HOST_PASSWORD",
-                    "default": os.environ.get("EMAIL_HOST_PASSWORD"),
-                },
-                {
-                    "key": "EMAIL_PORT",
-                    "default": os.environ.get("EMAIL_PORT", 587),
-                },
-                {
-                    "key": "EMAIL_USE_TLS",
-                    "default": os.environ.get("EMAIL_USE_TLS", "1"),
-                },
-                {
-                    "key": "EMAIL_FROM",
-                    "default": os.environ.get("EMAIL_FROM", "Team Plane <team@mailer.plane.so>"),
-                },
-            ]
-        )
+def get_email_configuration(instance_configuration):
+    # Get the configuration variables
+    EMAIL_HOST_USER = get_configuration_value(
+        instance_configuration,
+        "EMAIL_HOST_USER",
+        os.environ.get("EMAIL_HOST_USER", None),
    )

+    EMAIL_HOST_PASSWORD = get_configuration_value(
+        instance_configuration,
+        "EMAIL_HOST_PASSWORD",
+        os.environ.get("EMAIL_HOST_PASSWORD", None),
+    )
+
+    EMAIL_HOST = get_configuration_value(
+        instance_configuration,
+        "EMAIL_HOST",
+        os.environ.get("EMAIL_HOST", None),
+    )
+
+    EMAIL_FROM = get_configuration_value(
+        instance_configuration,
+        "EMAIL_FROM",
+        os.environ.get("EMAIL_FROM", None),
+    )
+
+    EMAIL_USE_TLS = get_configuration_value(
+        instance_configuration,
+        "EMAIL_USE_TLS",
+        os.environ.get("EMAIL_USE_TLS", "1"),
+    )
+
+    EMAIL_PORT = get_configuration_value(
+        instance_configuration,
+        "EMAIL_PORT",
+        587,
+    )
+
+    EMAIL_FROM = get_configuration_value(
+        instance_configuration,
+        "EMAIL_FROM",
+        os.environ.get("EMAIL_FROM", "Team Plane <team@mailer.plane.so>"),
+    )
+
+    return (
+        EMAIL_HOST,
+        EMAIL_HOST_USER,
+        EMAIL_HOST_PASSWORD,
+        EMAIL_PORT,
+        EMAIL_USE_TLS,
+        EMAIL_FROM,
+    )
@@ -5,7 +5,6 @@ import ssl
 import certifi
 from datetime import timedelta
 from urllib.parse import urlparse
-from kombu import Exchange, Queue

 # Django imports
 from django.core.management.utils import get_random_secret_key
@@ -149,9 +148,6 @@ else:
 REDIS_URL = os.environ.get("REDIS_URL")
 REDIS_SSL = REDIS_URL and "rediss" in REDIS_URL

-# RabbitMq Config
-RABBITMQ_URL = os.environ.get("RABBITMQ_URL")
-
 if REDIS_SSL:
    CACHES = {
        "default": {
@@ -274,40 +270,29 @@ SIMPLE_JWT = {
 # Celery Configuration
 CELERY_TIMEZONE = TIME_ZONE
 CELERY_TASK_SERIALIZER = "json"
-CELERY_ACCEPT_CONTENT = ["json"]
+CELERY_ACCEPT_CONTENT = ["application/json"]

-CELERY_BROKER_URL = RABBITMQ_URL
-CELERY_RESULT_BACKEND = REDIS_URL
-
-CELERY_QUEUES = (
-    Queue(
-        "internal_tasks",
-        Exchange("internal_exchange", type="direct"),
-        routing_key="internal",
-    ),
-    Queue(
-        "external_tasks",
-        Exchange("external_exchange", type="direct"),
-        routing_key="external",
-    ),
-    Queue(
-        "segway_tasks",
-        Exchange("segway_exchange", type="direct"),
-        routing_key="segway",
-    ),
-)
+if REDIS_SSL:
+    redis_url = os.environ.get("REDIS_URL")
+    broker_url = (
+        f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
+    )
+    CELERY_BROKER_URL = broker_url
+    CELERY_RESULT_BACKEND = broker_url
+else:
+    CELERY_BROKER_URL = REDIS_URL
+    CELERY_RESULT_BACKEND = REDIS_URL

 CELERY_IMPORTS = (
    "plane.bgtasks.issue_automation_task",
    "plane.bgtasks.exporter_expired_task",
    "plane.bgtasks.file_asset_task",
+    "plane.license.bgtasks.instance_verification_task",
 )

 # Sentry Settings
 # Enable Sentry Settings
-if bool(os.environ.get("SENTRY_DSN", False)) and os.environ.get(
-    "SENTRY_DSN"
-).startswith("https://"):
+if bool(os.environ.get("SENTRY_DSN", False)) and os.environ.get("SENTRY_DSN").startswith("https://"):
    sentry_sdk.init(
        dsn=os.environ.get("SENTRY_DSN", ""),
        integrations=[
@@ -343,11 +328,12 @@ USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
 POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False)
 POSTHOG_HOST = os.environ.get("POSTHOG_HOST", False)

-# Skip environment variable configuration
-SKIP_ENV_VAR = os.environ.get("SKIP_ENV_VAR", "1") == "1"
+# License engine base url
+LICENSE_ENGINE_BASE_URL = os.environ.get(
+    "LICENSE_ENGINE_BASE_URL", "https://control-center.plane.so"
+)

-DATA_UPLOAD_MAX_MEMORY_SIZE = int(os.environ.get("FILE_SIZE_LIMIT", 5242880))
-
-# Segway
-SEGWAY_BASE_URL = os.environ.get("SEGWAY_BASE_URL", "http://localhost:9000")
-SEGWAY_KEY = os.environ.get("SEGWAY_KEY", False)
+# instance key
+INSTANCE_KEY = os.environ.get(
+    "INSTANCE_KEY", "ae6517d563dfc13d8270bd45cf17b08f70b37d989128a9dab46ff687603333c3"
+)
@@ -19,11 +19,8 @@ urlpatterns = [


 if settings.DEBUG:
-    try:
-        import debug_toolbar
+    import debug_toolbar

-        urlpatterns = [
-            re_path(r"^__debug__/", include(debug_toolbar.urls)),
-        ] + urlpatterns
-    except ImportError:
-        pass
+    urlpatterns = [
+        re_path(r"^__debug__/", include(debug_toolbar.urls)),
+    ] + urlpatterns
@@ -30,7 +30,7 @@ openpyxl==3.1.2
 beautifulsoup4==4.12.2
 dj-database-url==2.1.0
 posthog==3.0.2
-cryptography==41.0.6
+cryptography==41.0.5
 lxml==4.9.3
 boto3==1.28.40

@@ -1,8 +1,8 @@
-## Coolify Setup
+## Coolify Setup 

 Access the `coolify-docker-compose` file [here](https://raw.githubusercontent.com/makeplane/plane/master/deploy/coolify/coolify-docker-compose.yml) or download using using below command

 ```
 curl -fsSL https://raw.githubusercontent.com/makeplane/plane/master/deploy/coolify/coolify-docker-compose.yml

-```
+```
@@ -7,6 +7,7 @@ services:
    restart: always
    command: /usr/local/bin/start.sh web/server.js web
    environment:
+      - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
      - NEXT_PUBLIC_DEPLOY_URL=$SERVICE_FQDN_SPACE_8082
    depends_on:
      - api
@@ -20,6 +21,7 @@ services:
    command: /usr/local/bin/start.sh space/server.js space
    environment:
      - SERVICE_FQDN_SPACE_8082=/api
+      - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
    depends_on:
      - api
      - worker
@@ -1,5 +1,8 @@
+
 # Helm Chart

-Click on the below link to access the helm chart instructions.
+Click on the below link to access the helm chart instructions. 

 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/makeplane)](https://artifacthub.io/packages/search?repo=makeplane)
+
+
@@ -1,20 +1,18 @@
-# Self Hosting
+# Self Hosting 

-In this guide, we will walk you through the process of setting up a self-hosted environment. Self-hosting allows you to have full control over your applications and data. It's a great way to ensure privacy, control, and customization.
+In this guide, we will walk you through the process of setting up a self-hosted environment. Self-hosting allows you to have full control over your applications and data. It's a great way to ensure privacy, control, and customization. 

-We will cover two main options for setting up your self-hosted environment: using a cloud server or using your desktop. For the cloud server, we will use an AWS EC2 instance. For the desktop, we will use Docker to create a local environment.
+We will cover two main options for setting up your self-hosted environment: using a cloud server or using your desktop. For the cloud server, we will use an AWS EC2 instance. For the desktop, we will use Docker to create a local environment. 

 Let's get started!

-## Setting up Docker Environment
-
+## Setting up Docker Environment 
 <details>
  <summary>Option 1 - Using Cloud Server</summary>
  <p>Best way to start is to create EC2 maching on AWS. It must of minimum t3.medium/t3a/medium</p>
  <p>Run the below command to install docker engine.</p>

-`curl -fsSL https://get.docker.com -o install-docker.sh`
-
+   ```curl -fsSL https://get.docker.com -o install-docker.sh```
 </details>

 ---
@@ -22,34 +20,30 @@ Let's get started!
 <details>
  <summary>Option 2 - Using Desktop</summary>

-#### For Mac
-
+  #### For Mac
  <ol>
    <li> Download Docker Desktop for Mac from the <a href="https://hub.docker.com/editions/community/docker-ce-desktop-mac/" target="_blank">Docker Hub</a>. </li>
    <li> Double-click the downloaded `.dmg` file and drag the Docker app icon to the Applications folder. </li>
    <li>Open Docker Desktop from the Applications folder. You might be asked to provide your system password to install additional software.</li>
  </ol>

-#### For Windows:
-
+  #### For Windows:
  <ol>
    <li>Download Docker Desktop for Windows from the <a href="https://hub.docker.com/editions/community/docker-ce-desktop-windows/" target="_blank">Docker Hub</a>.</li>
    <li>Run the installer and follow the instructions. You might be asked to enable Hyper-V and "Containers" Windows features.</li>
    <li>Open Docker Desktop. You might be asked to log out and log back in, or restart your machine, for changes to take effect.</li>
  </ol>

-After installation, you can verify the installation by opening a terminal (Command Prompt on Windows, Terminal app on Mac) and running the command `docker --version`. This should display the installed version of Docker.
-
+  After installation, you can verify the installation by opening a terminal (Command Prompt on Windows, Terminal app on Mac) and running the command `docker --version`. This should display the installed version of Docker.
 </details>

 ---

 ## Installing Plane

-Installing plane is a very easy and minimal step process.
-
-### Prerequisite
+Installing plane is a very easy and minimal step process. 

+### Prerequisite 
 - Docker installed and running
 - OS with bash scripting enabled (Ubuntu, Linux AMI, macos). Windows systems need to have [gitbash](https://git-scm.com/download/win)
 - User context used must have access to docker services. In most cases, use sudo su to switch as root user
@@ -88,11 +82,11 @@ chmod +x setup.sh

 ### Proceed with setup

-Above steps will set you ready to install and start plane services.
+Above steps will set you ready to install and start plane services. 

-Lets get started by running the `./setup.sh` command.
+Lets get started by running the `./setup.sh` command. 

-This will prompt you with the below options.
+This will prompt you with the below options. 

 ```
 Select a Action you want to perform:
@@ -106,27 +100,26 @@ Select a Action you want to perform:
 Action [2]: 1
 ```

-For the 1st time setup, type "1" as action input.
+For the 1st time setup, type "1" as action input. 

 This will create a create a folder `plane-app` or `plane-app-preview` (in case of preview deployment) and will download 2 files inside that
-
 - `docker-compose.yaml`
 - `.env`

-Again the `options [1-6]` will be popped up and this time hit `6` to exit.
+Again the `options [1-6]` will be popped up and this time hit `6` to exit. 

 ---

 ### Continue with setup - Environment Settings

-Before proceeding, we suggest used to review `.env` file and set the values.
-Below are the most import keys you must refer to. _<span style="color: #fcba03">You can use any text editor to edit this file</span>_.
+Before proceeding, we suggest used to review `.env` file and set the values. 
+Below are the most import keys you must refer to. *<span style="color: #fcba03">You can use any text editor to edit this file</span>*.

 > `NGINX_PORT` - This is default set to `80`. Make sure the port you choose to use is not preoccupied. (e.g `NGINX_PORT=8080`)

-> `WEB_URL` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
+> `WEB_URL` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`) 

-> `CORS_ALLOWED_ORIGINS` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
+> `CORS_ALLOWED_ORIGINS` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080`  or `http://[IP-ADDRESS]:8080`)

 There are many other settings you can play with, but we suggest you configure `EMAIL SETTINGS` as it will enable you to invite your teammates onto the platform.

@@ -155,15 +148,15 @@ Be patient as it might take sometime based on download speed and system configur

 ![Downloading completed](images/started.png)

-This is the confirmation that all images were downloaded and the services are up & running.
+This is the confirmation that all images were downloaded and the services are up & running. 

-You have successfully self hosted `Plane` instance. Access the application by going to IP or domain you have configured it (e.g `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
+You have successfully self hosted `Plane` instance. Access the application by going to IP or domain you have configured it (e.g `https://plane.example.com:8080`  or `http://[IP-ADDRESS]:8080`)

 ---

 ### Stopping the Server

-In case you want to make changes to `.env` variables, we suggest you to stop the services before doing that.
+In case you want to make changes to `.env` variables, we suggest you to stop the services before doing that. 

 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `3` to stop the sevices

@@ -187,7 +180,7 @@ If all goes well, you must see something like this

 ### Restarting the Server

-In case you want to make changes to `.env` variables, without stopping the server or you noticed some abnormalies in services, you can restart the services with RESTART option.
+In case you want to make changes to `.env` variables, without stopping the server or you noticed some abnormalies in services, you can restart the services with RESTART option. 

 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `4` to restart the sevices

@@ -213,7 +206,7 @@ If all goes well, you must see something like this

 It is always advised to keep Plane up to date with the latest release.

-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `5` to upgrade the release.
+Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `5` to upgrade the release. 

 ```
 Select a Action you want to perform:
@@ -227,7 +220,7 @@ Select a Action you want to perform:
 Action [2]: 5
 ```

-By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `variables-upgrade.env`. Here system will not replace `.env` with the new one.
+By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `variables-upgrade.env`. Here system will not replace `.env` with the new one. 

 You must expect the below message

@@ -235,17 +228,18 @@ You must expect the below message

 Once done, choose `6` to exit from prompt.

-> It is very important for you to compare the 2 files `variables-upgrade.env` and `.env`. Copy the newly added variable from downloaded file to `.env` and set the expected values.
+> It is very important for you to compare the 2 files `variables-upgrade.env` and `.env`. Copy the newly added variable from downloaded file to `.env` and set the expected values.   

 Once done with making changes in `.env` file, jump on to `Start Server`

+
 ## Upgrading from v0.13.2 to v0.14.x

 This is one time activity for users who are upgrading from v0.13.2 to v0.14.0

 As there has been significant changes to Self Hosting process, this step mainly covers the data migration from current (v0.13.2) docker volumes from newly created volumes

-> Before we begin with migration, make sure your v0.14.0 was started and then stopped. This is required to know the newly created docker volume names.
+> Before we begin with migration, make sure your v0.14.0 was started and then stopped. This is required to know the newly created docker volume names. 

 Begin with downloading the migration script using below command

@@ -262,15 +256,15 @@ Now run the `./migrate.sh` command and expect the instructions as below
 ```
 ******************************************************************

-This script is solely for the migration purpose only.
+This script is solely for the migration purpose only. 
 This is a 1 time migration of volume data from v0.13.2 => v0.14.x

-Assumption:
+Assumption: 
 1. Postgres data volume name ends with _pgdata
 2. Minio data volume name ends with _uploads
 3. Redis data volume name ends with _redisdata

-Any changes to this script can break the migration.
+Any changes to this script can break the migration. 

 Before you proceed, make sure you run the below command
 to know the docker volumes
@@ -281,12 +275,12 @@ docker volume ls -q | grep -i "_redisdata"

 *******************************************************

-Given below list of REDIS volumes, identify the prefix of source and destination volumes leaving "_redisdata"
+Given below list of REDIS volumes, identify the prefix of source and destination volumes leaving "_redisdata" 
 ---------------------
 plane-app_redisdata
 v0132_redisdata

-Provide the Source Volume Prefix :
+Provide the Source Volume Prefix : 
 ```

 **Open another terminal window**, and run the mentioned 3 command. This may be different for users who have changed the volume names in their previous setup (v0.13.2)
@@ -295,9 +289,9 @@ For every command you must see 2 records something like shown in above example o

 To move forward, you would need PREFIX of old setup and new setup. As per above example, `v0132` is the prefix of v0.13.2 and `plane-app` is the prefix of v0.14.0 setup

-**Back to original terminal window**, _Provide the Source Volume Prefix_ and hit ENTER.
+**Back to original terminal window**, *Provide the Source Volume Prefix* and hit ENTER.

-Now you will be prompted to _Provide Destination Volume Prefix_. Provide the value and hit ENTER
+Now you will be prompted to *Provide Destination Volume Prefix*. Provide the value and hit ENTER

 ```
 Provide the Source Volume Prefix : v0132
@@ -308,6 +302,8 @@ In case the suffixes are wrong or the mentioned volumes are not found, you will

 ![Migrate Error](images/migrate-error.png)

-In case of successful migration, it will be a silent exit without error.
+In case of successful migration, it will be a silent exit without error. 
+
+Now its time to restart v0.14.0 setup. 
+

-Now its time to restart v0.14.0 setup.
@@ -6,6 +6,7 @@ x-app-env : &app-env
    - WEB_URL=${WEB_URL:-http://localhost}
    - DEBUG=${DEBUG:-0}
    - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.production} # deprecated
+    - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0} # deprecated
    - NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL:-http://localhost/spaces} # deprecated
    - SENTRY_DSN=${SENTRY_DSN:-""}
    - SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-"production"}
@@ -40,7 +41,7 @@ x-app-env : &app-env
    - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
    # OPENAI SETTINGS - Deprecated can be configured through admin panel
    - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
-    - OPENAI_API_KEY=${OPENAI_API_KEY:-""}
+    - OPENAI_API_KEY=${OPENAI_API_KEY:-"sk-"}
    - GPT_ENGINE=${GPT_ENGINE:-"gpt-3.5-turbo"}
    # LOGIN/SIGNUP SETTINGS - Deprecated can be configured through admin panel
    - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
@@ -66,7 +67,7 @@ services:
  web:
    <<: *app-env
    platform: linux/amd64
-    image: makeplane/plane-frontend:${APP_RELEASE:-latest}
+    image: makeplane/plane-frontend-ce:${APP_RELEASE:-latest}
    restart: unless-stopped
    command: /usr/local/bin/start.sh web/server.js web
    deploy:
@@ -78,7 +79,7 @@ services:
  space:
    <<: *app-env
    platform: linux/amd64
-    image: makeplane/plane-space:${APP_RELEASE:-latest}
+    image: makeplane/plane-space-ce:${APP_RELEASE:-latest}
    restart: unless-stopped
    command: /usr/local/bin/start.sh space/server.js space
    deploy:
@@ -91,7 +92,7 @@ services:
  api:
    <<: *app-env
    platform: linux/amd64
-    image: makeplane/plane-backend:${APP_RELEASE:-latest}
+    image: makeplane/plane-backend-ce:${APP_RELEASE:-latest}
    restart: unless-stopped
    command: ./bin/takeoff
    deploy:
@@ -103,7 +104,7 @@ services:
  worker:
    <<: *app-env
    platform: linux/amd64
-    image: makeplane/plane-backend:${APP_RELEASE:-latest}
+    image: makeplane/plane-backend-ce:${APP_RELEASE:-latest}
    restart: unless-stopped
    command: ./bin/worker
    depends_on:
@@ -114,7 +115,7 @@ services:
  beat-worker:
    <<: *app-env
    platform: linux/amd64
-    image: makeplane/plane-backend:${APP_RELEASE:-latest}
+    image: makeplane/plane-backend-ce:${APP_RELEASE:-latest}
    restart: unless-stopped
    command: ./bin/beat
    depends_on:
@@ -149,7 +150,7 @@ services:
  proxy:
    <<: *app-env
    platform: linux/amd64
-    image: makeplane/plane-proxy:${APP_RELEASE:-latest}
+    image: makeplane/plane-proxy-ce:${APP_RELEASE:-latest}
    ports:
        - ${NGINX_PORT}:80
    depends_on:
@@ -39,7 +39,7 @@ function download(){
    echo ""
    echo "Latest version is now available for you to use"
    echo ""
-    echo "In case of Upgrade, your new setting file is available as 'variables-upgrade.env'. Please compare and set the required values in '.env 'file."
+    echo "In case of Upgrade, your new setting file is availabe as 'variables-upgrade.env'. Please compare and set the required values in '.env 'file."
    echo ""

 }
@@ -7,6 +7,7 @@ API_REPLICAS=1
 NGINX_PORT=80
 WEB_URL=http://localhost
 DEBUG=0
+NEXT_PUBLIC_ENABLE_OAUTH=0
 NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
 SENTRY_DSN=""
 SENTRY_ENVIRONMENT="production"
@@ -12,6 +12,7 @@ volumes:

 services:
  plane-redis:
+    container_name: plane-redis
    image: redis:6.2.7-alpine
    restart: unless-stopped
    networks:
@@ -20,6 +21,7 @@ services:
      - redisdata:/data
 
  plane-minio:
+    container_name: plane-minio
    image: minio/minio
    restart: unless-stopped
    networks:
@@ -34,6 +36,7 @@ services:
      MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
 
  plane-db:
+    container_name: plane-db
    image: postgres:15.2-alpine
    restart: unless-stopped
    networks:
@@ -50,6 +53,7 @@ services:
      PGDATA: /var/lib/postgresql/data

  web:
+    container_name: web
    build:
      context: .
      dockerfile: ./web/Dockerfile.dev
@@ -57,7 +61,8 @@ services:
    networks:
      - dev_env
    volumes:
-      - ./web:/app/web
+      - .:/app
+    command: yarn dev --filter=web
    env_file:
      - ./web/.env
    depends_on:
@@ -68,17 +73,22 @@ services:
    build:
      context: .
      dockerfile: ./space/Dockerfile.dev
+    container_name: space
    restart: unless-stopped
    networks:
      - dev_env
    volumes:
-      - ./space:/app/space
+      - .:/app
+    command: yarn dev --filter=space
+    env_file:
+      - ./space/.env
    depends_on:
      - api
      - worker
      - web

  api:
+    container_name: api
    build:
      context: ./apiserver
      dockerfile: Dockerfile.dev
@@ -89,7 +99,7 @@ services:
      - dev_env
    volumes:
      - ./apiserver:/code
-    # command: /bin/sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local"
+    command: /bin/sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local"
    env_file:
      - ./apiserver/.env
    depends_on:
@@ -97,6 +107,7 @@ services:
      - plane-redis
  
  worker:
+    container_name: bgworker
    build:
      context: ./apiserver
      dockerfile: Dockerfile.dev
@@ -116,6 +127,7 @@ services:
      - plane-redis

  beat-worker:
+    container_name: beatworker
    build:
      context: ./apiserver
      dockerfile: Dockerfile.dev
@@ -135,9 +147,10 @@ services:
      - plane-redis

  proxy:
+    container_name: proxy
    build:
      context: ./nginx
-      dockerfile: Dockerfile.dev
+      dockerfile: Dockerfile
    restart: unless-stopped
    networks:
      - dev_env
@@ -1,10 +0,0 @@
-FROM nginx:1.25.0-alpine
-
-RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx.conf.dev /etc/nginx/nginx.conf.template
-
-COPY ./env.sh /docker-entrypoint.sh
-
-RUN chmod +x /docker-entrypoint.sh
-# Update all environment variables
-CMD ["/docker-entrypoint.sh"]
@@ -18,7 +18,7 @@ server {
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
    }
-    location /spaces/ {
+    location /space/ {
        proxy_pass http://localhost:4000/;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
@@ -1,36 +0,0 @@
-events {
-}
-
-http {
-    sendfile on;
-
-    server {
-        listen 80;
-        root /www/data/;
-        access_log /var/log/nginx/access.log;
-
-        client_max_body_size ${FILE_SIZE_LIMIT};
-
-        add_header X-Content-Type-Options    "nosniff" always;
-        add_header Referrer-Policy           "no-referrer-when-downgrade" always;
-        add_header Permissions-Policy        "interest-cohort=()" always;
-        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-
-        location / {
-            proxy_pass http://web:3000/;
-        }
-
-        location /api/ {
-            proxy_pass http://api:8000/api/;
-        }
-
-        location /spaces/ {
-            rewrite ^/spaces/?$ /spaces/login break;
-            proxy_pass http://space:4000/spaces/;
-        }
-
-        location /${BUCKET_NAME}/ {
-            proxy_pass http://plane-minio:9000/uploads/;
-        }
-    }
-}
@@ -1,6 +1,6 @@
 {
  "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.14.0",
+  "version": "0.13.2",
  "license": "AGPL-3.0",
  "private": true,
  "workspaces": [
@@ -27,7 +27,7 @@
    "prettier": "latest",
    "prettier-plugin-tailwindcss": "^0.5.4",
    "tailwindcss": "^3.3.3",
-    "turbo": "^1.11.1"
+    "turbo": "^1.10.16"
  },
  "resolutions": {
    "@types/react": "18.2.42"
@@ -1,4 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ["custom"],
-};
@@ -1,6 +0,0 @@
-.next
-.vercel
-.tubro
-out/
-dis/
-build/
@@ -1,5 +0,0 @@
-{
-  "printWidth": 120,
-  "tabWidth": 2,
-  "trailingComma": "es5"
-}
@@ -1,6 +1,6 @@
 {
  "name": "@plane/editor-core",
-  "version": "0.14.0",
+  "version": "0.0.1",
  "description": "Core Editor that powers Plane",
  "private": true,
  "main": "./dist/index.mjs",
@@ -17,7 +17,7 @@
    }
  },
  "scripts": {
-    "build": "tsup --minify",
+    "build": "tsup",
    "dev": "tsup --watch",
    "check-types": "tsc --noEmit",
    "format": "prettier --write \"**/*.{ts,tsx,md}\""
@@ -28,28 +28,34 @@
    "react-dom": "18.2.0"
  },
  "dependencies": {
-    "@tiptap/core": "^2.1.13",
+    "@plane/editor-types": "*",
+    "@tiptap/core": "^2.1.7",
    "@tiptap/extension-blockquote": "^2.1.13",
-    "@tiptap/extension-code-block-lowlight": "^2.1.13",
-    "@tiptap/extension-color": "^2.1.13",
-    "@tiptap/extension-image": "^2.1.13",
-    "@tiptap/extension-link": "^2.1.13",
-    "@tiptap/extension-list-item": "^2.1.13",
-    "@tiptap/extension-mention": "^2.1.13",
-    "@tiptap/extension-task-item": "^2.1.13",
-    "@tiptap/extension-task-list": "^2.1.13",
-    "@tiptap/extension-text-style": "^2.1.13",
-    "@tiptap/extension-underline": "^2.1.13",
-    "@tiptap/pm": "^2.1.13",
-    "@tiptap/react": "^2.1.13",
-    "@tiptap/starter-kit": "^2.1.13",
-    "@tiptap/suggestion": "^2.0.13",
+    "@tiptap/extension-code-block-lowlight": "^2.1.12",
+    "@tiptap/extension-color": "^2.1.11",
+    "@tiptap/extension-image": "^2.1.7",
+    "@tiptap/extension-link": "^2.1.7",
+    "@tiptap/extension-list-item": "^2.1.12",
+    "@tiptap/extension-mention": "^2.1.12",
+    "@tiptap/extension-table": "^2.1.6",
+    "@tiptap/extension-table-cell": "^2.1.6",
+    "@tiptap/extension-table-header": "^2.1.6",
+    "@tiptap/extension-table-row": "^2.1.6",
+    "@tiptap/extension-task-item": "^2.1.7",
+    "@tiptap/extension-task-list": "^2.1.7",
+    "@tiptap/extension-text-style": "^2.1.11",
+    "@tiptap/extension-underline": "^2.1.7",
+    "@tiptap/pm": "^2.1.7",
+    "@tiptap/prosemirror-tables": "^1.1.4",
+    "@tiptap/react": "^2.1.7",
+    "@tiptap/starter-kit": "^2.1.10",
+    "@tiptap/suggestion": "^2.0.4",
    "class-variance-authority": "^0.7.0",
    "clsx": "^1.2.1",
    "highlight.js": "^11.8.0",
    "jsx-dom-cjs": "^8.0.3",
    "lowlight": "^3.0.0",
-    "lucide-react": "^0.294.0",
+    "lucide-react": "^0.244.0",
    "react-moveable": "^0.54.2",
    "tailwind-merge": "^1.14.0",
    "tippy.js": "^6.3.7",
@@ -1,32 +1,23 @@
 // styles
 // import "./styles/tailwind.css";
-import "src/styles/editor.css";
-import "src/styles/table.css";
-import "src/styles/github-dark.css";
+// import "./styles/editor.css";
+import "./styles/github-dark.css";

-export { isCellSelection } from "src/ui/extensions/table/table/utilities/is-cell-selection";
+export { isCellSelection } from "./ui/extensions/table/table/utilities/is-cell-selection";

 // utils
-export * from "src/lib/utils";
-export * from "src/ui/extensions/table/table";
-export { startImageUpload } from "src/ui/plugins/upload-image";
+export * from "./lib/utils";
+export * from "./ui/extensions/table/table";
+export { startImageUpload } from "./ui/plugins/upload-image";

 // components
-export { EditorContainer } from "src/ui/components/editor-container";
-export { EditorContentWrapper } from "src/ui/components/editor-content";
+export { EditorContainer } from "./ui/components/editor-container";
+export { EditorContentWrapper } from "./ui/components/editor-content";

 // hooks
-export { useEditor } from "src/hooks/use-editor";
-export { useReadOnlyEditor } from "src/hooks/use-read-only-editor";
+export { useEditor } from "./ui/hooks/use-editor";
+export { useReadOnlyEditor } from "./ui/hooks/use-read-only-editor";

 // helper items
-export * from "src/ui/menus/menu-items";
-export * from "src/lib/editor-commands";
-
-// types
-export type { DeleteImage } from "src/types/delete-image";
-export type { UploadImage } from "src/types/upload-image";
-export type { RestoreImage } from "src/types/restore-image";
-export type { IMentionHighlight, IMentionSuggestion } from "src/types/mention-suggestion";
-export type { ISlashCommandItem, CommandProps } from "src/types/slash-commands-suggestion";
-export type { LucideIconType } from "src/types/lucide-icon";
+export * from "./ui/menus/menu-items";
+export * from "./lib/editor-commands";
@@ -1,20 +1,38 @@
+import { UploadImage } from "@plane/editor-types";
 import { Editor, Range } from "@tiptap/core";
-import { startImageUpload } from "src/ui/plugins/upload-image";
-import { findTableAncestor } from "src/lib/utils";
-import { UploadImage } from "src/types/upload-image";
+import { startImageUpload } from "../ui/plugins/upload-image";
+import { findTableAncestor } from "./utils";

 export const toggleHeadingOne = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 1 }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .setNode("heading", { level: 1 })
+      .run();
  else editor.chain().focus().toggleHeading({ level: 1 }).run();
 };

 export const toggleHeadingTwo = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 2 }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .setNode("heading", { level: 2 })
+      .run();
  else editor.chain().focus().toggleHeading({ level: 2 }).run();
 };

 export const toggleHeadingThree = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 3 }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .setNode("heading", { level: 3 })
+      .run();
  else editor.chain().focus().toggleHeading({ level: 3 }).run();
 };

@@ -39,7 +57,8 @@ export const toggleCodeBlock = (editor: Editor, range?: Range) => {
 };

 export const toggleOrderedList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleOrderedList().run();
+  if (range)
+    editor.chain().focus().deleteRange(range).toggleOrderedList().run();
  else editor.chain().focus().toggleOrderedList().run();
 };

@@ -59,8 +78,21 @@ export const toggleStrike = (editor: Editor, range?: Range) => {
 };

 export const toggleBlockquote = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleNode("paragraph", "paragraph").toggleBlockquote().run();
-  else editor.chain().focus().toggleNode("paragraph", "paragraph").toggleBlockquote().run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .toggleNode("paragraph", "paragraph")
+      .toggleBlockquote()
+      .run();
+  else
+    editor
+      .chain()
+      .focus()
+      .toggleNode("paragraph", "paragraph")
+      .toggleBlockquote()
+      .run();
 };

 export const insertTableCommand = (editor: Editor, range?: Range) => {
@@ -73,8 +105,19 @@ export const insertTableCommand = (editor: Editor, range?: Range) => {
      }
    }
  }
-  if (range) editor.chain().focus().deleteRange(range).insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run();
-  else editor.chain().focus().insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run();
+  if (range)
+    editor
+      .chain()
+      .focus()
+      .deleteRange(range)
+      .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
+      .run();
+  else
+    editor
+      .chain()
+      .focus()
+      .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
+      .run();
 };

 export const unsetLinkEditor = (editor: Editor) => {
@@ -88,8 +131,10 @@ export const setLinkEditor = (editor: Editor, url: string) => {
 export const insertImageCommand = (
  editor: Editor,
  uploadFile: UploadImage,
-  setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void,
-  range?: Range
+  setIsSubmitting?: (
+    isSubmitting: "submitting" | "submitted" | "saved",
+  ) => void,
+  range?: Range,
 ) => {
  if (range) editor.chain().focus().deleteRange(range).run();
  const input = document.createElement("input");
@@ -6,19 +6,25 @@ interface EditorClassNames {
  customClassName?: string;
 }

-export const getEditorClassNames = ({ noBorder, borderOnFocus, customClassName }: EditorClassNames) =>
+export const getEditorClassNames = ({
+  noBorder,
+  borderOnFocus,
+  customClassName,
+}: EditorClassNames) =>
  cn(
    "relative w-full max-w-full sm:rounded-lg mt-2 p-3 relative focus:outline-none rounded-md",
    noBorder ? "" : "border border-custom-border-200",
    borderOnFocus ? "focus:border border-custom-border-300" : "focus:border-0",
-    customClassName
+    customClassName,
  );

 export function cn(...inputs: ClassValue[]) {
  return twMerge(clsx(inputs));
 }

-export const findTableAncestor = (node: Node | null): HTMLTableElement | null => {
+export const findTableAncestor = (
+  node: Node | null,
+): HTMLTableElement | null => {
  while (node !== null && node.nodeName !== "TABLE") {
    node = node.parentNode;
  }
@@ -6,12 +6,6 @@
  height: 0;
 }

-/* block quotes */
-.ProseMirror blockquote p::before,
-.ProseMirror blockquote p::after {
-  display: none;
-}
-
 .ProseMirror .is-empty::before {
  content: attr(data-placeholder);
  float: left;
@@ -21,6 +15,7 @@
 }

 /* Custom image styles */
+
 .ProseMirror img {
  transition: filter 0.1s ease-in-out;

@@ -58,12 +53,11 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {
  background-color: rgb(var(--color-background-100));
  margin: 0;
  cursor: pointer;
-  width: 0.8rem;
-  height: 0.8rem;
+  width: 1.2rem;
+  height: 1.2rem;
  position: relative;
-  border: 1.5px solid rgb(var(--color-text-100));
-  margin-right: 0.2rem;
-  margin-top: 0.15rem;
+  border: 2px solid rgb(var(--color-text-100));
+  margin-right: 0.3rem;
  display: grid;
  place-content: center;

@@ -77,8 +71,8 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {

  &::before {
    content: "";
-    width: 0.5em;
-    height: 0.5em;
+    width: 0.65em;
+    height: 0.65em;
    transform: scale(0);
    transition: 120ms transform ease-in-out;
    box-shadow: inset 1em 1em;
@@ -235,34 +229,3 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
 .ProseMirror table * .is-empty::before {
  opacity: 0;
 }
-
-.ProseMirror pre {
-  background: rgba(var(--color-background-80));
-  border-radius: 0.5rem;
-  color: rgba(var(--color-text-100));
-  font-family: "JetBrainsMono", monospace;
-  padding: 0.75rem 1rem;
-}
-
-.ProseMirror pre code {
-  background: none;
-  color: inherit;
-  font-size: 0.8rem;
-  padding: 0;
-}
-
-div[data-type="horizontalRule"] {
-  line-height: 0;
-  padding: 0.25rem 0;
-  margin-top: 0;
-  margin-bottom: 0;
-
-  & > div {
-    border-bottom: 1px solid rgb(var(--color-text-100));
-  }
-}
-
-/* image resizer */
-.moveable-control-box {
-  z-index: 10 !important;
-}
@@ -1,3 +0,0 @@
-import { Smile } from "lucide-react";
-
-export type LucideIconType = typeof Smile;
@@ -7,7 +7,11 @@ interface EditorContainerProps {
  children: ReactNode;
 }

-export const EditorContainer = ({ editor, editorClassNames, children }: EditorContainerProps) => (
+export const EditorContainer = ({
+  editor,
+  editorClassNames,
+  children,
+}: EditorContainerProps) => (
  <div
    id="editor-container"
    onClick={() => {
@@ -1,6 +1,6 @@
 import { Editor, EditorContent } from "@tiptap/react";
 import { ReactNode } from "react";
-import { ImageResizer } from "src/ui/extensions/image/image-resize";
+import { ImageResizer } from "../extensions/image/image-resize";

 interface EditorContentProps {
  editor: Editor | null;
@@ -8,10 +8,16 @@ interface EditorContentProps {
  children?: ReactNode;
 }

-export const EditorContentWrapper = ({ editor, editorContentCustomClassNames = "", children }: EditorContentProps) => (
+export const EditorContentWrapper = ({
+  editor,
+  editorContentCustomClassNames = "",
+  children,
+}: EditorContentProps) => (
  <div className={`contentEditor ${editorContentCustomClassNames}`}>
    <EditorContent editor={editor} />
-    {editor?.isActive("image") && editor?.isEditable && <ImageResizer editor={editor} />}
+    {editor?.isActive("image") && editor?.isEditable && (
+      <ImageResizer editor={editor} />
+    )}
    {children}
  </div>
 );
@@ -2,7 +2,10 @@ import { getNodeType } from "@tiptap/core";
 import { NodeType } from "@tiptap/pm/model";
 import { EditorState } from "@tiptap/pm/state";

-export const findListItemPos = (typeOrName: string | NodeType, state: EditorState) => {
+export const findListItemPos = (
+  typeOrName: string | NodeType,
+  state: EditorState,
+) => {
  const { $from } = state.selection;
  const nodeType = getNodeType(typeOrName, state.schema);

@@ -1,7 +1,7 @@
 import { getNodeAtPosition } from "@tiptap/core";
 import { EditorState } from "@tiptap/pm/state";

-import { findListItemPos } from "src/ui/extensions/custom-list-keymap/list-helpers/find-list-item-pos";
+import { findListItemPos } from "./find-list-item-pos";

 export const getNextListDepth = (typeOrName: string, state: EditorState) => {
  const listItemPos = findListItemPos(typeOrName, state);
@@ -10,7 +10,11 @@ export const getNextListDepth = (typeOrName: string, state: EditorState) => {
    return false;
  }

-  const [, depth] = getNodeAtPosition(state, typeOrName, listItemPos.$pos.pos + 4);
+  const [, depth] = getNodeAtPosition(
+    state,
+    typeOrName,
+    listItemPos.$pos.pos + 4,
+  );

  return depth;
 };
@@ -1,10 +1,14 @@
 import { Editor, isAtStartOfNode, isNodeActive } from "@tiptap/core";
 import { Node } from "@tiptap/pm/model";

-import { findListItemPos } from "src/ui/extensions/custom-list-keymap/list-helpers/find-list-item-pos";
-import { hasListBefore } from "src/ui/extensions/custom-list-keymap/list-helpers/has-list-before";
+import { findListItemPos } from "./find-list-item-pos";
+import { hasListBefore } from "./has-list-before";

-export const handleBackspace = (editor: Editor, name: string, parentListTypes: string[]) => {
+export const handleBackspace = (
+  editor: Editor,
+  name: string,
+  parentListTypes: string[],
+) => {
  // this is required to still handle the undo handling
  if (editor.commands.undoInputRule()) {
    return true;
@@ -19,7 +23,10 @@ export const handleBackspace = (editor: Editor, name: string, parentListTypes: s
  // if the current item is NOT inside a list item &
  // the previous item is a list (orderedList or bulletList)
  // move the cursor into the list and delete the current item
-  if (!isNodeActive(editor.state, name) && hasListBefore(editor.state, name, parentListTypes)) {
+  if (
+    !isNodeActive(editor.state, name) &&
+    hasListBefore(editor.state, name, parentListTypes)
+  ) {
    const { $anchor } = editor.state.selection;

    const $listPos = editor.state.doc.resolve($anchor.before() - 1);
@@ -38,11 +45,16 @@ export const handleBackspace = (editor: Editor, name: string, parentListTypes: s
      return false;
    }

-    const $lastItemPos = editor.state.doc.resolve($listPos.start() + lastItem.pos + 1);
+    const $lastItemPos = editor.state.doc.resolve(
+      $listPos.start() + lastItem.pos + 1,
+    );

    return editor
      .chain()
-      .cut({ from: $anchor.start() - 1, to: $anchor.end() + 1 }, $lastItemPos.end())
+      .cut(
+        { from: $anchor.start() - 1, to: $anchor.end() + 1 },
+        $lastItemPos.end(),
+      )
      .joinForward()
      .run();
  }
@@ -1,7 +1,7 @@
 import { Editor, isAtEndOfNode, isNodeActive } from "@tiptap/core";

-import { nextListIsDeeper } from "src/ui/extensions/custom-list-keymap/list-helpers/next-list-is-deeper";
-import { nextListIsHigher } from "src/ui/extensions/custom-list-keymap/list-helpers/next-list-is-higher";
+import { nextListIsDeeper } from "./next-list-is-deeper";
+import { nextListIsHigher } from "./next-list-is-higher";

 export const handleDelete = (editor: Editor, name: string) => {
  // if the cursor is not inside the current node type
@@ -1,6 +1,10 @@
 import { EditorState } from "@tiptap/pm/state";

-export const hasListBefore = (editorState: EditorState, name: string, parentListTypes: string[]) => {
+export const hasListBefore = (
+  editorState: EditorState,
+  name: string,
+  parentListTypes: string[],
+) => {
  const { $anchor } = editorState.selection;

  const previousNodePos = Math.max(0, $anchor.pos - 2);
@@ -1,6 +1,9 @@
 import { EditorState } from "@tiptap/pm/state";

-export const hasListItemAfter = (typeOrName: string, state: EditorState): boolean => {
+export const hasListItemAfter = (
+  typeOrName: string,
+  state: EditorState,
+): boolean => {
  const { $anchor } = state.selection;

  const $targetPos = state.doc.resolve($anchor.pos - $anchor.parentOffset - 2);
@@ -1,6 +1,9 @@
 import { EditorState } from "@tiptap/pm/state";

-export const hasListItemBefore = (typeOrName: string, state: EditorState): boolean => {
+export const hasListItemBefore = (
+  typeOrName: string,
+  state: EditorState,
+): boolean => {
  const { $anchor } = state.selection;

  const $targetPos = state.doc.resolve($anchor.pos - 2);
@@ -1,7 +1,7 @@
 import { EditorState } from "@tiptap/pm/state";

-import { findListItemPos } from "src/ui/extensions/custom-list-keymap/list-helpers/find-list-item-pos";
-import { getNextListDepth } from "src/ui/extensions/custom-list-keymap/list-helpers/get-next-list-depth";
+import { findListItemPos } from "./find-list-item-pos";
+import { getNextListDepth } from "./get-next-list-depth";

 export const nextListIsDeeper = (typeOrName: string, state: EditorState) => {
  const listDepth = getNextListDepth(typeOrName, state);
@@ -1,7 +1,7 @@
 import { EditorState } from "@tiptap/pm/state";

-import { findListItemPos } from "src/ui/extensions/custom-list-keymap/list-helpers/find-list-item-pos";
-import { getNextListDepth } from "src/ui/extensions/custom-list-keymap/list-helpers/get-next-list-depth";
+import { findListItemPos } from "./find-list-item-pos";
+import { getNextListDepth } from "./get-next-list-depth";

 export const nextListIsHigher = (typeOrName: string, state: EditorState) => {
  const listDepth = getNextListDepth(typeOrName, state);
@@ -1,6 +1,6 @@
 import { Extension } from "@tiptap/core";

-import { handleBackspace, handleDelete } from "src/ui/extensions/custom-list-keymap/list-helpers";
+import { handleBackspace, handleDelete } from "./list-helpers";

 export type ListKeymapOptions = {
  listTypes: Array<{
@@ -1,6 +1,12 @@
 import { TextSelection } from "prosemirror-state";

-import { InputRule, mergeAttributes, Node, nodeInputRule, wrappingInputRule } from "@tiptap/core";
+import {
+  InputRule,
+  mergeAttributes,
+  Node,
+  nodeInputRule,
+  wrappingInputRule,
+} from "@tiptap/core";

 /**
 * Extension based on:
@@ -22,7 +28,7 @@ declare module "@tiptap/core" {
  }
 }

-export const HorizontalRule = Node.create<HorizontalRuleOptions>({
+export default Node.create<HorizontalRuleOptions>({
  name: "horizontalRule",

  addOptions() {
@@ -77,7 +83,8 @@ export const HorizontalRule = Node.create<HorizontalRuleOptions>({
                    tr.setSelection(TextSelection.create(tr.doc, $to.pos));
                  } else {
                    // add node after horizontal rule if it’s the end of the document
-                    const node = $to.parent.type.contentMatch.defaultType?.create();
+                    const node =
+                      $to.parent.type.contentMatch.defaultType?.create();

                    if (node) {
                      tr.insert(posAfter, node);
@@ -4,7 +4,9 @@ import Moveable from "react-moveable";

 export const ImageResizer = ({ editor }: { editor: Editor }) => {
  const updateMediaSize = () => {
-    const imageInfo = document.querySelector(".ProseMirror-selectednode") as HTMLImageElement;
+    const imageInfo = document.querySelector(
+      ".ProseMirror-selectednode",
+    ) as HTMLImageElement;
    if (imageInfo) {
      const selection = editor.state.selection;
      editor.commands.setImage({
@@ -30,7 +32,9 @@ export const ImageResizer = ({ editor }: { editor: Editor }) => {
        resizable
        throttleResize={0}
        onResizeStart={() => {
-          const imageInfo = document.querySelector(".ProseMirror-selectednode") as HTMLImageElement;
+          const imageInfo = document.querySelector(
+            ".ProseMirror-selectednode",
+          ) as HTMLImageElement;
          if (imageInfo) {
            const originalWidth = Number(imageInfo.width);
            const originalHeight = Number(imageInfo.height);
@@ -1,10 +1,9 @@
 import { EditorState, Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 import { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { UploadImagesPlugin } from "src/ui/plugins/upload-image";
+import UploadImagesPlugin from "../../plugins/upload-image";
 import ImageExt from "@tiptap/extension-image";
-import { onNodeDeleted, onNodeRestored } from "src/ui/plugins/delete-image";
-import { DeleteImage } from "src/types/delete-image";
-import { RestoreImage } from "src/types/restore-image";
+import { onNodeDeleted, onNodeRestored } from "../../plugins/delete-image";
+import { DeleteImage, RestoreImage } from "@plane/editor-types";

 interface ImageNode extends ProseMirrorNode {
  attrs: {
@@ -16,14 +15,22 @@ interface ImageNode extends ProseMirrorNode {
 const deleteKey = new PluginKey("delete-image");
 const IMAGE_NODE_TYPE = "image";

-export const ImageExtension = (deleteImage: DeleteImage, restoreFile: RestoreImage, cancelUploadImage?: () => any) =>
+const ImageExtension = (
+  deleteImage: DeleteImage,
+  restoreFile: RestoreImage,
+  cancelUploadImage?: () => any,
+) =>
  ImageExt.extend({
    addProseMirrorPlugins() {
      return [
        UploadImagesPlugin(cancelUploadImage),
        new Plugin({
          key: deleteKey,
-          appendTransaction: (transactions: readonly Transaction[], oldState: EditorState, newState: EditorState) => {
+          appendTransaction: (
+            transactions: readonly Transaction[],
+            oldState: EditorState,
+            newState: EditorState,
+          ) => {
            const newImageSources = new Set<string>();
            newState.doc.descendants((node) => {
              if (node.type.name === IMAGE_NODE_TYPE) {
@@ -60,7 +67,11 @@ export const ImageExtension = (deleteImage: DeleteImage, restoreFile: RestoreIma
        }),
        new Plugin({
          key: new PluginKey("imageRestoration"),
-          appendTransaction: (transactions: readonly Transaction[], oldState: EditorState, newState: EditorState) => {
+          appendTransaction: (
+            transactions: readonly Transaction[],
+            oldState: EditorState,
+            newState: EditorState,
+          ) => {
            const oldImageSources = new Set<string>();
            oldState.doc.descendants((node) => {
              if (node.type.name === IMAGE_NODE_TYPE) {
@@ -131,3 +142,5 @@ export const ImageExtension = (deleteImage: DeleteImage, restoreFile: RestoreIma
      };
    },
  });
+
+export default ImageExtension;
@@ -1,6 +1,6 @@
 import Image from "@tiptap/extension-image";

-export const ReadOnlyImageExtension = Image.extend({
+const ReadOnlyImageExtension = Image.extend({
  addAttributes() {
    return {
      ...this.parent?.(),
@@ -13,3 +13,5 @@ export const ReadOnlyImageExtension = Image.extend({
    };
  },
 });
+
+export default ReadOnlyImageExtension;
--- a/Show More
+++ b/Show More