.github/workflows/build-bundle.yml

@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ inputs.gh_ref }}

.github/workflows/build-develop.yml

@@ -1,7 +1,6 @@
 name: _DEVELOP
 
 on:
-  workflow_dispatch:
   schedule:
     - cron: '16 5-20 * * 1-5'
 

.github/workflows/build-docker-devenv.yml

@@ -16,19 +16,19 @@ jobs:
           echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
 
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.PUB_DOCKER_USERNAME }}
           password: ${{ secrets.PUB_DOCKER_PASSWORD }}
 
       - name: Build and push DevEnv Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         env:
           DOCKER_IMAGE: 'penpotapp/devenv'
         with:

.github/workflows/build-docker.yml

@@ -28,7 +28,7 @@ jobs:
           echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
 
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ inputs.gh_ref }}
@@ -63,10 +63,10 @@ jobs:
           popd
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ${{ secrets.DOCKER_REGISTRY }}
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -76,14 +76,14 @@ jobs:
       # images from DockerHub for unregistered users.
       # https://docs.docker.com/docker-hub/usage/
       - name: Login to DockerHub Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.PUB_DOCKER_USERNAME }}
           password: ${{ secrets.PUB_DOCKER_PASSWORD }}
 
       - name: Extract metadata (tags, labels)
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images:
             frontend
@@ -95,7 +95,7 @@ jobs:
             bundle_version=${{ steps.bundles.outputs.bundle_version }}
 
       - name: Build and push Backend Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         env:
           DOCKER_IMAGE: 'backend'
           BUNDLE_PATH: './bundle-backend'
@@ -110,7 +110,7 @@ jobs:
           cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
 
       - name: Build and push Frontend Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         env:
           DOCKER_IMAGE: 'frontend'
           BUNDLE_PATH: './bundle-frontend'
@@ -125,7 +125,7 @@ jobs:
           cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
 
       - name: Build and push Exporter Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         env:
           DOCKER_IMAGE: 'exporter'
           BUNDLE_PATH: './bundle-exporter'
@@ -140,7 +140,7 @@ jobs:
           cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
 
       - name: Build and push Storybook Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         env:
           DOCKER_IMAGE: 'storybook'
           BUNDLE_PATH: './bundle-storybook'
@@ -155,7 +155,7 @@ jobs:
           cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
 
       - name: Build and push MCP Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         env:
           DOCKER_IMAGE: 'mcp'
           BUNDLE_PATH: './bundle-mcp'

.github/workflows/build-main-staging.yml

@@ -1,22 +0,0 @@
-name: _MAIN-STAGING
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '26 5-20 * * 1-5'
-
-jobs:
-  build-bundle:
-    uses: ./.github/workflows/build-bundle.yml
-    secrets: inherit
-    with:
-      gh_ref: "main-staging"
-      build_wasm: "yes"
-      build_storybook: "yes"
-
-  build-docker:
-    needs: build-bundle
-    uses: ./.github/workflows/build-docker.yml
-    secrets: inherit
-    with:
-      gh_ref: "main-staging"

.github/workflows/build-staging-render.yml

@@ -0,0 +1,14 @@
+name: _STAGING RENDER
+
+on:
+  schedule:
+    - cron: '36 5-20 * * 1-5'
+
+jobs:
+  build-bundle:
+    uses: ./.github/workflows/build-bundle.yml
+    secrets: inherit
+    with:
+      gh_ref: "staging-render"
+      build_wasm: "yes"
+      build_storybook: "yes"

.github/workflows/build-staging.yml

@@ -1,7 +1,6 @@
 name: _STAGING
 
 on:
-  workflow_dispatch:
   schedule:
     - cron: '36 5-20 * * 1-5'
 

.github/workflows/build-tag.yml

@@ -1,7 +1,6 @@
 name: _TAG
 
 on:
-  workflow_dispatch:
   push:
     tags:
       - '*'

.github/workflows/commit-checker.yml

@@ -6,14 +6,12 @@ on:
       - edited
       - reopened
       - synchronize
-      - ready_for_review
   pull_request_target:
     types:
       - opened
       - edited
       - reopened
       - synchronize
-      - ready_for_review
   push:
     branches:
       - main
@@ -22,7 +20,6 @@ on:
 
 jobs:
   check-commit-message:
-    if: ${{ !github.event.pull_request.draft }}
     name: Check Commit Message
     runs-on: ubuntu-latest
     steps:

.github/workflows/plugins-deploy-api-doc.yml

@@ -37,7 +37,7 @@ jobs:
           echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ steps.vars.outputs.gh_ref }}
@@ -62,7 +62,7 @@ jobs:
         run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
 
       - name: Cache pnpm store
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pnpm-store.outputs.STORE_PATH }}
           key: ${{ runner.os }}-pnpm-${{ hashFiles('plugins/pnpm-lock.yaml') }}

.github/workflows/plugins-deploy-package.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: penpot-runner-01
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ inputs.gh_ref }}
@@ -62,7 +62,7 @@ jobs:
         run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
 
       - name: Cache pnpm store
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pnpm-store.outputs.STORE_PATH }}
           key: ${{ runner.os }}-pnpm-${{ hashFiles('plugins/pnpm-lock.yaml') }}

.github/workflows/plugins-deploy-packages.yml

@@ -36,9 +36,9 @@ jobs:
       # [For new plugins]
       #   Add more outputs here
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - id: filter
-        uses: dorny/paths-filter@v4
+        uses: dorny/paths-filter@v3
         with:
           filters: |
             colors_to_tokens:

.github/workflows/plugins-deploy-styles-doc.yml

@@ -35,7 +35,7 @@ jobs:
           echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ steps.vars.outputs.gh_ref }}
@@ -60,7 +60,7 @@ jobs:
         run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
 
       - name: Cache pnpm store
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pnpm-store.outputs.STORE_PATH }}
           key: ${{ runner.os }}-pnpm-${{ hashFiles('plugins/pnpm-lock.yaml') }}

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
           echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
 
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ steps.vars.outputs.gh_ref }}
@@ -64,14 +64,13 @@ jobs:
           echo "$PUB_DOCKER_PASSWORD" | skopeo login --username "$PUB_DOCKER_USERNAME" --password-stdin docker.io
 
           IMAGES=("frontend" "backend" "exporter" "storybook")
-          SHORT_TAG=${TAG%.*}
 
           for image in "${IMAGES[@]}"; do
             skopeo copy --all \
               docker://$DOCKER_REGISTRY/$image:$TAG \
               docker://docker.io/penpotapp/$image:$TAG
 
-            for alias in main latest "$SHORT_TAG"; do
+            for alias in main latest; do
               skopeo copy --all \
                 docker://$DOCKER_REGISTRY/$image:$TAG \
                 docker://docker.io/penpotapp/$image:$alias
@@ -94,7 +93,7 @@ jobs:
 
       # --- Create GitHub release ---
       - name: Create GitHub release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/tests-mcp.yml

@@ -10,7 +10,6 @@ on:
     types:
       - opened
       - synchronize
-      - ready_for_review
 
     paths:
       - 'mcp/**'
@@ -25,15 +24,14 @@ on:
       - 'mcp/**'
 
 jobs:
-  test-mcp:
+  test:
-    if: ${{ !github.event.pull_request.draft }}
+    name: "Test"
-    name: "Test MCP"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup
         working-directory: ./mcp

.github/workflows/tests.yml

@@ -9,7 +9,6 @@ on:
     types:
       - opened
       - synchronize
-      - ready_for_review
   push:
     branches:
       - develop
@@ -21,14 +20,13 @@ concurrency:
 
 jobs:
   lint:
-    if: ${{ !github.event.pull_request.draft }}
     name: "Linter"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Lint Common
         working-directory: ./common
@@ -81,14 +79,13 @@ jobs:
           pnpm run lint
 
   test-common:
-    if: ${{ !github.event.pull_request.draft }}
     name: "Common Tests"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Run tests
         working-directory: ./common
@@ -96,13 +93,12 @@ jobs:
           ./scripts/test
 
   test-plugins:
-    if: ${{ !github.event.pull_request.draft }}
     name: Plugins Runtime Linter & Tests
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Setup Node
         id: setup-node
@@ -147,14 +143,13 @@ jobs:
         run: pnpm run build:styles-example
 
   test-frontend:
-    if: ${{ !github.event.pull_request.draft }}
     name: "Frontend Tests"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Unit Tests
         working-directory: ./frontend
@@ -169,14 +164,13 @@ jobs:
           ./scripts/test-components
 
   test-render-wasm:
-    if: ${{ !github.event.pull_request.draft }}
     name: "Render WASM Tests"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Format
         working-directory: ./render-wasm
@@ -194,7 +188,6 @@ jobs:
           ./test
 
   test-backend:
-    if: ${{ !github.event.pull_request.draft }}
     name: "Backend Tests"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
@@ -220,7 +213,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Run tests
         working-directory: ./backend
@@ -234,14 +227,13 @@ jobs:
           clojure -M:dev:test --reporter kaocha.report/documentation
 
   test-library:
-    if: ${{ !github.event.pull_request.draft }}
     name: "Library Tests"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Run tests
         working-directory: ./library
@@ -249,39 +241,38 @@ jobs:
           ./scripts/test
 
   build-integration:
-    if: ${{ !github.event.pull_request.draft }}
     name: "Build Integration Bundle"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Build Bundle
         working-directory: ./frontend
         run: |
-          ./scripts/build
+          ./scripts/build 0.0.0
 
       - name: Store Bundle Cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           key: "integration-bundle-${{ github.sha }}"
           path: frontend/resources/public
 
+
   test-integration-1:
-    if: ${{ !github.event.pull_request.draft }}
+    name: "Integration Tests 1/4"
-    name: "Integration Tests 1/3"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
     needs: build-integration
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Restore Cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
         with:
           key: "integration-bundle-${{ github.sha }}"
           path: frontend/resources/public
@@ -289,10 +280,10 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          ./scripts/test-e2e --shard="1/3";
+          ./scripts/test-e2e --shard="1/4";
 
       - name: Upload test result
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: integration-tests-result-1
@@ -301,18 +292,17 @@ jobs:
           retention-days: 3
 
   test-integration-2:
-    if: ${{ !github.event.pull_request.draft }}
+    name: "Integration Tests 2/4"
-    name: "Integration Tests 2/3"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
     needs: build-integration
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Restore Cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
         with:
           key: "integration-bundle-${{ github.sha }}"
           path: frontend/resources/public
@@ -320,10 +310,10 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          ./scripts/test-e2e --shard="2/3";
+          ./scripts/test-e2e --shard="2/4";
 
       - name: Upload test result
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: integration-tests-result-2
@@ -332,18 +322,17 @@ jobs:
           retention-days: 3
 
   test-integration-3:
-    if: ${{ !github.event.pull_request.draft }}
+    name: "Integration Tests 3/4"
-    name: "Integration Tests 3/3"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
     needs: build-integration
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Restore Cache
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
         with:
           key: "integration-bundle-${{ github.sha }}"
           path: frontend/resources/public
@@ -351,13 +340,43 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          ./scripts/test-e2e --shard="3/3";
+          ./scripts/test-e2e --shard="3/4";
 
       - name: Upload test result
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: integration-tests-result-3
           path: frontend/test-results/
           overwrite: true
           retention-days: 3
+
+  test-integration-4:
+    name: "Integration Tests 4/4"
+    runs-on: penpot-runner-02
+    container: penpotapp/devenv:latest
+    needs: build-integration
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Restore Cache
+        uses: actions/cache/restore@v4
+        with:
+          key: "integration-bundle-${{ github.sha }}"
+          path: frontend/resources/public
+
+      - name: Run Tests
+        working-directory: ./frontend
+        run: |
+          ./scripts/test-e2e --shard="4/4";
+
+      - name: Upload test result
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: integration-tests-result-4
+          path: frontend/test-results/
+          overwrite: true
+          retention-days: 3

.gitignore

@@ -50,7 +50,6 @@
 /frontend/.storybook/preview-body.html
 /frontend/.storybook/preview-head.html
 /frontend/playwright-report/
-/frontend/playwright/ui/visual-specs/
 /frontend/text-editor/src/wasm/
 /frontend/dist/
 /frontend/npm-debug.log
@@ -64,7 +63,6 @@
 /frontend/test-results/
 /frontend/.shadow-cljs
 /other/
-/scripts/
 /nexus/
 /tmp/
 /vendor/**/target
@@ -82,4 +80,3 @@
 /**/node_modules
 /**/.yarn/*
 /.pnpm-store
-/.vscode

.opencode/agents/commiter.md

@@ -1,27 +0,0 @@
----
-name: commiter
-description: Git commit assistant following CONTRIBUTING.md commit rules
-mode: primary
----
-
-Role: You are responsible for creating git commits for Penpot and must follow
-the repository commit-format rules exactly.
-
-Requirements:
-
-* Read `CONTRIBUTING.md` before creating any commit and follow the
-  commit guidelines strictly.
-* Use commit messages in the form `:emoji: <imperative subject>`.
-* Keep the subject capitalized, concise, 70 characters or fewer, and
-  without a trailing period.
-* Keep the description (commit body) with maximum line length of 80
-  characters. Use manual line breaks to wrap text before it exceeds
-  this limit.
-* Separate the subject from the body with a blank line.
-* Write a clear and concise body when needed.
-* Use `git commit -s` so the commit includes the required
-  `Signed-off-by` line.
-* Do not guess or hallucinate git author information (Name or
-  Email). Never include the `--author` flag in git commands unless
-  specifically instructed by the user for a unique case; assume the
-  local environment is already configured.

.opencode/agents/engineer.md

@@ -31,7 +31,3 @@ Requirements:
   exact commands).
 * Make small and logical commits following the commit guideline described in
   `CONTRIBUTING.md`. Commit only when explicitly asked.
-- Do not guess or hallucinate git author information (Name or Email). Never include the
-  `--author` flag in git commands unless specifically instructed by the user for a unique
-  case; assume the local environment is already configured. Allow git commit to
-  automatically pull the identity from the local git config `user.name` and `user.email`.

.opencode/agents/testing.md

@@ -31,7 +31,3 @@ Requirements:
   commands).
 * Make small and logical commits following the commit guideline described in
   `CONTRIBUTING.md`. Commit only when explicitly asked.
-- Do not guess or hallucinate git author information (Name or Email). Never include the
-  `--author` flag in git commands unless specifically instructed by the user for a unique
-  case; assume the local environment is already configured. Allow git commit to
-  automatically pull the identity from the local git config `user.name` and `user.email`.

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "files.exclude": {
+    "**/.clj-kondo": true,
+    "**/.cpcache": true,
+    "**/.lsp": true,
+    "**/.shadow-cljs": true,
+    "**/node_modules": true
+  }
+}

AGENTS.md

@@ -32,36 +32,6 @@ precision while maintaining a strong focus on maintainability and performance.
 5. When searching code, prefer `ripgrep` (`rg`) over `grep` — it respects
    `.gitignore` by default.
 
-## GitHub Operations
-
-To obtain the list of repository members/collaborators:
-
-```bash
-gh api repos/:owner/:repo/collaborators --paginate --jq '.[].login'
-```
-
-To obtain the list of open PRs authored by members:
-
-```bash
-MEMBERS=$(gh api repos/:owner/:repo/collaborators --paginate --jq '.[].login' | tr '\n' '|' | sed 's/|$//')
-gh pr list --state open --limit 200 --json author,title,number | jq -r --arg members "$MEMBERS" '
-  ($members | split("|")) as $m |
-  .[] | select(.author.login as $a | $m | index($a)) |
-  "\(.number)\t\(.author.login)\t\(.title)"
-'
-```
-
-To obtain the list of open PRs from external contributors (non-members):
-
-```bash
-MEMBERS=$(gh api repos/:owner/:repo/collaborators --paginate --jq '.[].login' | tr '\n' '|' | sed 's/|$//')
-gh pr list --state open --limit 200 --json author,title,number | jq -r --arg members "$MEMBERS" '
-  ($members | split("|")) as $m |
-  .[] | select(.author.login as $a | $m | index($a) | not) |
-  "\(.number)\t\(.author.login)\t\(.title)"
-'
-```
-
 ## Architecture Overview
 
 Penpot is an open-source design tool composed of several modules:

CHANGES.md

@@ -1,214 +1,5 @@
 # CHANGELOG
 
-## 2.17.0 (Unreleased)
-
-### :boom: Breaking changes & Deprecations
-
-### :rocket: Epics and highlights
-
-- Add MCP server integration [Taiga #13112](https://tree.taiga.io/project/penpot/us/13112)
-
-### :sparkles: New features & Enhancements
-
-- Show alpha percentage next to library color values to distinguish colors that differ only in opacity (by @rockchris099) [Github #6328](https://github.com/penpot/penpot/issues/6328)
-- Add "Clear artboard guides" option to right-click context menu for frames (by @eureka0928) [Github #6987](https://github.com/penpot/penpot/issues/6987)
-- Add loader feedback while importing and exporting files [Github #9020](https://github.com/penpot/penpot/issues/9020)
-- Allow duplicating color and typography styles (by @MkDev11) [Github #2912](https://github.com/penpot/penpot/issues/2912)
-- Add woff2 support on user uploaded fonts (by @Nivl) [Github #8248](https://github.com/penpot/penpot/pull/8248)
-- Import Tokens from linked library (by @dfelinto) [Github #8391](https://github.com/penpot/penpot/pull/8391)
-- Option to download custom fonts (by @dfelinto) [Github #8320](https://github.com/penpot/penpot/issues/8320)
-- Add copy as image to clipboard option to workspace context menu (by @dfelinto) [Github #8313](https://github.com/penpot/penpot/pull/8313)
-- Add Tab/Shift+Tab navigation to rename layers sequentially (by @bittoby) [Github #8474](https://github.com/penpot/penpot/pull/8474)
-- Copy and paste entire rows in existing table (by @bittoby) [Github #8498](https://github.com/penpot/penpot/pull/8498)
-- Rename token group [Taiga #13137](https://tree.taiga.io/project/penpot/us/13137)
-- Duplicate token group [Taiga #10653](https://tree.taiga.io/project/penpot/us/10653)
-- Copy token name from contextual menu [Taiga #13568](https://tree.taiga.io/project/penpot/issue/13568)
-- Add natural sorting on token names [Taiga #13713](https://tree.taiga.io/project/penpot/issue/13713)
-- Add drag-to-change for numeric inputs in workspace sidebar [Github #2466](https://github.com/penpot/penpot/issues/2466)
-- Add CSS linter [Taiga #13790](https://tree.taiga.io/project/penpot/us/13790)
-- Save and restore selection state in undo/redo (by @eureka0928) [Github #6007](https://github.com/penpot/penpot/issues/6007)
-- Fix warnings for unsupported token $type (by @Dexterity104) [Github #8790](https://github.com/penpot/penpot/issues/8790)
-- Add per-group add button for typographies (by @eureka0928) [Github #5275](https://github.com/penpot/penpot/issues/5275)
-- Add Find & Replace for text content and layer names (by @statxc) [Github #7108](https://github.com/penpot/penpot/issues/7108)
-- Use page name for multi-export ZIP/PDF downloads (by @Dexterity104) [Github #8773](https://github.com/penpot/penpot/issues/8773)
-- Make links in comments clickable (by @eureka0928) [Github #1602](https://github.com/penpot/penpot/issues/1602)
-- Add visibility toggle for strokes (by @eureka0928) [Github #7438](https://github.com/penpot/penpot/issues/7438)
-- Sort asset library subfolders alphabetically at every nesting level (by @eureka0928) [Github #2572](https://github.com/penpot/penpot/issues/2572)
-- Add Paste to replace (Cmd+Shift+V) to replace the selected shape with clipboard contents (by @eureka0928) [Github #4240](https://github.com/penpot/penpot/issues/4240)
-- Differentiate incoming and outgoing interaction link colors (by @claytonlin1110) [Github #7794](https://github.com/penpot/penpot/issues/7794)
-- Add guide locking and fix locked elements not selectable in viewer (by @Dexterity104) [Github #8358](https://github.com/penpot/penpot/issues/8358)
-- Apply styles to selection (by @AzazelN28) [Taiga #13647](https://tree.taiga.io/project/penpot/task/13647)
-- Reorder prototyping overlay options to show Position before Relative to (by @rockchris099) [Github #2910](https://github.com/penpot/penpot/issues/2910)
-- Add customizable colors for ruler guides (by @Dexterity104) [Github #5199](https://github.com/penpot/penpot/issues/5199)
-- Persist asset search query and section filter when switching sidebar tabs (by @eureka0928) [Github #2913](https://github.com/penpot/penpot/issues/2913)
-- Add delete and duplicate buttons to typography dialog (by @eureka0928) [Github #5270](https://github.com/penpot/penpot/issues/5270)
-- Edit ruler guide position by double-clicking the guide pill (by @eureka0928) [Github #2311](https://github.com/penpot/penpot/issues/2311)
-- Add a search bar to filter colors in the color palette toolbar (by @eureka0928) [Github #7653](https://github.com/penpot/penpot/issues/7653)
-- Allow customising the OIDC login button label (by @wdeveloper16) [Github #7027](https://github.com/penpot/penpot/issues/7027)
-- Add page separators in Workspace [Taiga #13611](https://tree.taiga.io/project/penpot/us/13611?milestone=262806)
-- Add Shift+Numpad0/1/2 as aliases to Shift+0/1/2 for zoom shortcuts [Github #2457](https://github.com/penpot/penpot/issues/2457)
-
-### :bug: Bugs fixed
-
-- Fix `PENPOT_OIDC_USER_INFO_SOURCE` flag being silently ignored (`userinfo` / `token`) in the OIDC callback, causing "incomplete user info" failures during registration [Github #9108](https://github.com/penpot/penpot/issues/9108)
-- Fix `get-view-only-bundle` crashing when a share-link viewer encounters a team member whose email lacks `@` (NullPointerException in `obfuscate-email`) or whose domain has no `.` (previously produced a dangling-dot `****@****.`); now the viewer-side obfuscation is nil-safe and omits the trailing dot when the domain has no TLD
-- Remove `corepack` from the MCP local launcher so it runs on Node.js 25+, where corepack is no longer bundled [Github #8877](https://github.com/penpot/penpot/issues/8877)
-- Fix Copy as SVG: emit a single valid SVG document when multiple shapes are selected, and publish `image/svg+xml` to the clipboard so the paste target works in Inkscape and other SVG-native tools [Github #838](https://github.com/penpot/penpot/issues/838)
-- Reset profile submenu state when the account menu closes (by @eureka0928) [Github #8947](https://github.com/penpot/penpot/issues/8947)
-- Add export panel to inspect styles tab [Taiga #13582](https://tree.taiga.io/project/penpot/issue/13582)
-- Fix styles between grid layout inputs [Taiga #13526](https://tree.taiga.io/project/penpot/issue/13526)
-- Fix id prop on switch component [Taiga #13534](https://tree.taiga.io/project/penpot/issue/13534)
-- Update copy on penpot update message [Taiga #12924](https://tree.taiga.io/project/penpot/issue/12924)
-- Fix scroll on library modal [Taiga #13639](https://tree.taiga.io/project/penpot/issue/13639)
-- Fix dates to avoid show them in english when browser is in auto [Taiga #13786](https://tree.taiga.io/project/penpot/issue/13786)
-- Fix focus radio button [Taiga #13841](https://tree.taiga.io/project/penpot/issue/13841)
-- Token tree should be expanded by default [Taiga #13631](https://tree.taiga.io/project/penpot/issue/13631)
-- Fix opacity incorrectly disabled for visible shapes [Taiga #13906](https://tree.taiga.io/project/penpot/issue/13906)
-- Update onboarding image [Taiga #13864](https://tree.taiga.io/project/penpot/issue/13864)
-- Fix plugin modal drag interactions over iframe and close-button behavior (by @marekhrabe) [Github #8871](https://github.com/penpot/penpot/pull/8871)
-- Fix hot update on color-row on texts [Taiga #13923](https://tree.taiga.io/project/penpot/issue/13923)
-- Fix selected color tokens [Taiga #13930](https://tree.taiga.io/project/penpot/issue/13930)
-- Fix dashboard Recent/Deleted titles overlapped by scrolling content (by @rockchris099) [Github #8577](https://github.com/penpot/penpot/issues/8577)
-- Display resolved values of inactive tokens [Taiga #13628](https://tree.taiga.io/project/penpot/issue/13628)
-- Fix hyphens stripped from export filenames (by @jamesrayammons) [Github #8901](https://github.com/penpot/penpot/issues/8901)
-- Fix app crash when selecting shapes with one hidden [Taiga #13959](https://tree.taiga.io/project/penpot/issue/13959)
-- Fix opacity mixed value [Taiga #13960](https://tree.taiga.io/project/penpot/issue/13960)
-- Fix gap input throwing an error [Github #8984](https://github.com/penpot/penpot/pull/8984)
-- Fix non-functional clear icon in change email modal inputs (by @Dexterity104) [Github #8977](https://github.com/penpot/penpot/issues/8977)
-- Disable save button after saving account profile settings (by @Dexterity104) [Github #8979](https://github.com/penpot/penpot/issues/8979)
-- Fix copy to be more specific [Taiga #13990](https://tree.taiga.io/project/penpot/issue/13990)
-- Allow deleting the profile avatar after uploading [Github #9067](https://github.com/penpot/penpot/issues/9067)
-- Fix incorrect rendering when exporting text as SVG, PNG and JPG (by @edwin-rivera-dev) [Github #8516](https://github.com/penpot/penpot/issues/8516)
-- Fix Settings and Notifications "Update Settings" button enabled state when form has no changes (by @moorsecopers99) [Github #9090](https://github.com/penpot/penpot/issues/9090)
-- Fix "Help & Learning" submenu vertical alignment in account menu (by @juan-flores077) [Github #9137](https://github.com/penpot/penpot/issues/9137)
-- Fix plugin `addInteraction` silently rejecting `open-overlay` actions with `manualPositionLocation` [Github #8409](https://github.com/penpot/penpot/issues/8409)
-- Fix typography style creation with tokenized line-height (by @juan-flores077) [Github #8479](https://github.com/penpot/penpot/issues/8479)
-- Fix colorpicker layout so the eyedropper button is visible again [Taiga #14057](https://tree.taiga.io/project/penpot/issue/14057)
-
-
-## 2.16.0 (Unreleased)
-
-### :boom: Breaking changes & Deprecations
-
-### :rocket: Epics and highlights
-
-### :sparkles: New features & Enhancements
-
-- Access Tokens look & feel refinement [Taiga #13114](https://tree.taiga.io/project/penpot/us/13114)
-- Enhance readability of applied tokens in plugins API [Taiga #13714](https://tree.taiga.io/project/penpot/issue/13714)
-
-### :bug: Bugs fixed
-
-- Fix Alt/Option to draw shapes from center point (by @offreal) [Github #8361](https://github.com/penpot/penpot/pull/8361)
-- Add token name on broken token pill on sidebar [Taiga #13527](https://tree.taiga.io/project/penpot/issue/13527)
-- Fix tooltip activated when tab change [Taiga #13627](https://tree.taiga.io/project/penpot/issue/13627)
-- Fix title on shared button [Taiga #13730](https://tree.taiga.io/project/penpot/issue/13730)
-- Fix hover on layers [Taiga #13799](https://tree.taiga.io/project/penpot/issue/13799)
-- Fix highlight after name edition [Taiga #13783](https://tree.taiga.io/project/penpot/issue/13783)
-- Fix id prop on switch component [Taiga #13534](https://tree.taiga.io/project/penpot/issue/13534)
-- Fix dashboard navigation tabs overlap with projects content when scrolling [Taiga #13962](https://tree.taiga.io/project/penpot/issue/13962)
-- Fix text editor v1 focus [Taiga #13961](https://tree.taiga.io/project/penpot/issue/13961)
-- Fix color dropdown option update [Taiga #14035](https://tree.taiga.io/project/penpot/issue/14035)
-- Fix themes modal height [Taiga #14046](https://tree.taiga.io/project/penpot/issue/14046)
-
-
-## 2.15.0 (Unreleased)
-
-### :sparkles: New features & Enhancements
-
-- Add MCP server integration [Taiga #13112](https://tree.taiga.io/project/penpot/us/13112)
-- Add chunked upload API for large media and binary files (removes previous upload size limits) [Github #8909](https://github.com/penpot/penpot/pull/8909)
-
-### :bug: Bugs fixed
-
-- Fix incorrect handling of version restore operation [Github #9041](https://github.com/penpot/penpot/pull/9041)
-
-
-## 2.14.4
-
-### :bug: Bugs fixed
-
-- Fix email validation [Taiga #14006](https://tree.taiga.io/project/penpot/issue/14006)
-- Fix email blacklisting [Github #9122](https://github.com/penpot/penpot/pull/9122)
-- Fix removeChild errors from unmount race conditions [Github #8927](https://github.com/penpot/penpot/pull/8927)
-
-
-## 2.14.3
-
-### :sparkles: New features & Enhancements
-
-- Add webp export format to plugin types [Github #8870](https://github.com/penpot/penpot/pull/8870)
-- Use shared singleton containers for React portals to reduce DOM growth [Github #8957](https://github.com/penpot/penpot/pull/8957)
-
-### :bug: Bugs fixed
-
-- Fix component "broken" after switch variant [Taiga #12984](https://tree.taiga.io/project/penpot/issue/12984)
-- Fix variants corner cases with selrect and points [Github #8882](https://github.com/penpot/penpot/pull/8882)
-- Fix dashboard navigation tabs overlap with projects content when scrolling [Taiga #13962](https://tree.taiga.io/project/penpot/issue/13962)
-- Fix text editor v1 focus [Taiga #13961](https://tree.taiga.io/project/penpot/issue/13961)
-- Fix highlight on frames after rename [Github #8938](https://github.com/penpot/penpot/pull/8938)
-- Fix TypeError in sd-token-uuid when resolving tokens interactively [Github #8929](https://github.com/penpot/penpot/pull/8929)
-- Fix path drawing preview passing shape instead of content to next-node
-- Fix swapped arguments in CLJS PathData `-nth` with default
-- Normalize PathData coordinates to safe integer bounds on read
-- Fix RangeError from re-entrant error handling causing stack overflow [Github #8962](https://github.com/penpot/penpot/pull/8962)
-- Fix builder bool styles and media validation [Github #8963](https://github.com/penpot/penpot/pull/8963)
-- Fix "Move to" menu allowing same project as target when multiple files are selected
-- Fix crash when index query param is duplicated in URL
-- Fix wrong extremity point in path `calculate-extremities` for line-to segments
-- Fix reversed args in DTCG shadow composite token conversion
-- Fix `inside-layout?` passing shape id instead of shape to `frame-shape?`
-- Fix wrong `mapcat` call in `collect-main-shapes`
-- Fix stale accumulator in `get-children-in-instance` recursion
-- Fix typo `:podition` in swap-shapes grid cell
-- Fix multiple selection on shapes with token applied to stroke color
-
-
-## 2.14.2
-
-### :sparkles: New features & Enhancements
-
-- Add protection for stale JS asset cache to force reload on version mismatch [Github #8638](https://github.com/penpot/penpot/pull/8638)
-- Normalize newsletter opt-in checkbox across different register flows [Github #8839](https://github.com/penpot/penpot/pull/8839)
-
-### :bug: Bugs fixed
-
-- Fix PathData corruption root causes across WASM and CLJS (unsafe transmute and byteOffset handling)
-- Handle corrupted PathData segments gracefully instead of crashing
-- Fix swapped move-to/line-to type codes in PathData binary readers
-- Fix non-integer row/column values in grid cell position inputs [Github #8869](https://github.com/penpot/penpot/pull/8869)
-- Fix nil path content crash by exposing safe public API [Github #8806](https://github.com/penpot/penpot/pull/8806)
-- Fix infinite recursion in get-frame-ids for thumbnail extraction [Github #8807](https://github.com/penpot/penpot/pull/8807)
-- Fix stale-asset detector missing protocol-dispatch errors
-- Ignore Zone.js toString TypeError in uncaught error handler [Github #8804](https://github.com/penpot/penpot/pull/8804)
-- Prevent thumbnail frame recursion overflow [Github #8763](https://github.com/penpot/penpot/pull/8763)
-- Fix vector index out of bounds in viewer zoom-to-fit/fill [Github #8834](https://github.com/penpot/penpot/pull/8834)
-- Guard delete undo against missing sibling order [Github #8858](https://github.com/penpot/penpot/pull/8858)
-- Fix ICounted error on numeric-input token dropdown keyboard nav [Github #8803](https://github.com/penpot/penpot/pull/8803)
-
-## 2.14.1
-
-### :sparkles: New features & Enhancements
-
-- Add automatic retry with backoff for idempotent RPC requests on network failures [Github #8792](https://github.com/penpot/penpot/pull/8792)
-- Add scroll and zoom throttling to one state update per animation frame [Github #8812](https://github.com/penpot/penpot/pull/8812)
-- Improve error handling and exception formatting [Github #8757](https://github.com/penpot/penpot/pull/8757)
-
-### :bug: Bugs fixed
-
-- Fix crash in apply-text-modifier with nil selrect or modifier [Github #8762](https://github.com/penpot/penpot/pull/8762)
-- Fix incorrect attrs references on generate-sync-shape [Github #8776](https://github.com/penpot/penpot/pull/8776)
-- Fix regression on subpath support [Github #8793](https://github.com/penpot/penpot/pull/8793)
-- Improve error reporting on request parsing failures [Github #8805](https://github.com/penpot/penpot/pull/8805)
-- Fix fetch abort errors escaping the unhandled exception handler [Github #8801](https://github.com/penpot/penpot/pull/8801)
-- Fix nil deref on missing bounds in layout modifier propagation [Github #8735](https://github.com/penpot/penpot/pull/8735)
-- Fix TypeError when token error map lacks :error/fn key [Github #8767](https://github.com/penpot/penpot/pull/8767)
-- Fix dissoc error when detaching stroke color from library [Github #8738](https://github.com/penpot/penpot/pull/8738)
-- Fix crash when pasting image into text editor
-- Fix null text crash on paste in text editor
-- Ensure path content is always PathData when saving
-- Fix error when get-parent-with-data encounters non-Element nodes
-
 ## 2.14.0
 
 ### :boom: Breaking changes & Deprecations
@@ -224,8 +15,6 @@
 - Optimize sidebar performance for deeply nested shapes [Taiga #13017](https://tree.taiga.io/project/penpot/task/13017)
 - Remove tokens path node and bulk remove tokens [Taiga #13007](https://tree.taiga.io/project/penpot/us/13007)
 - Replace themes management modal radio buttons for switches [Taiga #9215](https://tree.taiga.io/project/penpot/us/9215)
-- [MCP server] Integrations section [Taiga #13112](https://tree.taiga.io/project/penpot/us/13112)
-- [Access Tokens] Look & feel refinement [Taiga #13114](https://tree.taiga.io/project/penpot/us/13114)
 
 ### :bug: Bugs fixed
 
@@ -243,8 +32,6 @@
 - Fix boolean operators in menu for boards [Taiga #13174](https://tree.taiga.io/project/penpot/issue/13174)
 - Fix viewer can update library [Taiga #13186](https://tree.taiga.io/project/penpot/issue/13186)
 - Fix remove fill affects different element than selected [Taiga #13128](https://tree.taiga.io/project/penpot/issue/13128)
-- Fix unable to finish the create account form using keyboard [Taiga #11333](https://tree.taiga.io/project/penpot/issue/11333)
-- Fix 45 rotated board titles rendered incorrectly [Taiga #13306](https://tree.taiga.io/project/penpot/issue/13306)
 - Fix cannot apply second token after creation while shape is selected [Taiga #13513](https://tree.taiga.io/project/penpot/issue/13513)
 - Fix error activating a set with invalid shadow token applied [Taiga #13528](https://tree.taiga.io/project/penpot/issue/13528)
 - Fix component "broken" after variant switch [Taiga #12984](https://tree.taiga.io/project/penpot/issue/12984)
@@ -279,8 +66,6 @@
 
 ### :heart: Community contributions (Thank you!)
 
-- Add 'page' special shapeId to MCP export_shape tool for full-page snapshots [Github #8689](https://github.com/penpot/penpot/issues/8689)
-
 - Fix mask issues with component swap (by @dfelinto) [Github #7675](https://github.com/penpot/penpot/issues/7675)
 
 ### :sparkles: New features & Enhancements

README.md

@@ -9,39 +9,45 @@
 </picture>
 
 <p align="center">
-  <a href="https://www.mozilla.org/en-US/MPL/2.0" rel="nofollow"><img alt="License: MPL-2.0" src="https://img.shields.io/badge/MPL-2.0-blue.svg" style="max-width:100%;"></a>
+<a href="https://www.mozilla.org/en-US/MPL/2.0" rel="nofollow"><img alt="License: MPL-2.0" src="https://img.shields.io/badge/MPL-2.0-blue.svg" style="max-width:100%;"></a>
-  <a href="https://community.penpot.app" rel="nofollow"><img alt="Penpot Community" src="https://img.shields.io/discourse/posts?server=https%3A%2F%2Fcommunity.penpot.app" style="max-width:100%;"></a>
+<a href="https://community.penpot.app" rel="nofollow"><img alt="Penpot Community" src="https://img.shields.io/discourse/posts?server=https%3A%2F%2Fcommunity.penpot.app" style="max-width:100%;"></a>
-  <a href="https://tree.taiga.io/project/penpot/" title="Managed with Taiga.io" rel="nofollow"><img alt="Managed with Taiga.io" src="https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg" style="max-width:100%;"></a>
+<a href="https://tree.taiga.io/project/penpot/" title="Managed with Taiga.io" rel="nofollow"><img alt="Managed with Taiga.io" src="https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg" style="max-width:100%;"></a>
-  <a href="https://gitpod.io/#https://github.com/penpot/penpot" rel="nofollow"><img alt="Gitpod ready-to-code" src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod" style="max-width:100%;"></a>
+<a href="https://gitpod.io/#https://github.com/penpot/penpot" rel="nofollow"><img alt="Gitpod ready-to-code" src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod" style="max-width:100%;"></a>
 </p>
 
 <p align="center">
-  <a href="https://penpot.app/"><b>Website</b></a>  •
+    <a href="https://penpot.app/"><b>Website</b></a>  •
-  <a href="https://help.penpot.app/user-guide/"><b>User Guide</b></a>  •
+    <a href="https://help.penpot.app/user-guide/"><b>User Guide</b></a>  •
-  <a href="https://penpot.app/learning-center"><b>Learning Center</b></a>  •
+    <a href="https://penpot.app/learning-center"><b>Learning Center</b></a>  •
-  <a href="https://community.penpot.app/"><b>Community</b></a>
+    <a href="https://community.penpot.app/"><b>Community</b></a>
 </p>
 <p align="center">
-  <a href="https://www.youtube.com/@Penpot"><b>Youtube</b></a>  •
+    <a href="https://www.youtube.com/@Penpot"><b>Youtube</b></a>  •
-  <a href="https://peertube.kaleidos.net/a/penpot_app/video-channels"><b>Peertube</b></a>  •
+    <a href="https://peertube.kaleidos.net/a/penpot_app/video-channels"><b>Peertube</b></a>  •
-  <a href="https://www.linkedin.com/company/penpot/"><b>Linkedin</b></a>  •
+    <a href="https://www.linkedin.com/company/penpot/"><b>Linkedin</b></a>  •
-  <a href="https://instagram.com/penpot.app"><b>Instagram</b></a>  •
+    <a href="https://instagram.com/penpot.app"><b>Instagram</b></a>  •
-  <a href="https://fosstodon.org/@penpot/"><b>Mastodon</b></a>  •
+    <a href="https://fosstodon.org/@penpot/"><b>Mastodon</b></a>  •
-  <a href="https://bsky.app/profile/penpot.app"><b>Bluesky</b></a>  •
+    <a href="https://bsky.app/profile/penpot.app"><b>Bluesky</b></a>  •
-  <a href="https://twitter.com/penpotapp"><b>X</b></a>
+    <a href="https://twitter.com/penpotapp"><b>X</b></a>
+
 </p>
 
-[Penpot video](https://github.com/user-attachments/assets/7c67fd7c-04d3-4c9b-88ec-b6f5e23f8332)
+<br />
+
+[Penpot video](https://github.com/user-attachments/assets/7c67fd7c-04d3-4c9b-88ec-b6f5e23f8332
+)
+
+<br />
 
 Penpot is the first **open-source** design tool for design and code collaboration. Designers can create stunning designs, interactive prototypes, design systems at scale, while developers enjoy ready-to-use code and make their workflow easy and fast. And all of this with no handoff drama.
 
 Available on browser or self-hosted, Penpot works with open standards like SVG, CSS, HTML and JSON, and it’s free!
 
 The latest updates take Penpot even further. It’s the first design tool to integrate native [design tokens](https://penpot.dev/collaboration/design-tokens)—a single source of truth to improve efficiency and collaboration between product design and development.
-
 With the [huge 2.0 release](https://penpot.app/dev-diaries), Penpot took the platform to a whole new level. This update introduces the ground-breaking [CSS Grid Layout feature](https://penpot.app/penpot-2.0), a complete UI redesign, a new Components system, and much more.
+For organizations that need extra service for its teams, [get in touch](https://cal.com/team/penpot/talk-to-us)
 
-For organizations that need extra service for its teams, [get in touch](https://cal.com/team/penpot/talk-to-us).
+🎇 Design, code, and Open Source meet at [Penpot Fest](https://penpot.app/penpotfest)! Be part of the 2025 edition in Madrid, Spain, on October 9-10.
 
 ## Table of contents ##
 
@@ -57,42 +63,43 @@ For organizations that need extra service for its teams, [get in touch](https://
 Penpot expresses designs as code. Designers can do their best work and see it will be beautifully implemented by developers in a two-way collaboration.
 
 ### Plugin system ###
-
 [Penpot plugins](https://penpot.app/penpothub/plugins) let you expand the platform's capabilities, give you the flexibility to integrate it with other apps, and design custom solutions.
 
 ### Designed for developers ###
-
 Penpot was built to serve both designers and developers and create a fluid design-code process. You have the choice to enjoy real-time collaboration or play "solo".
 
 ### Inspect mode ###
-
 Work with ready-to-use code and make your workflow easy and fast. The inspect tab gives instant access to SVG, CSS and HTML code.
 
 ### Self host your own instance ###
-
 Provide your team or organization with a completely owned collaborative design tool. Use Penpot's cloud service or deploy your own Penpot server.
 
 ### Integrations ###
-
 Penpot offers integration into the development toolchain, thanks to its support for webhooks and an API accessible through access tokens.
 
-### Building Design Systems: design tokens, components and variants ###
+###  Building Design Systems: design tokens, components and variants  ###
-
 Penpot brings design systems to code-minded teams: a single source of truth with native Design Tokens, Components, and Variants for scalable, reusable, and consistent UI across projects and platforms.
 
+
+<br />
+
 <p align="center">
-  <img src="https://github.com/user-attachments/assets/cce75ad6-f783-473f-8803-da9eb8255fef">
+ <img src="https://github.com/user-attachments/assets/cce75ad6-f783-473f-8803-da9eb8255fef">
 </p>
 
+<br />
+
 ## Getting started ##
 
 Penpot is the only design & prototype platform that is deployment agnostic. You can use it in our [SAAS](https://design.penpot.app) or deploy it anywhere.
 
 Learn how to install it with Docker, Kubernetes, Elestio or other options on [our website](https://penpot.app/self-host).
+<br />
 
 <p align="center">
-  <img src="https://github.com/user-attachments/assets/93578500-2dbd-4045-a180-e640ea5b3bd5" style="width: 65%;">
+  <img src="https://site-assets.plasmic.app/2168cf524dd543caeff32384eb9ea0a1.svg" alt="Open Source" style="width: 65%;">
 </p>
+<br />
 
 ## Community ##
 
@@ -101,7 +108,6 @@ We love the Open Source software community. Contributing is our passion and if i
 If you need help or have any questions; if you’d like to share your experience using Penpot or get inspired; if you’d rather meet our community of developers and designers, [join our Community](https://community.penpot.app/)!
 
 You will find the following categories:
-
 - [Ask the Community](https://community.penpot.app/c/ask-for-help-using-penpot/6)
 - [Troubleshooting](https://community.penpot.app/c/technical/8)
 - [Help us Improve Penpot](https://community.penpot.app/c/help-us-improve-penpot/7)
@@ -111,36 +117,45 @@ You will find the following categories:
 - [Penpot in your language](https://community.penpot.app/c/penpot-in-your-language/12)
 - [Design and Code Essentials](https://community.penpot.app/c/design-and-code-essentials/22)
 
+
+<br />
+
 <p align="center">
-  <img src="https://github.com/user-attachments/assets/7b7d0f6b-a579-4822-a9ae-d3d5a9fc9d19" alt="Community" style="width: 65%;">
+  <img src="https://github.com/penpot/penpot/assets/5446186/6ac62220-a16c-46c9-ab21-d24ae357ed03" alt="Community" style="width: 65%;">
 </p>
+<br />
 
 ### Code of Conduct ###
 
 Anyone who contributes to Penpot, whether through code, in the community, or at an event, must adhere to the
 [code of conduct](https://help.penpot.app/contributing-guide/coc/) and foster a positive and safe environment.
 
+
 ## Contributing ##
 
 Any contribution will make a difference to improve Penpot. How can you get involved?
 
 Choose your way:
 
-- Create and [share Libraries & Templates](https://penpot.app/libraries-templates.html) that will be helpful for the community.
+- Create and [share Libraries & Templates](https://penpot.app/libraries-templates.html) that will be helpful for the community
-- Invite your [team to join](https://design.penpot.app/#/auth/register).
+- Invite your [team to join](https://design.penpot.app/#/auth/register)
-- Give this repo a star and follow us on Social Media: [Mastodon](https://fosstodon.org/@penpot/), [Youtube](https://www.youtube.com/c/Penpot), [Instagram](https://instagram.com/penpot.app), [Linkedin](https://www.linkedin.com/company/penpotdesign),  [Peertube](https://peertube.kaleidos.net/a/penpot_app), [X](https://twitter.com/penpotapp) and [BlueSky](https://bsky.app/profile/penpot.app).
+- Give this repo a star and follow us on Social Media: [Mastodon](https://fosstodon.org/@penpot/), [Youtube](https://www.youtube.com/c/Penpot), [Instagram](https://instagram.com/penpot.app), [Linkedin](https://www.linkedin.com/company/penpotdesign),  [Peertube](https://peertube.kaleidos.net/a/penpot_app), [X](https://twitter.com/penpotapp) and [BlueSky](https://bsky.app/profile/penpot.app)
 - Participate in the [Community](https://community.penpot.app/) space by asking and answering questions; reacting to others’ articles;  opening your own conversations and following along on decisions affecting the project.
-- Report bugs with our easy [guide for bugs hunting](https://help.penpot.app/contributing-guide/reporting-bugs/) or [GitHub issues](https://github.com/penpot/penpot/issues).
+- Report bugs with our easy [guide for bugs hunting](https://help.penpot.app/contributing-guide/reporting-bugs/) or [GitHub issues](https://github.com/penpot/penpot/issues)
-- Become a [translator](https://help.penpot.app/contributing-guide/translations).
+- Become a [translator](https://help.penpot.app/contributing-guide/translations)
-- Give feedback: [Email us](mailto:support@penpot.app).
+- Give feedback: [Email us](mailto:support@penpot.app)
-- **Contribute to Penpot's code:** [Watch this video](https://www.youtube.com/watch?v=TpN0osiY-8k) by Alejandro Alonso, CIO and developer at Penpot, where he gives us a hands-on demo of how to use Penpot’s repository and make changes in both front and back end.
+- **Contribute to Penpot's code:** [Watch this video](https://www.youtube.com/watch?v=TpN0osiY-8k) by Alejandro Alonso, CIO and developer at Penpot, where he gives us a hands-on demo of how to use Penpot’s repository and make changes in both front and back end
 
 To find (almost) everything you need to know on how to contribute to Penpot, refer to the [contributing guide](https://help.penpot.app/contributing-guide/).
 
+<br />
+
 <p align="center">
   <img src="https://github.com/penpot/penpot/assets/5446186/fea18923-dc06-49be-86ad-c3496a7956e6" alt="Libraries and templates" style="width: 65%;">
 </p>
 
+<br />
+
 ## Resources ##
 
 You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.
@@ -155,14 +170,14 @@ You can ask and answer questions, have open-ended conversations, and follow alon
 
 📚 [Dev Diaries](https://penpot.app/dev-diaries.html)
 
+
 ## License ##
 
-```text
+```
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Copyright (c) KALEIDOS INC
 ```
-
 Penpot is a Kaleidos’ [open source project](https://kaleidos.net/)

backend/AGENTS.md

@@ -83,52 +83,7 @@ are config maps with `::ig/ref` for dependencies. Components implement
 `ig/init-key` / `ig/halt-key!`.
 
 
-### Connecting to the Database
+### Database Access
-
-Two PostgreSQL databases are used in this environment:
-
-| Database      | Purpose            | Connection string                                  |
-|---------------|--------------------|----------------------------------------------------|
-| `penpot`      | Development / app  | `postgresql://penpot:penpot@postgres/penpot`       |
-| `penpot_test` | Test suite         | `postgresql://penpot:penpot@postgres/penpot_test`  |
-
-**Interactive psql session:**
-
-```bash
-# development DB
-psql "postgresql://penpot:penpot@postgres/penpot"
-
-# test DB
-psql "postgresql://penpot:penpot@postgres/penpot_test"
-```
-
-**One-shot query (non-interactive):**
-
-```bash
-psql "postgresql://penpot:penpot@postgres/penpot" -c "SELECT id, name FROM team LIMIT 5;"
-```
-
-**Useful psql meta-commands:**
-
-```
-\dt              -- list all tables
-\d <table>       -- describe a table (columns, types, constraints)
-\di              -- list indexes
-\q               -- quit
-```
-
-> **Migrations table:** Applied migrations are tracked in the `migrations` table
-> with columns `module`, `step`, and `created_at`. When renaming a migration
-> logical name, update this table in both databases to match the new name;
-> otherwise the runner will attempt to re-apply the migration on next startup.
-
-```bash
-# Example: fix a renamed migration entry in the test DB
-psql "postgresql://penpot:penpot@postgres/penpot_test" \
-  -c "UPDATE migrations SET step = 'new-name' WHERE step = 'old-name';"
-```
-
-### Database Access (Clojure)
 
 `app.db` wraps next.jdbc. Queries use a SQL builder that auto-converts kebab-case ↔ snake_case.
 
@@ -191,69 +146,3 @@ optimized implementations:
 `src/app/config.clj` reads `PENPOT_*` environment variables, validated with
 Malli. Access anywhere via `(cf/get :smtp-host)`. Feature flags: `(cf/flags
 :enable-smtp)`.
-
-
-### Background Tasks
-
-Background tasks live in `src/app/tasks/`. Each task is an Integrant component
-that exposes a `::handler` key and follows this three-method pattern:
-
-```clojure
-(defmethod ig/assert-key ::handler   ;; validate config at startup
-  [_ params]
-  (assert (db/pool? (::db/pool params)) "expected a valid database pool"))
-
-(defmethod ig/expand-key ::handler   ;; inject defaults before init
-  [k v]
-  {k (assoc v ::my-option default-value)})
-
-(defmethod ig/init-key ::handler     ;; return the task fn
-  [_ cfg]
-  (fn [_task]                        ;; receives the task row from the worker
-    (db/tx-run! cfg (fn [{:keys [::db/conn]}]
-                      ;; … do work …
-                      ))))
-```
-
-**Wiring a new task** requires two changes in `src/app/main.clj`:
-
-1. **Handler config** – add an entry in `system-config` with the dependencies:
-
-```clojure
-:app.tasks.my-task/handler
-{::db/pool (ig/ref ::db/pool)}
-```
-
-2. **Registry + cron** – register the handler name and schedule it:
-
-```clojure
-;; in ::wrk/registry ::wrk/tasks map:
-:my-task (ig/ref :app.tasks.my-task/handler)
-
-;; in worker-config ::wrk/cron ::wrk/entries vector:
-{:cron #penpot/cron "0 0 0 * * ?"   ;; daily at midnight
- :task :my-task}
-```
-
-**Useful cron patterns** (Quartz format — six fields: s m h dom mon dow):
-
-| Expression                   | Meaning            |
-|------------------------------|--------------------|
-| `"0 0 0 * * ?"`              | Daily at midnight  |
-| `"0 0 */6 * * ?"`            | Every 6 hours      |
-| `"0 */5 * * * ?"`            | Every 5 minutes    |
-
-**Time helpers** (`app.common.time`):
-
-```clojure
-(ct/now)                          ;; current instant
-(ct/duration {:hours 1})          ;; java.time.Duration
-(ct/minus (ct/now) some-duration) ;; subtract duration from instant
-```
-
-`db/interval` converts a `Duration` (or millis / string) to a PostgreSQL
-interval object suitable for use in SQL queries:
-
-```clojure
-(db/interval (ct/duration {:hours 1}))  ;; → PGInterval "3600.0 seconds"
-```

backend/package.json

@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "pnpm@10.31.0+sha512.e3927388bfaa8078ceb79b748ffc1e8274e84d75163e67bc22e06c0d3aed43dd153151cbf11d7f8301ff4acb98c68bdc5cadf6989532801ffafe3b3e4a63c268",
+  "packageManager": "pnpm@10.26.2+sha512.0e308ff2005fc7410366f154f625f6631ab2b16b1d2e70238444dd6ae9d630a8482d92a451144debc492416896ed16f7b114a86ec68b8404b2443869e68ffda6",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"

backend/resources/app/email/invite-to-org/en.html

@@ -1,264 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title>
-  </title>
-  <!--[if !mso]><!-- -->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <!--[if !mso]><!-->
-  <link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-
-      .mj-column-px-425 {
-        width: 425px !important;
-        max-width: 425px;
-      }
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="background-color:#E5E5E5;">
-  <div style="background-color:#E5E5E5;">
-    <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:collapse;border-spacing:0px;">
-                        <tbody>
-                          <tr>
-                            <td style="width:97px;">
-                              <img height="32" src="{{ public-uri }}/images/email/uxbox-title.png"
-                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
-                                width="97" />
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
-        <tr>
-
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div
-                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        Hi{% if user-name %} {{ user-name|abbreviate:25 }}{% endif %},
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div
-                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        <b>{{invited-by|abbreviate:25}}</b> sent you an invitation to join the organization:
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div
-                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="20" height="20" style="display:inline-block;vertical-align:middle;">
-                          <tr>
-                            <td width="20" height="20" align="center" valign="middle"
-                                background="{{org-logo}}"
-                                style="width:20px;height:20px;text-align:center;font-weight:bold;font-size:9px;line-height:20px;color:#ffffff;background-size:cover;background-position:center;background-repeat:no-repeat;border-radius: 50%;color:black">
-                              {{org-initials}}
-                            </td>
-                          </tr>
-                        </table>
-                        <span style="display:inline-block; vertical-align: middle;padding-left:5px;height:20px;line-height: 20px;">
-                        “{{ organization-name|abbreviate:25 }}”
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" vertical-align="middle"
-                      style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                        style="border-collapse:separate;line-height:100%;">
-                        <tr>
-                          <td align="center" bgcolor="#6911d4" role="presentation"
-                            style="border:none;border-radius:8px;cursor:auto;mso-padding-alt:10px 25px;background:#6911d4;"
-                            valign="middle">
-                            <a href="{{ public-uri }}/#/auth/verify-token?token={{token}}"
-                              style="display:inline-block;background:#6911d4;color:#FFFFFF;font-family:Source Sans Pro, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:8px;"
-                              target="_blank"> ACCEPT INVITE </a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div
-                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        Enjoy!</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div
-                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        The Penpot team.</div>
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-
-        </tr>
-
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    {% include "app/email/includes/footer.html" %}
-
-  </div>
-</body>
-
-</html>

backend/resources/app/email/invite-to-org/en.subj

@@ -1 +0,0 @@
-{{invited-by|abbreviate:25}} has invited you to join the organization “{{ organization-name|abbreviate:25 }}”

backend/resources/app/email/invite-to-org/en.txt

@@ -1,10 +0,0 @@
-Hello!
-
-{{invited-by|abbreviate:25}} has invited you to join the organization “{{ organization-name|abbreviate:25 }}”.
-
-Accept invitation using this link:
-
-{{ public-uri }}/#/auth/verify-token?token={{token}}
-
-Enjoy!
-The Penpot team.

backend/resources/app/email/invite-to-team/en.html

@@ -186,8 +186,7 @@
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                       <div
                         style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”{% if organization %}
+                        {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.</div>
-                         part of the organization “{{ organization|abbreviate:25 }}”{% endif %}.</div>
                     </td>
                   </tr>
                   <tr>

backend/resources/app/email/invite-to-team/en.txt

@@ -1,6 +1,6 @@
 Hello!
 
-{{invited-by|abbreviate:25}} has invited you to join the team "{{ team|abbreviate:25 }}"{% if organization %}, part of the organization "{{ organization|abbreviate:25 }}"{% endif %}.
+{{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.
 
 Accept invitation using this link:
 

backend/scripts/_env

@@ -2,7 +2,6 @@
 
 export PENPOT_NITRATE_SHARED_KEY=super-secret-nitrate-api-key
 export PENPOT_EXPORTER_SHARED_KEY=super-secret-exporter-api-key
-export PENPOT_NEXUS_SHARED_KEY=super-secret-nexus-api-key
 export PENPOT_SECRET_KEY=super-secret-devenv-key
 
 # DEPRECATED: only used for subscriptions
@@ -45,10 +44,6 @@ export PENPOT_FLAGS="\
        enable-redis-cache \
        enable-subscriptions";
 
-# Uncomment for nexus integration testing
-# export PENPOT_FLAGS="$PENPOT_FLAGS enable-audit-log-archive";
-# export PENPOT_AUDIT_LOG_ARCHIVE_URI="http://localhost:6070/api/audit";
-
 # Default deletion delay for devenv
 export PENPOT_DELETION_DELAY="24h"
 

backend/src/app/auth/oidc.clj

@@ -401,9 +401,8 @@
 
 (defn- parse-attr-path
   [provider path]
-  (let [separator        (if (str/includes? path "__") "__" ".")
+  (let [[fitem & items] (str/split path "__")]
-        [fitem & items]  (str/split path separator)]
+    (into [(keyword (:type provider) fitem)] (map keyword) items)))
-    (into [(keyword (:type provider) (str/kebab fitem))] (map keyword) items)))
 
 (defn- build-redirect-uri
   []
@@ -424,7 +423,7 @@
 
 (defn- qualify-prop-key
   [provider k]
-  (keyword (:type provider) (-> k name str/kebab)))
+  (keyword (:type provider) (name k)))
 
 (defn- qualify-props
   [provider props]
@@ -489,9 +488,9 @@
                 (let [attr-ph (parse-attr-path provider "nickname")]
                   (get-in props attr-ph))))]
 
-    (let [info    (assoc info :provider-id (str (:id provider)))
+    (let [info  (assoc info :provider-id (str (:id provider)))
-          props   (qualify-props provider info)
+          props (qualify-props provider info)
-          email   (get-email props)]
+          email (get-email props)]
       {:backend  (:type provider)
        :fullname (or (get-name props) email)
        :email email
@@ -548,29 +547,16 @@
 (def ^:private valid-info?
   (sm/validator schema:info))
 
-(defn- select-user-info-source
-  "Normalise the provider's configured user-info source into a keyword the
-  dispatch below can match. The raw value comes from config as a string
-  per the malli schema in `app.config` (`\"token\"`, `\"userinfo\"`, or
-  `\"auto\"`) and from hard-coded per-provider maps as strings as well;
-  any unrecognised or missing value falls back to `:auto` (prefer claims,
-  use userinfo as fallback)."
-  [source]
-  (case source
-    "token"    :token
-    "userinfo" :userinfo
-    :auto))
-
 (defn- get-info
   [cfg provider state code]
   (let [tdata  (fetch-access-token cfg provider code)
         claims (get-id-token-claims provider tdata)
 
-        info   (case (select-user-info-source (get provider :user-info-source))
+        info   (case (get provider :user-info-source)
-                 :token    (dissoc claims :exp :iss :iat :aud :sid)
+                 :token (dissoc claims :exp :iss :iat :aud :sub :sid)
                  :userinfo (fetch-user-info cfg provider tdata)
-                 :auto     (or (some-> claims (dissoc :exp :iss :iat :aud :sid))
+                 (or (some-> claims (dissoc :exp :iss :iat :aud :sub :sid))
-                               (fetch-user-info cfg provider tdata)))
+                     (fetch-user-info cfg provider tdata)))
 
         info   (process-user-info provider tdata info)]
 

backend/src/app/binfile/v1.clj

@@ -40,8 +40,8 @@
    [promesa.util :as pu]
    [yetti.adapter :as yt])
   (:import
-   com.github.luben.zstd.ZstdInputStream
    com.github.luben.zstd.ZstdIOException
+   com.github.luben.zstd.ZstdInputStream
    com.github.luben.zstd.ZstdOutputStream
    java.io.DataInputStream
    java.io.DataOutputStream

backend/src/app/config.clj

@@ -82,10 +82,7 @@
    :initial-project-skey "initial-project"
 
    ;; time to avoid email sending after profile modification
-   :email-verify-threshold "15m"
+   :email-verify-threshold "15m"})
-
-   :quotes-upload-sessions-per-profile 5
-   :quotes-upload-chunks-per-session 20})
 
 (def schema:config
   (do #_sm/optional-keys
@@ -106,7 +103,6 @@
 
     [:exporter-shared-key {:optional true} :string]
     [:nitrate-shared-key {:optional true} :string]
-    [:nexus-shared-key {:optional true} :string]
     [:management-api-key {:optional true} :string]
 
     [:telemetry-uri {:optional true} :string]
@@ -157,8 +153,6 @@
     [:quotes-snapshots-per-team {:optional true} ::sm/int]
     [:quotes-team-access-requests-per-team {:optional true} ::sm/int]
     [:quotes-team-access-requests-per-requester {:optional true} ::sm/int]
-    [:quotes-upload-sessions-per-profile {:optional true} ::sm/int]
-    [:quotes-upload-chunks-per-session {:optional true} ::sm/int]
 
     [:auth-token-cookie-name {:optional true} :string]
     [:auth-token-cookie-max-age {:optional true} ::ct/duration]
@@ -332,7 +326,7 @@
 
 (defn logging-context
   []
-  {:backend/version (:full version)})
+  {:version/backend (:full version)})
 
 ;; Set value for all new threads bindings.
 (alter-var-root #'*assert* (constantly (contains? flags :backend-asserts)))

backend/src/app/db.clj

@@ -36,11 +36,11 @@
    java.sql.Connection
    java.sql.PreparedStatement
    java.sql.Savepoint
+   org.postgresql.PGConnection
    org.postgresql.geometric.PGpoint
    org.postgresql.jdbc.PgArray
    org.postgresql.largeobject.LargeObject
    org.postgresql.largeobject.LargeObjectManager
-   org.postgresql.PGConnection
    org.postgresql.util.PGInterval
    org.postgresql.util.PGobject))
 

backend/src/app/email.clj

@@ -22,13 +22,13 @@
    [cuerdas.core :as str]
    [integrant.core :as ig])
   (:import
+   jakarta.mail.Message$RecipientType
+   jakarta.mail.Session
+   jakarta.mail.Transport
    jakarta.mail.internet.InternetAddress
    jakarta.mail.internet.MimeBodyPart
    jakarta.mail.internet.MimeMessage
    jakarta.mail.internet.MimeMultipart
-   jakarta.mail.Message$RecipientType
-   jakarta.mail.Session
-   jakarta.mail.Transport
    java.util.Properties))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -412,21 +412,6 @@
    :id ::invite-to-team
    :schema schema:invite-to-team))
 
-(def ^:private schema:invite-to-org
-  [:map
-   [:invited-by ::sm/text]
-   [:organization-name ::sm/text]
-   [:org-initials ::sm/text]
-   [:org-logo ::sm/uri]
-   [:user-name [:maybe ::sm/text]]
-   [:token ::sm/text]])
-
-(def invite-to-org
-  "Org member invitation email."
-  (template-factory
-   :id ::invite-to-org
-   :schema schema:invite-to-org))
-
 (def ^:private schema:join-team
   [:map
    [:invited-by ::sm/text]

backend/src/app/email/blacklist.clj

@@ -36,18 +36,10 @@
                :cause cause)))))
 
 (defn contains?
-  "Check if email is in the blacklist. Also matches subdomains: if
+  "Check if email is in the blacklist."
-  'somedomain.com' is blacklisted, 'xxx@foo.somedomain.com' will also
-  be rejected."
   [{:keys [::email/blacklist]} email]
-  (let [[_ domain] (str/split email "@" 2)
+  (let [[_ domain] (str/split email "@" 2)]
-        parts      (str/split (str/lower domain) #"\.")]
+    (c/contains? blacklist (str/lower domain))))
-    (loop [parts parts]
-      (if (empty? parts)
-        false
-        (if (c/contains? blacklist (str/join "." parts))
-          true
-          (recur (rest parts)))))))
 
 (defn enabled?
   "Check if the blacklist is enabled"

backend/src/app/features/file_snapshots.clj

@@ -112,9 +112,8 @@
                   THEN (c.deleted_at IS NULL OR c.deleted_at >= ?::timestamptz)
               END"))
 
-(defn get-snapshot-data
+(defn- get-snapshot
-  "Get a fully decoded snapshot for read-only preview or restoration.
+  "Get snapshot with decoded data"
-  Returns the snapshot map with decoded :data field."
   [cfg file-id snapshot-id]
   (let [now (ct/now)]
     (->> (db/get-with-sql cfg [sql:get-snapshot file-id snapshot-id now]
@@ -327,7 +326,7 @@
         (sto/resolve cfg {::db/reuse-conn true})
 
         snapshot
-        (get-snapshot-data cfg file-id snapshot-id)]
+        (get-snapshot cfg file-id snapshot-id)]
 
     (when-not snapshot
       (ex/raise :type :not-found

backend/src/app/http/debug.clj

@@ -31,6 +31,7 @@
    [app.srepl.main :as srepl]
    [app.storage :as-alias sto]
    [app.storage.tmp :as tmp]
+   [app.util.blob :as blob]
    [app.util.template :as tmpl]
    [cuerdas.core :as str]
    [datoteka.io :as io]
@@ -70,7 +71,8 @@
 
 (defn- get-resolved-file
   [cfg file-id]
-  (bfc/get-file cfg file-id :migrate? false :decode? false))
+  (some-> (bfc/get-file cfg file-id :migrate? false)
+          (update :data blob/encode)))
 
 (defn prepare-download
   [file filename]

backend/src/app/http/errors.clj

@@ -220,14 +220,12 @@
                          (assoc :hint (ex-message error)))}))))
 
 (defmethod handle-exception java.io.IOException
-  [cause request _]
+  [cause _ _]
-  (binding [l/*context* (request->context request)]
+  (l/wrn :hint "io exception" :cause cause)
-    (l/wrn :hint "io exception" :cause cause)
+  {::yres/status 500
-    {::yres/status 500
+   ::yres/body {:type :server-error
-     ::yres/body {:type :server-error
+                :code :io-exception
-                  :code :io-exception
+                :hint (ex-message cause)}})
-                  :hint (ex-message cause)
-                  :path (:path request)}}))
 
 (defmethod handle-exception java.util.concurrent.CompletionException
   [cause request _]

backend/src/app/http/sse.clj

@@ -53,7 +53,6 @@
      ::yres/status 200
      ::yres/body (yres/stream-body
                   (fn [_ output]
-
                     (let [channel  (sp/chan :buf buf :xf (keep encode))
                           listener (events/spawn-listener
                                     channel

backend/src/app/loggers/audit.clj

@@ -120,7 +120,7 @@
 ;; an external storage and data cleared.
 
 (def ^:private schema:event
-  [:map {:title "AuditEvent"}
+  [:map {:title "event"}
    [::type ::sm/text]
    [::name ::sm/text]
    [::profile-id ::sm/uuid]

backend/src/app/loggers/audit/archive_task.clj

@@ -10,11 +10,14 @@
    [app.common.logging :as l]
    [app.common.schema :as sm]
    [app.common.transit :as t]
+   [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
    [app.http.client :as http]
    [app.setup :as-alias setup]
+   [app.tokens :as tokens]
    [integrant.core :as ig]
+   [lambdaisland.uri :as u]
    [promesa.exec :as px]))
 
 ;; This is a task responsible to send the accumulated events to
@@ -49,18 +52,19 @@
 
 (defn- send!
   [{:keys [::uri] :as cfg} events]
-  (let [skey    (-> cfg ::setup/shared-keys :nexus)
+  (let [token   (tokens/generate cfg
+                                 {:iss "authentication"
+                                  :uid uuid/zero})
         body    (t/encode {:events events})
         headers {"content-type" "application/transit+json"
                  "origin" (str (cf/get :public-uri))
-                 "x-shared-key" (str "nexus " skey)}
+                 "cookie" (u/map->query-string {:auth-token token})}
         params  {:uri uri
                  :timeout 12000
                  :method :post
                  :headers headers
                  :body body}
         resp    (http/req! cfg params)]
-
     (if (= (:status resp) 204)
       true
       (do
@@ -81,7 +85,7 @@
 (def ^:private sql:get-audit-log-chunk
   "SELECT *
      FROM audit_log
-    WHERE archived_at IS NULL
+    WHERE archived_at is null
     ORDER BY created_at ASC
     LIMIT 128
       FOR UPDATE
@@ -105,7 +109,7 @@
 (def ^:private schema:handler-params
   [:map
    ::db/pool
-   ::setup/shared-keys
+   ::setup/props
    ::http/client])
 
 (defmethod ig/assert-key ::handler

backend/src/app/loggers/database.clj

@@ -50,9 +50,9 @@
                (ex-data cause))
 
         ctx  (-> context
-                 (assoc :backend/tenant (cf/get :tenant))
+                 (assoc :service/tenant (cf/get :tenant))
-                 (assoc :backend/host (cf/get :host))
+                 (assoc :service/host (cf/get :host))
-                 (assoc :backend/public-uri (str (cf/get :public-uri)))
+                 (assoc :service/public-uri (str (cf/get :public-uri)))
                  (assoc :backend/version (:full cf/version))
                  (assoc :logger/name logger)
                  (assoc :logger/level level)

backend/src/app/main.clj

@@ -388,7 +388,6 @@
      :offload-file-data  (ig/ref :app.tasks.offload-file-data/handler)
      :tasks-gc           (ig/ref :app.tasks.tasks-gc/handler)
      :telemetry          (ig/ref :app.tasks.telemetry/handler)
-     :upload-session-gc  (ig/ref :app.tasks.upload-session-gc/handler)
      :storage-gc-deleted (ig/ref ::sto.gc-deleted/handler)
      :storage-gc-touched (ig/ref ::sto.gc-touched/handler)
      :session-gc         (ig/ref ::session.tasks/gc)
@@ -424,9 +423,6 @@
    :app.tasks.tasks-gc/handler
    {::db/pool (ig/ref ::db/pool)}
 
-   :app.tasks.upload-session-gc/handler
-   {::db/pool (ig/ref ::db/pool)}
-
    :app.tasks.objects-gc/handler
    {::db/pool     (ig/ref ::db/pool)
     ::sto/storage (ig/ref ::sto/storage)}
@@ -470,17 +466,16 @@
 
    ::setup/shared-keys
    {::setup/props (ig/ref ::setup/props)
-    :nexus        (cf/get :nexus-shared-key)
+    :nitrate (cf/get :nitrate-shared-key)
-    :nitrate      (cf/get :nitrate-shared-key)
+    :exporter (cf/get :exporter-shared-key)}
-    :exporter     (cf/get :exporter-shared-key)}
 
    ::setup/clock
    {}
 
    :app.loggers.audit.archive-task/handler
-   {::setup/shared-keys  (ig/ref ::setup/shared-keys)
+   {::setup/props        (ig/ref ::setup/props)
-    ::http.client/client (ig/ref ::http.client/client)
+    ::db/pool            (ig/ref ::db/pool)
-    ::db/pool            (ig/ref ::db/pool)}
+    ::http.client/client (ig/ref ::http.client/client)}
 
    :app.loggers.audit.gc-task/handler
    {::db/pool (ig/ref ::db/pool)}
@@ -548,9 +543,6 @@
      {:cron #penpot/cron "0 0 0 * * ?" ;; daily
       :task :tasks-gc}
 
-     {:cron #penpot/cron "0 0 0 * * ?" ;; daily
-      :task :upload-session-gc}
-
      {:cron #penpot/cron "0 0 2 * * ?" ;; daily
       :task :file-gc-scheduler}
 

backend/src/app/media.clj

@@ -31,8 +31,8 @@
   (:import
    clojure.lang.XMLHandler
    java.io.InputStream
-   javax.xml.parsers.SAXParserFactory
    javax.xml.XMLConstants
+   javax.xml.parsers.SAXParserFactory
    org.apache.commons.io.IOUtils
    org.im4java.core.ConvertCmd
    org.im4java.core.IMOperation))
@@ -54,7 +54,7 @@
    [:path ::fs/path]
    [:mtype {:optional true} ::sm/text]])
 
-(def check-input
+(def ^:private check-input
   (sm/check-fn schema:input))
 
 (defn validate-media-type!
@@ -409,22 +409,6 @@
               (when (zero? (:exit res))
                 (:out res))))
 
-          (woff2->sfnt [data]
-            ;; woff2_decompress outputs to same directory with .ttf extension
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix ".woff2")
-                  foutput (fs/path (str/replace (str finput) #"\.woff2$" ".ttf"))]
-              (try
-                (io/write* finput data)
-                (let [res (sh/sh "woff2_decompress" (str finput))]
-                  (if (zero? (:exit res))
-                    foutput
-                    (do
-                      (when (fs/exists? foutput)
-                        (fs/delete foutput))
-                      nil)))
-                (finally
-                  (fs/delete finput)))))
-
           ;; Documented here:
           ;; https://docs.microsoft.com/en-us/typography/opentype/spec/otff#table-directory
           (get-sfnt-type [data]
@@ -474,27 +458,4 @@
 
               (= stype :ttf)
               (-> (assoc "font/otf" (ttf->otf sfnt))
-                  (assoc "font/ttf" sfnt)))))
+                  (assoc "font/ttf" sfnt)))))))))
-
-        (contains? current "font/woff2")
-        (let [data    (get input "font/woff2")
-              foutput (woff2->sfnt data)]
-          (when-not foutput
-            (ex/raise :type :validation
-                      :code :invalid-woff2-file
-                      :hint "invalid woff2 file"))
-          (try
-            (let [sfnt  (io/read* foutput)
-                  type (get-sfnt-type sfnt)]
-              (cond-> input
-                (= type :otf)
-                (-> (assoc "font/otf" sfnt)
-                    (assoc "font/ttf" (otf->ttf sfnt))
-                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))
-
-                (= type :ttf)
-                (-> (assoc "font/ttf" sfnt)
-                    (assoc "font/otf" (ttf->otf sfnt))
-                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))))
-            (finally
-              (fs/delete foutput))))))))

backend/src/app/metrics.clj

@@ -15,16 +15,16 @@
    io.prometheus.client.CollectorRegistry
    io.prometheus.client.Counter
    io.prometheus.client.Counter$Child
-   io.prometheus.client.exporter.common.TextFormat
    io.prometheus.client.Gauge
    io.prometheus.client.Gauge$Child
    io.prometheus.client.Histogram
    io.prometheus.client.Histogram$Child
-   io.prometheus.client.hotspot.DefaultExports
    io.prometheus.client.SimpleCollector
    io.prometheus.client.Summary
    io.prometheus.client.Summary$Builder
    io.prometheus.client.Summary$Child
+   io.prometheus.client.exporter.common.TextFormat
+   io.prometheus.client.hotspot.DefaultExports
    java.io.StringWriter))
 
 (set! *warn-on-reflection* true)

backend/src/app/migrations.clj

@@ -463,19 +463,8 @@
     :fn (mg/resource "app/migrations/sql/0144-mod-server-error-report-table.sql")}
 
    {:name "0145-fix-plugins-uri-on-profile"
-    :fn mg0145/migrate}
+    :fn mg0145/migrate}])
 
-   {:name "0145-mod-audit-log-table"
-    :fn (mg/resource "app/migrations/sql/0145-mod-audit-log-table.sql")}
-
-   {:name "0146-mod-access-token-table"
-    :fn (mg/resource "app/migrations/sql/0146-mod-access-token-table.sql")}
-
-   {:name "0147-mod-team-invitation-table"
-    :fn (mg/resource "app/migrations/sql/0147-mod-team-invitation-table.sql")}
-
-   {:name "0147-add-upload-session-table"
-    :fn (mg/resource "app/migrations/sql/0147-add-upload-session-table.sql")}])
 
 (defn apply-migrations!
   [pool name migrations]

backend/src/app/migrations/clj/migration_0023.clj

@@ -58,3 +58,4 @@
       (when (nil? (:data file))
         (migrate-file conn file)))
     (db/exec-one! conn ["drop table page cascade;"])))
+

backend/src/app/migrations/sql/0145-mod-audit-log-table.sql

@@ -1,2 +0,0 @@
-CREATE INDEX audit_log__created_at__idx ON audit_log(created_at) WHERE archived_at IS NULL;
-CREATE INDEX audit_log__archived_at__idx ON audit_log(archived_at) WHERE archived_at IS NOT NULL;

backend/src/app/migrations/sql/0146-mod-access-token-table.sql

@@ -1,2 +0,0 @@
-ALTER TABLE access_token
- ADD COLUMN type text NULL;

backend/src/app/migrations/sql/0147-add-upload-session-table.sql

@@ -1,14 +0,0 @@
-CREATE TABLE upload_session (
-  id         uuid PRIMARY KEY,
-
-  created_at timestamptz NOT NULL DEFAULT now(),
-
-  profile_id    uuid NOT NULL REFERENCES profile(id) ON DELETE CASCADE,
-  total_chunks  integer NOT NULL
-);
-
-CREATE INDEX upload_session__profile_id__idx
-    ON upload_session(profile_id);
-
-CREATE INDEX upload_session__created_at__idx
-    ON upload_session(created_at);

backend/src/app/migrations/sql/0147-mod-team-invitation-table.sql

@@ -1,13 +0,0 @@
-ALTER TABLE team_invitation
- ADD COLUMN org_id uuid NULL;
-
-ALTER TABLE team_invitation
- ALTER COLUMN team_id DROP NOT NULL;
-
-ALTER TABLE team_invitation
- ADD CONSTRAINT team_invitation_team_or_org_not_null
- CHECK (team_id IS NOT NULL OR org_id IS NOT NULL);
-
-CREATE UNIQUE INDEX team_invitation_org_unique
-    ON team_invitation (org_id, email_to)
-    WHERE team_id IS NULL;

backend/src/app/nitrate.clj

@@ -1,23 +1,13 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
 (ns app.nitrate
   "Module that make calls to the external nitrate aplication"
   (:require
-   [app.common.exceptions :as ex]
-   [app.common.json :as json]
    [app.common.logging :as l]
    [app.common.schema :as sm]
-   [app.common.schema.generators :as sg]
-   [app.common.time :as ct]
-   [app.common.types.organization :as cto]
    [app.config :as cf]
    [app.http.client :as http]
    [app.rpc :as-alias rpc]
    [app.setup :as-alias setup]
+   [app.util.json :as json]
    [clojure.core :as c]
    [integrant.core :as ig]))
 
@@ -26,16 +16,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defn- request-builder
-  [cfg method uri shared-key profile-id request-params]
+  [cfg method uri shared-key profile-id]
   (fn []
-    (http/req! cfg (cond-> {:method method
+    (http/req! cfg {:method method
-                            :headers {"content-type" "application/json"
+                    :headers {"content-type" "application/json"
-                                      "accept" "application/json"
+                              "accept" "application/json"
-                                      "x-shared-key" shared-key
+                              "x-shared-key" shared-key
-                                      "x-profile-id" (str profile-id)}
+                              "x-profile-id" (str profile-id)}
-                            :uri uri
+                    :uri uri
-                            :version :http1.1}
+                    :version :http1.1})))
-                     (= method :post) (assoc :body (json/encode request-params :key-fn json/write-camel-key))))))
+
 
 (defn- with-retries
   [handler max-retries]
@@ -57,41 +47,20 @@
 
 (defn- with-validate [handler uri schema]
   (fn []
-    (let [response (handler)
+    (let [coercer-http (sm/coercer schema
-          status (:status response)]
+                                   :type :validation
-      (when-not status
+                                   :hint (str "invalid data received calling " uri))]
-        (l/error :hint "could't do the nitrate request, it is probably down"
+      (try
-                 :uri uri)
+        (coercer-http (-> (handler) :body json/decode))
-        ;; TODO decide what to do when Nitrate is inaccesible
+        (catch Exception e
-        nil)
+          ;; TODO Error handling
-      (cond
+          (l/error :hint "error validating json response" :cause e)
-        (>= status 400)
+          nil)))))
-        ;; For error status codes (4xx, 5xx), fail immediately without validation
-        (do
-          (when (not= status 404) ;; Don't need to log 404
-            (l/error :hint "nitrate request failed with error status"
-                     :uri uri
-                     :status status
-                     :body (:body response)))
-          nil)
-        (= status 204) ;; 204 doesn't return any body
-        nil
-        :else ;; For success status codes, validate the response
-        (let [coercer-http (sm/coercer schema
-                                       :type :validation
-                                       :hint (str "invalid data received calling " uri))
-              data (-> response :body (json/decode :key-fn json/read-kebab-key))]
-          (try
-            (coercer-http data)
-            (catch Exception e
-              ;; TODO Error handling
-              (l/error :hint "error validating json response" :cause e)
-              nil)))))))
 
 (defn- request-to-nitrate
-  [cfg method uri schema {:keys [::rpc/profile-id request-params] :as params}]
+  [cfg method uri schema {:keys [::rpc/profile-id] :as params}]
   (let [shared-key     (-> cfg ::setup/shared-keys :nitrate)
-        full-http-call (-> (request-builder cfg method uri shared-key profile-id request-params)
+        full-http-call (-> (request-builder cfg method uri shared-key profile-id)
                            (with-retries 3)
                            (with-validate uri schema))]
     (full-http-call)))
@@ -109,226 +78,24 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def ^:private schema:org-summary
+(def ^:private schema:organization
   [:map
-   [:id ::sm/uuid]
-   [:name ::sm/text]
-   [:owner-id ::sm/uuid]
-   [:teams
-    [:vector
-     [:map
-      [:id ::sm/uuid]
-      [:is-your-penpot :boolean]]]]])
-
-(def ^:private schema:profile-org
-  [:map
-   [:is-member :boolean]
-   [:organization-id {:optional true} [:maybe ::sm/uuid]]
-   [:default-team-id {:optional true} [:maybe ::sm/uuid]]])
-
-
-;; TODO Unify with schemas on backend/src/app/http/management.clj
-(def ^:private schema:timestamp
-  (sm/type-schema
-   {:type ::timestamp
-    :pred ct/inst?
-    :type-properties
-    {:title "inst"
-     :description "The same as :app.common.time/inst but encodes to epoch"
-     :error/message "should be an instant"
-     :gen/gen (->> (sg/small-int)
-                   (sg/fmap (fn [v] (ct/inst v))))
-     :decode/string ct/inst
-     :encode/string inst-ms
-     :decode/json ct/inst
-     :encode/json inst-ms}}))
-
-(def ^:private schema:subscription
-  [:map {:title "Subscription"}
    [:id ::sm/text]
-   [:customer-id ::sm/text]
+   [:name ::sm/text]])
-   [:type [:enum
-           "unlimited"
-           "professional"
-           "enterprise"
-           "nitrate"]]
-   [:status [:enum
-             "active"
-             "canceled"
-             "incomplete"
-             "incomplete_expired"
-             "past_due"
-             "paused"
-             "trialing"
-             "unpaid"]]
 
-   [:billing-period [:enum
+(def ^:private schema:user
-                     "month"
-                     "day"
-                     "week"
-                     "year"]]
-   [:quantity :int]
-   [:description [:maybe ::sm/text]]
-   [:created-at schema:timestamp]
-   [:start-date [:maybe schema:timestamp]]
-   [:ended-at [:maybe schema:timestamp]]
-   [:trial-end [:maybe schema:timestamp]]
-   [:trial-start [:maybe schema:timestamp]]
-   [:cancel-at [:maybe schema:timestamp]]
-   [:canceled-at [:maybe schema:timestamp]]
-   [:current-period-end [:maybe schema:timestamp]]
-   [:current-period-start [:maybe schema:timestamp]]
-   [:cancel-at-period-end :boolean]
-
-   [:cancellation-details
-    [:map {:title "CancellationDetails"}
-     [:comment [:maybe ::sm/text]]
-     [:reason [:maybe ::sm/text]]
-     [:feedback [:maybe
-                 [:enum
-                  "customer_service"
-                  "low_quality"
-                  "missing_feature"
-                  "other"
-                  "switched_service"
-                  "too_complex"
-                  "too_expensive"
-                  "unused"]]]]]])
-
-(def ^:private schema:connectivity
   [:map
-   [:licenses ::sm/boolean]])
+   [:valid ::sm/boolean]])
 
-(defn- get-team-org-api
+(defn- get-team-org
   [cfg {:keys [team-id] :as params}]
   (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
+    (request-to-nitrate cfg :get (str baseuri "/api/teams/" (str team-id)) schema:organization params)))
-                        (str baseuri
-                             "/api/teams/"
-                             team-id)
-                        cto/schema:team-with-organization params)))
 
-(defn- get-org-membership-api
+(defn- is-valid-user
-  [cfg {:keys [profile-id organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/members/"
-                             profile-id)
-                        schema:profile-org params)))
-
-(defn- get-org-membership-by-team-api
-  [cfg {:keys [profile-id team-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/teams/"
-                             team-id
-                             "/users/"
-                             profile-id)
-                        schema:profile-org params)))
-
-
-(defn- get-org-summary-api
-  [cfg {:keys [organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/summary")
-                        schema:org-summary params)))
-
-
-(defn- set-team-org-api
-  [cfg {:keys [organization-id team-id is-default] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        params (assoc params :request-params {:team-id team-id
-                                              :is-your-penpot (true? is-default)})
-        team (request-to-nitrate cfg :post
-                                 (str baseuri
-                                      "/api/organizations/"
-                                      organization-id
-                                      "/add-team")
-                                 cto/schema:team-with-organization params)
-        custom-photo (when-let [logo-id (get-in team [:organization :logo-id])]
-                       (str (cf/get :public-uri) "/assets/by-id/" logo-id))]
-    (cond-> team
-      custom-photo
-      (assoc-in [:organization :custom-photo] custom-photo))))
-
-(defn- add-profile-to-org-api
-  [cfg {:keys [profile-id organization-id team-id email] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        request-params (cond-> {:user-id profile-id :team-id team-id}
-                         (some? email) (assoc :email email))
-        params (assoc params :request-params request-params)]
-    (request-to-nitrate cfg :post
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/add-user")
-                        schema:profile-org params)))
-
-(defn- remove-profile-from-org-api
-  [cfg {:keys [profile-id organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        params (assoc params :request-params {:user-id profile-id})]
-    (request-to-nitrate cfg :post
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/remove-user")
-                        nil params)))
-
-(defn- remove-profile-from-all-orgs-api
   [cfg {:keys [profile-id] :as params}]
   (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :post
+    (request-to-nitrate cfg :get (str baseuri "/api/users/" (str profile-id)) schema:user params)))
-                        (str baseuri
-                             "/api/users/"
-                             profile-id
-                             "/remove-organizations")
-                        nil params)))
-
-(defn- remove-team-from-org-api
-  [cfg {:keys [team-id organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        params (assoc params :request-params {:team-id team-id})]
-    (request-to-nitrate cfg :post
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/remove-team")
-                        nil params)))
-
-(defn- delete-team-api
-  [cfg {:keys [team-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :delete
-                        (str baseuri
-                             "/api/teams/"
-                             team-id)
-                        nil params)))
-
-(defn- get-subscription-api
-  [cfg {:keys [profile-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/subscriptions/"
-                             profile-id)
-                        schema:subscription params)))
-
-(defn- get-connectivity-api
-  [cfg params]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/connectivity")
-                        schema:connectivity params)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; INITIALIZATION
@@ -337,18 +104,8 @@
 (defmethod ig/init-key ::client
   [_ cfg]
   (when (contains? cf/flags :nitrate)
-    {:get-team-org                 (partial get-team-org-api cfg)
+    {:get-team-org (partial get-team-org cfg)
-     :set-team-org                 (partial set-team-org-api cfg)
+     :is-valid-user (partial is-valid-user cfg)}))
-     :get-org-membership           (partial get-org-membership-api cfg)
-     :get-org-membership-by-team   (partial get-org-membership-by-team-api cfg)
-     :get-org-summary              (partial get-org-summary-api cfg)
-     :add-profile-to-org           (partial add-profile-to-org-api cfg)
-     :remove-profile-from-org      (partial remove-profile-from-org-api cfg)
-     :remove-profile-from-all-orgs (partial remove-profile-from-all-orgs-api cfg)
-     :delete-team                  (partial delete-team-api cfg)
-     :remove-team-from-org         (partial remove-team-from-org-api cfg)
-     :get-subscription             (partial get-subscription-api cfg)
-     :connectivity                 (partial get-connectivity-api cfg)}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; UTILS
@@ -356,57 +113,18 @@
 
 
 (defn add-nitrate-licence-to-profile
-  "Enriches a profile map with subscription information from Nitrate.
-  Adds a :subscription field containing the user's license details.
-  Returns the original profile unchanged if the request fails."
   [cfg profile]
   (try
-    (let [subscription (call cfg :get-subscription {:profile-id (:id profile)})]
+    (let [nitrate-licence (call cfg :is-valid-user {:profile-id (:id profile)})]
-      (assoc profile :subscription subscription))
+      (assoc profile :nitrate-licence (:valid nitrate-licence)))
     (catch Throwable cause
       (l/error :hint "failed to get nitrate licence"
                :profile-id (:id profile)
                :cause cause)
       profile)))
 
-(defn add-org-info-to-team
+(defn add-org-to-team
-  "Enriches a team map with organization information from Nitrate.
-  Adds organization-id, organization-name, organization-slug, organization-owner-id, and your-penpot fields.
-  Returns the original team unchanged if the request fails or org data is nil."
   [cfg team params]
-  (try
+  (let [params (assoc (or params {}) :team-id (:id team))
-    (let [params        (assoc (or params {}) :team-id (:id team))
+        org (call cfg :get-team-org params)]
-          team-with-org (call cfg :get-team-org params)
+    (assoc team :organization-id (:id org) :organization-name (:name org))))
-          org           (:organization team-with-org)]
-      (if (some? org)
-        (-> (cto/apply-organization team (assoc org :custom-photo
-                                                (when-let [logo-id (:logo-id org)]
-                                                  (str (cf/get :public-uri) "/assets/by-id/" logo-id))))
-            (assoc :is-default (or (:is-default team) (true? (:is-your-penpot team-with-org)))))
-        team))
-    (catch Throwable cause
-      (l/error :hint "failed to get team organization info"
-               :team-id (:id team)
-               :cause cause)
-      team)))
-
-(defn set-team-organization
-  "Associates a team with an organization in Nitrate.
-  Requires organization-id and is-default in params.
-  Throws an exception if the request fails."
-  [cfg team params]
-  (let [params (assoc (or params {})
-                      :team-id (:id team)
-                      :organization-id (:organization-id params)
-                      :is-default (:is-default params))
-        result (call cfg :set-team-org params)]
-    (when (nil? result)
-      (ex/raise :type :internal
-                :code :failed-to-set-team-org
-                :context {:team-id (:id team)
-                          :organization-id (:organization-id params)}))
-    team))
-
-
-
-

backend/src/app/redis.clj

@@ -24,28 +24,28 @@
    [integrant.core :as ig])
   (:import
    clojure.lang.MapEntry
-   io.lettuce.core.api.StatefulRedisConnection
-   io.lettuce.core.api.sync.RedisCommands
-   io.lettuce.core.api.sync.RedisScriptingCommands
-   io.lettuce.core.codec.RedisCodec
-   io.lettuce.core.codec.StringCodec
    io.lettuce.core.KeyValue
-   io.lettuce.core.pubsub.api.sync.RedisPubSubCommands
-   io.lettuce.core.pubsub.RedisPubSubListener
-   io.lettuce.core.pubsub.StatefulRedisPubSubConnection
    io.lettuce.core.RedisClient
    io.lettuce.core.RedisCommandInterruptedException
    io.lettuce.core.RedisCommandTimeoutException
    io.lettuce.core.RedisException
    io.lettuce.core.RedisURI
-   io.lettuce.core.resource.ClientResources
-   io.lettuce.core.resource.DefaultClientResources
    io.lettuce.core.ScriptOutputType
    io.lettuce.core.SetArgs
+   io.lettuce.core.api.StatefulRedisConnection
+   io.lettuce.core.api.sync.RedisCommands
+   io.lettuce.core.api.sync.RedisScriptingCommands
+   io.lettuce.core.codec.RedisCodec
+   io.lettuce.core.codec.StringCodec
+   io.lettuce.core.pubsub.RedisPubSubListener
+   io.lettuce.core.pubsub.StatefulRedisPubSubConnection
+   io.lettuce.core.pubsub.api.sync.RedisPubSubCommands
+   io.lettuce.core.resource.ClientResources
+   io.lettuce.core.resource.DefaultClientResources
    io.netty.channel.nio.NioEventLoopGroup
-   io.netty.util.concurrent.EventExecutorGroup
    io.netty.util.HashedWheelTimer
    io.netty.util.Timer
+   io.netty.util.concurrent.EventExecutorGroup
    java.lang.AutoCloseable
    java.time.Duration))
 

backend/src/app/rpc.clj

@@ -73,13 +73,9 @@
                                      (if (nil? result)
                                        204
                                        200))
-
+                         headers (cond-> (::http/headers mdata {})
-                         headers (::http/headers mdata {})
+                                   (yres/stream-body? result)
-                         headers (cond-> headers
-                                   (and (yres/stream-body? result)
-                                        (not (contains? headers "content-type")))
                                    (assoc "content-type" "application/octet-stream"))]
-
                      {::yres/status  status
                       ::yres/headers headers
                       ::yres/body    result}))]
@@ -96,7 +92,6 @@
     (fn [{:keys [params path-params method] :as request}]
       (let [handler-name (:method-name path-params)
             etag         (yreq/get-header request "if-none-match")
-            session-id   (yreq/get-header request "x-session-id")
 
             key-id       (get request ::http/auth-key-id)
             profile-id   (or (::session/profile-id request)
@@ -109,7 +104,6 @@
                              (assoc ::handler-name handler-name)
                              (assoc ::ip-addr ip-addr)
                              (assoc ::request-at (ct/now))
-                             (assoc ::session-id (some-> session-id uuid/parse*))
                              (assoc ::cond/key etag)
                              (cond-> (uuid? profile-id)
                                (assoc ::profile-id profile-id)))
@@ -264,7 +258,6 @@
           'app.rpc.commands.ldap
           'app.rpc.commands.management
           'app.rpc.commands.media
-          'app.rpc.commands.nitrate
           'app.rpc.commands.profile
           'app.rpc.commands.projects
           'app.rpc.commands.search

backend/src/app/rpc/commands/access_token.clj

@@ -23,7 +23,7 @@
   (dissoc row :perms))
 
 (defn create-access-token
-  [{:keys [::db/conn] :as cfg} profile-id name expiration type]
+  [{:keys [::db/conn] :as cfg} profile-id name expiration]
   (let [token-id   (uuid/next)
         expires-at (some-> expiration (ct/in-future))
         created-at (ct/now)
@@ -36,7 +36,6 @@
                                {:id token-id
                                 :name name
                                 :token token
-                                :type type
                                 :profile-id profile-id
                                 :created-at created-at
                                 :updated-at created-at
@@ -51,18 +50,17 @@
 (def ^:private schema:create-access-token
   [:map {:title "create-access-token"}
    [:name [:string {:max 250 :min 1}]]
-   [:expiration {:optional true} ::ct/duration]
+   [:expiration {:optional true} ::ct/duration]])
-   [:type {:optional true} :string]])
 
 (sv/defmethod ::create-access-token
   {::doc/added "1.18"
    ::sm/params schema:create-access-token}
-  [cfg {:keys [::rpc/profile-id name expiration type]}]
+  [cfg {:keys [::rpc/profile-id name expiration]}]
 
   (quotes/check! cfg {::quotes/id ::quotes/access-tokens-per-profile
                       ::quotes/profile-id profile-id})
 
-  (db/tx-run! cfg create-access-token profile-id name expiration type))
+  (db/tx-run! cfg create-access-token profile-id name expiration))
 
 (def ^:private schema:delete-access-token
   [:map {:title "delete-access-token"}
@@ -85,22 +83,5 @@
   (->> (db/query pool :access-token
                  {:profile-id profile-id}
                  {:order-by [[:expires-at :asc] [:created-at :asc]]
-                  :columns [:id :name :perms :type :created-at :updated-at :expires-at]})
+                  :columns [:id :name :perms :created-at :updated-at :expires-at]})
        (mapv decode-row)))
-
-(def ^:private schema:get-current-mcp-token
-  [:map {:title "get-current-mcp-token"}])
-
-(sv/defmethod ::get-current-mcp-token
-  {::doc/added "2.15"
-   ::sm/params schema:get-current-mcp-token}
-  [{:keys [::db/pool]} {:keys [::rpc/profile-id ::rpc/request-at]}]
-  (->> (db/query pool :access-token
-                 {:profile-id profile-id
-                  :type "mcp"}
-                 {:order-by [[:expires-at :asc] [:created-at :asc]]
-                  :columns [:token :expires-at]})
-       (remove #(and (some? (:expires-at %))
-                     (ct/is-after? request-at (:expires-at %))))
-       (map decode-row)
-       (first)))

backend/src/app/rpc/commands/auth.clj

@@ -253,15 +253,12 @@
               :hint "email has complaint reports")))
 
 (defn prepare-register
-  [{:keys [::db/pool] :as cfg} {:keys [fullname email] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [fullname email accept-newsletter-updates] :as params}]
 
   (validate-register-attempt! cfg params)
 
   (let [email   (profile/clean-email email)
         profile (profile/get-profile-by-email pool email)
-        props   (-> (audit/extract-utm-params params)
-                    (cond-> (:accept-newsletter-updates params)
-                      (assoc :newsletter-updates true)))
         params  {:email email
                  :fullname fullname
                  :password (:password params)
@@ -270,12 +267,13 @@
                  :iss :prepared-register
                  :profile-id (:id profile)
                  :exp (ct/in-future {:days 7})
-                 :props props}
+                 :props {:newsletter-updates (or accept-newsletter-updates false)}}
+
         params (d/without-nils params)
         token  (tokens/generate cfg params)]
 
-    (-> {:token token}
+    (with-meta {:token token}
-        (with-meta {::audit/profile-id uuid/zero}))))
+      {::audit/profile-id uuid/zero})))
 
 (def schema:prepare-register-profile
   [:map {:title "prepare-register-profile"}
@@ -283,7 +281,6 @@
    [:email ::sm/email]
    [:password schema:password]
    [:create-welcome-file {:optional true} :boolean]
-   [:accept-newsletter-updates {:optional true} :boolean]
    [:invitation-token {:optional true} schema:token]])
 
 (sv/defmethod ::prepare-register-profile
@@ -320,7 +317,8 @@
   attrs (all the other attrs are filled with default values)."
   [{:keys [::db/conn] :as cfg} {:keys [email] :as params}]
   (let [id        (or (:id params) (uuid/next))
-        props     (-> (:props params)
+        props     (-> (audit/extract-utm-params params)
+                      (merge (:props params))
                       (merge {:viewed-tutorial? false
                               :viewed-walkthrough? false
                               :nudge {:big 10 :small 1}
@@ -371,12 +369,11 @@
                     :cause cause)
           (throw cause))))))
 
+
 (defn create-profile-rels
-  [{:keys [::db/conn] :as cfg} {:keys [id] :as profile}]
+  [conn {:keys [id] :as profile}]
-  (assert (db/connection-map? cfg)
-          "expected cfg with valid connection")
   (let [features (cfeat/get-enabled-features cf/flags)
-        team     (teams/create-team cfg
+        team     (teams/create-team conn
                                     {:profile-id id
                                      :name "Default"
                                      :features features
@@ -412,9 +409,7 @@
 (defn register-profile
   [{:keys [::db/conn ::wrk/executor] :as cfg} {:keys [token] :as params}]
   (let [claims     (tokens/verify cfg {:token token :iss :prepared-register})
-        params     (cond-> claims
+        params     (into claims params)
-                     (:accept-newsletter-updates params)
-                     (update :props assoc :newsletter-updates true))
 
         profile    (if-let [profile-id (:profile-id claims)]
                      (profile/get-profile conn profile-id)
@@ -431,7 +426,7 @@
                                              (assoc :is-active is-active)
                                              (update :password auth/derive-password))
                                profile   (->> (create-profile cfg params)
-                                              (create-profile-rels cfg))]
+                                              (create-profile-rels conn))]
                            (vary-meta profile assoc :created true))))
 
         created?   (-> profile meta :created true?)
@@ -448,7 +443,6 @@
           (when (:create-welcome-file params)
             (let [cfg (dissoc cfg ::db/conn)]
               (wrk/submit! executor (create-welcome-file cfg profile)))))]
-
     (cond
       ;; When profile is blocked, we just ignore it and return plain data
       (:is-blocked profile)
@@ -456,8 +450,7 @@
         (l/wrn :hint "register attempt for already blocked profile"
                :profile-id (str  (:id profile))
                :profile-email (:email profile))
-        (rph/with-meta {:id (:id profile)
+        (rph/with-meta {:email (:email profile)}
-                        :email (:email profile)}
           {::audit/replace-props props
            ::audit/context {:action "ignore-because-blocked"}
            ::audit/profile-id (:id profile)
@@ -473,9 +466,7 @@
               (:member-email invitation)))
       (let [invitation (assoc invitation :member-id  (:id profile))
             token      (tokens/generate cfg invitation)]
-        (-> {:id (:id profile)
+        (-> {:invitation-token token}
-             :email (:email profile)
-             :invitation-token token}
             (rph/with-transform (session/create-fn cfg profile claims))
             (rph/with-meta {::audit/replace-props props
                             ::audit/context {:action "accept-invitation"}
@@ -498,8 +489,7 @@
           (when-not (eml/has-reports? conn (:email profile))
             (send-email-verification! cfg profile))
 
-          (-> {:id (:id profile)
+          (-> {:email (:email profile)}
-               :email (:email profile)}
               (rph/with-defer create-welcome-file-when-needed)
               (rph/with-meta
                 {::audit/replace-props props
@@ -526,8 +516,7 @@
                       {:id (:id profile)})
           (send-email-verification! cfg profile))
 
-        (rph/with-meta {:email (:email profile)
+        (rph/with-meta {:email (:email profile)}
-                        :id (:id profile)}
           {::audit/replace-props (audit/profile->props profile)
            ::audit/context {:action action}
            ::audit/profile-id (:id profile)
@@ -535,8 +524,7 @@
 
 (def schema:register-profile
   [:map {:title "register-profile"}
-   [:token schema:token]
+   [:token schema:token]])
-   [:accept-newsletter-updates {:optional true} :boolean]])
 
 (sv/defmethod ::register-profile
   {::rpc/auth false

backend/src/app/rpc/commands/binfile.clj

@@ -22,7 +22,6 @@
    [app.media :as media]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.files :as files]
-   [app.rpc.commands.media :as media-cmd]
    [app.rpc.commands.projects :as projects]
    [app.rpc.commands.teams :as teams]
    [app.rpc.doc :as-alias doc]
@@ -81,33 +80,20 @@
 ;; --- Command: import-binfile
 
 (defn- import-binfile
-  [{:keys [::db/pool] :as cfg} {:keys [profile-id project-id version name file upload-id]}]
+  [{:keys [::db/pool] :as cfg} {:keys [profile-id project-id version name file]}]
-  (let [team
+  (let [team   (teams/get-team pool
-        (teams/get-team pool
+                               :profile-id profile-id
-                        :profile-id profile-id
+                               :project-id project-id)
-                        :project-id project-id)
+        cfg    (-> cfg
+                   (assoc ::bfc/features (cfeat/get-team-enabled-features cf/flags team))
+                   (assoc ::bfc/project-id project-id)
+                   (assoc ::bfc/profile-id profile-id)
+                   (assoc ::bfc/name name)
+                   (assoc ::bfc/input (:path file)))
 
-        cfg
+        result (case (int version)
-        (-> cfg
+                 1 (bf.v1/import-files! cfg)
-            (assoc ::bfc/features (cfeat/get-team-enabled-features cf/flags team))
+                 3 (bf.v3/import-files! cfg))]
-            (assoc ::bfc/project-id project-id)
-            (assoc ::bfc/profile-id profile-id)
-            (assoc ::bfc/name name))
-
-        input-path (:path file)
-        owned?     (some? upload-id)
-
-        cfg
-        (assoc cfg ::bfc/input input-path)
-
-        result
-        (try
-          (case (int version)
-            1 (bf.v1/import-files! cfg)
-            3 (bf.v3/import-files! cfg))
-          (finally
-            (when owned?
-              (fs/delete input-path))))]
 
     (db/update! pool :project
                 {:modified-at (ct/now)}
@@ -117,18 +103,13 @@
     result))
 
 (def ^:private schema:import-binfile
-  [:and
+  [:map {:title "import-binfile"}
-   [:map {:title "import-binfile"}
+   [:name [:or [:string {:max 250}]
-    [:name [:or [:string {:max 250}]
+           [:map-of ::sm/uuid [:string {:max 250}]]]]
-            [:map-of ::sm/uuid [:string {:max 250}]]]]
+   [:project-id ::sm/uuid]
-    [:project-id ::sm/uuid]
+   [:file-id {:optional true} ::sm/uuid]
-    [:file-id {:optional true} ::sm/uuid]
+   [:version {:optional true} ::sm/int]
-    [:version {:optional true} ::sm/int]
+   [:file media/schema:upload]])
-    [:file {:optional true} media/schema:upload]
-    [:upload-id {:optional true} ::sm/uuid]]
-   [:fn {:error/message "one of :file or :upload-id is required"}
-    (fn [{:keys [file upload-id]}]
-      (or (some? file) (some? upload-id)))]])
 
 (sv/defmethod ::import-binfile
   "Import a penpot file in a binary format. If `file-id` is provided,
@@ -136,40 +117,28 @@
 
   The in-place imports are only supported for binfile-v3 and when a
   .penpot file only contains one penpot file.
-
-  The file content may be provided either as a multipart `file` upload
-  or as an `upload-id` referencing a completed chunked-upload session,
-  which allows importing files larger than the multipart size limit.
   "
   {::doc/added "1.15"
    ::doc/changes ["1.20" "Add file-id param for in-place import"
-                  "1.20" "Set default version to 3"
+                  "1.20" "Set default version to 3"]
-                  "2.15" "Add upload-id param for chunked upload support"]
 
    ::webhooks/event? true
    ::sse/stream? true
    ::sm/params schema:import-binfile}
-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version file-id upload-id] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version file-id file] :as params}]
   (projects/check-edition-permissions! pool profile-id project-id)
-  (let [version (or version 3)
+  (let [version  (or version 3)
-        params  (-> params
+        params   (-> params
-                    (assoc :profile-id profile-id)
+                     (assoc :profile-id profile-id)
-                    (assoc :version version))
+                     (assoc :version version))
 
-        cfg     (cond-> cfg
+        cfg      (cond-> cfg
-                  (uuid? file-id)
+                   (uuid? file-id)
-                  (assoc ::bfc/file-id file-id))
+                   (assoc ::bfc/file-id file-id))
 
-        params
+        manifest (case (int version)
-        (if (some? upload-id)
+                   1 nil
-          (let [file (db/tx-run! cfg media-cmd/assemble-chunks upload-id)]
+                   3 (bf.v3/get-manifest (:path file)))]
-            (assoc params :file file))
-          params)
-
-        manifest
-        (case (int version)
-          1 nil
-          3 (bf.v3/get-manifest (-> params :file :path)))]
 
     (with-meta
       (sse/response (partial import-binfile cfg params))

backend/src/app/rpc/commands/demo.clj

@@ -49,9 +49,9 @@
                   :deleted-at (ct/in-future (cf/get-deletion-delay))
                   :password (derive-password password)
                   :props {}}
-        profile  (db/tx-run! cfg (fn [cfg]
+        profile  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
                                    (->> (auth/create-profile cfg params)
-                                        (auth/create-profile-rels cfg))))]
+                                        (auth/create-profile-rels conn))))]
     (with-meta {:email email
                 :password password}
       {::audit/profile-id (:id profile)})))

backend/src/app/rpc/commands/files.clj

@@ -13,7 +13,6 @@
    [app.common.features :as cfeat]
    [app.common.files.helpers :as cfh]
    [app.common.files.migrations :as fmg]
-   [app.common.files.stats :as cfs]
    [app.common.logging :as l]
    [app.common.schema :as sm]
    [app.common.schema.desc-js-like :as-alias smdj]
@@ -607,76 +606,6 @@
   (get-file-summary cfg id))
 
 
-;; --- COMMAND QUERY: get-file-stats
-
-(def ^:private sql:file-stats-library-counts
-  "SELECT
-     (SELECT COUNT(*)
-        FROM file_library_rel AS flr
-        JOIN file AS fl ON (fl.id = flr.library_file_id)
-       WHERE flr.file_id = ?::uuid
-         AND (fl.deleted_at IS NULL OR fl.deleted_at > now())) AS library_count,
-     (SELECT COUNT(*)
-        FROM file_library_rel AS flr
-        JOIN file AS fl ON (fl.id = flr.file_id)
-       WHERE flr.library_file_id = ?::uuid
-         AND (fl.deleted_at IS NULL OR fl.deleted_at > now())) AS referenced_by_count")
-
-(defn- get-file-stats-library-counts
-  [conn file-id]
-  (let [row (db/exec-one! conn [sql:file-stats-library-counts file-id file-id])]
-    {:library-count       (or (:library-count row) 0)
-     :referenced-by-count (or (:referenced-by-count row) 0)}))
-
-(defn- get-file-stats
-  [{:keys [::db/conn] :as cfg} file-id]
-  (let [file    (bfc/get-file cfg file-id)
-        base    (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg file-id)]
-                  (cfs/calc-file-stats (:data file)))
-        lib-cnt (get-file-stats-library-counts conn file-id)]
-    (-> base
-        (merge lib-cnt)
-        (assoc :file-id    file-id
-               :revn       (:revn file)
-               :updated-at (:modified-at file)))))
-
-(def ^:private schema:shape-counts
-  [:map {:title "FileStatsShapeCounts"}
-   [:total [::sm/int {:min 0}]]
-   [:by-type [:map-of :keyword [::sm/int {:min 0}]]]])
-
-(def ^:private schema:get-file-stats-result
-  [:map {:title "FileStats"}
-   [:file-id ::sm/uuid]
-   [:page-count [::sm/int {:min 0}]]
-   [:shape-counts schema:shape-counts]
-   [:component-count [::sm/int {:min 0}]]
-   [:deleted-component-count [::sm/int {:min 0}]]
-   [:color-count [::sm/int {:min 0}]]
-   [:typography-count [::sm/int {:min 0}]]
-   [:library-count [::sm/int {:min 0}]]
-   [:referenced-by-count [::sm/int {:min 0}]]
-   [:revn [::sm/int {:min 0}]]
-   [:updated-at ::ct/inst]])
-
-(def ^:private schema:get-file-stats
-  [:map {:title "get-file-stats"}
-   [:id ::sm/uuid]])
-
-(sv/defmethod ::get-file-stats
-  "Return aggregate statistics for a single file: page count, shape
-   counts by type, component/color/typography counts, and inbound and
-   outbound library reference counts. Cheap alternative to `get-file`
-   when only metrics are needed."
-  {::doc/added "2.17"
-   ::sm/params schema:get-file-stats
-   ::sm/result schema:get-file-stats-result
-   ::db/transaction true}
-  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id id]}]
-  (check-read-permissions! conn profile-id id)
-  (get-file-stats cfg id))
-
-
 ;; --- COMMAND QUERY: get-file-libraries
 
 (def ^:private schema:get-file-libraries

backend/src/app/rpc/commands/files_snapshot.clj

@@ -8,7 +8,6 @@
   (:require
    [app.binfile.common :as bfc]
    [app.common.exceptions :as ex]
-   [app.common.features :as-alias cfeat]
    [app.common.schema :as sm]
    [app.common.time :as ct]
    [app.db :as db]
@@ -36,43 +35,6 @@
                  (files/check-read-permissions! conn profile-id file-id)
                  (fsnap/get-visible-snapshots conn file-id))))
 
-;; --- COMMAND QUERY: get-file-snapshot
-
-(def ^:private schema:get-file-snapshot
-  [:map {:title "get-file-snapshot"}
-   [:file-id ::sm/uuid]
-   [:id ::sm/uuid]
-   [:features {:optional true} ::cfeat/features]])
-
-(sv/defmethod ::get-file-snapshot
-  "Retrieve a file bundle with data from a specific snapshot for
-  read-only preview. Does not modify any database state."
-  {::doc/added "2.16"
-   ::sm/params schema:get-file-snapshot
-   ::sm/result files/schema:file-with-permissions
-   ::db/transaction true}
-  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id file-id id] :as params}]
-  (let [perms (bfc/get-file-permissions conn profile-id file-id)]
-    (files/check-read-permissions! perms)
-    (let [snapshot (fsnap/get-snapshot-data cfg file-id id)]
-      (when-not snapshot
-        (ex/raise :type :not-found
-                  :code :snapshot-not-found
-                  :hint "unable to find snapshot with the provided id"
-                  :snapshot-id id
-                  :file-id file-id))
-      ;; Load current file metadata only (no data decoding) then overlay
-      ;; the snapshot data so the client receives the same shape as a
-      ;; normal get-file response but with historical page/object content.
-      (let [base-file (bfc/get-file cfg file-id :load-data? false)]
-        (-> base-file
-            (assoc :data (:data snapshot))
-            (assoc :version (:version snapshot))
-            (assoc :features (:features snapshot))
-            (assoc :revn (:revn snapshot))
-            (assoc :vern (rand-int 100000))
-            (assoc :permissions perms))))))
-
 (def ^:private schema:create-file-snapshot
   [:map
    [:file-id ::sm/uuid]
@@ -109,7 +71,7 @@
   {::doc/added "1.20"
    ::sm/params schema:restore-file-snapshot
    ::db/transaction true}
-  [{:keys [::db/conn ::mbus/msgbus] :as cfg} {:keys [::rpc/profile-id ::rpc/session-id file-id id] :as params}]
+  [{:keys [::db/conn ::mbus/msgbus] :as cfg} {:keys [::rpc/profile-id file-id id] :as params}]
   (files/check-edition-permissions! conn profile-id file-id)
   (let [file  (bfc/get-file cfg file-id)
         team  (teams/get-team conn
@@ -126,8 +88,7 @@
       ;; Send to the clients a notification to reload the file
       (mbus/pub! msgbus
                  :topic (:id file)
-                 :message {:type :file-restored
+                 :message {:type :file-restore
-                           :session-id session-id
                            :file-id (:id file)
                            :vern vern})
       nil)))

backend/src/app/rpc/commands/fonts.clj

@@ -9,14 +9,12 @@
    [app.binfile.common :as bfc]
    [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
-   [app.common.media :as cmedia]
    [app.common.schema :as sm]
    [app.common.time :as ct]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.db.sql :as-alias sql]
    [app.features.logical-deletion :as ldel]
-   [app.http :as-alias http]
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as-alias webhooks]
    [app.media :as media]
@@ -36,9 +34,7 @@
    java.io.InputStream
    java.io.OutputStream
    java.io.SequenceInputStream
-   java.util.Collections
+   java.util.Collections))
-   java.util.zip.ZipEntry
-   java.util.zip.ZipOutputStream))
 
 (set! *warn-on-reflection* true)
 
@@ -300,98 +296,3 @@
     (rph/with-meta (rph/wrap)
       {::audit/props {:font-family (:font-family variant)
                       :font-id (:font-id variant)}})))
-
-;; --- DOWNLOAD FONT
-
-(defn- make-temporal-storage-object
-  [cfg profile-id content]
-  (let [storage (sto/resolve cfg)
-        content (media/check-input content)
-        hash    (sto/calculate-hash (:path content))
-        data    (-> (sto/content (:path content))
-                    (sto/wrap-with-hash hash))
-        mtype   (:mtype content "application/octet-stream")
-        content {::sto/content data
-                 ::sto/deduplicate? true
-                 ::sto/touched-at (ct/in-future {:minutes 30})
-                 :profile-id profile-id
-                 :content-type mtype
-                 :bucket "tempfile"}]
-
-    (sto/put-object! storage content)))
-
-(defn- make-variant-filename
-  [v mtype]
-  (str (:font-family v) "-" (:font-weight v)
-       (when-not (= "normal" (:font-style v)) (str "-" (:font-style v)))
-       (cmedia/mtype->extension mtype)))
-
-(def ^:private schema:download-font
-  [:map {:title "download-font"}
-   [:id ::sm/uuid]])
-
-(sv/defmethod ::download-font
-  "Download the font file. Returns a http redirect to the asset resource uri."
-  {::doc/added "2.15"
-   ::sm/params schema:download-font}
-  [{:keys [::sto/storage ::db/pool] :as cfg} {:keys [::rpc/profile-id id]}]
-  (let [variant (db/get pool :team-font-variant {:id id})]
-    (teams/check-read-permissions! pool profile-id (:team-id variant))
-
-    ;; Try to get the best available font format (prefer TTF for broader compatibility).
-    (let [media-id (or (:ttf-file-id variant)
-                       (:otf-file-id variant)
-                       (:woff2-file-id variant)
-                       (:woff1-file-id variant))
-          sobj     (sto/get-object storage media-id)
-          mtype    (-> sobj meta :content-type)]
-
-      {:id (:id sobj)
-       :uri (files/resolve-public-uri (:id sobj))
-       :name (make-variant-filename variant mtype)})))
-
-(def ^:private schema:download-font-family
-  [:map {:title "download-font-family"}
-   [:font-id ::sm/uuid]])
-
-(sv/defmethod ::download-font-family
-  "Download the entire font family as a zip file. Returns the zip
-  bytes on the body, without encoding it on transit or json."
-  {::doc/added "2.15"
-   ::sm/params schema:download-font-family}
-  [{:keys [::sto/storage ::db/pool] :as cfg} {:keys [::rpc/profile-id font-id]}]
-  (let [variants (db/query pool :team-font-variant
-                           {:font-id font-id
-                            :deleted-at nil})]
-
-    (when-not (seq variants)
-      (ex/raise :type :not-found
-                :code :object-not-found))
-
-    (teams/check-read-permissions! pool profile-id (:team-id (first variants)))
-
-    (let [tempfile (tmp/tempfile :suffix ".zip")
-          ffamily  (-> variants first :font-family)]
-
-      (with-open [^OutputStream output (io/output-stream tempfile)
-                  ^OutputStream output (ZipOutputStream. output)]
-        (doseq [v variants]
-          (let [media-id (or (:ttf-file-id v)
-                             (:otf-file-id v)
-                             (:woff2-file-id v)
-                             (:woff1-file-id v))
-                sobj     (sto/get-object storage media-id)
-                mtype    (-> sobj meta :content-type)
-                name     (make-variant-filename v mtype)]
-
-            (with-open [input (sto/get-object-data storage sobj)]
-              (.putNextEntry ^ZipOutputStream output (ZipEntry. ^String name))
-              (io/copy input output :size (:size sobj))
-              (.closeEntry ^ZipOutputStream output)))))
-
-      (let [{:keys [id] :as sobj} (make-temporal-storage-object cfg profile-id
-                                                                {:mtype "application/zip"
-                                                                 :path tempfile})]
-        {:id id
-         :uri (files/resolve-public-uri id)
-         :name (str ffamily ".zip")}))))

backend/src/app/rpc/commands/ldap.clj

@@ -84,5 +84,5 @@
                              (profile/get-profile-by-email conn))
                     (->> (assoc info :is-active true :is-demo false)
                          (auth/create-profile cfg)
-                         (auth/create-profile-rels cfg)
+                         (auth/create-profile-rels conn)
                          (profile/strip-private-attrs))))))

backend/src/app/rpc/commands/management.clj

@@ -207,7 +207,8 @@
                          (update :team-id bfc/lookup-index)
                          (assoc :created-at timestamp)
                          (assoc :modified-at timestamp))]
-          (teams/add-profile-to-team! cfg params {::db/return-keys false})))
+          (db/insert! conn :team-profile-rel params
+                      {::db/return-keys false})))
 
       ;; Duplicate team fonts
       (doseq [font fonts]
@@ -338,21 +339,6 @@
 ;; --- COMMAND: Move project
 
 (defn move-project
-  "Moves a project from one team to another.
-
-  Performs comprehensive validation including:
-  - Permission checks on both source and destination teams
-  - Team compatibility verification between source and destination
-  - File features compatibility with destination team
-
-  The operation also:
-  - Updates the project's team assignment
-  - Cleans up any broken library relations after the move
-
-  Throws:
-  - :cant-move-to-same-team if trying to move project to its current team
-  - Permission exceptions if user lacks required permissions
-  - Team compatibility exceptions if teams are incompatible"
   [{:keys [::db/conn] :as cfg} {:keys [profile-id team-id project-id] :as params}]
   (let [project (db/get-by-id conn :project project-id {:columns [:id :team-id]})
         pids    (->> (db/query conn :project {:team-id (:team-id project)} {:columns [:id]})

backend/src/app/rpc/commands/media.clj

@@ -7,11 +7,9 @@
 (ns app.rpc.commands.media
   (:require
    [app.common.data :as d]
-   [app.common.exceptions :as ex]
    [app.common.schema :as sm]
    [app.common.time :as ct]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.db :as db]
    [app.loggers.audit :as-alias audit]
    [app.media :as media]
@@ -19,13 +17,8 @@
    [app.rpc.climit :as climit]
    [app.rpc.commands.files :as files]
    [app.rpc.doc :as-alias doc]
-   [app.rpc.quotes :as quotes]
    [app.storage :as sto]
-   [app.storage.tmp :as tmp]
+   [app.util.services :as sv]))
-   [app.util.services :as sv]
-   [datoteka.io :as io])
-  (:import
-   java.io.OutputStream))
 
 (def thumbnail-options
   {:width 100
@@ -243,182 +236,3 @@
                  :width  (:width mobj)
                  :height (:height mobj)
                  :mtype  (:mtype mobj)})))
-
-;; --- Chunked Upload: Create an upload session
-
-(def ^:private schema:create-upload-session
-  [:map {:title "create-upload-session"}
-   [:total-chunks ::sm/int]])
-
-(def ^:private schema:create-upload-session-result
-  [:map {:title "create-upload-session-result"}
-   [:session-id ::sm/uuid]])
-
-(sv/defmethod ::create-upload-session
-  {::doc/added "2.17"
-   ::sm/params schema:create-upload-session
-   ::sm/result schema:create-upload-session-result}
-  [{:keys [::db/pool] :as cfg}
-   {:keys [::rpc/profile-id total-chunks]}]
-
-  (let [max-chunks (cf/get :quotes-upload-chunks-per-session)]
-    (when (> total-chunks max-chunks)
-      (ex/raise :type :restriction
-                :code :max-quote-reached
-                :target "upload-chunks-per-session"
-                :quote max-chunks
-                :count total-chunks)))
-
-  (quotes/check! cfg {::quotes/id ::quotes/upload-sessions-per-profile
-                      ::quotes/profile-id profile-id})
-
-  (let [session-id (uuid/next)]
-    (db/insert! pool :upload-session
-                {:id           session-id
-                 :profile-id   profile-id
-                 :total-chunks total-chunks})
-    {:session-id session-id}))
-
-;; --- Chunked Upload: Upload a single chunk
-
-(def ^:private schema:upload-chunk
-  [:map {:title "upload-chunk"}
-   [:session-id ::sm/uuid]
-   [:index      ::sm/int]
-   [:content    media/schema:upload]])
-
-(def ^:private schema:upload-chunk-result
-  [:map {:title "upload-chunk-result"}
-   [:session-id ::sm/uuid]
-   [:index      ::sm/int]])
-
-(sv/defmethod ::upload-chunk
-  {::doc/added "2.17"
-   ::sm/params schema:upload-chunk
-   ::sm/result schema:upload-chunk-result}
-  [{:keys [::db/pool] :as cfg}
-   {:keys [::rpc/profile-id session-id index content] :as _params}]
-  (let [session (db/get pool :upload-session {:id session-id :profile-id profile-id})]
-    (when (or (neg? index) (>= index (:total-chunks session)))
-      (ex/raise :type :validation
-                :code :invalid-chunk-index
-                :hint "chunk index is out of range for this session"
-                :session-id session-id
-                :total-chunks (:total-chunks session)
-                :index index)))
-
-  (let [storage (sto/resolve cfg)
-        data    (sto/content (:path content))]
-    (sto/put-object! storage
-                     {::sto/content      data
-                      ::sto/deduplicate? false
-                      ::sto/touch        true
-                      :content-type      (:mtype content)
-                      :bucket            "tempfile"
-                      :upload-id         (str session-id)
-                      :chunk-index       index}))
-
-  {:session-id session-id
-   :index      index})
-
-;; --- Chunked Upload: shared helpers
-
-(def ^:private sql:get-upload-chunks
-  "SELECT id, size, (metadata->>'~:chunk-index')::integer AS chunk_index
-     FROM storage_object
-    WHERE (metadata->>'~:upload-id') = ?::text
-      AND deleted_at IS NULL
-    ORDER BY (metadata->>'~:chunk-index')::integer ASC")
-
-(defn- get-upload-chunks
-  [conn session-id]
-  (db/exec! conn [sql:get-upload-chunks (str session-id)]))
-
-(defn- concat-chunks
-  "Reads all chunk storage objects in order and writes them to a single
-  temporary file on the local filesystem. Returns a path to that file."
-  [storage chunks]
-  (let [tmp (tmp/tempfile :prefix "penpot.chunked-upload.")]
-    (with-open [^OutputStream out (io/output-stream tmp)]
-      (doseq [{:keys [id]} chunks]
-        (let [sobj  (sto/get-object storage id)
-              bytes (sto/get-object-bytes storage sobj)]
-          (.write out ^bytes bytes))))
-    tmp))
-
-(defn assemble-chunks
-  "Validates that all expected chunks are present for `session-id` and
-  concatenates them into a single temporary file.  Returns a map
-  conforming to `media/schema:upload` with `:filename`, `:path` and
-  `:size`.
-
-  Raises a :validation/:missing-chunks error when the number of stored
-  chunks does not match `:total-chunks` recorded in the session row.
-  Deletes the session row from `upload_session` on success."
-  [{:keys [::db/conn] :as cfg} session-id]
-  (let [session (db/get conn :upload-session {:id session-id})
-        chunks  (get-upload-chunks conn session-id)]
-
-    (when (not= (count chunks) (:total-chunks session))
-      (ex/raise :type :validation
-                :code :missing-chunks
-                :hint "number of stored chunks does not match expected total"
-                :session-id session-id
-                :expected   (:total-chunks session)
-                :found      (count chunks)))
-
-    (let [storage (sto/resolve cfg ::db/reuse-conn true)
-          path    (concat-chunks storage chunks)
-          size    (reduce #(+ %1 (:size %2)) 0 chunks)]
-
-      (db/delete! conn :upload-session {:id session-id})
-
-      {:filename "upload"
-       :path     path
-       :size     size})))
-
-;; --- Chunked Upload: Assemble all chunks into a final media object
-
-(def ^:private schema:assemble-file-media-object
-  [:map {:title "assemble-file-media-object"}
-   [:session-id ::sm/uuid]
-   [:file-id    ::sm/uuid]
-   [:is-local   ::sm/boolean]
-   [:name       [:string {:max 250}]]
-   [:mtype      :string]
-   [:id         {:optional true} ::sm/uuid]])
-
-(sv/defmethod ::assemble-file-media-object
-  {::doc/added "2.17"
-   ::sm/params schema:assemble-file-media-object
-   ::climit/id [[:process-image/by-profile ::rpc/profile-id]
-                [:process-image/global]]}
-  [{:keys [::db/pool] :as cfg}
-   {:keys [::rpc/profile-id session-id file-id is-local name mtype id] :as params}]
-  (files/check-edition-permissions! pool profile-id file-id)
-
-  (db/tx-run! cfg
-              (fn [{:keys [::db/conn] :as cfg}]
-                (let [{:keys [path size]} (assemble-chunks cfg session-id)
-                      content {:filename "upload"
-                               :size     size
-                               :path     path
-                               :mtype    mtype}
-                      _       (media/validate-media-type! content)
-                      mobj    (create-file-media-object cfg (assoc params
-                                                                   :id (or id (uuid/next))
-                                                                   :content content))]
-
-                  (db/update! conn :file
-                              {:modified-at      (ct/now)
-                               :has-media-trimmed false}
-                              {:id file-id}
-                              {::db/return-keys false})
-
-                  (with-meta mobj
-                    {::audit/replace-props
-                     {:name      name
-                      :file-id   file-id
-                      :is-local  is-local
-                      :mtype     mtype}})))))
-

backend/src/app/rpc/commands/nitrate.clj

@@ -1,283 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.rpc.commands.nitrate
-  "Nitrate API for Penpot. Provides nitrate-related endpoints to be called
-   from Penpot frontend."
-  (:require
-   [app.common.data :as d]
-   [app.common.exceptions :as ex]
-   [app.common.schema :as sm]
-   [app.db :as db]
-   [app.nitrate :as nitrate]
-   [app.rpc :as-alias rpc]
-   [app.rpc.commands.teams :as teams]
-   [app.rpc.doc :as-alias doc]
-   [app.rpc.notifications :as notifications]
-   [app.util.services :as sv]))
-
-
-(defn assert-is-owner [cfg profile-id team-id]
-  (let [perms (teams/get-permissions cfg profile-id team-id)]
-    (when-not (:is-owner perms)
-      (ex/raise :type :validation
-                :code :insufficient-permissions))))
-
-(defn assert-not-default-team [cfg team-id]
-  (let [team (teams/get-team-info cfg {:id team-id})]
-    (when (:is-default team)
-      (ex/raise :type :validation
-                :code :cant-move-default-team))))
-
-(defn assert-membership [cfg profile-id organization-id]
-  (let [membership (nitrate/call cfg :get-org-membership {:profile-id profile-id
-                                                          :organization-id organization-id})]
-    (when-not (:organization-id membership)
-      (ex/raise :type :validation
-                :code :organization-doesnt-exists))
-
-    (when-not (:is-member membership)
-      (ex/raise :type :validation
-                :code :user-doesnt-belong-organization))))
-
-
-(def schema:connectivity
-  [:map {:title "nitrate-connectivity"}
-   [:licenses ::sm/boolean]])
-
-(sv/defmethod ::get-nitrate-connectivity
-  {::rpc/auth true
-   ::doc/added "2.14"
-   ::sm/params [:map]
-   ::sm/result schema:connectivity}
-  [cfg _params]
-  (nitrate/call cfg :connectivity {}))
-
-(def ^:private sql:prefix-team-name-and-unset-default
-  "UPDATE team
-      SET name = ? || name,
-          is_default = FALSE
-    WHERE id = ?;")
-
-(def ^:private sql:get-member-teams-info
-  "SELECT t.id,
-          t.is_default,
-          tpr.is_owner,
-          (SELECT count(*)    FROM team_profile_rel WHERE team_id = t.id) AS num_members,
-          (SELECT array_agg(profile_id) FROM team_profile_rel WHERE team_id = t.id) AS member_ids
-     FROM team AS t
-     JOIN team_profile_rel AS tpr ON (tpr.team_id = t.id)
-    WHERE tpr.profile_id = ?
-      AND t.id = ANY(?)
-      AND t.deleted_at IS NULL")
-
-(def ^:private sql:get-team-files-count
-  "SELECT count(*) AS total
-     FROM file AS f
-     JOIN project AS p ON (p.id = f.project_id)
-    WHERE p.team_id = ?
-      AND f.deleted_at IS NULL")
-
-(def ^:private schema:leave-org
-  [:map
-   [:id ::sm/uuid]
-   [:name ::sm/text]
-   [:default-team-id ::sm/uuid]
-   [:teams-to-delete
-    [:vector ::sm/uuid]]
-   [:teams-to-leave
-    [:vector
-     [:map
-      [:id ::sm/uuid]
-      [:reassign-to {:optional true} ::sm/uuid]]]]])
-
-
-(defn- get-organization-teams-for-user
-  [{:keys [::db/conn] :as cfg} org-summary profile-id]
-  (let [org-team-ids (->> (:teams org-summary)
-                          (map :id))
-        ids-array    (db/create-array conn "uuid" org-team-ids)]
-    (db/exec! conn [sql:get-member-teams-info profile-id ids-array])))
-
-(defn- calculate-valid-teams
-  ([org-teams default-team-id]
-   (let [;; valid default team is the one which id is default-team-id
-         valid-default-team          (d/seek #(= default-team-id (:id %)) org-teams)
-
-         ;; Remove your-penpot for the rest of validations
-         org-teams                   (remove #(= default-team-id (:id %)) org-teams)
-
-         ;; valid teams to delete are those that the user is owner, and only have one member
-         valid-teams-to-delete-ids   (->> org-teams
-                                          (filter #(and (:is-owner %)
-                                                        (= (:num-members %) 1)))
-                                          (map :id)
-                                          (into #{}))
-         ;; valid teams to transfer are those that the user is owner, and have more than one member
-         valid-teams-to-transfer     (->> org-teams
-                                          (filter #(and (:is-owner %)
-                                                        (> (:num-members %) 1))))
-
-         ;; valid teams to exit are those that the user isn't owner, and have more than one member
-         valid-teams-to-exit         (->> org-teams
-                                          (filter #(and (not (:is-owner %))
-                                                        (> (:num-members %) 1))))]
-     {:valid-teams-to-delete-ids valid-teams-to-delete-ids
-      :valid-teams-to-transfer valid-teams-to-transfer
-      :valid-teams-to-exit valid-teams-to-exit
-      :valid-default-team valid-default-team})))
-
-(defn get-valid-teams [cfg organization-id profile-id default-team-id]
-  (let [org-summary                (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        org-teams                  (get-organization-teams-for-user cfg org-summary profile-id)]
-    (calculate-valid-teams org-teams default-team-id)))
-
-(defn- assert-valid-teams [cfg profile-id organization-id default-team-id teams-to-delete teams-to-leave]
-  (let [org-summary                (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        org-teams                  (get-organization-teams-for-user cfg org-summary profile-id)
-        {:keys [valid-teams-to-delete-ids
-                valid-teams-to-transfer
-                valid-teams-to-exit
-                valid-default-team]} (calculate-valid-teams org-teams default-team-id)
-
-
-
-        valid-teams-to-exit-ids     (->> valid-teams-to-exit (map :id) (into #{}))
-        valid-teams-to-transfer-ids (->> valid-teams-to-transfer (map :id) (into #{}))
-        valid-teams-to-leave-ids    (into valid-teams-to-transfer-ids valid-teams-to-exit-ids)
-
-        valid-default-team-id?      (some? valid-default-team)
-
-
-
-        valid-teams-to-delete?      (= valid-teams-to-delete-ids (into #{} teams-to-delete))
-
-        ;; for every team in teams-to-leave, check that:
-        ;; - if it has a reassign-to, it belongs to valid-teams-to-transfer and
-        ;;   the reassign-to is a member of the team and not the current user;
-        ;; - if it hasn't a reassign-to, check that it belongs to valid-teams-to-exit
-        teams-by-id                 (d/index-by :id org-teams)
-        valid-teams-to-leave?       (and
-                                     (= valid-teams-to-leave-ids (->> teams-to-leave (map :id) (into #{})))
-                                     (every? (fn [{:keys [id reassign-to]}]
-                                               (if reassign-to
-                                                 (let [members (db/pgarray->set (:member-ids (get teams-by-id id)))]
-                                                   (and (contains? valid-teams-to-transfer-ids id)
-                                                        (not= reassign-to profile-id)
-                                                        (contains? members reassign-to)))
-                                                 (contains? valid-teams-to-exit-ids id)))
-                                             teams-to-leave))]
-    ;; the org owner cannot leave
-    (when (= (:owner-id org-summary) profile-id)
-      (ex/raise :type :validation
-                :code :org-owner-cannot-leave))
-
-    (when (or
-           (not valid-teams-to-delete?)
-           (not valid-teams-to-leave?)
-           (not valid-default-team-id?))
-      (ex/raise :type :validation
-                :code :not-valid-teams))))
-
-
-(defn leave-org
-  [{:keys [::db/conn] :as cfg} {:keys [profile-id id name default-team-id teams-to-delete teams-to-leave skip-validation] :as params}]
-  (let [org-prefix                 (str "[" (d/sanitize-string name) "] ")
-
-        default-team-files-count    (-> (db/exec-one! conn [sql:get-team-files-count default-team-id])
-                                        :total)
-        delete-default-team?        (= default-team-files-count 0)]
-
-
-
-
-    ;; assert that the received teams are valid, checking the different constraints
-    (when-not skip-validation
-      (assert-valid-teams cfg profile-id id default-team-id teams-to-delete teams-to-leave))
-
-    (assert-membership cfg profile-id id)
-
-    ;; delete the teams-to-delete
-    (doseq [id teams-to-delete]
-      (teams/delete-team cfg {:profile-id profile-id :team-id id}))
-
-    ;; leave the teams-to-leave
-    (doseq [{:keys [id reassign-to]} teams-to-leave]
-      (teams/leave-team cfg {:profile-id profile-id :id id :reassign-to reassign-to}))
-
-    ;; Delete default-team-id if empty; otherwise keep it and prefix the name.
-    (if delete-default-team?
-      (do
-        (db/update! conn :team {:is-default false} {:id default-team-id})
-        (teams/delete-team cfg {:profile-id profile-id :team-id default-team-id}))
-      (db/exec! conn [sql:prefix-team-name-and-unset-default org-prefix default-team-id]))
-
-    ;; Api call to nitrate
-    (nitrate/call cfg :remove-profile-from-org {:profile-id profile-id :organization-id id})
-
-    nil))
-
-
-(sv/defmethod ::leave-org
-  {::rpc/auth true
-   ::doc/added "2.15"
-   ::sm/params schema:leave-org
-   ::db/transaction true}
-  [cfg {:keys [::rpc/profile-id] :as params}]
-  (leave-org cfg (assoc params :profile-id profile-id)))
-
-
-(def ^:private schema:remove-team-from-org
-  [:map
-   [:team-id ::sm/uuid]
-   [:organization-id ::sm/uuid]
-   [:organization-name ::sm/text]])
-
-(sv/defmethod ::remove-team-from-org
-  {::doc/added "2.17"
-   ::sm/params schema:remove-team-from-org}
-  [cfg {:keys [::rpc/profile-id  team-id organization-id organization-name]}]
-
-  (assert-is-owner cfg profile-id team-id)
-  (assert-not-default-team cfg team-id)
-  (assert-membership cfg profile-id organization-id)
-
-  ;; Api call to nitrate
-  (nitrate/call cfg :remove-team-from-org {:team-id team-id :organization-id organization-id})
-
-  ;; Notify connected users
-  (notifications/notify-team-change cfg {:id team-id :organization {:name organization-name}} "dashboard.team-no-longer-belong-org")
-  nil)
-
-
-(def ^:private schema:add-team-to-organization
-  [:map
-   [:team-id ::sm/uuid]
-   [:organization-id ::sm/uuid]])
-
-(sv/defmethod ::add-team-to-organization
-  {::rpc/auth true
-   ::doc/added "2.17"
-   ::sm/params schema:add-team-to-organization
-   ::db/transaction true}
-  [cfg {:keys [::rpc/profile-id  team-id organization-id]}]
-
-  (assert-is-owner cfg profile-id team-id)
-  (assert-not-default-team cfg team-id)
-  (assert-membership cfg profile-id organization-id)
-
-  (let [team-members (db/query cfg :team-profile-rel {:team-id team-id})]
-    ;; Add teammates to the org if needed
-    (doseq [{member-id :profile-id} team-members
-            :when (not= member-id profile-id)]
-      (teams/initialize-user-in-nitrate-org cfg member-id organization-id)))
-
-  ;; Api call to nitrate
-  (let [team (nitrate/call cfg :set-team-org {:team-id team-id :organization-id organization-id :is-default false})]
-
-    ;; Notify connected users
-    (notifications/notify-team-change cfg team "dashboard.team-belong-org"))
-  nil)

backend/src/app/rpc/commands/profile.clj

@@ -48,7 +48,6 @@
 (def schema:props
   [:map {:title "ProfileProps"}
    [:plugins {:optional true} schema:plugin-registry]
-   [:mcp-enabled {:optional true} ::sm/boolean]
    [:newsletter-updates {:optional true} ::sm/boolean]
    [:newsletter-news {:optional true} ::sm/boolean]
    [:onboarding-team-id {:optional true} ::sm/uuid]
@@ -314,25 +313,6 @@
                    (climit/invoke! generate-thumbnail file))]
     (sto/put-object! storage params)))
 
-;; --- MUTATION: Delete Photo
-
-(sv/defmethod ::delete-profile-photo
-  {::doc/added "2.17"
-   ::sm/params [:map]
-   ::sm/result :nil
-   ::db/transaction true}
-  [{:keys [::db/conn ::sto/storage]} {:keys [::rpc/profile-id]}]
-  (let [profile (get-profile conn profile-id ::db/for-update true)]
-    (when-let [id (:photo-id profile)]
-      (sto/touch-object! storage id))
-
-    (db/update! conn :profile
-                {:photo-id nil}
-                {:id profile-id}
-                {::db/return-keys false})
-
-    nil))
-
 ;; --- MUTATION: Request Email Change
 
 (declare ^:private request-email-change!)
@@ -481,9 +461,6 @@
                 {:deleted-at deleted-at}
                 {:id profile-id})
 
-    ;; Api call to nitrate
-    (nitrate/call cfg :remove-profile-from-all-orgs {:profile-id profile-id})
-
     ;; Schedule cascade deletion to a worker
     (wrk/submit! {::db/conn conn
                   ::wrk/task :delete-object

backend/src/app/rpc/commands/teams.clj

@@ -193,7 +193,7 @@
   (dm/with-open [conn (db/open pool)]
     (cond->> (get-teams conn profile-id)
       (contains? cf/flags :nitrate)
-      (map #(nitrate/add-org-info-to-team cfg % params)))))
+      (map #(nitrate/add-org-to-team cfg % params)))))
 
 (def ^:private sql:get-owned-teams
   "SELECT t.id, t.name,
@@ -471,8 +471,8 @@
 ;; --- COMMAND QUERY: get-team-info
 
 (defn get-team-info
-  [cfg {:keys [id] :as params}]
+  [{:keys [::db/conn] :as cfg} {:keys [id] :as params}]
-  (-> (db/get* cfg :team
+  (-> (db/get* conn :team
                {:id id}
                {::sql/columns [:id :is-default :features]})
       (decode-row)))
@@ -499,9 +499,7 @@
   [:map {:title "create-team"}
    [:name [:string {:max 250}]]
    [:features {:optional true} ::cfeat/features]
-   [:id {:optional true} ::sm/uuid]
+   [:id {:optional true} ::sm/uuid]])
-   [:organization-id {:optional true} ::sm/uuid]
-   [:is-default {:optional true} :boolean]])
 
 (sv/defmethod ::create-team
   {::doc/added "1.17"
@@ -522,89 +520,17 @@
     (with-meta team
       {::audit/props {:id (:id team)}})))
 
-
-(defn create-default-org-team
-  [cfg profile-id organization-id]
-  (quotes/check! cfg {::quotes/id ::quotes/teams-per-profile
-                      ::quotes/profile-id profile-id})
-
-  (let [features (-> (cfeat/get-enabled-features cf/flags)
-                     (set/difference cfeat/frontend-only-features)
-                     (set/difference cfeat/no-team-inheritable-features))
-        params   {:profile-id profile-id
-                  :name "Your Penpot"
-                  :features features
-                  :organization-id organization-id
-                  :is-default true}
-        team     (create-team cfg params)]
-    (select-keys team [:id])))
-
-(defn initialize-user-in-nitrate-org
-  "If needed, create a default team for the user on the organization,
-   and notify Nitrate that an user has been added to an org."
-  ([cfg profile-id organization-id]
-   (initialize-user-in-nitrate-org cfg profile-id organization-id nil))
-  ([cfg profile-id organization-id email]
-   (assert (db/connection-map? cfg)
-           "expected cfg with valid connection")
-   (when (contains? cf/flags :nitrate)
-     (db/tx-run!
-      cfg
-      (fn [{:keys [::db/conn] :as tx-cfg}]
-
-        (let [membership (nitrate/call cfg :get-org-membership {:profile-id profile-id
-                                                                :organization-id organization-id})]
-          ;; Only when the user doesn't belong to the organization yet
-          (when (and
-                 (some? (:organization-id membership)) ;; the organization exists
-                 (not (:is-member membership)))        ;; the user is not a member of the org yet
-
-
-            (let [organization-id           organization-id
-                  default-team     (create-default-org-team (assoc tx-cfg ::db/conn conn) profile-id organization-id)
-                  default-team-id  (:id default-team)
-                  result           (nitrate/call tx-cfg :add-profile-to-org (cond-> {:profile-id profile-id
-                                                                                     :team-id default-team-id
-                                                                                     :organization-id organization-id}
-                                                                              (some? email) (assoc :email email)))]
-              (when (not (:is-member result))
-                (ex/raise :type :internal
-                          :code :failed-add-profile-org-nitrate
-                          :context {:profile-id profile-id
-                                    :organization-id organization-id
-                                    :default-team-id default-team-id}))
-              default-team-id))))))))
-
-(defn add-profile-to-team!
-  ([cfg params]
-   (add-profile-to-team! cfg params nil))
-  ([{:keys [::db/conn] :as cfg} {:keys [:profile-id :team-id] :as params} options]
-   (assert (db/connection-map? cfg)
-           "expected cfg with valid connection")
-   (when (contains? cf/flags :nitrate)
-     (let [membership (nitrate/call cfg :get-org-membership-by-team {:profile-id profile-id :team-id team-id})]
-       ;; Only when the team belong to an organization and the user is not a member
-       (when (and
-              (some? (:organization-id membership)) ;; the team do belong to an organization
-              (not (:is-member membership)))        ;; the user is not a member of the org yet
-         (initialize-user-in-nitrate-org cfg profile-id (:organization-id membership)))))
-   (db/insert! conn :team-profile-rel params options)))
-
 (defn create-team
   "This is a complete team creation process, it creates the team
   object and all related objects (default role and default project)."
-  [{:keys [::db/conn] :as cfg} params]
+  [cfg-or-conn params]
-  (assert (db/connection-map? cfg)
+  (let [conn    (db/get-connection cfg-or-conn)
-          "expected cfg with valid connection")
+        team    (create-team* conn params)
-  (let [team    (create-team* conn params)
         params  (assoc params
                        :team-id (:id team)
                        :role :owner)
         project (create-team-default-project conn params)]
-    (create-team-role cfg params)
+    (create-team-role conn params)
-    ;; Set team organization in Nitrate if organization-id is provided
-    (when (and (contains? cf/flags :nitrate) (:organization-id params))
-      (nitrate/set-team-organization cfg team params))
     (assoc team :default-project-id (:id project))))
 
 (defn- create-team*
@@ -620,13 +546,11 @@
     (decode-row team)))
 
 (defn- create-team-role
-  [cfg {:keys [profile-id team-id role] :as params}]
+  [conn {:keys [profile-id team-id role] :as params}]
-  (assert (db/connection-map? cfg)
-          "expected cfg with valid connection")
   (let [params {:team-id team-id
                 :profile-id profile-id}]
     (->> (perms/assign-role-flags params role)
-         (add-profile-to-team! cfg))))
+         (db/insert! conn :team-profile-rel))))
 
 (defn- create-team-default-project
   [conn {:keys [profile-id team-id] :as params}]
@@ -685,7 +609,7 @@
 ;; --- Mutation: Leave Team
 
 (defn leave-team
-  [{:keys [::db/conn ::mbus/msgbus]} {:keys [profile-id id reassign-to]}]
+  [conn {:keys [profile-id id reassign-to]}]
   (let [perms   (get-permissions conn profile-id id)
         members (get-team-members conn id)]
 
@@ -700,9 +624,7 @@
       ;; if the `reassign-to` is filled and has a different value
       ;; than the current profile-id, we proceed to reassing the
       ;; owner role to profile identified by the `reassign-to`.
-      ;; Ignore the reasignation if the current profile is not
+      (and reassign-to (not= reassign-to profile-id))
-      ;; the owner
-      (and reassign-to (not= reassign-to profile-id) (:is-owner perms))
       (let [member (d/seek #(= reassign-to (:id %)) members)]
         (when-not member
           (ex/raise :type :not-found :code :member-does-not-exist))
@@ -716,15 +638,7 @@
         ;; assign owner role to new profile
         (db/update! conn :team-profile-rel
                     (get types.team/permissions-for-role :owner)
-                    {:team-id id :profile-id reassign-to})
+                    {:team-id id :profile-id reassign-to}))
-
-        ;; notify new owner
-        (mbus/pub! msgbus
-                   :topic reassign-to
-                   :message {:type :team-role-change
-                             :topic reassign-to
-                             :team-id id
-                             :role :owner}))
 
       ;; and finally, if all other conditions does not match and the
       ;; current profile is owner, we dont allow it because there
@@ -749,44 +663,32 @@
   {::doc/added "1.17"
    ::sm/params schema:leave-team
    ::db/transaction true}
-  [cfg {:keys [::rpc/profile-id] :as params}]
+  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id] :as params}]
-  (leave-team cfg (assoc params :profile-id profile-id)))
+  (leave-team conn (assoc params :profile-id profile-id)))
-
 
 ;; --- Mutation: Delete Team
 
-(defn delete-team
+(defn- delete-team
   "Mark a team for deletion"
-  [{:keys [::db/conn] :as cfg} {:keys [profile-id team-id]}]
+  [conn {:keys [id] :as team}]
 
-  (let [team  (get-team conn :profile-id profile-id :team-id team-id)
+  (let [delay (ldel/get-deletion-delay team)
-        perms (get team :permissions)]
+        team  (db/update! conn :team
-
+                          {:deleted-at (ct/in-future delay)}
-    (when-not (:is-owner perms)
+                          {:id id}
-      (ex/raise :type :validation
+                          {::db/return-keys true})]
-                :code :only-owner-can-delete-team))
 
     (when (:is-default team)
       (ex/raise :type :validation
                 :code :non-deletable-team
                 :hint "impossible to delete default team"))
 
-    (let [delay (ldel/get-deletion-delay team)
+    (wrk/submit! {::db/conn conn
-          team  (db/update! conn :team
+                  ::wrk/task :delete-object
-                            {:deleted-at (ct/in-future delay)}
+                  ::wrk/params {:object :team
-                            {:id team-id}
+                                :deleted-at (:deleted-at team)
-                            {::db/return-keys true})]
+                                :id id}})
-
+    team))
-      ;; Api call to nitrate
-      (when (contains? cf/flags :nitrate)
-        (nitrate/call cfg :delete-team {:profile-id profile-id :team-id team-id}))
-
-      (wrk/submit! {::db/conn conn
-                    ::wrk/task :delete-object
-                    ::wrk/params {:object :team
-                                  :deleted-at (:deleted-at team)
-                                  :id team-id}})
-      team)))
 
 (def ^:private schema:delete-team
   [:map {:title "delete-team"}
@@ -796,9 +698,16 @@
   {::doc/added "1.17"
    ::sm/params schema:delete-team
    ::db/transaction true}
-  [cfg {:keys [::rpc/profile-id id] :as params}]
+  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id id] :as params}]
-  (delete-team cfg {:team-id id :profile-id profile-id})
+  (let [team  (get-team conn :profile-id profile-id :team-id id)
-  nil)
+        perms (get team :permissions)]
+
+    (when-not (:is-owner perms)
+      (ex/raise :type :validation
+                :code :only-owner-can-delete-team))
+
+    (delete-team conn team)
+    nil))
 
 ;; --- Mutation: Team Update Role
 

backend/src/app/rpc/commands/teams_invitations.clj

@@ -21,7 +21,6 @@
    [app.email :as eml]
    [app.loggers.audit :as audit]
    [app.main :as-alias main]
-   [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.profile :as profile]
    [app.rpc.commands.teams :as teams]
@@ -36,29 +35,20 @@
 ;; --- Mutation: Create Team Invitation
 
 (def sql:upsert-team-invitation
-  "insert into team_invitation(id, team_id, org_id, email_to, created_by, role, valid_until)
+  "insert into team_invitation(id, team_id, email_to, created_by, role, valid_until)
-   values (?, ?, null, ?, ?, ?, ?)
+   values (?, ?, ?, ?, ?, ?)
        on conflict(team_id, email_to) do
           update set role = ?, valid_until = ?, updated_at = now()
    returning *")
 
-(def sql:upsert-org-invitation
-  "insert into team_invitation(id, team_id, org_id, email_to, created_by, role, valid_until)
-   values (?, null, ?, ?, ?, ?, ?)
-       on conflict(org_id, email_to) where team_id is null do
-          update set role = ?, valid_until = ?, updated_at = now()
-   returning *")
-
 (defn- create-invitation-token
-  [cfg {:keys [profile-id valid-until organization-id organization-name team-id member-id member-email role]}]
+  [cfg {:keys [profile-id valid-until team-id member-id member-email role]}]
   (tokens/generate cfg
                    {:iss :team-invitation
                     :exp valid-until
                     :profile-id profile-id
                     :role role
                     :team-id team-id
-                    :organization-id organization-id
-                    :organization-name organization-name
                     :member-email member-email
                     :member-id member-id}))
 
@@ -84,40 +74,19 @@
    [:role types.team/schema:role]
    [:email ::sm/email]])
 
-(def ^:private schema:create-org-invitation
-  [:map {:title "params:create-org-invitation"}
-   [::rpc/profile-id ::sm/uuid]
-   [:organization
-    [:map
-     [:id ::sm/uuid]
-     [:name :string]
-     [:logo ::sm/uri]]]
-   [:profile
-    [:map
-     [:id ::sm/uuid]
-     [:fullname :string]]]
-   [:role types.team/schema:role]
-   [:email ::sm/email]])
-
 (def ^:private check-create-invitation-params
   (sm/check-fn schema:create-invitation))
 
-(def ^:private check-create-org-invitation-params
-  (sm/check-fn schema:create-org-invitation))
-
 (defn- allow-invitation-emails?
   [member]
   (let [notifications (dm/get-in member [:props :notifications])]
     (not= :none (:email-invites notifications))))
 
 (defn- create-invitation
-  [{:keys [::db/conn] :as cfg} {:keys [team organization profile role email] :as params}]
+  [{:keys [::db/conn] :as cfg} {:keys [team profile role email] :as params}]
 
-  (assert (db/connection-map? cfg)
+  (assert (db/connection? conn) "expected valid connection on cfg parameter")
-          "expected cfg with valid connection")
+  (assert (check-create-invitation-params params))
-  (if organization
-    (assert (check-create-org-invitation-params params))
-    (assert (check-create-invitation-params params)))
 
   (let [email  (profile/clean-email email)
         member (profile/get-profile-by-email conn email)]
@@ -134,12 +103,9 @@
                            :profile-id (:id member)}
                           (get types.team/permissions-for-role role))]
 
-        (if organization
+        ;; Insert the invited member to the team
-          ;; Insert the invited member to the org
+        (db/insert! conn :team-profile-rel params
-          (when (contains? cf/flags :nitrate)
+                    {::db/on-conflict-do-nothing? true})
-            (teams/initialize-user-in-nitrate-org cfg (:id member) (:id organization) email))
-          ;; Insert the invited member to the team
-          (teams/add-profile-to-team! cfg params {::db/on-conflict-do-nothing? true}))
 
         ;; If profile is not yet verified, mark it as verified because
         ;; accepting an invitation link serves as verification.
@@ -156,30 +122,18 @@
         (teams/check-email-spam conn email true)
 
         (let [id         (uuid/next)
-              expire     (if organization
+              expire     (ct/in-future "168h") ;; 7 days
-                           (ct/in-future "876000h")  ;; Organization invitations doesn't expire
+              invitation (db/exec-one! conn [sql:upsert-team-invitation id
-                           (ct/in-future "168h")) ;; 7 days
+                                             (:id team) (str/lower email)
-              invitation (db/exec-one! conn (if organization
+                                             (:id profile)
-                                              [sql:upsert-org-invitation id
+                                             (name role) expire
-                                               (:id organization)
+                                             (name role) expire])
-                                               (str/lower email)
-                                               (:id profile)
-                                               (name role) expire
-                                               (name role) expire]
-                                              [sql:upsert-team-invitation id
-                                               (:id team)
-                                               (str/lower email)
-                                               (:id profile)
-                                               (name role) expire
-                                               (name role) expire]))
               updated?   (not= id (:id invitation))
               profile-id (:id profile)
               tprops     {:profile-id profile-id
                           :invitation-id (:id invitation)
                           :valid-until expire
                           :team-id (:id team)
-                          :organization-id (:id organization)
-                          :organization-name (:name organization)
                           :member-email (:email-to invitation)
                           :member-id (:id member)
                           :role role}
@@ -191,58 +145,28 @@
 
           (let [props  (-> (dissoc tprops :profile-id)
                            (audit/clean-props))
-                evname (cond
+                evname (if updated?
-                         (and updated? organization) "update-org-invitation"
+                         "update-team-invitation"
-                         updated? "update-team-invitation"
+                         "create-team-invitation")
-                         organization "create-org-invitation"
-                         :else "create-team-invitation")
                 event (-> (audit/event-from-rpc-params params)
                           (assoc ::audit/name evname)
                           (assoc ::audit/props props))]
             (audit/submit! cfg event))
 
           (when (allow-invitation-emails? member)
-            (if organization
+            (eml/send! {::eml/conn conn
-              (when (contains? cf/flags :nitrate)
+                        ::eml/factory eml/invite-to-team
-                (eml/send! {::eml/conn conn
+                        :public-uri (cf/get :public-uri)
-                            ::eml/factory eml/invite-to-org
+                        :to email
-                            :public-uri (cf/get :public-uri)
+                        :invited-by (:fullname profile)
-                            :to email
+                        :team (:name team)
-                            :invited-by (:fullname profile)
+                        :token itoken
-                            :user-name (:fullname member)
+                        :extra-data ptoken}))
-                            :organization-name (:name organization)
-                            :org-logo (:logo organization)
-                            :org-initials (d/get-initials (:name organization))
-                            :token itoken
-                            :extra-data ptoken}))
-              (let [team (if (contains? cf/flags :nitrate)
-                           (nitrate/add-org-info-to-team cfg team {})
-                           team)]
-                (eml/send! {::eml/conn conn
-                            ::eml/factory eml/invite-to-team
-                            :public-uri (cf/get :public-uri)
-                            :to email
-                            :invited-by (:fullname profile)
-                            :team (:name team)
-                            :organization (:organization-name team)
-                            :token itoken
-                            :extra-data ptoken}))))
 
           itoken)))))
 
-(defn create-org-invitation
-  [cfg {:keys [::rpc/profile-id id name logo] :as params}]
-  (let [profile  (db/get-by-id cfg :profile profile-id)]
-    (create-invitation cfg
-                       (assoc params
-                              :organization {:id id :name name :logo logo}
-                              :profile profile
-                              :role :editor))))
-
 (defn- add-member-to-team
-  [{:keys [::db/conn] :as cfg} profile team role member]
+  [conn profile team role member]
-  (assert (db/connection-map? cfg)
-          "expected cfg with valid connection")
 
   (let [team-id (:id team)
         params  (merge
@@ -262,7 +186,7 @@
       ::quotes/team-id team-id})
 
     ;; Insert the member to the team
-    (teams/add-profile-to-team! cfg params {::db/on-conflict-do-nothing? true})
+    (db/insert! conn :team-profile-rel params {::db/on-conflict-do-nothing? true})
 
     ;; Delete any request
     (db/delete! conn :team-access-request
@@ -344,7 +268,7 @@
          (filter #(contains? invitation-emails (key %)))
          (map (fn [[email member]]
                 (let [role (:role (first (filter #(= (:email %) email) invitation-data)))]
-                  (add-member-to-team cfg profile team role member))))
+                  (add-member-to-team conn profile team role member))))
          (doall))
 
     invitations))

backend/src/app/rpc/commands/verify_token.clj

@@ -16,10 +16,8 @@
    [app.http.session :as session]
    [app.loggers.audit :as audit]
    [app.main :as-alias main]
-   [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.profile :as profile]
-   [app.rpc.commands.teams :as teams]
    [app.rpc.doc :as-alias doc]
    [app.rpc.helpers :as rph]
    [app.rpc.quotes :as quotes]
@@ -88,74 +86,52 @@
 ;; --- Team Invitation
 
 (defn- accept-invitation
-  [{:keys [::db/conn] :as cfg}
+  [{:keys [::db/conn] :as cfg} {:keys [team-id role member-email] :as claims} invitation member]
-   {:keys [team-id organization-id role member-email] :as claims} invitation member]
   (let [;; Update the role if there is an invitation
         role   (or (some-> invitation :role keyword) role)
-        id-member (:id member)]
+        params (merge
+                {:team-id team-id
+                 :profile-id (:id member)}
+                (get types.team/permissions-for-role role))]
 
     ;; Do not allow blocked users accept invitations.
     (when (:is-blocked member)
       (ex/raise :type :restriction
                 :code :profile-blocked))
 
-    (when team-id
+    (quotes/check! cfg {::quotes/id ::quotes/profiles-per-team
-      (quotes/check! cfg {::quotes/id ::quotes/profiles-per-team
+                        ::quotes/profile-id (:id member)
-                          ::quotes/profile-id id-member
+                        ::quotes/team-id team-id})
-                          ::quotes/team-id team-id}))
 
-    (let [params (merge
+    ;; Insert the invited member to the team
-                  {:team-id team-id
+    (db/insert! conn :team-profile-rel params {::db/on-conflict-do-nothing? true})
-                   :profile-id id-member}
-                  (get types.team/permissions-for-role role))
 
-          accepted-team-id (if organization-id
+    ;; If profile is not yet verified, mark it as verified because
-                             ;; Insert the invited member to the org
+    ;; accepting an invitation link serves as verification.
-                             (when (contains? cf/flags :nitrate)
+    (when-not (:is-active member)
-                               (teams/initialize-user-in-nitrate-org cfg id-member organization-id member-email))
+      (db/update! conn :profile
-                             ;; Insert the invited member to the team
+                  {:is-active true}
-                             (do (teams/add-profile-to-team! cfg params {::db/on-conflict-do-nothing? true})
+                  {:id (:id member)}))
-                                 team-id))]
 
-      (when-not accepted-team-id
+    ;; Delete the invitation
-        (ex/raise :type :internal
+    (db/delete! conn :team-invitation
-                  :code :accept-invitation-failed
+                {:team-id team-id :email-to member-email})
-                  :hint "the accept invitation has failed"))
 
+    ;; Delete any request
+    (db/delete! conn :team-access-request
+                {:team-id team-id :requester-id (:id member)})
 
-      ;; If profile is not yet verified, mark it as verified because
+    (assoc member :is-active true)))
-      ;; accepting an invitation link serves as verification.
-      (when-not (:is-active member)
-        (db/update! conn :profile
-                    {:is-active true}
-                    {:id id-member}))
-
-      ;; Delete the invitation
-      (db/delete! conn :team-invitation
-                  (cond-> {:email-to member-email}
-                    team-id (assoc :team-id team-id)
-                    organization-id  (assoc :org-id organization-id)))
-
-      ;; Delete any request (only applicable for team invitations)
-      (when team-id
-        (db/delete! conn :team-access-request
-                    {:team-id team-id :requester-id id-member}))
-
-      accepted-team-id)))
 
 (def schema:team-invitation-claims
-  [:and
+  [:map {:title "TeamInvitationClaims"}
-   [:map {:title "TeamInvitationClaims"}
+   [:iss :keyword]
-    [:iss :keyword]
+   [:exp ::ct/inst]
-    [:exp ::ct/inst]
+   [:profile-id ::sm/uuid]
-    [:profile-id ::sm/uuid]
+   [:role types.team/schema:role]
-    [:role types.team/schema:role]
+   [:team-id ::sm/uuid]
-    [:team-id {:optional true} ::sm/uuid]
+   [:member-email ::sm/email]
-    [:organization-id {:optional true} ::sm/uuid]
+   [:member-id {:optional true} ::sm/uuid]])
-    [:member-email ::sm/email]
-    [:member-id {:optional true} ::sm/uuid]]
-   [:fn {:error/message "team-id or organization-id must be present"}
-    (fn [m] (or (:team-id m) (:organization-id m)))]])
 
 (def valid-team-invitation-claims?
   (sm/lazy-validator schema:team-invitation-claims))
@@ -163,7 +139,7 @@
 (defmethod process-token :team-invitation
   [{:keys [::db/conn] :as cfg}
    {:keys [::rpc/profile-id token] :as params}
-   {:keys [member-id team-id organization-id member-email] :as claims}]
+   {:keys [member-id team-id member-email] :as claims}]
 
   (when-not (valid-team-invitation-claims? claims)
     (ex/raise :type :validation
@@ -171,44 +147,19 @@
               :hint "invitation token contains unexpected data"))
 
   (let [invitation             (db/get* conn :team-invitation
-                                        (cond-> {:email-to member-email}
+                                        {:team-id team-id :email-to member-email})
-                                          team-id (assoc :team-id team-id)
-                                          organization-id  (assoc :org-id organization-id)))
         profile                (db/get* conn :profile
                                         {:id profile-id}
-                                        {:columns [:id :email :default-team-id]})
+                                        {:columns [:id :email]})
-        registration-disabled? (not (contains? cf/flags :registration))
+        registration-disabled? (not (contains? cf/flags :registration))]
-
+    (when (nil? invitation)
-        org-invitation?        (and (contains? cf/flags :nitrate) organization-id)
+      (ex/raise :type :validation
-        membership             (when org-invitation?
+                :code :invalid-token
-                                 (nitrate/call cfg :get-org-membership {:profile-id profile-id
+                :hint "no invitation associated with the token"))
-                                                                        :organization-id organization-id}))]
-
-    (if profile
-      (do
-        (when-not (or (= member-id profile-id)
-                      (= member-email (:email profile)))
-          (ex/raise :type :validation
-                    :code :invalid-token
-                    :hint "logged-in user does not matches the invitation"))
-
-        (when (:is-member membership)
-          (ex/raise :type :validation
-                    :code :already-an-org-member
-                    :team-id (:default-team-id membership)
-                    :hint "the user is already a member of the organization"))
-
-        (when (and org-invitation? (not (:organization-id membership)))
-          (ex/raise :type :validation
-                    :code :org-not-found
-                    :team-id (:default-team-id profile)
-                    :hint "the organization doesn't exist"))
-
-        (when (nil? invitation)
-          (ex/raise :type :validation
-                    :code :invalid-token
-                    :hint "no invitation associated with the token"))
 
+    (if (some? profile)
+      (if (or (= member-id profile-id)
+              (= member-email (:email profile)))
 
         ;; if we have logged-in user and it matches the invitation we proceed
         ;; with accepting the invitation and joining the current profile to the
@@ -236,16 +187,17 @@
                                              :profile-id (:id profile)
                                              :email (:email profile))))))
 
-          (let [accepted-team-id (accept-invitation cfg claims invitation profile)]
+          (accept-invitation cfg claims invitation profile)
-            (cond-> (assoc claims :state :created)
+          (assoc claims :state :created))
-              ;; when the invitation is to an org, instead of a team, add the
+
-              ;; accepted-team-id as :org-team-id
+        (ex/raise :type :validation
-              (:organization-id claims)
+                  :code :invalid-token
-              (assoc :org-team-id accepted-team-id)))))
+                  :hint "logged-in user does not matches the invitation"))
 
       ;; If we have not logged-in user, and invitation comes with member-id we
       ;; redirect user to login, if no memeber-id is present and  in the invitation
       ;; token and registration is enabled, we redirect user the the register page.
+
       {:invitation-token token
        :iss :team-invitation
        :redirect-to (if (or member-id registration-disabled?) :auth-login :auth-register)

backend/src/app/rpc/commands/viewer.clj

@@ -28,25 +28,19 @@
       (update :pages-index select-keys allowed)))
 
 (defn obfuscate-email
-  "Obfuscate the `email` for share-link members so the viewer only sees a
-   partially redacted address. Accepts any string shape (including nil,
-   missing `@`, or a domain with no `.`) and falls back to a fully-masked
-   result rather than throwing — the function is called while building the
-   view-only bundle for anonymous viewers, so an NPE here would abort the
-   entire share-link response."
   [email]
   (let [[name domain]
-        (str/split (or email "") "@" 2)
+        (str/split email "@" 2)
 
         [_ rest]
-        (str/split (or domain "") "." 2)
+        (str/split domain "." 2)
 
         name
         (if (> (count name) 3)
           (str (subs name 0 1) (apply str (take (dec (count name)) (repeat "*"))))
           "****")]
 
-    (str name "@****" (when rest (str "." rest)))))
+    (str name "@****." rest)))
 
 (defn anonymize-member
   [member]

backend/src/app/rpc/management/nitrate.clj

@@ -8,34 +8,18 @@
   "Internal Nitrate HTTP RPC API. Provides authenticated access to
   organization management and token validation endpoints."
   (:require
-   [app.common.data :as d]
-   [app.common.exceptions :as ex]
    [app.common.schema :as sm]
-   [app.common.types.organization :refer [schema:team-with-organization]]
    [app.common.types.profile :refer [schema:profile, schema:basic-profile]]
    [app.common.types.team :refer [schema:team]]
-   [app.config :as cf]
+   [app.common.uuid :as uuid]
    [app.db :as db]
-   [app.media :as media]
+   [app.msgbus :as mbus]
-   [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.files :as files]
-   [app.rpc.commands.nitrate :as cnit]
    [app.rpc.commands.profile :as profile]
-   [app.rpc.commands.teams :as teams]
-   [app.rpc.commands.teams-invitations :as ti]
    [app.rpc.doc :as doc]
-   [app.rpc.notifications :as notifications]
-   [app.storage :as sto]
    [app.util.services :as sv]))
 
-
-(defn- profile-to-map [profile]
-  {:id            (:id profile)
-   :name          (:fullname profile)
-   :email         (:email profile)
-   :photo-url     (files/resolve-public-uri (get profile :photo-id))})
-
 ;; ---- API: authenticate
 
 (sv/defmethod ::authenticate
@@ -44,9 +28,11 @@
    ::sm/params [:map]
    ::sm/result schema:profile}
   [cfg {:keys [::rpc/profile-id] :as params}]
-  (let [profile            (profile/get-profile cfg profile-id)]
+  (let [profile (profile/get-profile cfg profile-id)]
-    (-> (profile-to-map profile)
+    {:id (get profile :id)
-        (assoc :theme (:theme profile)))))
+     :name (get profile :fullname)
+     :email (get profile :email)
+     :photo-url (files/resolve-public-uri (get profile :photo-id))}))
 
 ;; ---- API: get-teams
 
@@ -59,19 +45,6 @@
       AND t.is_default IS FALSE
       AND t.deleted_at IS NULL;")
 
-;; ---- API: get-penpot-version
-
-(def ^:private schema:get-penpot-version-result
-  [:map [:version ::sm/text]])
-
-(sv/defmethod ::get-penpot-version
-  "Get the current Penpot version"
-  {::doc/added "2.14"
-   ::sm/params [:map]
-   ::sm/result schema:get-penpot-version-result}
-  [_cfg _params]
-  {:version cf/version})
-
 (def ^:private schema:get-teams-result
   [:vector schema:team])
 
@@ -85,63 +58,28 @@
     (->> (db/exec! cfg [sql:get-teams current-user-id])
          (map #(select-keys % [:id :name])))))
 
-;; ---- API: upload-org-logo
-
-(def ^:private schema:upload-org-logo
-  [:map
-   [:content media/schema:upload]
-   [:organization-id ::sm/uuid]
-   [:previous-id {:optional true} ::sm/uuid]])
-
-(def ^:private schema:upload-org-logo-result
-  [:map [:id ::sm/uuid]])
-
-(sv/defmethod ::upload-org-logo
-  "Store an organization logo in penpot storage and return its ID.
-  Accepts an optional previous-id to mark the old logo for garbage
-  collection when replacing an existing one."
-  {::doc/added "2.17"
-   ::sm/params schema:upload-org-logo
-   ::sm/result schema:upload-org-logo-result}
-  [{:keys [::sto/storage]} {:keys [content organization-id previous-id]}]
-  (when previous-id
-    (sto/touch-object! storage previous-id))
-  (let [hash (sto/calculate-hash (:path content))
-        data (-> (sto/content (:path content))
-                 (sto/wrap-with-hash hash))
-        obj  (sto/put-object! storage {::sto/content      data
-                                       ::sto/deduplicate? true
-                                       :bucket            "organization"
-                                       :content-type      (:mtype content)
-                                       :organization-id   organization-id})]
-    {:id (:id obj)}))
-
 ;; ---- API: notify-team-change
 
+(def ^:private schema:notify-team-change
+  [:map
+   [:id ::sm/uuid]
+   [:organization-id ::sm/text]])
+
 (sv/defmethod ::notify-team-change
   "Notify to Penpot a team change from nitrate"
   {::doc/added "2.14"
-   ::sm/params schema:team-with-organization
+   ::sm/params schema:notify-team-change
    ::rpc/auth false}
-  [cfg team]
+  [cfg {:keys [id organization-id organization-name]}]
-  (notifications/notify-team-change cfg (select-keys team [:id :is-your-penpot :organization]) nil)
+  (let [msgbus (::mbus/msgbus cfg)]
-  nil)
+    (mbus/pub! msgbus
-
+               ;;TODO There is a bug on dashboard with teams notifications.
-;; ---- API: notify-user-added-to-organization
+               ;;For now we send it to uuid/zero instead of team-id
-
+               :topic uuid/zero
-(def ^:private schema:notify-user-added-to-organization
+               :message {:type :team-org-change
-  [:map
+                         :team-id id
-   [:profile-id ::sm/uuid]
+                         :organization-id organization-id
-   [:organization-id ::sm/uuid]
+                         :organization-name organization-name})))
-   [:role ::sm/text]])
-
-(sv/defmethod ::notify-user-added-to-organization
-  "Notify to Penpot that an user has joined an org from nitrate"
-  {::doc/added "2.14"
-   ::sm/params schema:notify-user-added-to-organization
-   ::rpc/auth false}
-  [cfg {:keys [profile-id organization-id]}]
-  (db/tx-run! cfg teams/create-default-org-team profile-id organization-id))
 
 
 ;; ---- API: get-managed-profiles
@@ -174,359 +112,3 @@
   [cfg {:keys [::rpc/profile-id]}]
   (let [current-user-id (-> (profile/get-profile cfg profile-id) :id)]
     (db/exec! cfg [sql:get-managed-profiles current-user-id current-user-id])))
-
-;; ---- API: get-teams-summary
-
-(def ^:private sql:get-teams-summary
-  "SELECT t.id, t.name, t.is_default
-     FROM team AS t
-    WHERE t.id = ANY(?)
-      AND t.deleted_at IS NULL;")
-
-(def ^:private sql:get-files-count
-  "SELECT COUNT(f.*) AS count
-     FROM file AS f
-     JOIN project AS p ON f.project_id = p.id
-     JOIN team AS t ON t.id = p.team_id
-    WHERE p.team_id = ANY(?)
-      AND t.deleted_at IS NULL
-      AND p.deleted_at IS NULL
-      AND f.deleted_at IS NULL;")
-
-(def ^:private schema:get-teams-summary-params
-  [:map
-   [:ids [:or ::sm/uuid [:vector ::sm/uuid]]]])
-
-(def ^:private schema:get-teams-summary-result
-  [:map
-   [:teams [:vector [:map
-                     [:id ::sm/uuid]
-                     [:name ::sm/text]
-                     [:is-default ::sm/boolean]]]]
-   [:num-files ::sm/int]])
-
-(sv/defmethod ::get-teams-summary
-  "Get summary information for a list of teams"
-  {::doc/added "2.15"
-   ::sm/params schema:get-teams-summary-params
-   ::sm/result schema:get-teams-summary-result}
-  [cfg {:keys [ids]}]
-  (let [;; Handle one or multiple params
-        ids (cond
-              (uuid? ids)
-              [ids]
-
-              (and (vector? ids) (every? uuid? ids))
-              ids
-
-              :else
-              [])]
-    (db/run! cfg (fn [{:keys [::db/conn]}]
-                   (let [ids-array     (db/create-array conn "uuid" ids)
-                         teams         (db/exec! conn [sql:get-teams-summary ids-array])
-                         files-count   (-> (db/exec-one! conn [sql:get-files-count ids-array]) :count)]
-                     {:teams teams
-                      :num-files files-count})))))
-
-
-;; ---- API: delete-teams-keeping-your-penpot-projects
-
-(def ^:private sql:prefix-teams-name-and-unset-default
-  "UPDATE team
-      SET name = ? || name,
-          is_default = FALSE
-    WHERE id = ANY(?)
-RETURNING id, name;")
-
-
-(def ^:private schema:notify-org-deletion
-  [:map
-   [:organization-name ::sm/text]
-   [:teams [:vector ::sm/uuid]]])
-
-(sv/defmethod ::notify-org-deletion
-  "For a list of teams, rename them with the name of the deleted org, and notify
-   of the deletion to the connected users"
-  {::doc/added "2.15"
-   ::sm/params schema:notify-org-deletion}
-  [cfg {:keys [teams organization-name]}]
-  (when (seq teams)
-    (let [org-prefix (str "[" (d/sanitize-string organization-name) "] ")]
-      (db/tx-run!
-       cfg
-       (fn [{:keys [::db/conn] :as cfg}]
-         (let [ids-array (db/create-array conn "uuid" teams)
-               ;; Rename projects
-               updated-teams (db/exec! conn [sql:prefix-teams-name-and-unset-default org-prefix ids-array])]
-
-           ;; Notify users
-           (doseq [team updated-teams]
-             (notifications/notify-team-change cfg {:id (:id team) :name (:name team) :organization {:name organization-name}} "dashboard.org-deleted"))))))))
-
-;; ---- API: get-profile-by-email
-
-(def ^:private sql:get-profile-by-email
-  "SELECT DISTINCT id, fullname, email, photo_id
-     FROM profile
-    WHERE email = ?
-      AND deleted_at IS NULL;")
-
-(sv/defmethod ::get-profile-by-email
-  "Get profile by email"
-  {::doc/added "2.15"
-   ::sm/params [:map [:email ::sm/email]]
-   ::sm/result schema:profile}
-  [cfg {:keys [email]}]
-  (let [profile (db/exec-one! cfg [sql:get-profile-by-email email])]
-    (when-not profile
-      (ex/raise :type :not-found
-                :code :profile-not-found
-                :hint "profile does not exist"
-                :email email))
-    (profile-to-map profile)))
-
-
-;; ---- API: get-profile-by-id
-
-(def ^:private sql:get-profile-by-id
-  "SELECT DISTINCT id, fullname, email, photo_id
-     FROM profile
-    WHERE id = ?
-      AND deleted_at IS NULL;")
-
-(sv/defmethod ::get-profile-by-id
-  "Get profile by email"
-  {::doc/added "2.15"
-   ::sm/params [:map [:id ::sm/uuid]]
-   ::sm/result schema:profile}
-  [cfg {:keys [id]}]
-  (let [profile (db/exec-one! cfg [sql:get-profile-by-id id])]
-    (when-not profile
-      (ex/raise :type :not-found
-                :code :profile-not-found
-                :hint "profile does not exist"
-                :id id))
-    (profile-to-map profile)))
-
-
-;; ---- API: get-org-member-team-counts
-
-(def ^:private sql:get-org-member-team-counts
-  "SELECT tpr.profile_id, COUNT(DISTINCT t.id) AS team_count
-     FROM team_profile_rel AS tpr
-     JOIN team AS t ON t.id = tpr.team_id
-    WHERE t.id = ANY(?)
-      AND t.deleted_at IS NULL
-      AND t.is_default IS FALSE
-    GROUP BY tpr.profile_id;")
-
-(def ^:private schema:get-org-member-team-counts-params
-  [:map [:team-ids [:or ::sm/uuid [:vector ::sm/uuid]]]])
-
-(def ^:private schema:get-org-member-team-counts-result
-  [:vector [:map
-            [:profile-id ::sm/uuid]
-            [:team-count ::sm/int]]])
-
-(sv/defmethod ::get-org-member-team-counts
-  "Get the number of non-default teams each profile belongs to within a set of teams."
-  {::doc/added "2.15"
-   ::sm/params schema:get-org-member-team-counts-params
-   ::sm/result schema:get-org-member-team-counts-result
-   ::rpc/auth false}
-  [cfg {:keys [team-ids]}]
-  (let [team-ids (cond
-                   (uuid? team-ids)
-                   [team-ids]
-
-                   (and (vector? team-ids) (every? uuid? team-ids))
-                   team-ids
-
-                   :else
-                   [])]
-    (if (empty? team-ids)
-      []
-      (db/run! cfg (fn [{:keys [::db/conn]}]
-                     (let [ids-array (db/create-array conn "uuid" team-ids)]
-                       (db/exec! conn [sql:get-org-member-team-counts ids-array])))))))
-
-
-;; API: invite-to-org
-
-(sv/defmethod ::invite-to-org
-  "Invite to organization"
-  {::doc/added "2.15"
-   ::sm/params [:map
-                [:email ::sm/email]
-                [:id ::sm/uuid]
-                [:name ::sm/text]
-                [:logo ::sm/uri]]}
-  [cfg params]
-  (db/tx-run! cfg ti/create-org-invitation params)
-  nil)
-
-
-;; API: get-org-invitations
-
-(def ^:private sql:get-org-invitations
-  "SELECT DISTINCT ON (email_to)
-          ti.id,
-          ti.org_id AS organization_id,
-          ti.email_to AS email,
-          ti.created_at AS sent_at,
-          p.fullname AS name,
-          p.photo_id
-     FROM team_invitation AS ti
-LEFT JOIN profile AS p
-       ON p.email = ti.email_to
-      AND p.deleted_at IS NULL
-    WHERE ti.valid_until >= now()
-      AND (ti.org_id = ? OR ti.team_id = ANY(?))
-    ORDER BY ti.email_to, ti.valid_until DESC, ti.created_at DESC;")
-
-(def ^:private schema:get-org-invitations-params
-  [:map
-   [:organization-id ::sm/uuid]])
-
-(def ^:private schema:get-org-invitations-result
-  [:vector
-   [:map
-    [:id ::sm/uuid]
-    [:organization-id {:optional true} [:maybe ::sm/uuid]]
-    [:email ::sm/email]
-    [:sent-at ::sm/inst]
-    [:name {:optional true} [:maybe ::sm/text]]
-    [:photo-url {:optional true} ::sm/uri]]])
-
-(sv/defmethod ::get-org-invitations
-  "Get valid invitations for an organization, returning at most one invitation per email."
-  {::doc/added "2.16"
-   ::sm/params schema:get-org-invitations-params
-   ::sm/result schema:get-org-invitations-result}
-  [cfg {:keys [organization-id]}]
-  (let [org-summary (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        team-ids    (->> (:teams org-summary)
-                         (map :id)
-                         (filter uuid?)
-                         (into []))]
-    (db/run! cfg (fn [{:keys [::db/conn]}]
-                   (let [ids-array (db/create-array conn "uuid" team-ids)]
-                     (->> (db/exec! conn [sql:get-org-invitations organization-id ids-array])
-                          (mapv (fn [{:keys [photo-id] :as invitation}]
-                                  (cond-> (dissoc invitation :photo-id)
-                                    photo-id
-                                    (assoc :photo-url (files/resolve-public-uri photo-id)))))))))))
-
-
-;; API: delete-org-invitations
-
-(def ^:private sql:delete-org-invitations
-  "DELETE FROM team_invitation AS ti
-    WHERE ti.email_to = ?
-      AND (ti.org_id = ? OR ti.team_id = ANY(?));")
-
-(def ^:private schema:delete-org-invitations-params
-  [:map
-   [:organization-id ::sm/uuid]
-   [:email ::sm/email]])
-
-(sv/defmethod ::delete-org-invitations
-  "Delete all invitations for one email in an organization scope (org + org teams)."
-  {::doc/added "2.16"
-   ::sm/params schema:delete-org-invitations-params}
-  [cfg {:keys [organization-id email]}]
-  (let [org-summary (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        clean-email (profile/clean-email email)
-        team-ids    (->> (:teams org-summary)
-                         (map :id)
-                         (filter uuid?)
-                         (into []))]
-    (db/run! cfg (fn [{:keys [::db/conn]}]
-                   (let [ids-array (db/create-array conn "uuid" team-ids)]
-                     (db/exec! conn [sql:delete-org-invitations clean-email organization-id ids-array]))))
-    nil))
-
-
-
-;; API: remove-from-org
-
-(def ^:private sql:get-reassign-to
-  "SELECT tpr.profile_id
-     FROM team_profile_rel AS tpr
-    WHERE tpr.team_id = ?
-      AND tpr.profile_id <> ?
-      AND tpr.is_owner IS NOT TRUE
-    ORDER BY CASE
-               WHEN tpr.is_admin IS TRUE THEN 1
-               ELSE 2
-             END,
-             tpr.created_at,
-             tpr.profile_id
-    LIMIT 1;")
-
-(defn add-reassign-to [cfg profile-id team-to-transfer]
-  (let [reassign-to (-> (db/exec-one! cfg [sql:get-reassign-to (:id team-to-transfer) profile-id])
-                        :profile-id)]
-    (when-not reassign-to
-      (ex/raise :type :validation
-                :code :nobody-to-reassign-team))
-
-    (assoc team-to-transfer :reassign-to reassign-to)))
-
-(sv/defmethod ::remove-from-org
-  "Remove an user from an organization"
-  {::doc/added "2.17"
-   ::sm/params [:map
-                [:profile-id ::sm/uuid]
-                [:organization-id ::sm/uuid]
-                [:organization-name ::sm/text]
-                [:default-team-id ::sm/uuid]]
-   ::db/transaction true}
-  [cfg {:keys [profile-id organization-id organization-name default-team-id] :as params}]
-  (let [{:keys [valid-teams-to-delete-ids
-                valid-teams-to-transfer
-                valid-teams-to-exit]} (cnit/get-valid-teams cfg organization-id profile-id default-team-id)
-        add-reassign-to (partial add-reassign-to cfg profile-id)
-
-        valid-teams-to-leave (into valid-teams-to-exit
-                                   (map add-reassign-to valid-teams-to-transfer))]
-
-    (cnit/leave-org cfg (assoc params
-                               :id organization-id
-                               :name organization-name
-                               :teams-to-delete valid-teams-to-delete-ids
-                               :teams-to-leave valid-teams-to-leave
-                               :skip-validation true))
-    (notifications/notify-user-org-change cfg profile-id organization-id organization-name "dashboard.user-no-longer-belong-org")
-    nil))
-
-;; API: get-remove-from-org-summary
-
-(def ^:private schema:get-remove-from-org-summary-result
-  [:map
-   [:teams-to-delete ::sm/int]
-   [:teams-to-transfer ::sm/int]
-   [:teams-to-exit ::sm/int]])
-
-(sv/defmethod ::get-remove-from-org-summary
-  "Get a summary of the teams that would be deleted, transferred, or exited
-   if the user were removed from the organization"
-  {::doc/added "2.17"
-   ::sm/params [:map
-                [:profile-id ::sm/uuid]
-                [:organization-id ::sm/uuid]
-                [:default-team-id ::sm/uuid]]
-   ::sm/result schema:get-remove-from-org-summary-result
-   ::db/transaction true}
-  [cfg {:keys [profile-id organization-id default-team-id]}]
-  (let [{:keys [valid-teams-to-delete-ids
-                valid-teams-to-transfer
-                valid-teams-to-exit
-                valid-default-team]} (cnit/get-valid-teams cfg organization-id profile-id default-team-id)]
-    (when-not valid-default-team
-      (ex/raise :type :validation
-                :code :not-valid-teams))
-    {:teams-to-delete   (count valid-teams-to-delete-ids)
-     :teams-to-transfer (count valid-teams-to-transfer)
-     :teams-to-exit     (count valid-teams-to-exit)}))
-

backend/src/app/rpc/notifications.clj

@@ -1,33 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.rpc.notifications
-  (:require
-   [app.common.uuid :as uuid]
-   [app.msgbus :as mbus]))
-
-(defn notify-team-change
-  [cfg team notification]
-  (let [msgbus (::mbus/msgbus cfg)]
-    (mbus/pub! msgbus
-               ;;TODO There is a bug on dashboard with teams notifications.
-               ;;For now we send it to uuid/zero instead of team-id
-               :topic uuid/zero
-               :message {:type :team-org-change
-                         :team team
-                         :notification notification})))
-
-
-(defn notify-user-org-change
-  [cfg profile-id organization-id organization-name notification]
-  (let [msgbus (::mbus/msgbus cfg)]
-    (mbus/pub! msgbus
-               :topic profile-id
-               :message {:type :user-org-change
-                         :topic profile-id
-                         :organization-id organization-id
-                         :organization-name organization-name
-                         :notification notification})))

backend/src/app/rpc/quotes.clj

@@ -522,30 +522,6 @@
       (assoc ::count-sql [sql:get-team-access-requests-per-requester profile-id])
       (generic-check!)))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; QUOTE: UPLOAD-SESSIONS-PER-PROFILE
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:private schema:upload-sessions-per-profile
-  [:map [::profile-id ::sm/uuid]])
-
-(def ^:private valid-upload-sessions-per-profile-quote?
-  (sm/lazy-validator schema:upload-sessions-per-profile))
-
-(def ^:private sql:get-upload-sessions-per-profile
-  "SELECT count(*) AS total
-     FROM upload_session
-    WHERE profile_id = ?")
-
-(defmethod check-quote ::upload-sessions-per-profile
-  [{:keys [::profile-id ::target] :as quote}]
-  (assert (valid-upload-sessions-per-profile-quote? quote) "invalid quote parameters")
-  (-> quote
-      (assoc ::default (cf/get :quotes-upload-sessions-per-profile Integer/MAX_VALUE))
-      (assoc ::quote-sql [sql:get-quotes-1 target profile-id])
-      (assoc ::count-sql [sql:get-upload-sessions-per-profile profile-id])
-      (generic-check!)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; QUOTE: DEFAULT
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

backend/src/app/setup.clj

@@ -82,37 +82,45 @@
   (db/tx-run! cfg (fn [{:keys [::db/conn]}]
                     (db/xact-lock! conn 0)
                     (when-not key
-                      (l/wrn :hint (str "using autogenerated secret-key, it will change "
+                      (l/warn :hint (str "using autogenerated secret-key, it will change on each restart and will invalidate "
-                                        "on each restart and will invalidate "
+                                         "all sessions on each restart, it is highly recommended setting up the "
-                                        "all sessions on each restart, it is highly "
+                                         "PENPOT_SECRET_KEY environment variable")))
-                                        "recommended setting up the "
-                                        "PENPOT_SECRET_KEY environment variable")))
                     (let [secret (or key (generate-random-key))]
                       (-> (get-all-props conn)
                           (assoc :secret-key secret)
                           (assoc :tokens-key (keys/derive secret :salt "tokens"))
                           (update :instance-id handle-instance-id conn (db/read-only? pool)))))))
 
+(sm/register! ::props [:map-of :keyword ::sm/any])
+
+
 (defmethod ig/init-key ::shared-keys
   [_ {:keys [::props] :as cfg}]
   (let [secret (get props :secret-key)]
-    (reduce (fn [keys id]
+    (d/without-nils
-              (let [key (or (get cfg id)
+     {:exporter
-                            (-> (keys/derive secret :salt (name id))
+      (let [key (or (get cfg :exporter)
-                                (bc/bytes->b64-str true)))]
+                    (-> (keys/derive secret :salt "exporter")
-                (if (or (str/empty? key)
+                        (bc/bytes->b64-str true)))]
-                        (str/blank? key))
+        (if (or (str/empty? key)
-                  (do
+                (str/blank? key))
-                    (l/wrn :id (name id) :hint "key is disabled because empty string found")
+          (do
-                    keys)
+            (l/wrn :hint "exporter key is disabled because empty string found")
-                  (do
+            nil)
-                    (l/inf :id (name id) :hint "key initialized" :key (d/obfuscate-string key))
+          (do
-                    (assoc keys id key)))))
+            (l/inf :hint "exporter key initialized" :key (d/obfuscate-string key))
-            {}
+            key)))
-            [:exporter
-             :nitrate
-             :nexus])))
 
-(sm/register! ::props [:map-of :keyword ::sm/any])
+      :nitrate
-(sm/register! ::shared-keys [:map-of :keyword ::sm/text])
+      (let [key (or (get cfg :nitrate)
+                    (-> (keys/derive secret :salt "nitrate")
+                        (bc/bytes->b64-str true)))]
+        (if (or (str/empty? key)
+                (str/blank? key))
+          (do
+            (l/wrn :hint "nitrate key is disabled because empty string found")
+            nil)
+          (do
+            (l/inf :hint "nitrate key initialized" :key (d/obfuscate-string key))
+            key)))})))
 

backend/src/app/srepl/cli.clj

@@ -53,7 +53,7 @@
     :or {is-active true}}]
   (some-> (get-current-system)
           (db/tx-run!
-           (fn [system]
+           (fn [{:keys [::db/conn] :as system}]
              (let [password (derive-password password)
                    params   {:id (uuid/next)
                              :email email
@@ -62,7 +62,7 @@
                              :password password
                              :props {}}]
                (->> (cmd.auth/create-profile system params)
-                    (cmd.auth/create-profile-rels system)))))))
+                    (cmd.auth/create-profile-rels conn)))))))
 
 (defmethod exec-command "update-profile"
   [{:keys [fullname email password is-active]}]

backend/src/app/srepl/main.clj

@@ -905,4 +905,5 @@
                       (let [params (-> rel
                                        (assoc :id (uuid/next))
                                        (assoc :team-id (:id team)))]
-                        (teams/add-profile-to-team! cfg params {::db/return-keys false}))))))))
+                        (db/insert! conn :team-profile-rel params
+                                    {::db/return-keys false}))))))))

backend/src/app/storage.clj

@@ -44,7 +44,6 @@
     "file-object-thumbnail"
     "file-thumbnail"
     "profile"
-    "organization"
     "tempfile"
     "file-data"
     "file-data-fragment"

backend/src/app/storage/gc_touched.clj

@@ -149,7 +149,7 @@
                  :status "delete"
                  :bucket bucket)
           (recur to-freeze (conj to-delete id) (rest objects))))
-      (let [deletion-delay (if (= "tempfile" bucket)
+      (let [deletion-delay (if (= bucket "tempfile")
                              (ct/duration {:hours 2})
                              (cf/get-deletion-delay))]
         (some->> (seq to-freeze) (mark-freeze-in-bulk! conn))
@@ -166,7 +166,6 @@
     "profile"               (process-objects! conn has-profile-refs? bucket objects)
     "file-data"             (process-objects! conn has-file-data-refs? bucket objects)
     "tempfile"              (process-objects! conn (constantly false) bucket objects)
-    "organization"          (process-objects! conn (constantly false) bucket objects)
     (ex/raise :type :internal
               :code :unexpected-unknown-reference
               :hint (dm/fmt "unknown reference '%'" bucket))))
@@ -214,13 +213,8 @@
   [_ params]
   (assert (db/pool? (::db/pool params)) "expect valid storage"))
 
-(defmethod ig/expand-key ::handler
-  [k v]
-  {k (merge {::min-age (ct/duration {:hours 2})} v)})
-
 (defmethod ig/init-key ::handler
-  [_ {:keys [::min-age] :as cfg}]
+  [_ cfg]
   (fn [_]
-    (let [threshold (ct/minus (ct/now) min-age)]
+    (process-touched! (assoc cfg ::timestamp (ct/now)))))
-      (process-touched! (assoc cfg ::timestamp threshold)))))
 

backend/src/app/storage/s3.clj

@@ -30,18 +30,21 @@
    java.nio.file.Path
    java.time.Duration
    java.util.Collection
-   java.util.concurrent.atomic.AtomicLong
    java.util.Optional
+   java.util.concurrent.atomic.AtomicLong
    org.reactivestreams.Subscriber
    software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider
+   software.amazon.awssdk.core.ResponseBytes
    software.amazon.awssdk.core.async.AsyncRequestBody
    software.amazon.awssdk.core.async.AsyncResponseTransformer
    software.amazon.awssdk.core.async.BlockingInputStreamAsyncRequestBody
    software.amazon.awssdk.core.client.config.ClientAsyncConfiguration
-   software.amazon.awssdk.core.ResponseBytes
    software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient
    software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup
    software.amazon.awssdk.regions.Region
+   software.amazon.awssdk.services.s3.S3AsyncClient
+   software.amazon.awssdk.services.s3.S3AsyncClientBuilder
+   software.amazon.awssdk.services.s3.S3Configuration
    software.amazon.awssdk.services.s3.model.Delete
    software.amazon.awssdk.services.s3.model.DeleteObjectRequest
    software.amazon.awssdk.services.s3.model.DeleteObjectsRequest
@@ -51,12 +54,9 @@
    software.amazon.awssdk.services.s3.model.ObjectIdentifier
    software.amazon.awssdk.services.s3.model.PutObjectRequest
    software.amazon.awssdk.services.s3.model.S3Error
-   software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest
-   software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest
    software.amazon.awssdk.services.s3.presigner.S3Presigner
-   software.amazon.awssdk.services.s3.S3AsyncClient
+   software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest
-   software.amazon.awssdk.services.s3.S3AsyncClientBuilder
+   software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest))
-   software.amazon.awssdk.services.s3.S3Configuration))
 
 (def ^:private max-retries
   "A maximum number of retries on internal operations"

backend/src/app/tasks/telemetry.clj

@@ -129,12 +129,6 @@
   (->> [sql:team-averages]
        (db/exec-one! conn)))
 
-(defn- get-email-domains
-  [conn]
-  (let [sql "SELECT DISTINCT split_part(email, '@', 2) AS domain FROM profile ORDER BY 1"]
-    (->> (db/exec! conn [sql])
-         (mapv :domain))))
-
 (defn- get-enabled-auth-providers
   [conn]
   (let [sql  (str "SELECT auth_backend AS backend, count(*) AS total "
@@ -198,8 +192,7 @@
          :total-fonts         (get-num-fonts conn)
          :total-comments      (get-num-comments conn)
          :total-file-changes  (get-num-file-changes conn)
-         :total-touched-files (get-num-touched-files conn)
+         :total-touched-files (get-num-touched-files conn)}
-         :email-domains       (get-email-domains conn)}
         (merge
          (get-team-averages conn)
          (get-jvm-stats)

backend/src/app/tasks/upload_session_gc.clj

@@ -1,41 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.tasks.upload-session-gc
-  "A maintenance task that deletes stalled (incomplete) upload sessions.
-
-  An upload session is considered stalled when it was created more than
-  `max-age` ago without being completed (i.e. the session row still
-  exists because `assemble-chunks` was never called to clean it up).
-  The default max-age is 1 hour."
-  (:require
-   [app.common.logging :as l]
-   [app.common.time :as ct]
-   [app.db :as db]
-   [integrant.core :as ig]))
-
-(def ^:private sql:delete-stalled-sessions
-  "DELETE FROM upload_session
-    WHERE created_at < ?::timestamptz")
-
-(defmethod ig/assert-key ::handler
-  [_ params]
-  (assert (db/pool? (::db/pool params)) "expected a valid database pool"))
-
-(defmethod ig/expand-key ::handler
-  [k v]
-  {k (merge {::max-age (ct/duration {:hours 1})} v)})
-
-(defmethod ig/init-key ::handler
-  [_ {:keys [::max-age] :as cfg}]
-  (fn [_]
-    (db/tx-run! cfg
-                (fn [{:keys [::db/conn]}]
-                  (let [threshold (ct/minus (ct/now) max-age)
-                        result    (-> (db/exec-one! conn [sql:delete-stalled-sessions threshold])
-                                      (db/get-update-count))]
-                    (l/debug :hint "task finished" :deleted result)
-                    {:deleted result})))))

backend/test/backend_tests/auth_oidc_test.clj

@@ -1,55 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns backend-tests.auth-oidc-test
-  (:require
-   [app.auth.oidc :as oidc]
-   [clojure.test :as t]))
-
-(def ^:private oidc-provider
-  {:id "oidc"
-   :type "oidc"})
-
-(t/deftest parse-attr-path-supports-dot-and-double-underscore
-  (t/is
-   (= [:oidc/resource-access :penpot_roles :roles]
-      (#'oidc/parse-attr-path oidc-provider "resource_access__penpot_roles__roles")))
-  (t/is
-   (= [:oidc/ocs :data :email]
-      (#'oidc/parse-attr-path oidc-provider "ocs.data.email"))))
-
-(t/deftest process-user-info-supports-dot-notation-nested-attrs
-  (let [provider (assoc oidc-provider
-                        :email-attr "ocs.data.email"
-                        :name-attr "ocs.data.display-name")
-        info     (#'oidc/process-user-info provider
-                                           {}
-                                           {:email_verified true
-                                            :ocs {:data {:email "nextcloud@example.com"
-                                                         :display-name "Nextcloud User"}}})]
-    (t/is (= "nextcloud@example.com" (:email info)))
-    (t/is (= "Nextcloud User" (:fullname info)))
-    (t/is (true? (:email-verified info)))))
-
-;; The provider's `:user-info-source` value arrives as a string (enforced by
-;; the malli schema in `app.config` and used as-is by the hard-coded Google /
-;; GitHub provider maps), so the dispatch must interpret strings — not
-;; keywords — to actually honour `PENPOT_OIDC_USER_INFO_SOURCE=userinfo`.
-(t/deftest select-user-info-source-interprets-config-strings
-  (t/testing "explicit string values map to keyword dispatch tokens"
-    (t/is (= :token    (#'oidc/select-user-info-source "token")))
-    (t/is (= :userinfo (#'oidc/select-user-info-source "userinfo"))))
-
-  (t/testing "missing or explicit \"auto\" falls back to auto dispatch"
-    (t/is (= :auto (#'oidc/select-user-info-source "auto")))
-    (t/is (= :auto (#'oidc/select-user-info-source nil))))
-
-  (t/testing "unknown values fall back to auto dispatch safely"
-    (t/is (= :auto (#'oidc/select-user-info-source "unknown")))
-    ;; Guards against the reverse regression — a stray keyword value must
-    ;; not silently slip through as if it were the matching string.
-    (t/is (= :auto (#'oidc/select-user-info-source :token)))
-    (t/is (= :auto (#'oidc/select-user-info-source :userinfo)))))

backend/test/backend_tests/email_blacklist_test.clj

@@ -1,34 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns backend-tests.email-blacklist-test
-  (:require
-   [app.email :as-alias email]
-   [app.email.blacklist :as blacklist]
-   [clojure.test :as t]))
-
-(def ^:private cfg
-  {::email/blacklist #{"somedomain.com" "spam.net"}})
-
-(t/deftest test-exact-domain-match
-  (t/is (true?  (blacklist/contains? cfg "user@somedomain.com")))
-  (t/is (true?  (blacklist/contains? cfg "user@spam.net")))
-  (t/is (false? (blacklist/contains? cfg "user@legit.com"))))
-
-(t/deftest test-subdomain-match
-  (t/is (true?  (blacklist/contains? cfg "user@sub.somedomain.com")))
-  (t/is (true?  (blacklist/contains? cfg "user@a.b.somedomain.com")))
-  ;; A domain that merely contains the blacklisted string but is not a
-  ;; subdomain must NOT be rejected.
-  (t/is (false? (blacklist/contains? cfg "user@notsomedomain.com"))))
-
-(t/deftest test-case-insensitive
-  (t/is (true? (blacklist/contains? cfg "user@SOMEDOMAIN.COM")))
-  (t/is (true? (blacklist/contains? cfg "user@Sub.SomeDomain.Com"))))
-
-(t/deftest test-non-blacklisted-domain
-  (t/is (false? (blacklist/contains? cfg "user@example.com")))
-  (t/is (false? (blacklist/contains? cfg "user@sub.legit.com"))))

backend/test/backend_tests/helpers.clj

@@ -186,10 +186,10 @@
                         :is-demo false}
                        params)]
      (db/run! system
-              (fn [cfg]
+              (fn [{:keys [::db/conn] :as cfg}]
                 (->> params
                      (cmd.auth/create-profile cfg)
-                     (cmd.auth/create-profile-rels cfg)))))))
+                     (cmd.auth/create-profile-rels conn)))))))
 
 (defn create-project*
   ([i params] (create-project* *system* i params))
@@ -234,10 +234,10 @@
    (dm/with-open [conn (db/open system)]
      (let [id       (mk-uuid "team" i)
            features (cfeat/get-enabled-features cf/flags)]
-       (teams/create-team {::db/conn conn} {:id id
+       (teams/create-team conn {:id id
-                                            :profile-id profile-id
+                                :profile-id profile-id
-                                            :features features
+                                :features features
-                                            :name (str "team" i)})))))
+                                :name (str "team" i)})))))
 
 (defn create-file-media-object*
   ([params] (create-file-media-object* *system* params))
@@ -283,10 +283,9 @@
   ([params] (create-team-role* *system* params))
   ([system {:keys [team-id profile-id role] :or {role :owner}}]
    (dm/with-open [conn (db/open system)]
-     (#'teams/create-team-role {::db/conn conn}
+     (#'teams/create-team-role conn {:team-id team-id
-                               {:team-id team-id
+                                     :profile-id profile-id
-                                :profile-id profile-id
+                                     :role role}))))
-                                :role role}))))
 
 (defn create-project-role*
   ([params] (create-project-role* *system* params))
@@ -385,31 +384,6 @@
                             (dissoc ::type)
                             (assoc :app.rpc/request-at (ct/now)))))))
 
-(defn management-command!
-  ([data]
-   (management-command! data nil))
-  ([{:keys [::type] :as data} flags-to-add]
-   (let [flags (reduce conj cf/flags (or flags-to-add []))
-
-         resolve-management-methods
-         (requiring-resolve 'app.rpc/resolve-management-methods)
-
-         methods
-         (with-redefs [cf/flags flags]
-           (resolve-management-methods *system*))
-
-         [_ method-fn]
-         (get methods type)]
-
-     (when-not method-fn
-       (ex/raise :type :assertion
-                 :code :rpc-method-not-found
-                 :hint (str/ffmt "management rpc method '%' not found" (name type))))
-
-     (try-on! (method-fn (-> data
-                             (dissoc ::type)
-                             (assoc :app.rpc/request-at (ct/now))))))))
-
 (defn run-task!
   ([name]
    (run-task! name {}))

backend/test/backend_tests/http_middleware_test.clj

@@ -102,7 +102,7 @@
 
 (t/deftest access-token-authz
   (let [profile (th/create-profile* 1)
-        token   (db/tx-run! th/*system* app.rpc.commands.access-token/create-access-token (:id profile) "test" nil nil)
+        token   (db/tx-run! th/*system* app.rpc.commands.access-token/create-access-token (:id profile) "test" nil)
         handler (#'app.http.access-token/wrap-authz identity th/*system*)]
 
     (let [response (handler nil)]

backend/test/backend_tests/rpc_access_tokens_test.clj

@@ -107,18 +107,4 @@
         ;; (th/print-result! out)
         (t/is (nil? (:error out)))
         (let [results (:result out)]
-          (t/is (= 2 (count results))))))
+          (t/is (= 2 (count results))))))))
-
-    (t/testing "get mcp token"
-      (let [_ (th/command! {::th/type :create-access-token
-                            ::rpc/profile-id (:id prof)
-                            :type "mcp"
-                            :name "token 1"
-                            :perms ["get-profile"]})
-            {:keys [error result]}
-            (th/command! {::th/type :get-current-mcp-token
-                          ::rpc/profile-id (:id prof)})]
-        ;; (th/print-result! result)
-        (t/is (nil? error))
-        (t/is (string? (:token result)))))))
-

backend/test/backend_tests/rpc_file_test.clj

@@ -312,8 +312,7 @@
       ;; freeze because of the deduplication (we have uploaded 2 times
       ;; the same files).
 
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
-                  (th/run-task! :storage-gc-touched {}))]
         (t/is (= 2 (:freeze res)))
         (t/is (= 0 (:delete res))))
 
@@ -387,8 +386,7 @@
       ;; Now that file-gc have deleted the file-media-object usage,
       ;; lets execute the touched-gc task, we should see that two of
       ;; them are marked to be deleted
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
-                  (th/run-task! :storage-gc-touched {}))]
         (t/is (= 0 (:freeze res)))
         (t/is (= 2 (:delete res))))
 
@@ -573,8 +571,7 @@
       ;; Now that file-gc have deleted the file-media-object usage,
       ;; lets execute the touched-gc task, we should see that two of
       ;; them are marked to be deleted.
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
-                  (th/run-task! :storage-gc-touched {}))]
         (t/is (= 0 (:freeze res)))
         (t/is (= 2 (:delete res))))
 
@@ -667,8 +664,7 @@
       ;; because of the deduplication (we have uploaded 2 times the
       ;; same files).
 
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
-                  (th/run-task! :storage-gc-touched {}))]
         (t/is (= 1 (:freeze res)))
         (t/is (= 0 (:delete res))))
 
@@ -718,8 +714,7 @@
 
       ;; Now that objects-gc have deleted the object thumbnail lets
       ;; execute the touched-gc task
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! "storage-gc-touched" {})]
-                  (th/run-task! "storage-gc-touched" {}))]
         (t/is (= 1 (:freeze res))))
 
       ;; check file media objects
@@ -754,8 +749,7 @@
 
       ;; Now that file-gc have deleted the object thumbnail lets
       ;; execute the touched-gc task
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
-                  (th/run-task! :storage-gc-touched {}))]
         (t/is (= 1 (:delete res))))
 
       ;; check file media objects
@@ -1325,8 +1319,7 @@
     ;; The FileGC task will schedule an inner taskq
     (th/run-pending-tasks!)
 
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 2 (:freeze res)))
       (t/is (= 0 (:delete res))))
 
@@ -1420,8 +1413,7 @@
 
     ;; we ensure that once object-gc is passed and marked two storage
     ;; objects to delete
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 0 (:freeze res)))
       (t/is (= 2 (:delete res))))
 
@@ -2121,92 +2113,3 @@
           (t/is (= 1 (count rows)))
           (t/is (= (:created-at row1) #penpot/inst "2025-10-31T00:00:00Z"))
           (t/is (nil? (:deleted-at row1))))))))
-
-(t/deftest get-file-stats-empty-file
-  (let [profile (th/create-profile* 1 {:is-active true})
-        file    (th/create-file* 1 {:profile-id (:id profile)
-                                    :project-id (:default-project-id profile)
-                                    :is-shared  false})
-        out     (th/command! {::th/type :get-file-stats
-                              ::rpc/profile-id (:id profile)
-                              :id (:id file)})]
-
-    ;; (th/print-result! out)
-    (t/is (nil? (:error out)))
-
-    (let [result (:result out)]
-      (t/is (= (:id file) (:file-id result)))
-      (t/is (pos? (:page-count result)))
-      (t/is (zero? (:component-count result)))
-      (t/is (zero? (:deleted-component-count result)))
-      (t/is (zero? (:color-count result)))
-      (t/is (zero? (:typography-count result)))
-      (t/is (zero? (:library-count result)))
-      (t/is (zero? (:referenced-by-count result)))
-      (t/is (contains? result :shape-counts))
-      (t/is (zero? (get-in result [:shape-counts :total])))
-      (t/is (= {} (get-in result [:shape-counts :by-type]))))))
-
-(t/deftest get-file-stats-with-shapes
-  (let [profile  (th/create-profile* 1 {:is-active true})
-        file     (th/create-file* 1 {:profile-id (:id profile)
-                                     :project-id (:default-project-id profile)
-                                     :is-shared  false})
-        page-id  (-> file :data :pages first)
-        rect-id  (uuid/random)
-        frame-id (uuid/random)]
-
-    (update-file!
-     :file-id (:id file)
-     :profile-id (:id profile)
-     :revn 0
-     :vern 0
-     :changes
-     [{:type :add-obj
-       :page-id page-id
-       :id frame-id
-       :parent-id uuid/zero
-       :frame-id uuid/zero
-       :components-v2 true
-       :obj (cts/setup-shape
-             {:id frame-id
-              :name "frame"
-              :frame-id uuid/zero
-              :parent-id uuid/zero
-              :type :frame})}
-      {:type :add-obj
-       :page-id page-id
-       :id rect-id
-       :parent-id frame-id
-       :frame-id frame-id
-       :components-v2 true
-       :obj (cts/setup-shape
-             {:id rect-id
-              :name "rect"
-              :frame-id frame-id
-              :parent-id frame-id
-              :type :rect})}])
-
-    (let [out    (th/command! {::th/type :get-file-stats
-                               ::rpc/profile-id (:id profile)
-                               :id (:id file)})
-          result (:result out)]
-
-      (t/is (nil? (:error out)))
-      (t/is (= 2 (get-in result [:shape-counts :total])))
-      (t/is (= 1 (get-in result [:shape-counts :by-type :rect])))
-      (t/is (= 1 (get-in result [:shape-counts :by-type :frame]))))))
-
-(t/deftest get-file-stats-forbidden
-  (let [owner (th/create-profile* 1 {:is-active true})
-        other (th/create-profile* 2 {:is-active true})
-        file  (th/create-file* 1 {:profile-id (:id owner)
-                                  :project-id (:default-project-id owner)
-                                  :is-shared  false})
-        out   (th/command! {::th/type :get-file-stats
-                            ::rpc/profile-id (:id other)
-                            :id (:id file)})]
-
-    (t/is (not (nil? (:error out))))
-    (let [edata (-> out :error ex-data)]
-      (t/is (= :not-found (:type edata))))))

backend/test/backend_tests/rpc_file_thumbnails_test.clj

@@ -85,7 +85,7 @@
       (t/is (map? (:result out))))
 
     ;; run the task again
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:minutes 31}))]
                 (th/run-task! "storage-gc-touched" {}))]
       (t/is (= 2 (:freeze res))))
 
@@ -136,7 +136,7 @@
       (t/is (some? (sto/get-object storage (:media-id row2))))
 
       ;; run the task again
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:minutes 31}))]
                   (th/run-task! :storage-gc-touched {}))]
         (t/is (= 1 (:delete res)))
         (t/is (= 0 (:freeze res))))
@@ -235,8 +235,7 @@
         (t/is (= (:object-id data1) (:object-id row)))
         (t/is (uuid? (:media-id row1))))
 
-      (let [result (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [result (th/run-task! :storage-gc-touched {})]
-                     (th/run-task! :storage-gc-touched {}))]
         (t/is (= 1 (:delete result))))
 
       ;; Check if storage objects still exists after file-gc

backend/test/backend_tests/rpc_font_test.clj

@@ -93,41 +93,6 @@
         :font-weight
         :font-style))))
 
-(t/deftest woff2-font-upload-1
-  (let [prof    (th/create-profile* 1 {:is-active true})
-        team-id (:default-team-id prof)
-        proj-id (:default-project-id prof)
-        font-id (uuid/custom 10 1)
-
-        data    (-> (io/resource "backend_tests/test_files/font-1.woff2")
-                    (io/read*))
-
-        params  {::th/type :create-font-variant
-                 ::rpc/profile-id (:id prof)
-                 :team-id team-id
-                 :font-id font-id
-                 :font-family "somefont"
-                 :font-weight 400
-                 :font-style "normal"
-                 :data {"font/woff2" data}}
-        out     (th/command! params)]
-
-    ;; (th/print-result! out)
-    (t/is (nil? (:error out)))
-    (let [result (:result out)]
-      (t/is (uuid? (:id result)))
-      (t/is (uuid? (:ttf-file-id result)))
-      (t/is (uuid? (:otf-file-id result)))
-      (t/is (uuid? (:woff1-file-id result)))
-      (t/is (uuid? (:woff2-file-id result)))
-      (t/are [k] (= (get params k)
-                    (get result k))
-        :team-id
-        :font-id
-        :font-family
-        :font-weight
-        :font-style))))
-
 (t/deftest font-deletion-1
   (let [prof    (th/create-profile* 1 {:is-active true})
         team-id (:default-team-id prof)
@@ -165,8 +130,7 @@
       ;; (th/print-result! out)
       (t/is (nil? (:error out))))
 
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 6 (:freeze res))))
 
     (let [params {::th/type :delete-font
@@ -178,16 +142,14 @@
       (t/is (nil? (:error out)))
       (t/is (nil? (:result out))))
 
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 0 (:freeze res)))
       (t/is (= 0 (:delete res))))
 
     (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
       (let [res (th/run-task! :objects-gc {})]
-        (t/is (= 2 (:processed res)))))
+        (t/is (= 2 (:processed res))))
 
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
       (let [res (th/run-task! :storage-gc-touched {})]
         (t/is (= 0 (:freeze res)))
         (t/is (= 6 (:delete res)))))))
@@ -229,8 +191,7 @@
       ;; (th/print-result! out)
       (t/is (nil? (:error out))))
 
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 6 (:freeze res))))
 
     (let [params {::th/type :delete-font
@@ -242,16 +203,14 @@
       (t/is (nil? (:error out)))
       (t/is (nil? (:result out))))
 
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 0 (:freeze res)))
       (t/is (= 0 (:delete res))))
 
     (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
       (let [res (th/run-task! :objects-gc {})]
-        (t/is (= 1 (:processed res)))))
+        (t/is (= 1 (:processed res))))
 
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
       (let [res (th/run-task! :storage-gc-touched {})]
         (t/is (= 0 (:freeze res)))
         (t/is (= 3 (:delete res)))))))
@@ -261,42 +220,57 @@
         team-id (:default-team-id prof)
         proj-id (:default-project-id prof)
         font-id (uuid/custom 10 1)
-        data1   (-> (io/resource "backend_tests/test_files/font-1.woff") (io/read*))
+
-        data2   (-> (io/resource "backend_tests/test_files/font-2.woff") (io/read*))
+        data1   (-> (io/resource "backend_tests/test_files/font-1.woff")
-        params1 {::th/type :create-font-variant ::rpc/profile-id (:id prof)
+                    (io/read*))
-                 :team-id team-id :font-id font-id :font-family "somefont"
+
-                 :font-weight 400 :font-style "normal" :data {"font/woff" data1}}
+        data2   (-> (io/resource "backend_tests/test_files/font-2.woff")
-        params2 {::th/type :create-font-variant ::rpc/profile-id (:id prof)
+                    (io/read*))
-                 :team-id team-id :font-id font-id :font-family "somefont"
+        params1 {::th/type :create-font-variant
-                 :font-weight 500 :font-style "normal" :data {"font/woff" data2}}
+                 ::rpc/profile-id (:id prof)
+                 :team-id team-id
+                 :font-id font-id
+                 :font-family "somefont"
+                 :font-weight 400
+                 :font-style "normal"
+                 :data {"font/woff" data1}}
+
+        params2 {::th/type :create-font-variant
+                 ::rpc/profile-id (:id prof)
+                 :team-id team-id
+                 :font-id font-id
+                 :font-family "somefont"
+                 :font-weight 500
+                 :font-style "normal"
+                 :data {"font/woff" data2}}
+
         out1    (th/command! params1)
         out2    (th/command! params2)]
+
+    ;; (th/print-result! out1)
     (t/is (nil? (:error out1)))
     (t/is (nil? (:error out2)))
 
-    ;; freeze with hours 3 clock
+    (let [res (th/run-task! :storage-gc-touched {})]
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 6 (:freeze res))))
 
-    (let [params {::th/type :delete-font-variant ::rpc/profile-id (:id prof)
+    (let [params {::th/type :delete-font-variant
-                  :team-id team-id :id (-> out1 :result :id)}
+                  ::rpc/profile-id (:id prof)
+                  :team-id team-id
+                  :id (-> out1 :result :id)}
           out    (th/command! params)]
+      ;; (th/print-result! out)
       (t/is (nil? (:error out)))
       (t/is (nil? (:result out))))
 
-    ;; no-op with hours 3 clock (nothing touched yet)
+    (let [res (th/run-task! :storage-gc-touched {})]
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 0 (:freeze res)))
       (t/is (= 0 (:delete res))))
 
-    ;; objects-gc at days 8, then storage-gc-touched at days 8 + 3h
     (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
       (let [res (th/run-task! :objects-gc {})]
-        (t/is (= 1 (:processed res)))))
+        (t/is (= 1 (:processed res))))
 
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
       (let [res (th/run-task! :storage-gc-touched {})]
         (t/is (= 0 (:freeze res)))
         (t/is (= 3 (:delete res)))))))

backend/test/backend_tests/rpc_management_nitrate_test.clj

@@ -1,800 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns backend-tests.rpc-management-nitrate-test
-  (:require
-   [app.common.data :as d]
-   [app.common.time :as ct]
-   [app.common.uuid :as uuid]
-   [app.config :as cf]
-   [app.db :as-alias db]
-   [app.email :as email]
-   [app.msgbus :as mbus]
-   [app.nitrate :as nitrate]
-   [app.rpc :as-alias rpc]
-   [backend-tests.helpers :as th]
-   [clojure.set :as set]
-   [clojure.test :as t]
-   [cuerdas.core :as str]))
-
-(t/use-fixtures :once th/state-init)
-(t/use-fixtures :each th/database-reset)
-
-(defn- management-command-with-nitrate!
-  [data]
-  (th/management-command! data [:nitrate]))
-
-(t/deftest authenticate-success
-  (let [profile (th/create-profile* 1 {:is-active true
-                                       :fullname "Nitrate User"})
-        out     (management-command-with-nitrate! {::th/type :authenticate
-                                                   ::rpc/profile-id (:id profile)})]
-    (t/is (th/success? out))
-    (t/is (= (:id profile) (-> out :result :id)))
-    (t/is (= "Nitrate User" (-> out :result :name)))
-    (t/is (= (:email profile) (-> out :result :email)))
-    (t/is (nil? (-> out :result :photo-url)))))
-
-(t/deftest authenticate-requires-authentication
-  (let [out (management-command-with-nitrate! {::th/type :authenticate})]
-    (t/is (not (th/success? out)))
-    (t/is (= :authentication (th/ex-type (:error out))))
-    (t/is (= :authentication-required (th/ex-code (:error out))))))
-
-(t/deftest get-penpot-version
-  (let [profile (th/create-profile* 1 {:is-active true})
-        out     (management-command-with-nitrate! {::th/type :get-penpot-version
-                                                   ::rpc/profile-id (:id profile)})]
-    (t/is (th/success? out))
-    (t/is (= cf/version (-> out :result :version)))))
-
-(t/deftest get-teams-returns-only-owned-non-default-non-deleted
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        other        (th/create-profile* 2 {:is-active true})
-        owned-team   (th/create-team* 1 {:profile-id (:id profile)})
-        deleted-team (th/create-team* 2 {:profile-id (:id profile)})
-        _            (th/db-update! :team
-                                    {:deleted-at (ct/now)}
-                                    {:id (:id deleted-team)})
-        other-team   (th/create-team* 3 {:profile-id (:id other)})
-        _            (th/create-team-role* {:team-id (:id other-team)
-                                            :profile-id (:id profile)
-                                            :role :editor})
-        out          (management-command-with-nitrate! {::th/type :get-teams
-                                                        ::rpc/profile-id (:id profile)})]
-    (t/is (th/success? out))
-    (t/is (= #{(:id owned-team)}
-             (->> out :result (map :id) set)))
-    (t/is (= #{(:name owned-team)}
-             (->> out :result (map :name) set)))))
-
-(t/deftest notify-team-change-publishes-event
-  (let [team-id          (uuid/random)
-        organization-id  (uuid/random)
-        organization     {:id organization-id
-                          :name "Acme Inc"
-                          :slug "acme-inc"
-                          :owner-id (uuid/random)
-                          :avatar-bg-url "http://example.com/avatar.svg"}
-        calls            (atom [])
-        out              (with-redefs [mbus/pub! (fn [_cfg & {:keys [topic message]}]
-                                                   (swap! calls conj {:topic topic
-                                                                      :message message}))]
-                           (management-command-with-nitrate! {::th/type :notify-team-change
-                                                              :id team-id
-                                                              :is-your-penpot false
-                                                              :organization organization}))]
-    (t/is (th/success? out))
-    (t/is (= 1 (count @calls)))
-    (t/is (= uuid/zero (-> @calls first :topic)))
-    (let [msg (-> @calls first :message)]
-      (t/is (= :team-org-change (:type msg)))
-      (t/is (= nil (:notification msg)))
-      (t/is (= team-id (-> msg :team :id)))
-      (t/is (= false (-> msg :team :is-your-penpot)))
-      (t/is (= (:id organization) (-> msg :team :organization :id)))
-      (t/is (= (:name organization) (-> msg :team :organization :name)))
-      (t/is (= (:slug organization) (-> msg :team :organization :slug)))
-      (t/is (= (:owner-id organization) (-> msg :team :organization :owner-id)))
-      (t/is (= (:avatar-bg-url organization) (str (-> msg :team :organization :avatar-bg-url)))))))
-
-(t/deftest notify-user-added-to-organization-creates-default-org-team
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        before-teams (->> (th/db-query :team-profile-rel {:profile-id (:id profile)
-                                                          :is-owner true})
-                          (map :team-id)
-                          set)
-        out          (management-command-with-nitrate! {::th/type :notify-user-added-to-organization
-                                                        :profile-id (:id profile)
-                                                        :organization-id (uuid/random)
-                                                        :role "owner"})
-        after-teams  (->> (th/db-query :team-profile-rel {:profile-id (:id profile)
-                                                          :is-owner true})
-                          (map :team-id)
-                          set)
-        new-team-id  (first (set/difference after-teams before-teams))
-        new-team     (th/db-get :team {:id new-team-id})]
-    (t/is (th/success? out))
-    (t/is (= 1 (count (set/difference after-teams before-teams))))
-    (t/is (= "Your Penpot" (:name new-team)))
-    (t/is (true? (:is-default new-team)))))
-
-(t/deftest get-managed-profiles-returns-unique-members-for-owned-teams
-  (let [owner     (th/create-profile* 1 {:is-active true})
-        member1   (th/create-profile* 2 {:is-active true})
-        member2   (th/create-profile* 3 {:is-active true})
-        team1     (th/create-team* 1 {:profile-id (:id owner)})
-        team2     (th/create-team* 2 {:profile-id (:id owner)})
-        _         (th/create-team-role* {:team-id (:id team1)
-                                         :profile-id (:id member1)
-                                         :role :editor})
-        _         (th/create-team-role* {:team-id (:id team1)
-                                         :profile-id (:id member2)
-                                         :role :editor})
-        _         (th/create-team-role* {:team-id (:id team2)
-                                         :profile-id (:id member1)
-                                         :role :editor})
-        out       (management-command-with-nitrate! {::th/type :get-managed-profiles
-                                                     ::rpc/profile-id (:id owner)})]
-    (t/is (th/success? out))
-    (t/is (= #{(:id member1) (:id member2)}
-             (->> out :result (map :id) set)))
-    (t/is (= #{(:email member1) (:email member2)}
-             (->> out :result (map :email) set)))))
-
-(t/deftest get-teams-summary-returns-teams-and-files-count
-  (let [profile (th/create-profile* 1 {:is-active true})
-        team1   (th/create-team* 1 {:profile-id (:id profile)})
-        team2   (th/create-team* 2 {:profile-id (:id profile)})
-        proj1   (th/create-project* 1 {:profile-id (:id profile)
-                                       :team-id (:id team1)})
-        proj2   (th/create-project* 2 {:profile-id (:id profile)
-                                       :team-id (:id team2)})
-        _       (th/create-file* 1 {:profile-id (:id profile)
-                                    :project-id (:id proj1)})
-        _       (th/create-file* 2 {:profile-id (:id profile)
-                                    :project-id (:id proj2)})
-        out     (management-command-with-nitrate! {::th/type :get-teams-summary
-                                                   ::rpc/profile-id (:id profile)
-                                                   :ids [(:id team1) (:id team2)]})]
-    (t/is (th/success? out))
-    (t/is (= 2 (-> out :result :num-files)))
-    (t/is (= #{(:id team1) (:id team2)}
-             (->> out :result :teams (map :id) set)))))
-
-(t/deftest notify-org-deletion-prefixes-teams-and-notifies
-  (let [profile        (th/create-profile* 1 {:is-active true})
-        extra-team     (th/create-team* 1 {:profile-id (:id profile)})
-        default-team   (th/db-get :team {:id (:default-team-id profile)})
-        teams          [(:id default-team) (:id extra-team)]
-        organization-name       "Acme / Design"
-        expected-start (str "[" (d/sanitize-string organization-name) "] ")
-        calls          (atom [])
-        out            (with-redefs [mbus/pub! (fn [_cfg & {:keys [topic message]}]
-                                                 (swap! calls conj {:topic topic
-                                                                    :message message}))]
-                         (management-command-with-nitrate! {::th/type :notify-org-deletion
-                                                            ::rpc/profile-id (:id profile)
-                                                            :teams teams
-                                                            :organization-name organization-name}))
-        updated        (map #(th/db-get :team {:id %} {::db/remove-deleted false}) teams)]
-    (t/is (th/success? out))
-    (t/is (= 2 (count @calls)))
-    (doseq [team updated]
-      (t/is (false? (:is-default team)))
-      (t/is (str/starts-with? (:name team) expected-start)))
-    (doseq [call @calls]
-      (t/is (= uuid/zero (:topic call)))
-      (t/is (= :team-org-change (-> call :message :type)))
-      (t/is (= organization-name (-> call :message :team :organization :name)))
-      (t/is (= "dashboard.org-deleted" (-> call :message :notification))))))
-
-(t/deftest get-profile-by-email-success-and-not-found
-  (let [profile (th/create-profile* 1 {:is-active true
-                                       :fullname "Lookup by Email"})
-        ok-out  (management-command-with-nitrate! {::th/type :get-profile-by-email
-                                                   ::rpc/profile-id (:id profile)
-                                                   :email (:email profile)})
-        ko-out  (management-command-with-nitrate! {::th/type :get-profile-by-email
-                                                   ::rpc/profile-id (:id profile)
-                                                   :email "not-found@example.com"})]
-    (t/is (th/success? ok-out))
-    (t/is (= (:id profile) (-> ok-out :result :id)))
-    (t/is (= "Lookup by Email" (-> ok-out :result :name)))
-    (t/is (nil? (-> ok-out :result :photo-url)))
-
-    (t/is (not (th/success? ko-out)))
-    (t/is (= :not-found (th/ex-type (:error ko-out))))
-    (t/is (= :profile-not-found (th/ex-code (:error ko-out))))))
-
-(t/deftest get-profile-by-id-success-and-not-found
-  (let [profile (th/create-profile* 1 {:is-active true
-                                       :fullname "Lookup by Id"})
-        ok-out  (management-command-with-nitrate! {::th/type :get-profile-by-id
-                                                   ::rpc/profile-id (:id profile)
-                                                   :id (:id profile)})
-        ko-out  (management-command-with-nitrate! {::th/type :get-profile-by-id
-                                                   ::rpc/profile-id (:id profile)
-                                                   :id (uuid/random)})]
-    (t/is (th/success? ok-out))
-    (t/is (= (:id profile) (-> ok-out :result :id)))
-    (t/is (= "Lookup by Id" (-> ok-out :result :name)))
-    (t/is (nil? (-> ok-out :result :photo-url)))
-
-    (t/is (not (th/success? ko-out)))
-    (t/is (= :not-found (th/ex-type (:error ko-out))))
-    (t/is (= :profile-not-found (th/ex-code (:error ko-out))))))
-
-(t/deftest get-org-invitations-returns-valid-deduped-by-email
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        team-1       (th/create-team* 1 {:profile-id (:id profile)})
-        team-2       (th/create-team* 2 {:profile-id (:id profile)})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams [{:id (:id team-1)}
-                              {:id (:id team-2)}]}
-        params       {::th/type :get-org-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id}]
-
-    ;; Same email appears in org and team invitations; only one should be returned.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "dup@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to "dup@example.com"
-                    :created-by (:id profile)
-                    :role "admin"
-                    :valid-until (ct/in-future "72h")})
-
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "valid@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "48h")})
-
-    ;; Expired invitation should be ignored.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "expired@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-past "1h")})
-
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          result (:result out)
-          emails (->> result (map :email) set)
-          dedup  (->> result
-                      (filter #(= "dup@example.com" (:email %)))
-                      first)]
-      (t/is (th/success? out))
-      (t/is (= #{"dup@example.com" "valid@example.com"} emails))
-      (t/is (= 2 (count result)))
-      (t/is (some? (:id dedup)))
-      (t/is (some? (:sent-at dedup)))
-      (t/is (nil? (:organization-id dedup)))
-      (t/is (nil? (:team-id dedup)))
-      (t/is (nil? (:role dedup)))
-      (t/is (nil? (:valid-until dedup))))))
-
-(t/deftest get-org-invitations-includes-org-level-invitations-when-no-teams
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams []}
-        params       {::th/type :get-org-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id}]
-
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "org-only@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          result (:result out)]
-      (t/is (th/success? out))
-      (t/is (= 1 (count result)))
-      (t/is (= "org-only@example.com" (-> result first :email)))
-      (t/is (some? (-> result first :sent-at))))))
-
-(t/deftest get-org-invitations-returns-existing-profile-data
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        invited      (th/create-profile* 2 {:is-active true
-                                            :fullname "Invited User"})
-        photo-id     (uuid/random)
-        _            (th/db-insert! :storage-object {:id photo-id
-                                                     :backend "assets-fs"})
-        _            (th/db-update! :profile {:photo-id photo-id} {:id (:id invited)})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams []}
-        params       {::th/type :get-org-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id}]
-
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to (:email invited)
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          invitation (-> out :result first)]
-      (t/is (th/success? out))
-      (t/is (= "Invited User" (:name invitation)))
-      (t/is (some? (:sent-at invitation)))
-      (t/is (str/ends-with? (:photo-url invitation)
-                            (str "/assets/by-id/" photo-id))))))
-
-(t/deftest delete-org-invitations-removes-org-and-org-team-invitations-for-email
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        team-1       (th/create-team* 1 {:profile-id (:id profile)})
-        team-2       (th/create-team* 2 {:profile-id (:id profile)})
-        outside-team (th/create-team* 3 {:profile-id (:id profile)})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams [{:id (:id team-1)}
-                              {:id (:id team-2)}]}
-        target-email "target@example.com"
-        params       {::th/type :delete-org-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id
-                      :email "TARGET@example.com"}]
-
-    ;; Should be deleted: org-level invitation for same org+email.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to target-email
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-
-    ;; Should be deleted: team-level invitation for teams belonging to org summary.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to target-email
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-past "1h")})
-
-    ;; Should remain: different email.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "other@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-
-    ;; Should remain: same email but outside org scope.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id outside-team)
-                    :org-id nil
-                    :email-to target-email
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          remaining-target (th/db-query :team-invitation {:email-to target-email})
-          remaining-other  (th/db-query :team-invitation {:email-to "other@example.com"})]
-      (t/is (th/success? out))
-      (t/is (nil? (:result out)))
-      (t/is (= 1 (count remaining-target)))
-      (t/is (= (:id outside-team) (:team-id (first remaining-target))))
-      (t/is (= 1 (count remaining-other))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Tests: remove-from-org
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- make-org-summary
-  [& {:keys [organization-id organization-name owner-id your-penpot-teams org-teams]
-      :or   {your-penpot-teams [] org-teams []}}]
-  {:id       organization-id
-   :name     organization-name
-   :owner-id owner-id
-   :teams    (into
-              (mapv (fn [id] {:id id :is-your-penpot true}) your-penpot-teams)
-              (mapv (fn [id] {:id id :is-your-penpot false}) org-teams))})
-
-(defn- nitrate-call-mock
-  [org-summary]
-  (fn [_cfg method _params]
-    (case method
-      :get-org-summary org-summary
-      :get-org-membership {:organization-id (:id org-summary)
-                           :is-member true}
-      :remove-profile-from-org nil
-      nil)))
-
-(t/deftest remove-from-org-happy-path-no-extra-teams
-  ;; User is only in its default team (which has files); it should be
-  ;; kept, renamed and unset as default.  A notification must be sent.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        org-team    (th/create-team* 1 {:profile-id (:id user)})
-        project     (th/create-project* 1 {:profile-id (:id user)
-                                           :team-id   (:id org-team)})
-        _           (th/create-file* 1 {:profile-id (:id user)
-                                        :project-id (:id project)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [])
-        calls       (atom [])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [_bus & {:keys [topic message]}]
-                                              (swap! calls conj {:topic topic :message message}))]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-org
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (nil? (:result out)))
-
-    ;; default team preserved, renamed and unset as default
-    (let [team (th/db-get :team {:id (:id org-team)})]
-      (t/is (false? (:is-default team)))
-      (t/is (str/starts-with? (:name team) "[Acme Org] ")))
-
-    ;; exactly one notification sent to the user
-    (t/is (= 1 (count @calls)))
-    (let [msg (-> @calls first :message)]
-      (t/is (= :user-org-change (:type msg)))
-      (t/is (= (:id user) (:topic msg)))
-      (t/is (= organization-id (:organization-id msg)))
-      (t/is (= "Acme Org" (:organization-name msg)))
-      (t/is (= "dashboard.user-no-longer-belong-org" (:notification msg))))))
-
-(t/deftest remove-from-org-deletes-empty-default-team
-  ;; When the default team has no files it should be soft-deleted.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        org-team    (th/create-team* 2 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-org
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (let [team (th/db-get :team {:id (:id org-team)} {::db/remove-deleted false})]
-      (t/is (some? (:deleted-at team))))))
-
-(t/deftest remove-from-org-deletes-sole-owner-team
-  ;; When the user is the sole member of an org team it should be deleted.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 3 {:profile-id (:id user)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-org
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (let [team (th/db-get :team {:id (:id extra-team)} {::db/remove-deleted false})]
-      (t/is (some? (:deleted-at team))))))
-
-(t/deftest remove-from-org-transfers-ownership-of-multi-member-team
-  ;; When the user owns a team that has another non-owner member, ownership
-  ;; is transferred to that member by the endpoint automatically.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        candidate   (th/create-profile* 3 {:is-active true})
-        extra-team  (th/create-team* 4 {:profile-id (:id user)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id candidate)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-org
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    ;; user no longer in extra-team
-    (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
-      (t/is (nil? rel)))
-    ;; candidate promoted to owner
-    (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id candidate)})]
-      (t/is (true? (:is-owner rel))))))
-
-(t/deftest remove-from-org-exits-non-owned-team
-  ;; When the user is a non-owner member of an org team, they simply leave.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 5 {:profile-id (:id org-owner)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id user)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-org
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    ;; user no longer a member of extra-team
-    (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
-      (t/is (nil? rel)))
-    ;; team still exists for the owner
-    (let [team (th/db-get :team {:id (:id extra-team)})]
-      (t/is (some? team)))))
-
-(t/deftest remove-from-org-error-nobody-to-reassign
-  ;; When the user owns a multi-member team but every other member is
-  ;; also an owner, the auto-selection query finds nobody and raises.
-  (let [other-owner (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 6 {:profile-id (:id user)})
-        ;; add other-owner to the team and make them co-owner directly in DB
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id other-owner)
-                                           :role       :editor})
-        _           (th/db-update! :team-profile-rel
-                                   {:is-owner true :is-admin false}
-                                   {:team-id (:id extra-team) :profile-id (:id other-owner)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id other-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-org
-                        ::rpc/profile-id (:id other-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (not (th/success? out)))
-    (t/is (= :validation (th/ex-type (:error out))))
-    (t/is (= :nobody-to-reassign-team (th/ex-code (:error out))))))
-
-;; Tests: get-remove-from-org-summary
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(t/deftest get-remove-from-org-summary-no-extra-teams
-  ;; User only has a default team — nothing to delete/transfer/exit.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        org-team    (th/create-team* 1 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-org-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   0
-              :teams-to-transfer 0
-              :teams-to-exit     0}
-             (:result out)))))
-
-(t/deftest get-remove-from-org-summary-with-teams-to-delete
-  ;; User owns a sole-member extra org team → 1 to delete.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 3 {:profile-id (:id user)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-org-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   1
-              :teams-to-transfer 0
-              :teams-to-exit     0}
-             (:result out)))))
-
-(t/deftest get-remove-from-org-summary-with-teams-to-transfer
-  ;; User owns a multi-member extra org team → 1 to transfer.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        candidate   (th/create-profile* 3 {:is-active true})
-        extra-team  (th/create-team* 4 {:profile-id (:id user)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id candidate)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-org-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   0
-              :teams-to-transfer 1
-              :teams-to-exit     0}
-             (:result out)))))
-
-(t/deftest get-remove-from-org-summary-with-teams-to-exit
-  ;; User is a non-owner member of an org team → 1 to exit.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 5 {:profile-id (:id org-owner)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id user)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-org-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   0
-              :teams-to-transfer 0
-              :teams-to-exit     1}
-             (:result out)))))
-
-(t/deftest get-remove-from-org-summary-does-not-mutate
-  ;; Calling the summary endpoint must not modify any teams.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 6 {:profile-id (:id user)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        _           (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-org-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    ;; Both teams must still exist and be undeleted
-    (let [t1 (th/db-get :team {:id (:id org-team)})]
-      (t/is (some? t1))
-      (t/is (nil? (:deleted-at t1))))
-    (let [t2 (th/db-get :team {:id (:id extra-team)})]
-      (t/is (some? t2))
-      (t/is (nil? (:deleted-at t2))))
-    ;; User must still be a member of both teams
-    (let [rel1 (th/db-get :team-profile-rel {:team-id (:id org-team) :profile-id (:id user)})]
-      (t/is (some? rel1)))
-    (let [rel2 (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
-      (t/is (some? rel2)))))

backend/test/backend_tests/rpc_media_test.clj

@@ -6,7 +6,9 @@
 
 (ns backend-tests.rpc-media-test
   (:require
+   [app.common.time :as ct]
    [app.common.uuid :as uuid]
+   [app.db :as db]
    [app.http.client :as http]
    [app.media :as media]
    [app.rpc :as-alias rpc]
@@ -14,10 +16,7 @@
    [backend-tests.helpers :as th]
    [clojure.test :as t]
    [datoteka.fs :as fs]
-   [datoteka.io :as io]
+   [mockery.core :refer [with-mocks]]))
-   [mockery.core :refer [with-mocks]])
-  (:import
-   java.io.RandomAccessFile))
 
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
@@ -261,7 +260,7 @@
                                    :is-shared false})
 
         _      (th/db-update! :file
-                              {:deleted-at (app.common.time/now)}
+                              {:deleted-at (ct/now)}
                               {:id (:id file)})
 
         mfile  {:filename "sample.jpg"
@@ -379,325 +378,3 @@
         (t/is (some? err))
         (t/is (= :validation (:type (ex-data err))))
         (t/is (= :unable-to-download-image (:code (ex-data err))))))))
-
-;; --------------------------------------------------------------------
-;; Helpers for chunked-upload tests
-;; --------------------------------------------------------------------
-
-(defn- split-file-into-chunks
-  "Splits the file at `path` into byte-array chunks of at most
-  `chunk-size` bytes. Returns a vector of byte arrays."
-  [path chunk-size]
-  (let [file   (RandomAccessFile. (str path) "r")
-        length (.length file)]
-    (try
-      (loop [offset 0 chunks []]
-        (if (>= offset length)
-          chunks
-          (let [remaining (- length offset)
-                size      (min chunk-size remaining)
-                buf       (byte-array size)]
-            (.seek file offset)
-            (.readFully file buf)
-            (recur (+ offset size) (conj chunks buf)))))
-      (finally
-        (.close file)))))
-
-(defn- make-chunk-mfile
-  "Writes `data` (byte array) to a tempfile and returns a map
-  compatible with `media/schema:upload`."
-  [data mtype]
-  (let [tmp (fs/create-tempfile :dir "/tmp/penpot" :prefix "test-chunk-")]
-    (io/write* tmp data)
-    {:filename "chunk"
-     :path     tmp
-     :mtype    mtype
-     :size     (alength data)}))
-
-;; --------------------------------------------------------------------
-;; Chunked-upload tests
-;; --------------------------------------------------------------------
-
-(defn- create-session!
-  "Creates an upload session for `prof` with `total-chunks`. Returns the session-id UUID."
-  [prof total-chunks]
-  (let [out (th/command! {::th/type        :create-upload-session
-                          ::rpc/profile-id (:id prof)
-                          :total-chunks    total-chunks})]
-    (t/is (nil? (:error out)))
-    (:session-id (:result out))))
-
-(t/deftest chunked-upload-happy-path
-  (let [prof       (th/create-profile* 1)
-        _          (th/create-project* 1 {:profile-id (:id prof)
-                                          :team-id (:default-team-id prof)})
-        file       (th/create-file* 1 {:profile-id (:id prof)
-                                       :project-id (:default-project-id prof)
-                                       :is-shared false})
-        source-path (th/tempfile "backend_tests/test_files/sample.jpg")
-        chunks      (split-file-into-chunks source-path 110000) ; ~107 KB each
-        mtype       "image/jpeg"
-        total-size  (reduce + (map alength chunks))
-        session-id  (create-session! prof (count chunks))]
-
-    (t/is (= 3 (count chunks)))
-
-    ;; --- 1. Upload chunks ---
-    (doseq [[idx chunk-data] (map-indexed vector chunks)]
-      (let [mfile (make-chunk-mfile chunk-data mtype)
-            out   (th/command! {::th/type        :upload-chunk
-                                ::rpc/profile-id (:id prof)
-                                :session-id      session-id
-                                :index           idx
-                                :content         mfile})]
-        (t/is (nil? (:error out)))
-        (t/is (= session-id (:session-id (:result out))))
-        (t/is (= idx (:index (:result out))))))
-
-    ;; --- 2. Assemble ---
-    (let [assemble-out (th/command! {::th/type        :assemble-file-media-object
-                                     ::rpc/profile-id (:id prof)
-                                     :session-id      session-id
-                                     :file-id         (:id file)
-                                     :is-local        true
-                                     :name            "assembled-image"
-                                     :mtype           mtype})]
-
-      (t/is (nil? (:error assemble-out)))
-      (let [{:keys [media-id thumbnail-id] :as result} (:result assemble-out)]
-        (t/is (= (:id file) (:file-id result)))
-        (t/is (= 800 (:width result)))
-        (t/is (= 800 (:height result)))
-        (t/is (= mtype (:mtype result)))
-        (t/is (uuid? media-id))
-        (t/is (uuid? thumbnail-id))
-
-        (let [storage (:app.storage/storage th/*system*)
-              mobj1   (sto/get-object storage media-id)
-              mobj2   (sto/get-object storage thumbnail-id)]
-          (t/is (sto/object? mobj1))
-          (t/is (sto/object? mobj2))
-          (t/is (= total-size (:size mobj1))))))))
-
-(t/deftest chunked-upload-idempotency
-  (let [prof       (th/create-profile* 1)
-        _          (th/create-project* 1 {:profile-id (:id prof)
-                                          :team-id (:default-team-id prof)})
-        file       (th/create-file* 1 {:profile-id (:id prof)
-                                       :project-id (:default-project-id prof)
-                                       :is-shared false})
-        media-id   (uuid/next)
-        source-path (th/tempfile "backend_tests/test_files/sample.jpg")
-        chunks      (split-file-into-chunks source-path 312043) ; single chunk = whole file
-        mtype       "image/jpeg"
-        mfile       (make-chunk-mfile (first chunks) mtype)
-        session-id  (create-session! prof 1)]
-
-    (th/command! {::th/type        :upload-chunk
-                  ::rpc/profile-id (:id prof)
-                  :session-id      session-id
-                  :index           0
-                  :content         mfile})
-
-    ;; First assemble succeeds; session row is deleted afterwards
-    (let [out1 (th/command! {::th/type        :assemble-file-media-object
-                             ::rpc/profile-id (:id prof)
-                             :session-id      session-id
-                             :file-id         (:id file)
-                             :is-local        true
-                             :name            "sample"
-                             :mtype           mtype
-                             :id              media-id})]
-      (t/is (nil? (:error out1)))
-      (t/is (= media-id (:id (:result out1)))))
-
-    ;; Second assemble with the same session-id must fail because the
-    ;; session row has been deleted after the first assembly
-    (let [out2 (th/command! {::th/type        :assemble-file-media-object
-                             ::rpc/profile-id (:id prof)
-                             :session-id      session-id
-                             :file-id         (:id file)
-                             :is-local        true
-                             :name            "sample"
-                             :mtype           mtype
-                             :id              media-id})]
-      (t/is (some? (:error out2)))
-      (t/is (= :not-found (-> out2 :error ex-data :type)))
-      (t/is (= :object-not-found (-> out2 :error ex-data :code))))))
-
-(t/deftest chunked-upload-no-permission
-  ;; A second profile must not be able to upload chunks into a session
-  ;; that belongs to another profile: the DB lookup includes profile-id,
-  ;; so the session will not be found.
-  (let [prof1      (th/create-profile* 1)
-        prof2      (th/create-profile* 2)
-        session-id (create-session! prof1 1)
-        source-path (th/tempfile "backend_tests/test_files/sample.jpg")
-        mfile       {:filename "sample.jpg"
-                     :path     source-path
-                     :mtype    "image/jpeg"
-                     :size     312043}
-
-        ;; prof2 tries to upload a chunk into prof1's session
-        out (th/command! {::th/type        :upload-chunk
-                          ::rpc/profile-id (:id prof2)
-                          :session-id      session-id
-                          :index           0
-                          :content         mfile})]
-
-    (t/is (some? (:error out)))
-    (t/is (= :not-found (-> out :error ex-data :type)))))
-
-(t/deftest chunked-upload-invalid-media-type
-  (let [prof       (th/create-profile* 1)
-        _          (th/create-project* 1 {:profile-id (:id prof)
-                                          :team-id (:default-team-id prof)})
-        file       (th/create-file* 1 {:profile-id (:id prof)
-                                       :project-id (:default-project-id prof)
-                                       :is-shared false})
-        session-id (create-session! prof 1)
-        source-path (th/tempfile "backend_tests/test_files/sample.jpg")
-        mfile       {:filename "sample.jpg"
-                     :path     source-path
-                     :mtype    "image/jpeg"
-                     :size     312043}]
-
-    (th/command! {::th/type        :upload-chunk
-                  ::rpc/profile-id (:id prof)
-                  :session-id      session-id
-                  :index           0
-                  :content         mfile})
-
-    ;; Assemble with a wrong mtype should fail validation
-    (let [out (th/command! {::th/type        :assemble-file-media-object
-                            ::rpc/profile-id (:id prof)
-                            :session-id      session-id
-                            :file-id         (:id file)
-                            :is-local        true
-                            :name            "bad-type"
-                            :mtype           "application/octet-stream"})]
-      (t/is (some? (:error out)))
-      (t/is (= :validation (-> out :error ex-data :type))))))
-
-(t/deftest chunked-upload-missing-chunks
-  (let [prof       (th/create-profile* 1)
-        _          (th/create-project* 1 {:profile-id (:id prof)
-                                          :team-id (:default-team-id prof)})
-        file       (th/create-file* 1 {:profile-id (:id prof)
-                                       :project-id (:default-project-id prof)
-                                       :is-shared false})
-        ;; Session expects 3 chunks
-        session-id (create-session! prof 3)
-        source-path (th/tempfile "backend_tests/test_files/sample.jpg")
-        mfile       {:filename "sample.jpg"
-                     :path     source-path
-                     :mtype    "image/jpeg"
-                     :size     312043}]
-
-    ;; Upload only 1 chunk
-    (th/command! {::th/type        :upload-chunk
-                  ::rpc/profile-id (:id prof)
-                  :session-id      session-id
-                  :index           0
-                  :content         mfile})
-
-    ;; Assemble: session says 3 expected, only 1 stored → :missing-chunks
-    (let [out (th/command! {::th/type        :assemble-file-media-object
-                            ::rpc/profile-id (:id prof)
-                            :session-id      session-id
-                            :file-id         (:id file)
-                            :is-local        true
-                            :name            "incomplete"
-                            :mtype           "image/jpeg"})]
-      (t/is (some? (:error out)))
-      (t/is (= :validation (-> out :error ex-data :type)))
-      (t/is (= :missing-chunks (-> out :error ex-data :code))))))
-
-(t/deftest chunked-upload-session-not-found
-  (let [prof       (th/create-profile* 1)
-        _          (th/create-project* 1 {:profile-id (:id prof)
-                                          :team-id (:default-team-id prof)})
-        file       (th/create-file* 1 {:profile-id (:id prof)
-                                       :project-id (:default-project-id prof)
-                                       :is-shared false})
-        bogus-id   (uuid/next)]
-
-    ;; Assemble with a session-id that was never created
-    (let [out (th/command! {::th/type        :assemble-file-media-object
-                            ::rpc/profile-id (:id prof)
-                            :session-id      bogus-id
-                            :file-id         (:id file)
-                            :is-local        true
-                            :name            "ghost"
-                            :mtype           "image/jpeg"})]
-      (t/is (some? (:error out)))
-      (t/is (= :not-found (-> out :error ex-data :type)))
-      (t/is (= :object-not-found (-> out :error ex-data :code))))))
-
-(t/deftest chunked-upload-over-chunk-limit
-  ;; Verify that requesting more chunks than the configured maximum
-  ;; (quotes-upload-chunks-per-session) raises a :restriction error.
-  (with-mocks [mock {:target 'app.config/get
-                     :return (th/config-get-mock
-                              {:quotes-upload-chunks-per-session 3})}]
-    (let [prof (th/create-profile* 1)
-          out  (th/command! {::th/type        :create-upload-session
-                             ::rpc/profile-id (:id prof)
-                             :total-chunks    4})]
-
-      (t/is (some? (:error out)))
-      (t/is (= :restriction (-> out :error ex-data :type)))
-      (t/is (= :max-quote-reached (-> out :error ex-data :code)))
-      (t/is (= "upload-chunks-per-session" (-> out :error ex-data :target))))))
-
-(t/deftest chunked-upload-invalid-chunk-index
-  ;; Both a negative index and an index >= total-chunks must be
-  ;; rejected with a :validation / :invalid-chunk-index error.
-  (let [prof (th/create-profile* 1)
-        session-id   (create-session! prof 2)
-        source-path  (th/tempfile "backend_tests/test_files/sample.jpg")
-        mfile        {:filename "sample.jpg"
-                      :path     source-path
-                      :mtype    "image/jpeg"
-                      :size     312043}]
-
-    ;; index == total-chunks (out of range)
-    (let [out (th/command! {::th/type        :upload-chunk
-                            ::rpc/profile-id (:id prof)
-                            :session-id      session-id
-                            :index           2
-                            :content         mfile})]
-      (t/is (some? (:error out)))
-      (t/is (= :validation (-> out :error ex-data :type)))
-      (t/is (= :invalid-chunk-index (-> out :error ex-data :code))))
-
-    ;; negative index
-    (let [out (th/command! {::th/type        :upload-chunk
-                            ::rpc/profile-id (:id prof)
-                            :session-id      session-id
-                            :index           -1
-                            :content         mfile})]
-      (t/is (some? (:error out)))
-      (t/is (= :validation (-> out :error ex-data :type)))
-      (t/is (= :invalid-chunk-index (-> out :error ex-data :code))))))
-
-(t/deftest chunked-upload-sessions-per-profile-quota
-  ;; With the session limit set to 2, creating a third session for the
-  ;; same profile must fail with :restriction / :max-quote-reached.
-  ;; The :quotes flag is already enabled by the test fixture.
-  (with-mocks [mock {:target 'app.config/get
-                     :return (th/config-get-mock
-                              {:quotes-upload-sessions-per-profile 2})}]
-    (let [prof (th/create-profile* 1)]
-
-      ;; First two sessions succeed
-      (create-session! prof 1)
-      (create-session! prof 1)
-
-      ;; Third session must be rejected
-      (let [out (th/command! {::th/type        :create-upload-session
-                              ::rpc/profile-id (:id prof)
-                              :total-chunks    1})]
-        (t/is (some? (:error out)))
-        (t/is (= :restriction (-> out :error ex-data :type)))
-        (t/is (= :max-quote-reached (-> out :error ex-data :code)))))))

backend/test/backend_tests/rpc_nitrate_test.clj

@@ -1,686 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns backend-tests.rpc-nitrate-test
-  (:require
-   [app.common.uuid :as uuid]
-   [app.db :as-alias db]
-   [app.nitrate :as nitrate]
-   [app.rpc :as-alias rpc]
-   [app.rpc.commands.nitrate]
-   [backend-tests.helpers :as th]
-   [clojure.test :as t]
-   [cuerdas.core :as str]))
-
-(t/use-fixtures :once th/state-init)
-(t/use-fixtures :each th/database-reset)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Helpers
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- make-org-summary
-  [& {:keys [organization-id organization-name owner-id your-penpot-teams org-teams]
-      :or   {your-penpot-teams [] org-teams []}}]
-  {:id       organization-id
-   :name     organization-name
-   :owner-id owner-id
-   :teams    (into
-              (mapv (fn [id] {:id id :is-your-penpot true}) your-penpot-teams)
-              (mapv (fn [id] {:id id :is-your-penpot false}) org-teams))})
-
-(defn- nitrate-call-mock
-  "Creates a mock for nitrate/call that returns the given org-summary for
-  :get-org-summary, a valid membership for :get-org-membership, and nil for
-  any other method."
-  [org-summary]
-  (fn [_cfg method _params]
-    (case method
-      :get-org-summary org-summary
-      :get-org-membership {:is-member true
-                           :organization-id (:id org-summary)}
-      nil)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Tests
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(t/deftest leave-org-happy-path-no-extra-teams
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-        project          (th/create-project* 99 {:profile-id (:id profile-user)
-                                                 :team-id (:id org-default-team)})
-        _                (th/create-file* 99 {:profile-id (:id profile-user)
-                                              :project-id (:id project)})
-
-        organization-id         (uuid/random)
-        ;; The user's personal penpot team in the org context
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        ;; (th/print-result! out)
-        (t/is (th/success? out))
-        (t/is (nil? (:result out)))
-
-        ;; The personal team must be renamed with the org prefix and
-        ;; unset as a default team.
-        (let [team (th/db-get :team {:id your-penpot-id})]
-          (t/is (str/starts-with? (:name team) "[Test Org] "))
-          (t/is (false? (:is-default team))))))))
-
-(t/deftest leave-org-deletes-org-default-team-when-empty
-  (let [profile-owner   (th/create-profile* 1 {:is-active true})
-        profile-user    (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 98 {:profile-id (:id profile-user)})
-
-        organization-id          (uuid/random)
-        your-penpot-id  (:id org-default-team)
-
-        org-summary     (make-org-summary
-                         :organization-id            organization-id
-                         :organization-name          "Test Org"
-                         :owner-id          (:id profile-owner)
-                         :your-penpot-teams [your-penpot-id]
-                         :org-teams         [])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        (t/is (th/success? out))
-
-        ;; Empty org default team should be soft-deleted.
-        (let [team (th/db-get :team {:id your-penpot-id} {::db/remove-deleted false})]
-          (t/is (some? (:deleted-at team))))))))
-
-(t/deftest leave-org-keeps-and-renames-org-default-team-when-has-files
-  (let [profile-owner    (th/create-profile* 1 {:is-active true})
-        profile-user     (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 97 {:profile-id (:id profile-user)})
-        project          (th/create-project* 97 {:profile-id (:id profile-user)
-                                                 :team-id (:id org-default-team)})
-        _                (th/create-file* 97 {:profile-id (:id profile-user)
-                                              :project-id (:id project)})
-
-        organization-id           (uuid/random)
-        your-penpot-id   (:id org-default-team)
-
-        org-summary      (make-org-summary
-                          :organization-id            organization-id
-                          :organization-name          "Test Org"
-                          :owner-id          (:id profile-owner)
-                          :your-penpot-teams [your-penpot-id]
-                          :org-teams         [])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        (t/is (th/success? out))
-
-        ;; Non-empty org default team should remain and be renamed.
-        (let [team (th/db-get :team {:id your-penpot-id})]
-          (t/is (str/starts-with? (:name team) "[Test Org] "))
-          (t/is (false? (:is-default team)))
-          (t/is (nil? (:deleted-at team))))))))
-
-(t/deftest leave-org-with-teams-to-delete
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; profile-user is the sole owner/member of team1
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete [(:id team1)]
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        ;; (th/print-result! out)
-        (t/is (th/success? out))
-
-        ;; team1 should be scheduled for deletion (deleted-at set)
-        (let [team (th/db-get :team {:id (:id team1)} {::db/remove-deleted false})]
-          (t/is (some? (:deleted-at team))))))))
-
-(t/deftest leave-org-with-ownership-transfer
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; profile-user owns team1; profile-owner is also a member
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        _              (th/create-team-role* {:team-id    (:id team1)
-                                              :profile-id (:id profile-owner)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  [{:id (:id team1) :reassign-to (:id profile-owner)}]}
-            out  (th/command! data)]
-
-        ;; (th/print-result! out)
-        (t/is (th/success? out))
-
-        ;; profile-user should no longer be a member of team1
-        (let [rel (th/db-get :team-profile-rel
-                             {:team-id    (:id team1)
-                              :profile-id (:id profile-user)})]
-          (t/is (nil? rel)))
-
-        ;; profile-owner should have been promoted to owner
-        (let [rel (th/db-get :team-profile-rel
-                             {:team-id    (:id team1)
-                              :profile-id (:id profile-owner)})]
-          (t/is (true? (:is-owner rel))))))))
-
-(t/deftest leave-org-exit-as-non-owner
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; profile-owner owns team1; profile-user is a non-owner member
-        team1          (th/create-team* 1 {:profile-id (:id profile-owner)})
-        _              (th/create-team-role* {:team-id    (:id team1)
-                                              :profile-id (:id profile-user)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  [{:id (:id team1)}]}
-            out  (th/command! data)]
-
-        ;; (th/print-result! out)
-        (t/is (th/success? out))
-
-        ;; profile-user should no longer be a member of team1
-        (let [rel (th/db-get :team-profile-rel
-                             {:team-id    (:id team1)
-                              :profile-id (:id profile-user)})]
-          (t/is (nil? rel)))
-
-        ;; The team itself should still exist
-        (let [team (th/db-get :team {:id (:id team1)})]
-          (t/is (nil? (:deleted-at team))))))))
-
-(t/deftest leave-org-error-org-owner-cannot-leave
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-owner)})
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        ;; profile-owner IS the org owner in the org-summary
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-owner)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :org-owner-cannot-leave (th/ex-code (:error out))))))))
-
-(t/deftest leave-org-error-invalid-default-team-id
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      ;; Pass a random UUID that is not in the your-penpot-teams list
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id (uuid/random)
-                  :teams-to-delete []
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Unit Tests for calculate-valid-teams
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:private calculate-valid-teams
-  (or (ns-resolve 'app.rpc.commands.nitrate 'calculate-valid-teams)
-      (throw (ex-info "Unable to resolve calculate-valid-teams"
-                      {:ns 'app.rpc.commands.nitrate
-                       :symbol 'calculate-valid-teams}))))
-
-(defn- make-team [id & {:keys [is-owner num-members member-ids]
-                        :or   {is-owner false num-members 1 member-ids []}}]
-  {:id id :is-owner is-owner :num-members num-members :member-ids member-ids})
-
-(t/deftest calculate-valid-teams-no-org-teams
-  (let [default-id (uuid/random)
-        default-team (make-team default-id)
-        result (calculate-valid-teams [default-team] default-id)]
-    (t/is (= default-team (:valid-default-team result)))
-    (t/is (empty? (:valid-teams-to-delete-ids result)))
-    (t/is (empty? (:valid-teams-to-transfer result)))
-    (t/is (empty? (:valid-teams-to-exit result)))))
-
-(t/deftest calculate-valid-teams-default-not-found
-  (let [default-id   (uuid/random)
-        other-id     (uuid/random)
-        other-team   (make-team other-id)
-        ;; default-id is not in org-teams at all
-        result (calculate-valid-teams [other-team] default-id)]
-    (t/is (nil? (:valid-default-team result)))))
-
-(t/deftest calculate-valid-teams-sole-owner-team
-  (let [default-id (uuid/random)
-        team-id    (uuid/random)
-        default    (make-team default-id)
-        solo-team  (make-team team-id :is-owner true :num-members 1)
-        result     (calculate-valid-teams [default solo-team] default-id)]
-    (t/is (contains? (:valid-teams-to-delete-ids result) team-id))
-    (t/is (empty? (:valid-teams-to-transfer result)))
-    (t/is (empty? (:valid-teams-to-exit result)))))
-
-(t/deftest calculate-valid-teams-owned-multi-member-team
-  (let [default-id (uuid/random)
-        team-id    (uuid/random)
-        default    (make-team default-id)
-        ;; owner of a team with 3 members — must be transferred
-        multi-team (make-team team-id :is-owner true :num-members 3)
-        result     (calculate-valid-teams [default multi-team] default-id)]
-    (t/is (empty? (:valid-teams-to-delete-ids result)))
-    (t/is (= [team-id] (map :id (:valid-teams-to-transfer result))))
-    (t/is (empty? (:valid-teams-to-exit result)))))
-
-(t/deftest calculate-valid-teams-non-owner-multi-member-team
-  (let [default-id (uuid/random)
-        team-id    (uuid/random)
-        default    (make-team default-id)
-        ;; non-owner member of a team with 2 members — can just exit
-        exit-team  (make-team team-id :is-owner false :num-members 2)
-        result     (calculate-valid-teams [default exit-team] default-id)]
-    (t/is (empty? (:valid-teams-to-delete-ids result)))
-    (t/is (empty? (:valid-teams-to-transfer result)))
-    (t/is (= [team-id] (map :id (:valid-teams-to-exit result))))))
-
-(t/deftest calculate-valid-teams-mixed
-  (let [default-id   (uuid/random)
-        solo-id      (uuid/random)
-        transfer-id  (uuid/random)
-        exit-id      (uuid/random)
-        default      (make-team default-id)
-        solo-team    (make-team solo-id     :is-owner true  :num-members 1)
-        transfer-team (make-team transfer-id :is-owner true  :num-members 2)
-        exit-team    (make-team exit-id     :is-owner false :num-members 3)
-        result       (calculate-valid-teams [default solo-team transfer-team exit-team] default-id)]
-    (t/is (= #{solo-id} (:valid-teams-to-delete-ids result)))
-    (t/is (= [transfer-id] (map :id (:valid-teams-to-transfer result))))
-    (t/is (= [exit-id] (map :id (:valid-teams-to-exit result))))
-    (t/is (= default-id (:id (:valid-default-team result))))))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Integration: combined delete + leave
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(t/deftest leave-org-combined-delete-and-leave
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; team1: profile-user is sole owner — must delete
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        ;; team2: profile-user owns it, profile-owner is also member — must transfer
-        team2          (th/create-team* 2 {:profile-id (:id profile-user)})
-        _              (th/create-team-role* {:team-id    (:id team2)
-                                              :profile-id (:id profile-owner)
-                                              :role       :editor})
-        ;; team3: profile-owner owns it, profile-user is non-owner member — can exit
-        team3          (th/create-team* 3 {:profile-id (:id profile-owner)})
-        _              (th/create-team-role* {:team-id    (:id team3)
-                                              :profile-id (:id profile-user)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1) (:id team2) (:id team3)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete [(:id team1)]
-                  :teams-to-leave  [{:id (:id team2) :reassign-to (:id profile-owner)}
-                                    {:id (:id team3)}]}
-            out  (th/command! data)]
-
-        (t/is (th/success? out))
-
-        ;; team1 should be soft-deleted
-        (let [team (th/db-get :team {:id (:id team1)} {::db/remove-deleted false})]
-          (t/is (some? (:deleted-at team))))
-
-        ;; profile-user should no longer be a member of team2
-        (let [rel (th/db-get :team-profile-rel {:team-id (:id team2) :profile-id (:id profile-user)})]
-          (t/is (nil? rel)))
-
-        ;; profile-owner should now own team2
-        (let [rel (th/db-get :team-profile-rel {:team-id (:id team2) :profile-id (:id profile-owner)})]
-          (t/is (true? (:is-owner rel))))
-
-        ;; profile-user should no longer be a member of team3
-        (let [rel (th/db-get :team-profile-rel {:team-id (:id team3) :profile-id (:id profile-user)})]
-          (t/is (nil? rel)))
-
-        ;; team3 itself should still exist (profile-owner is still there)
-        (let [team (th/db-get :team {:id (:id team3)})]
-          (t/is (some? team)))))))
-(t/deftest leave-org-error-teams-to-delete-incomplete
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; profile-user is the sole owner/member of both team1 and team2
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        team2          (th/create-team* 2 {:profile-id (:id profile-user)})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1) (:id team2)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      ;; Only team1 is listed; team2 is also a sole-owner team and must be included
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete [(:id team1)]
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
-
-(t/deftest leave-org-error-cannot-delete-multi-member-team
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; team1 has two members: profile-user (owner) and profile-owner (editor)
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        _              (th/create-team-role* {:team-id    (:id team1)
-                                              :profile-id (:id profile-owner)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      ;; team1 has 2 members so it is not a valid deletion candidate
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete [(:id team1)]
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
-
-(t/deftest leave-org-error-teams-to-leave-incomplete
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; profile-user owns team1, which also has profile-owner as editor
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        _              (th/create-team-role* {:team-id    (:id team1)
-                                              :profile-id (:id profile-owner)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      ;; team1 must be transferred (owner + multiple members) but is absent
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  []}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
-
-(t/deftest leave-org-error-reassign-to-self
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        _              (th/create-team-role* {:team-id    (:id team1)
-                                              :profile-id (:id profile-owner)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      ;; reassign-to points to the profile that is leaving — not allowed
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  [{:id (:id team1) :reassign-to (:id profile-user)}]}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
-
-(t/deftest leave-org-error-reassign-to-non-member
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        profile-other  (th/create-profile* 3 {:is-active true})
-        ;; team1 has profile-user (owner) and profile-owner (editor) — NOT profile-other
-        team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        _              (th/create-team-role* {:team-id    (:id team1)
-                                              :profile-id (:id profile-owner)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      ;; profile-other is not a member of team1
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  [{:id (:id team1) :reassign-to (:id profile-other)}]}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
-
-(t/deftest leave-org-error-reassign-on-non-owned-team
-  (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        profile-user   (th/create-profile* 2 {:is-active true})
-        ;; profile-owner owns team1; profile-user is just a non-owner member
-        team1          (th/create-team* 1 {:profile-id (:id profile-owner)})
-        _              (th/create-team-role* {:team-id    (:id team1)
-                                              :profile-id (:id profile-user)
-                                              :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
-
-        organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
-
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
-
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      ;; profile-user is not the owner so providing reassign-to is invalid
-      (let [data {::th/type        :leave-org
-                  ::rpc/profile-id (:id profile-user)
-                  :id          organization-id
-                  :name        "Test Org"
-                  :default-team-id your-penpot-id
-                  :teams-to-delete []
-                  :teams-to-leave  [{:id (:id team1) :reassign-to (:id profile-owner)}]}
-            out  (th/command! data)]
-
-        (t/is (not (th/success? out)))
-        (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :not-valid-teams (th/ex-code (:error out))))))))

backend/test/backend_tests/rpc_profile_test.clj

@@ -125,20 +125,7 @@
             out  (th/command! data)]
 
         ;; (th/print-result! out)
-        (t/is (nil? (:error out)))))
+        (t/is (nil? (:error out)))))))
-
-    (t/testing "delete photo clears photo-id"
-      (let [data {::th/type :delete-profile-photo
-                  ::rpc/profile-id (:id profile)}
-            out  (th/command! data)]
-        (t/is (nil? (:error out)))
-        (t/is (nil? (:result out))))
-
-      (let [data {::th/type :get-profile
-                  ::rpc/profile-id (:id profile)}
-            out  (th/command! data)]
-        (t/is (nil? (:error out)))
-        (t/is (nil? (:photo-id (:result out))))))))
 
 (t/deftest profile-deletion-1
   (let [prof (th/create-profile* 1)
@@ -393,9 +380,7 @@
   (let [data  {::th/type :prepare-register-profile
                :email "user@example.com"
                :fullname "foobar"
-               :password "foobar"
+               :password "foobar"}
-               :utm_campaign "utma"
-               :mtm_campaign "mtma"}
         out   (th/command! data)
         token (get-in out [:result :token])]
     (t/is (string? token))
@@ -411,9 +396,11 @@
 
     ;; try correct register
     (let [data  {::th/type :register-profile
-                 :token token}
+                 :token token
-          out   (th/command! data)]
+                 :utm_campaign "utma"
-      (t/is (nil? (:error out))))
+                 :mtm_campaign "mtma"}]
+      (let [{:keys [result error]} (th/command! data)]
+        (t/is (nil? error))))
 
     (let [profile (some-> (th/db-get :profile {:email "user@example.com"})
                           (profile/decode-row))]

backend/test/backend_tests/rpc_viewer_test.clj

@@ -9,7 +9,6 @@
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.rpc :as-alias rpc]
-   [app.rpc.commands.viewer :as viewer]
    [backend-tests.helpers :as th]
    [clojure.test :as t]
    [datoteka.fs :as fs]))
@@ -17,28 +16,6 @@
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
 
-(t/deftest obfuscate-email-happy-path
-  (t/is (= "a****@****.com" (viewer/obfuscate-email "alice@example.com")))
-  (t/is (= "a****@****.example.com" (viewer/obfuscate-email "alice@sub.example.com")))
-  (t/is (= "****@****.com" (viewer/obfuscate-email "bob@bar.com"))))
-
-(t/deftest obfuscate-email-handles-domain-without-dot
-  ;; `localhost`-style domains have no `.`; the previous implementation produced
-  ;; a dangling-dot output like "a****@****." — now the trailing `.` is only
-  ;; emitted when there actually is a TLD segment to append.
-  (t/is (= "a****@****" (viewer/obfuscate-email "alice@localhost")))
-  (t/is (= "****@****" (viewer/obfuscate-email "x@y"))))
-
-(t/deftest obfuscate-email-handles-malformed-input
-  ;; These shapes must not throw — `obfuscate-email` runs while building the
-  ;; view-only bundle for share-link viewers and an NPE here aborts the whole
-  ;; RPC response. The previous implementation called `clojure.string/split`
-  ;; on `nil` for the `no-@` case, raising NullPointerException.
-  (t/is (= "****@****" (viewer/obfuscate-email nil)))
-  (t/is (= "****@****" (viewer/obfuscate-email "")))
-  (t/is (= "r***@****" (viewer/obfuscate-email "root")))       ; no `@`, count > 3
-  (t/is (= "****@****" (viewer/obfuscate-email "bob"))))       ; no `@`, count <= 3
-
 (t/deftest retrieve-bundle
   (let [prof     (th/create-profile* 1 {:is-active true})
         prof2    (th/create-profile* 2 {:is-active true})

backend/test/backend_tests/storage_test.clj

@@ -169,8 +169,7 @@
         (t/is (= 2 (:count res))))
 
       ;; run the touched gc task
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
-                  (th/run-task! :storage-gc-touched {}))]
         (t/is (= 2 (:freeze res)))
         (t/is (= 0 (:delete res))))
 
@@ -230,8 +229,7 @@
     (t/is (nil? (:error out2)))
 
     ;; run the touched gc task
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 5 (:freeze res)))
       (t/is (= 0 (:delete res)))
 
@@ -251,8 +249,7 @@
         (th/db-exec-one! ["update storage_object set touched_at=?" (ct/now)])
 
         ;; Run the task again
-        (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+        (let [res (th/run-task! :storage-gc-touched {})]
-                    (th/run-task! :storage-gc-touched {}))]
           (t/is (= 2 (:freeze res)))
           (t/is (= 3 (:delete res))))
 
@@ -298,8 +295,7 @@
       (th/db-exec! ["update storage_object set touched_at=?" (ct/now)])
 
       ;; run the touched gc task
-      (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
-                  (th/run-task! :storage-gc-touched {}))]
         (t/is (= 2 (:freeze res)))
         (t/is (= 0 (:delete res))))
 
@@ -314,8 +310,7 @@
       (t/is (= 2 (:processed res))))
 
     ;; run the touched gc task
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+    (let [res (th/run-task! :storage-gc-touched {})]
-                (th/run-task! :storage-gc-touched {}))]
       (t/is (= 0 (:freeze res)))
       (t/is (= 2 (:delete res))))
 
@@ -341,7 +336,7 @@
         (t/is (= 0 (:delete res)))))
 
 
-    (binding [ct/*clock* (ct/fixed-clock (ct/plus now {:hours 3}))]
+    (binding [ct/*clock* (ct/fixed-clock (ct/plus now {:minutes 1}))]
       (let [res (th/run-task! :storage-gc-touched {})]
         (t/is (= 0 (:freeze res)))
         (t/is (= 1 (:delete res)))))

backend/test/backend_tests/tasks_telemetry_test.clj

@@ -42,6 +42,4 @@
         (t/is (contains? data :avg-files-on-project))
         (t/is (contains? data :max-projects-on-team))
         (t/is (contains? data :avg-files-on-project))
-        (t/is (contains? data :version))
+        (t/is (contains? data :version))))))
-        (t/is (contains? data :email-domains))
-        (t/is (= ["nodomain.com"] (:email-domains data)))))))