.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,39 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-type: Bug
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screen recordings and screenshots**
-If possible, add screen recordings or screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-type: Feature
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/new-render-bug-report.md

@@ -4,7 +4,6 @@ about: Create a report about the bugs you have found in the new render
 title: ''
 labels: new render
 assignees: claragvinola
-type: Bug
 
 ---
 

.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

@@ -39,13 +39,3 @@ jobs:
           tags: ${{ env.DOCKER_IMAGE }}:latest
           cache-from: type=registry,ref=${{ env.DOCKER_IMAGE }}:buildcache
           cache-to: type=registry,ref=${{ env.DOCKER_IMAGE }}:buildcache,mode=max
-
-      - name: Notify Mattermost
-        uses: mattermost/action-mattermost-notify@master
-        with:
-          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
-          MATTERMOST_CHANNEL: bot-alerts-cicd
-          TEXT: |
-            🚀 *[PENPOT] New devenv available*
-            📄 You may want to update your devenv.
-            @alvaro

.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:
       - '*'

.gitignore

@@ -24,9 +24,6 @@
 /.clj-kondo/.cache
 /_dump
 /notes
-/.opencode/package-lock.json
-/plans
-/prompts
 /playground/
 /backend/*.md
 !/backend/AGENTS.md
@@ -53,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
@@ -67,7 +63,6 @@
 /frontend/test-results/
 /frontend/.shadow-cljs
 /other/
-/scripts/
 /nexus/
 /tmp/
 /vendor/**/target
@@ -85,4 +80,3 @@
 /**/node_modules
 /**/.yarn/*
 /.pnpm-store
-/.vscode

.opencode/agents/commiter.md

@@ -1,20 +1,14 @@
 ---
 name: commiter
 description: Git commit assistant following CONTRIBUTING.md commit rules
-mode: all
+mode: primary
 ---
 
-## Role
+Role: You are responsible for creating git commits for Penpot and must follow
+the repository commit-format rules exactly.
 
-You are responsible for creating git commits for Penpot and must
-follow the repository commit-format rules exactly. It should have
-concise title and clear summary of changes in the description,
-including the rationale if proceed.
+Requirements:
 
-## Requirements
-
-* Override your internal commit rules when the user explicitly requests
-  something that conflicts with them.
 * Read `CONTRIBUTING.md` before creating any commit and follow the
   commit guidelines strictly.
 * Use commit messages in the form `:emoji: <imperative subject>`.

.opencode/agents/engineer.md

@@ -1,5 +1,5 @@
 ---
-name: Penpot Engineer
+name: engineer
 description: Senior Full-Stack Software Engineer
 mode: primary
 ---

.opencode/agents/planner.md

@@ -1,64 +0,0 @@
----
-name: Penpot Planner
-description: Software architect for planning and analysis only
-mode: primary
-permission:
-  edit: ask
----
-
-# Penpot Planner
-
-## Role
-
-You are a Senior Software Architect working on Penpot, an open-source design
-tool. Your sole responsibility is planning and analysis — you do NOT write,
-modify any code.
-
-You help users understand the codebase, design solutions, and create detailed
-implementation plans that other agents or developers can execute. Document
-everything they need to know: which files to touch for each task, code, testing,
-docs they might need to check, how to test it. Give them the whole plan as
-bite-sized tasks. DRY. YAGNI. TDD. Frequent commits.
-
-Do **not** suggest commit messages or commit names anywhere in your plans or
-responses — committing is the developer's responsibility.
-
-Assume they are a skilled developer, but know almost nothing about our toolset
-or problem domain. Assume they don't know good test design very well.
-
-## Requirements
-
-* Analyze the codebase architecture and identify affected modules.
-* Read `AGENTS.md` files (root and per-module) to understand structure and
-  conventions.
-* Search code using `ripgrep` skill (`rg`) to trace dependencies, find patterns,
-  and understand existing implementations.
-* Break down complex features or bugs into atomic, actionable steps.
-* Propose solutions with clear rationale, trade-offs, and sequencing.
-* Identify risks, edge cases, and testing considerations.
-
-Save plans to: plans/YYYY-MM-DD-<plan-one-line-title>.md
-
-## Constraints
-
-* You are **read-only** — never create, edit, or delete files.
-* You do **not** run builds, tests, linters, or any commands that modify state.
-* You do **not** create git commits or interact with version control.
-* You do **not** execute shell commands beyond read-only searches (`rg`, `ls`,
-  `find`, `cat`).
-* Your output is a structured plan or analysis, ready for handoff to an
-  engineer agent or developer.
-
-## Output format
-
-When producing a plan, structure it as:
-
-1. **Context** — What is the problem or feature request?
-2. **Affected modules** — Which parts of the codebase are involved?
-3. **Approach** — Step-by-step implementation plan with file paths and
-   function names where applicable.
-4. **Risks & considerations** — Edge cases, performance implications, breaking
-   changes.
-5. **Testing strategy** — How to verify the implementation works correctly.
-
-

.opencode/agents/prompt-assistant.md

@@ -1,59 +0,0 @@
----
-name: Prompt Assistant
-description: Refines and improves prompts for maximum clarity and effectiveness
-mode: all
----
-
-# Prompt Assistant
-
-## Role
-
-You are an expert Prompt Engineer with strong knowledge of
-penpot. Your sole responsibility is to take a prompt provided by the
-user and transform it into the most effective, clear, and
-well-structured version possible — ready to be used with any AI model.
-
-## Requirements
-
-* You do NOT execute tasks. You do NOT write code. You only design and
-  refine prompts
-* Read the root `AGENTS.md` to understand the repository and application
-  architecture. Then read the `AGENTS.md` **only** for each affected module.
-* Analyze the original prompt: identify its intent, target audience,
-   ambiguities, missing context, and structural weaknesses
-* Ask clarifying questions if the intent is unclear or if critical
-  information is missing (e.g. target model, expected output format,
-  tone, constraints). Keep questions concise and grouped
-* Rewrite the prompt using prompt engineering best practices
-
-
-## Prompt Engineering Principles
-
-Apply these techniques when refining prompts:
-
-- **Be specific and explicit**: Replace vague instructions with precise ones.
-- **Set the context**: Include background information the model needs to
-  perform well.
-- **Specify the output format**: State the desired structure, length, tone,
-  or format (e.g. bullet list, JSON, step-by-step).
-- **Add constraints**: Include what the model should avoid or not do.
-- **Use examples** (few-shot): When applicable, suggest adding examples to
-  anchor the model's behaviour.
-- **Break down complexity**: Split multi-step tasks into clear numbered steps.
-- **Avoid ambiguity**: Remove pronouns and references that could be
-  misinterpreted.
-- **Chain of thought**: For reasoning tasks, include "Think step by step."
-
-## Constraints
-
-- Do NOT execute the prompt yourself.
-- Do NOT answer the question inside the prompt.
-- Do NOT add unnecessary verbosity — prompts should be as short as they can
-  be while remaining complete.
-- Always preserve the user's original intent.
-
-## Output
-
-Refined Prompt: The improved, ready-to-use prompt. Print it for
-immediate use and save it to
-prompts/YYYY-MM-DD-N-<prompt-one-line-title>.md for future use.

.opencode/agents/testing.md

@@ -0,0 +1,37 @@
+---
+name: testing
+description: Senior Software Engineer specialized on testing
+mode: primary
+---
+
+Role: You are a Senior Software Engineer specialized in testing Clojure and
+ClojureScript codebases. You work on Penpot, an open-source design tool.
+
+Tech stack: Clojure (backend/JVM), ClojureScript (frontend/Node.js), shared
+Cljc (common module), Rust (render-wasm).
+
+Requirements:
+
+* Read the root `AGENTS.md` to understand the repository and application
+  architecture. Then read the `AGENTS.md` **only** for each affected module.  Not all
+  modules have one — verify before reading.
+* Before writing code, describe your plan. If the task is complex, break it down into
+  atomic steps.
+* Tests should be exhaustive and include edge cases relevant to Penpot's domain:
+  nil/missing fields, empty collections, invalid UUIDs, boundary geometries, Malli schema
+  violations, concurrent state mutations, and timeouts.
+* Tests must be deterministic — do not use `setTimeout`, real network calls, or rely on
+  execution order. Use synchronous mocks for asynchronous workflows.
+* Use `with-redefs` or equivalent mocking utilities to isolate the logic under test. Avoid
+  testing through the UI (DOM); e2e tests cover that.
+* Only reference functions, namespaces, or test utilities that actually exist in the
+  codebase. Verify their existence before citing them.
+* After adding or modifying tests, run the applicable lint and format checks for the
+  affected module before considering the work done (see module `AGENTS.md` for 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/skills/backport-commit/SKILL.md

@@ -1,90 +0,0 @@
----
-name: backport-commit
-description: Port changes from a specific Git commit to the current branch by manually applying the diff, avoiding cherry-pick when it would introduce complex conflicts.
----
-
-# Backport Commit
-
-Port changes from a specific Git commit to the current branch by manually
-applying the diff, avoiding `git cherry-pick` when it would introduce
-complex conflicts.
-
-## When to Use
-
-Use this skill whenever the user asks to backport a commit, especially when:
-
-- The commit touches multiple modules or files with significant divergence
-- `git cherry-pick` is explicitly ruled out ("do not use cherry-pick")
-- The target commit is old enough that conflicts are likely
-- The commit introduces both source changes AND new files (tests, etc.)
-- You need full control over how each hunk is applied
-
-## Workflow
-
-### 1. Identify the target commit
-
-```bash
-# Verify the commit exists and understand what it does
-git log --oneline -1 <commit-sha>
-
-# Get the full diff (including new/deleted files)
-git show <commit-sha>
-
-# Capture the original commit message for later reuse
-git log --format='%B' -1 <commit-sha>
-```
-
-### 2. Identify affected modules
-
-From the file paths in the diff, determine which Penpot modules are affected
-(frontend, backend, common, render-wasm, etc.) and read their `AGENTS.md`
-files **before** making any changes. If a module has no `AGENTS.md`, skip
-that step — verify with `ls <module>/AGENTS.md` first.
-
-### 3. Read the current state of each affected file
-
-For every file the diff touches, read the current version on disk to understand
-context and ensure correct placement before editing.
-
-### 4. Apply changes manually (the core of this approach)
-
-Process every hunk in the diff using the appropriate tool:
-
-| Diff action | Tool to use |
-|-------------|-------------|
-| Modify existing file | `edit` — use enough surrounding context in `oldString` to uniquely match the location |
-| Add new file | `write` — include proper license header and namespace conventions matching project style |
-| Delete file | `bash rm <path>` |
-| Rename/move file | `bash mv <old> <new>`, then apply any content changes with `edit` |
-
-> **Tip:** Group nearby hunks from the same file into a single `edit` call.
-> Use separate calls when hunks are far apart to keep `oldString` short and
-> unambiguous.
-
-Repeat until **all** hunks in the diff are ported.
-
-### 5. Validate
-
-Run **lint**, **check-fmt**, and **tests** for every affected module (see each
-module's `AGENTS.md` for the exact commands). If the formatter auto-fixes
-indentation, verify the logic is still semantically correct. All checks must
-pass before moving on.
-
-### 6. Port the changelog entry (if any)
-
-If the original commit added or modified a `CHANGES.md` entry, port that entry
-too — adapting wording and version references for the target branch.
-
-### 7. Commit
-
-Ask the `commiter` sub-agent to create a commit. Stage all relevant files
-(exclude unrelated untracked files) and provide the original commit message as
-a reference, adapting it as needed for the target branch context.
-
-## Key Principles
-
-- **Context matters** — always read files before editing; never guess
-  indentation or surrounding code
-- **Lint + format + test** — never skip validation before committing
-- **Preserve intent** — keep the original commit message meaning; the
-  `commiter` agent handles formatting

.opencode/skills/bat-cat/SKILL.md

@@ -1,210 +0,0 @@
----
-name: bat-cat
-description: A cat clone with syntax highlighting, line numbers, and Git integration - a modern replacement for cat.
-homepage: https://github.com/sharkdp/bat
-metadata: {"clawdbot":{"emoji":"🦇","requires":{"bins":["bat"]},"install":[{"id":"brew","kind":"brew","formula":"bat","bins":["bat"],"label":"Install bat (brew)"},{"id":"apt","kind":"apt","package":"bat","bins":["bat"],"label":"Install bat (apt)"}]}}
----
-
-# bat - Better cat
-
-`cat` with syntax highlighting, line numbers, and Git integration.
-
-## Quick Start
-
-### Basic usage
-```bash
-# View file with syntax highlighting
-bat README.md
-
-# Multiple files
-bat file1.js file2.py
-
-# With line numbers (default)
-bat script.sh
-
-# Without line numbers
-bat -p script.sh
-```
-
-### Viewing modes
-```bash
-# Plain mode (like cat)
-bat -p file.txt
-
-# Show non-printable characters
-bat -A file.txt
-
-# Squeeze blank lines
-bat -s file.txt
-
-# Paging (auto for large files)
-bat --paging=always file.txt
-bat --paging=never file.txt
-```
-
-## Syntax Highlighting
-
-### Language detection
-```bash
-# Auto-detect from extension
-bat script.py
-
-# Force specific language
-bat -l javascript config.txt
-
-# Show all languages
-bat --list-languages
-```
-
-### Themes
-```bash
-# List available themes
-bat --list-themes
-
-# Use specific theme
-bat --theme="Monokai Extended" file.py
-
-# Set default theme in config
-# ~/.config/bat/config: --theme="Dracula"
-```
-
-## Line Ranges
-
-```bash
-# Show specific lines
-bat -r 10:20 file.txt
-
-# From line to end
-bat -r 100: file.txt
-
-# Start to specific line
-bat -r :50 file.txt
-
-# Multiple ranges
-bat -r 1:10 -r 50:60 file.txt
-```
-
-## Git Integration
-
-```bash
-# Show Git modifications (added/removed/modified lines)
-bat --diff file.txt
-
-# Show decorations (Git + file header)
-bat --decorations=always file.txt
-```
-
-## Output Control
-
-```bash
-# Output raw (no styling)
-bat --style=plain file.txt
-
-# Customize style
-bat --style=numbers,changes file.txt
-
-# Available styles: auto, full, plain, changes, header, grid, numbers, snip
-bat --style=header,grid,numbers file.txt
-```
-
-## Common Use Cases
-
-**Quick file preview:**
-```bash
-bat file.json
-```
-
-**View logs with syntax highlighting:**
-```bash
-bat error.log
-```
-
-**Compare files visually:**
-```bash
-bat --diff file1.txt
-bat file2.txt
-```
-
-**Preview before editing:**
-```bash
-bat config.yaml && vim config.yaml
-```
-
-**Cat replacement in pipes:**
-```bash
-bat -p file.txt | grep "pattern"
-```
-
-**View specific function:**
-```bash
-bat -r 45:67 script.py  # If function is on lines 45-67
-```
-
-## Integration with other tools
-
-**As pager for man pages:**
-```bash
-export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-man grep
-```
-
-**With ripgrep:**
-```bash
-rg "pattern" -l | xargs bat
-```
-
-**With fzf:**
-```bash
-fzf --preview 'bat --color=always --style=numbers {}'
-```
-
-**With diff:**
-```bash
-diff -u file1 file2 | bat -l diff
-```
-
-## Configuration
-
-Create `~/.config/bat/config` for defaults:
-
-```
-# Set theme
---theme="Dracula"
-
-# Show line numbers, Git modifications and file header, but no grid
---style="numbers,changes,header"
-
-# Use italic text on terminal
---italic-text=always
-
-# Add custom mapping
---map-syntax "*.conf:INI"
-```
-
-## Performance Tips
-
-- Use `-p` for plain mode when piping
-- Use `--paging=never` when output is used programmatically
-- `bat` caches parsed files for faster subsequent access
-
-## Tips
-
-- **Alias:** `alias cat='bat -p'` for drop-in cat replacement
-- **Pager:** Use as pager with `export PAGER="bat"`
-- **On Debian/Ubuntu:** Command may be `batcat` instead of `bat`
-- **Custom syntaxes:** Add to `~/.config/bat/syntaxes/`
-- **Performance:** For huge files, use `bat --paging=never` or plain `cat`
-
-## Common flags
-
-- `-p` / `--plain`: Plain mode (no line numbers/decorations)
-- `-n` / `--number`: Only show line numbers
-- `-A` / `--show-all`: Show non-printable characters
-- `-l` / `--language`: Set language for syntax highlighting
-- `-r` / `--line-range`: Only show specific line range(s)
-
-## Documentation
-
-GitHub: https://github.com/sharkdp/bat
-Man page: `man bat`
-Customization: https://github.com/sharkdp/bat#customization

.opencode/skills/fd-find/SKILL.md

@@ -1,194 +0,0 @@
----
-name: fd-find
-description: A fast and user-friendly alternative to 'find' - simple syntax, smart defaults, respects gitignore.
-homepage: https://github.com/sharkdp/fd
-metadata: {"clawdbot":{"emoji":"📂","requires":{"bins":["fd"]},"install":[{"id":"brew","kind":"brew","formula":"fd","bins":["fd"],"label":"Install fd (brew)"},{"id":"apt","kind":"apt","package":"fd-find","bins":["fd"],"label":"Install fd (apt)"}]}}
----
-
-# fd - Fast File Finder
-
-User-friendly alternative to `find` with smart defaults.
-
-## Quick Start
-
-### Basic search
-```bash
-# Find files by name
-fd pattern
-
-# Find in specific directory
-fd pattern /path/to/dir
-
-# Case-insensitive
-fd -i pattern
-```
-
-### Common patterns
-```bash
-# Find all Python files
-fd -e py
-
-# Find multiple extensions
-fd -e py -e js -e ts
-
-# Find directories only
-fd -t d pattern
-
-# Find files only
-fd -t f pattern
-
-# Find symlinks
-fd -t l
-```
-
-## Advanced Usage
-
-### Filtering
-```bash
-# Exclude patterns
-fd pattern -E "node_modules" -E "*.min.js"
-
-# Include hidden files
-fd -H pattern
-
-# Include ignored files (.gitignore)
-fd -I pattern
-
-# Search all (hidden + ignored)
-fd -H -I pattern
-
-# Maximum depth
-fd pattern -d 3
-```
-
-### Execution
-```bash
-# Execute command on results
-fd -e jpg -x convert {} {.}.png
-
-# Parallel execution
-fd -e md -x wc -l
-
-# Use with xargs
-fd -e log -0 | xargs -0 rm
-```
-
-### Regex patterns
-```bash
-# Full regex search
-fd '^test.*\.js$'
-
-# Match full path
-fd --full-path 'src/.*/test'
-
-# Glob pattern
-fd -g "*.{js,ts}"
-```
-
-## Time-based filtering
-```bash
-# Modified within last day
-fd --changed-within 1d
-
-# Modified before specific date
-fd --changed-before 2024-01-01
-
-# Created recently
-fd --changed-within 1h
-```
-
-## Size filtering
-```bash
-# Files larger than 10MB
-fd --size +10m
-
-# Files smaller than 1KB
-fd --size -1k
-
-# Specific size range
-fd --size +100k --size -10m
-```
-
-## Output formatting
-```bash
-# Absolute paths
-fd --absolute-path
-
-# List format (like ls -l)
-fd --list-details
-
-# Null separator (for xargs)
-fd -0 pattern
-
-# Color always/never/auto
-fd --color always pattern
-```
-
-## Common Use Cases
-
-**Find and delete old files:**
-```bash
-fd --changed-before 30d -t f -x rm {}
-```
-
-**Find large files:**
-```bash
-fd --size +100m --list-details
-```
-
-**Copy all PDFs to directory:**
-```bash
-fd -e pdf -x cp {} /target/dir/
-```
-
-**Count lines in all Python files:**
-```bash
-fd -e py -x wc -l | awk '{sum+=$1} END {print sum}'
-```
-
-**Find broken symlinks:**
-```bash
-fd -t l -x test -e {} \; -print
-```
-
-**Search in specific time window:**
-```bash
-fd --changed-within 2d --changed-before 1d
-```
-
-## Integration with other tools
-
-**With ripgrep:**
-```bash
-fd -e js | xargs rg "pattern"
-```
-
-**With fzf (fuzzy finder):**
-```bash
-vim $(fd -t f | fzf)
-```
-
-**With bat (cat alternative):**
-```bash
-fd -e md | xargs bat
-```
-
-## Performance Tips
-
-- `fd` is typically much faster than `find`
-- Respects `.gitignore` by default (disable with `-I`)
-- Uses parallel traversal automatically
-- Smart case: lowercase = case-insensitive, any uppercase = case-sensitive
-
-## Tips
-
-- Use `-t` for type filtering (f=file, d=directory, l=symlink, x=executable)
-- `-e` for extension is simpler than `-g "*.ext"`
-- `{}` in `-x` commands represents the found path
-- `{.}` strips the extension
-- `{/}` gets basename, `{//}` gets directory
-
-## Documentation
-
-GitHub: https://github.com/sharkdp/fd
-Man page: `man fd`

.opencode/skills/jq-json-processor/SKILL.md

@@ -1,112 +0,0 @@
----
-name: jq-json-processor
-description: Process, filter, and transform JSON data using jq - the lightweight and flexible command-line JSON processor.
-homepage: https://jqlang.github.io/jq/
-metadata: {"clawdbot":{"emoji":"🔍","requires":{"bins":["jq"]},"install":[{"id":"brew","kind":"brew","formula":"jq","bins":["jq"],"label":"Install jq (brew)"},{"id":"apt","kind":"apt","package":"jq","bins":["jq"],"label":"Install jq (apt)"}]}}
----
-
-# jq JSON Processor
-
-Process, filter, and transform JSON data with jq.
-
-## Quick Examples
-
-### Basic filtering
-```bash
-# Extract a field
-echo '{"name":"Alice","age":30}' | jq '.name'
-# Output: "Alice"
-
-# Multiple fields
-echo '{"name":"Alice","age":30}' | jq '{name: .name, age: .age}'
-
-# Array indexing
-echo '[1,2,3,4,5]' | jq '.[2]'
-# Output: 3
-```
-
-### Working with arrays
-```bash
-# Map over array
-echo '[{"name":"Alice"},{"name":"Bob"}]' | jq '.[].name'
-# Output: "Alice" "Bob"
-
-# Filter array
-echo '[1,2,3,4,5]' | jq 'map(select(. > 2))'
-# Output: [3,4,5]
-
-# Length
-echo '[1,2,3]' | jq 'length'
-# Output: 3
-```
-
-### Common operations
-```bash
-# Pretty print JSON
-cat file.json | jq '.'
-
-# Compact output
-cat file.json | jq -c '.'
-
-# Raw output (no quotes)
-echo '{"name":"Alice"}' | jq -r '.name'
-# Output: Alice
-
-# Sort keys
-echo '{"z":1,"a":2}' | jq -S '.'
-```
-
-### Advanced filtering
-```bash
-# Select with conditions
-jq '[.[] | select(.age > 25)]' people.json
-
-# Group by
-jq 'group_by(.category)' items.json
-
-# Reduce
-echo '[1,2,3,4,5]' | jq 'reduce .[] as $item (0; . + $item)'
-# Output: 15
-```
-
-### Working with files
-```bash
-# Read from file
-jq '.users[0].name' users.json
-
-# Multiple files
-jq -s '.[0] * .[1]' file1.json file2.json
-
-# Modify and save
-jq '.version = "2.0"' package.json > package.json.tmp && mv package.json.tmp package.json
-```
-
-## Common Use Cases
-
-**Extract specific fields from API response:**
-```bash
-curl -s https://api.github.com/users/octocat | jq '{name: .name, repos: .public_repos, followers: .followers}'
-```
-
-**Convert CSV-like data:**
-```bash
-jq -r '.[] | [.name, .email, .age] | @csv' users.json
-```
-
-**Debug API responses:**
-```bash
-curl -s https://api.example.com/data | jq '.'
-```
-
-## Tips
-
-- Use `-r` for raw string output (removes quotes)
-- Use `-c` for compact output (single line)
-- Use `-S` to sort object keys
-- Use `--arg name value` to pass variables
-- Pipe multiple jq operations: `jq '.a' | jq '.b'`
-
-## Documentation
-
-Full manual: https://jqlang.github.io/jq/manual/
-Interactive tutorial: https://jqplay.org/

.opencode/skills/nrepl-eval/SKILL.md

@@ -1,120 +0,0 @@
----
-name: nrepl-eval
-description: Evaluate Clojure code via nREPL using the standalone tools/nrepl-eval.mjs CLI tool.
----
-
-# nREPL Eval
-
-Evaluate Clojure (or ClojureScript) code via a running nREPL server using
-`tools/nrepl-eval.mjs` — a standalone CLI application.
-
-Session state (defs, in-ns, etc.) persists across invocations via a stored
-session ID, so you can build up state incrementally.
-
-## Usage
-
-```bash
-node tools/nrepl-eval.mjs [options] [<code>]
-```
-
-The tool is also executable directly:
-```bash
-./tools/nrepl-eval.mjs [options] [<code>]
-```
-
-## Options
-
-| Flag | Description | Default |
-|------|-------------|---------|
-| `-p, --port PORT` | nREPL server port | `6064` |
-| `-H, --host HOST` | nREPL server host | `127.0.0.1` |
-| `-t, --timeout MS` | Timeout in milliseconds | `120000` |
-| `--reset-session` | Discard stored session and start fresh | — |
-| `-e, --last-error` | Evaluate `*e` to retrieve the last exception | — |
-| `-h, --help` | Show help message | — |
-
-## When to Use
-
-Use this tool when you need to:
-
-1. **Evaluate Clojure code** during development — test functions, inspect
-   state, or run experiments against a running Clojure process.
-2. **Verify that edited files compile** — require namespaces with `:reload`
-   to pick up changes.
-3. **Inspect the last exception** after a failed evaluation — use `-e` to
-   print the error stored in `*e`.
-
-## Workflow
-
-### 1. Session management
-
-Sessions are persisted to `/tmp/penpot-nrepl-session-<host>-<port>`. State
-carries across calls automatically:
-
-```bash
-./tools/nrepl-eval.mjs '(def x 42)'
-./tools/nrepl-eval.mjs 'x'
-# => 42
-```
-
-Reset the session to start fresh:
-
-```bash
-./tools/nrepl-eval.mjs --reset-session '(def x 0)'
-```
-
-### 2. Evaluate code
-
-**Single expression (inline) — uses default port 6064:**
-```bash
-./tools/nrepl-eval.mjs '(+ 1 2 3)'
-```
-
-**Multiple expressions via heredoc (recommended — avoids escaping issues):**
-```bash
-./tools/nrepl-eval.mjs <<'EOF'
-(def x 10)
-(+ x 20)
-EOF
-```
-
-**Override with a different port:**
-```bash
-./tools/nrepl-eval.mjs -p 7888 '(+ 1 2 3)'
-```
-
-### 3. Inspect last exception
-
-After code throws an error, retrieve the full exception details:
-
-```bash
-./tools/nrepl-eval.mjs -e
-```
-
-## Common Patterns
-
-**Require a namespace with reload:**
-```bash
-./tools/nrepl-eval.mjs "(require '[my.namespace :as ns] :reload)"
-```
-
-**Test a function:**
-```bash
-./tools/nrepl-eval.mjs "(ns/my-function arg1 arg2)"
-```
-
-**Long-running operation with custom timeout:**
-```bash
-./tools/nrepl-eval.mjs -t 300000 "(long-running-fn)"
-```
-
-## Key Principles
-
-- **Default port is 6064** — just pass code directly, no `-p` needed when
-  your nREPL server is on 6064. Use `-p <PORT>` for a different port.
-- **Always use `:reload`** when requiring namespaces to pick up file changes.
-- **Session is reused** across invocations — defs, in-ns, and var bindings
-  persist. Use `--reset-session` to clear.
-- **Do not start any server** — the tool connects to an existing nREPL
-  server, it is not the agent's responsibility to start the nREPL server
-  (assume the server is already running on the specified port).

.opencode/skills/ripgrep/SKILL.md

@@ -1,150 +0,0 @@
----
-name: ripgrep
-description: Blazingly fast text search tool - recursively searches directories for regex patterns with respect to gitignore rules.
-homepage: https://github.com/BurntSushi/ripgrep
-metadata: {"clawdbot":{"emoji":"🔎","requires":{"bins":["rg"]},"install":[{"id":"brew","kind":"brew","formula":"ripgrep","bins":["rg"],"label":"Install ripgrep (brew)"},{"id":"apt","kind":"apt","package":"ripgrep","bins":["rg"],"label":"Install ripgrep (apt)"}]}}
----
-
-# ripgrep (rg)
-
-Fast, smart recursive search. Respects `.gitignore` by default.
-
-## Quick Start
-
-### Basic search
-```bash
-# Search for "TODO" in current directory
-rg "TODO"
-
-# Case-insensitive search
-rg -i "fixme"
-
-# Search specific file types
-rg "error" -t py       # Python files only
-rg "function" -t js    # JavaScript files
-```
-
-### Common patterns
-```bash
-# Whole word match
-rg -w "test"
-
-# Show only filenames
-rg -l "pattern"
-
-# Show with context (3 lines before/after)
-rg -C 3 "function"
-
-# Count matches
-rg -c "import"
-```
-
-## Advanced Usage
-
-### File type filtering
-```bash
-# Multiple file types
-rg "error" -t py -t js
-
-# Exclude file types
-rg "TODO" -T md -T txt
-
-# List available types
-rg --type-list
-```
-
-### Search modifiers
-```bash
-# Regex search
-rg "user_\d+"
-
-# Fixed string (no regex)
-rg -F "function()"
-
-# Multiline search
-rg -U "start.*end"
-
-# Only show matches, not lines
-rg -o "https?://[^\s]+"
-```
-
-### Path filtering
-```bash
-# Search specific directory
-rg "pattern" src/
-
-# Glob patterns
-rg "error" -g "*.log"
-rg "test" -g "!*.min.js"
-
-# Include hidden files
-rg "secret" --hidden
-
-# Search all files (ignore .gitignore)
-rg "pattern" --no-ignore
-```
-
-## Replacement Operations
-
-```bash
-# Preview replacements
-rg "old_name" --replace "new_name"
-
-# Actually replace (requires extra tool like sd)
-rg "old_name" -l | xargs sed -i 's/old_name/new_name/g'
-```
-
-## Performance Tips
-
-```bash
-# Parallel search (auto by default)
-rg "pattern" -j 8
-
-# Skip large files
-rg "pattern" --max-filesize 10M
-
-# Memory map files
-rg "pattern" --mmap
-```
-
-## Common Use Cases
-
-**Find TODOs in code:**
-```bash
-rg "TODO|FIXME|HACK" --type-add 'code:*.{rs,go,py,js,ts}' -t code
-```
-
-**Search in specific branches:**
-```bash
-git show branch:file | rg "pattern"
-```
-
-**Find files containing multiple patterns:**
-```bash
-rg "pattern1" | rg "pattern2"
-```
-
-**Search with context and color:**
-```bash
-rg -C 2 --color always "error" | less -R
-```
-
-## Comparison to grep
-
-- **Faster:** Typically 5-10x faster than grep
-- **Smarter:** Respects `.gitignore`, skips binary files
-- **Better defaults:** Recursive, colored output, line numbers
-- **Easier:** Simpler syntax for common tasks
-
-## Tips
-
-- `rg` is often faster than `grep -r`
-- Use `-t` for file type filtering instead of `--include`
-- Combine with other tools: `rg pattern -l | xargs tool`
-- Add custom types in `~/.ripgreprc`
-- Use `--stats` to see search performance
-
-## Documentation
-
-GitHub: https://github.com/BurntSushi/ripgrep
-User Guide: https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md

.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,17 +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.
 
-## Changelogs
-
-The project has two changelogs:
-
-- **Main project changelog**: `CHANGES.md` (root of the repository). Tracks changes for the core Penpot application (backend, frontend, common, render-wasm, exporter, mcp).
-- **Plugins changelog**: `plugins/CHANGELOG.md`. Tracks changes for the plugins subproject only.
-
-When making changes, add a changelog entry to the appropriate file under the
-`## <version> (Unreleased)` section in the correct category
-(`:sparkles: New features & Enhancements` or `:bug: Bugs fixed`).
-
 ## GitHub Operations
 
 To obtain the list of repository members/collaborators:

CHANGES.md

@@ -1,190 +1,5 @@
 # CHANGELOG
 
-## 2.17.0 (Unreleased)
-
-### :boom: Breaking changes & Deprecations
-
-### :rocket: Epics and highlights
-
-### :sparkles: New features & Enhancements
-
-- Show a read-only W × H size badge below the bounding box of the current selection (by @bittoby) [Github #9205](https://github.com/penpot/penpot/issues/9205)
-- Expose `variants` retrieval on `LibraryComponent` via `isVariant()` type guard in plugin API [Github #9185](https://github.com/penpot/penpot/issues/9185)
-
-### :bug: Bugs fixed
-
-- Fix plugin API `LibraryTypography.remove()` failing with a UUID assertion error [Github #8223](https://github.com/penpot/penpot/issues/8223)
-- Fix MCP SSE sessions leaking memory on zombie connections by adding inactivity timeout parity with Streamable HTTP sessions (by @bitloi) [Github #9432](https://github.com/penpot/penpot/issues/9432)
-- Fix missing `labels.open` translation (by @MilosM348) [Github #9320](https://github.com/penpot/penpot/pull/9320)
-- Harden Nginx responses with standard security headers and hide upstream `X-Powered-By` headers
-- Expose Source Sans Pro semibold (weight 600) variants in the builtin fonts list, matching the bundled font assets and CSS @font-face declarations [Github #7378](https://github.com/penpot/penpot/issues/7378)
-- Fix plugin API `shape.fills` and `shape.strokes` arrays being read-only [Github #8357](https://github.com/penpot/penpot/issues/8357)
-- Fix `get-profile` masking transient DB errors as anonymous user (by @jack-stormentswe) [Github #9253](https://github.com/penpot/penpot/issues/9253)
-- Fix `Ctrl+'` "Show guides" shortcut on non-US keyboard layouts by matching the physical key location (by @RenzoMXD) [Github #8423](https://github.com/penpot/penpot/issues/8423)
-- Fix lost-update race on `team.features` during concurrent file creation (by @web-dev0521) [Github #9197](https://github.com/penpot/penpot/issues/9197)
-- Fix copy and paste actions crashing the workspace on insecure origins (plain HTTP / non-`localhost`) where the Clipboard API is unavailable (by @MilosM348) [Github #6514](https://github.com/penpot/penpot/issues/6514)
-
-
-## 2.16.0 (Unreleased)
-
-### :boom: Breaking changes & Deprecations
-
-### :rocket: Epics and highlights
-
-### :sparkles: New features & Enhancements
-
-- Enhance readability of applied tokens in plugins API [Taiga #13714](https://tree.taiga.io/project/penpot/issue/13714)
-- Add "Delete group" option to the assets panel context menu for components, colors and typographies (by @FairyPigDev) [Github #9141](https://github.com/penpot/penpot/issues/9141)
-- Add `Alt+click` on a layer's disclosure arrow to recursively expand the entire subtree rooted at that layer in the Layers sidebar; symmetric with the existing `Shift+click` collapse-all gesture, and removes the O(siblings × depth) click cost of unfolding a deep subtree one level at a time [Github #7736](https://github.com/penpot/penpot/issues/7736)
-- Show relative timestamp and short identifier for each entry in the workspace Actions history sidebar (by @FairyPigDev) [Github #7660](https://github.com/penpot/penpot/issues/7660)
-- Add `Alt+click` on a layer's disclosure arrow to recursively expand the entire subtree in the Layers sidebar (by @MilosM348) [Github #9179](https://github.com/penpot/penpot/pull/9179)
-- 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 (by @moorsecopers99) [Github #9024](https://github.com/penpot/penpot/pull/9024)
-- 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 (by @RenzoMXD) [Github #8536](https://github.com/penpot/penpot/pull/8536)
-- 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)
-- Add a search bar to filter board size presets (by @eureka0928) [Github #4658](https://github.com/penpot/penpot/issues/4658)
-- 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)
-- Preserve vector content when pasting SVG from external tools such as Inkscape (by @RenzoMXD) [Github #9182](https://github.com/penpot/penpot/pull/9182)
-- Add Shift+Numpad0/1/2 as aliases to Shift+0/1/2 for zoom shortcuts (by @RenzoMXD) [Github #9063](https://github.com/penpot/penpot/pull/9063)
-- Add pixel grid color picker in viewport settings (by @Yakehira) [Github #7750](https://github.com/penpot/penpot/issues/7750)
-- Add HEX, HSB and HSL support to the color picker with a model switcher that persists across sessions (by @edwin-rivera-dev) [Github #9133](https://github.com/penpot/penpot/issues/9133)
-- Show specific invitation-link error messages for expired, email-mismatch and invalid token cases [Github #9220](https://github.com/penpot/penpot/issues/9220)
-- Show detailed messages on file import errors to help diagnose why a file could not be imported (by @jsdevninja) [Github #9004](https://github.com/penpot/penpot/issues/9004)
-- Add read-only preview mode for saved versions — click a version name to open a dedicated preview view (by @wdeveloper16) [Github #8976](https://github.com/penpot/penpot/issues/8976)
-- Add clipboard read/write permissions to the plugin system (by @wdeveloper16) [Github #9053](https://github.com/penpot/penpot/issues/9053)
-- Add new numeric inputs for token management on the right sidebar [Taiga #12109](https://tree.taiga.io/project/penpot/us/12109?milestone=513226)
-- Restore deleted team files in bulk instead of per file (by @Dexterity104) [Github #9248](https://github.com/penpot/penpot/pull/9248)
-- Preserve Inkscape labels when pasting SVGs (by @jeffrey701) [Github #9252](https://github.com/penpot/penpot/pull/9252)
-
-### :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)
-- Fix layers panel rename input showing the default type name instead of the saved layer name (by @jack-stormentswe) [Github #9231](https://github.com/penpot/penpot/pull/9231)
-- Suppress browser context menu on right-click in workspace sidebars while preserving it on text inputs (by @sujyotraut) [Github #5127](https://github.com/penpot/penpot/issues/5127)
-- Fix release notes modal appearing behind the dashboard sidebar (by @ciaokitty) [Github #8296](https://github.com/penpot/penpot/issues/8296)
-- Fix plugin API `fileVersion.restore()` promise hanging indefinitely on restore failure (by @thomascolden585-svg) [Github #9092](https://github.com/penpot/penpot/issues/9092)
-- Fix imported stroke-only SVG paths losing their rounded join when split into adjacent subpaths (by @Chrissi2812) [Github #5283](https://github.com/penpot/penpot/issues/5283)
-- Fix plugin API `library.connectLibrary()` not returning a Promise when the plugin lacks `library:write` permission (by @boskodev790) [Github #9158](https://github.com/penpot/penpot/pull/9158)
-- Fix LDAP provider schema typo (`bind-passwor` → `bind-password`) introduced during the `clojure.spec` → `malli` migration (by @boskodev790) [Github #9165](https://github.com/penpot/penpot/pull/9165)
-- Fix `login-with-ldap` silently dropping the error message when LDAP is not initialized (typo `:hide` → `:hint`) (by @boskodev790) [Github #9159](https://github.com/penpot/penpot/pull/9159)
-- Fix `PENPOT_OIDC_USER_INFO_SOURCE` flag being silently ignored in the OIDC callback (by @GeekClassy) [Github #9108](https://github.com/penpot/penpot/issues/9108)
-- Fix crash in share-link viewer when a team member's email is missing `@` or has no domain TLD (by @boskodev790) [Github #9120](https://github.com/penpot/penpot/pull/9120)
-- Fix crash when pasting a component with variants from an external shared library into a file that uses that library (by @FairyPigDev) [Github #8144](https://github.com/penpot/penpot/issues/8144)
-- Remove `corepack` from the MCP local launcher so it runs on Node.js 25+, where corepack is no longer bundled (by @TheAifam5) [Github #8877](https://github.com/penpot/penpot/issues/8877)
-- Fix Copy as SVG to produce a valid document for multi-shape selections and use `image/svg+xml` MIME type (by @RenzoMXD) [Github #9066](https://github.com/penpot/penpot/pull/9066)
-- Preserve OpenType variant name table for custom fonts in the dashboard (by @rutherfordcraze) [Github #8924](https://github.com/penpot/penpot/issues/8924)
-- 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 copy to be more specific [Taiga #13990](https://tree.taiga.io/project/penpot/issue/13990)
-- Allow deleting the profile avatar after uploading (by @moorsecopers99) [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 "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` (by @axelseis) [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)
-- Fix restore-deleted-team-files failing due to a typo in the reduce accumulator (by @Dexterity104) [Github #9241](https://github.com/penpot/penpot/issues/9241)
-- Fix internal error on layer prev/next sibling selection (by @jsdevninja) [Github #9003](https://github.com/penpot/penpot/issues/9003)
-- Fix tooltip appearing two times when nested elements [Github #9031](https://github.com/penpot/penpot/issues/9031)
-- Fix broken update library notification link in the UI [Github #9070](https://github.com/penpot/penpot/issues/9070)
-- Fix plugin API `ShapeBase.component()` returning the outermost component instead of the immediate component in case of nested component instances [Github #9183](https://github.com/penpot/penpot/issues/9183)
-- Fix content attribute sync group resolution by shape type [Github #8724](https://github.com/penpot/penpot/pull/8724)
-- Fix highlight on shape after rename [Github #8890](https://github.com/penpot/penpot/pull/8890)
-- Fix plugin parse-point returning plain map instead of Point record (by @FairyPigDev) [Github #9129](https://github.com/penpot/penpot/pull/9129)
-- Fix `:heigth` typo in clipboard frame-same-size? (by @iot2edge) [Github #9250](https://github.com/penpot/penpot/pull/9250)
-- 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)
-
-## 2.15.0 (Unreleased)
-
-### :sparkles: New features & Enhancements
-
-- Add MCP server integration [Github #9174](https://github.com/penpot/penpot/issues/9174) 
-- Add chunked upload API for large media and binary files (removes previous upload size limits) [Github #8909](https://github.com/penpot/penpot/pull/8909)
-- Improve team name validation [Github #9176](https://github.com/penpot/penpot/pull/9176)
-
-### :bug: Bugs fixed
-
-- Fix MCP integrations URL copy action to match the URL displayed in settings [Github #9238](https://github.com/penpot/penpot/issues/9238)
-- Fix Plugin API token methods rejecting JS array of strings [Github #9162](https://github.com/penpot/penpot/issues/9162)
-- Harden Nginx responses with standard security headers and hide upstream `X-Powered-By` headers
-- Fix keep-alive interval leak in PluginBridge (by @opcode81) [Github #9435](https://github.com/penpot/penpot/pull/9435)
-- Fix MCP "active in another tab" notification not clearing (by @Dexterity104) [Github #9321](https://github.com/penpot/penpot/pull/9321)
-- Fix swapped analytics event names on MCP tab-switch dialog (by @Dexterity104) [Github #9322](https://github.com/penpot/penpot/pull/9322)
-- Fix MCP ReplServer binding to all interfaces (0.0.0.0) instead of localhost, allowing unauthenticated RCE [Github #9400] (https://github.com/penpot/penpot/pull/9400)
-- Fix incorrect handling of version restore operation [Github #9041](https://github.com/penpot/penpot/pull/9041)
-- Fix SSRF in media URL import and restrict unauthenticated asset access to public buckets only [Github #9390](https://github.com/penpot/penpot/pull/9390)
-- Fix text edition mode not exited when changing selection, blocking token application [Github #9346](https://github.com/penpot/penpot/issues/9346)
-- Use base64 envelope for Uint8Array task results to avoid JSON expansion (by @opcode81) [Github #9431](https://github.com/penpot/penpot/pull/9431)
-- Fix empty warning on login [Github #9056](https://github.com/penpot/penpot/pull/9056)
-- Fix layer hierarchy to match old and new SCSS [Github #9126](https://github.com/penpot/penpot/pull/9126)
-- Fix multiple selection on shapes with token applied to stroke color [Github #9110](https://github.com/penpot/penpot/pull/9110)
-- Fix onboarding modals appearing behind libraries and templates panel [Github #9178](https://github.com/penpot/penpot/pull/9178)
-- Fix release notes modal appearing behind the dashboard sidebar (by @RenzoMXD) [Github #8296](https://github.com/penpot/penpot/issues/8296)
-- Fix maximum call stack size exceeded in SSE read-stream [Github #9470](https://github.com/penpot/penpot/issues/9470)
-
-## 2.14.5
-
-### :bug: Bugs fixed
-
-- Fix incorrect invitation token handling on register process [Github #9380](https://github.com/penpot/penpot/pull/9380)
-
 ## 2.14.4
 
 ### :bug: Bugs fixed
@@ -203,6 +18,7 @@
 
 ### :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)
@@ -292,9 +108,11 @@
 - Fix wrong image in the onboarding invitation block [Taiga #13040](https://tree.taiga.io/project/penpot/issue/13040)
 - Fix wrong register image [Taiga #12955](https://tree.taiga.io/project/penpot/task/12955)
 - Fix error message on components doesn't close automatically [Taiga #12012](https://tree.taiga.io/project/penpot/issue/12012)
+- Fix incorrect handling of input values on layout gap and padding inputs [Github #8113](https://github.com/penpot/penpot/issues/8113)
 - Fix incorrect default option on tokens import dialog [Github #8051](https://github.com/penpot/penpot/pull/8051)
 - Fix unhandled exception tokens creation dialog [Github #8110](https://github.com/penpot/penpot/issues/8110)
 - Fix displaying a hidden user avatar when there is only one more [Taiga #13058](https://tree.taiga.io/project/penpot/issue/13058)
+- Fix unhandled exception on open-new-window helper [Github #7787](https://github.com/penpot/penpot/issues/7787)
 - Fix exception on uploading large fonts [Github #8135](https://github.com/penpot/penpot/pull/8135)
 - 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)
@@ -355,8 +173,12 @@
 - Fix missing text color token from selected shapes in selected colors list [Taiga #12956](https://tree.taiga.io/project/penpot/issue/12956)
 - Fix dropdown option width in Guides columns dropdown [Taiga #12959](https://tree.taiga.io/project/penpot/issue/12959)
 - Fix typos on download modal [Taiga #12865](https://tree.taiga.io/project/penpot/issue/12865)
+- Fix problem with text editor maintaining previous styles [Taiga #12835](https://tree.taiga.io/project/penpot/issue/12835)
+- Fix unhandled exception tokens creation dialog [Github #8110](https://github.com/penpot/penpot/issues/8110)
 - Fix allow negative spread values on shadow token creation [Taiga #13167](https://tree.taiga.io/project/penpot/issue/13167)
 - Fix spanish translations on import export token modal [Taiga #13171](https://tree.taiga.io/project/penpot/issue/13171)
+- Remove whitespaces from asset export filename [Github #8133](https://github.com/penpot/penpot/pull/8133)
+- Fix exception on uploading large fonts [Github #8135](https://github.com/penpot/penpot/pull/8135)
 - Fix unhandled exception on open-new-window helper [Github #7787](https://github.com/penpot/penpot/issues/7787)
 - Fix incorrect handling of input values on layout gap and padding inputs [Github #8113](https://github.com/penpot/penpot/issues/8113)
 - Fix several race conditions on path editor [Github #8187](https://github.com/penpot/penpot/pull/8187)
@@ -449,8 +271,10 @@ example. It's still usable as before, we just removed the example.
 ### :bug: Bugs fixed
 
 - Fix text line-height values are wrong [Taiga #12252](https://tree.taiga.io/project/penpot/issue/12252)
+- Fix an error translation [Taiga #12402](https://tree.taiga.io/project/penpot/issue/12402)
 - Fix pan cursor not disabling viewport guides [Github #6985](https://github.com/penpot/penpot/issues/6985)
 - Fix viewport resize on locked shapes [Taiga #11974](https://tree.taiga.io/project/penpot/issue/11974)
+- Fix nested variant in a component doesn't keep inherited overrides [Taiga #12299](https://tree.taiga.io/project/penpot/issue/12299)
 - Fix on copy instance inside a components chain touched are missing [Taiga #12371](https://tree.taiga.io/project/penpot/issue/12371)
 - Fix problem with multiple selection and shadows [Github #7437](https://github.com/penpot/penpot/issues/7437)
 - Fix search shortcut [Taiga #10265](https://tree.taiga.io/project/penpot/issue/10265)
@@ -531,7 +355,7 @@ example. It's still usable as before, we just removed the example.
 - Fix text override is lost after switch [Taiga #12269](https://tree.taiga.io/project/penpot/issue/12269)
 - Fix exporting a board crashing the app [Taiga #12384](https://tree.taiga.io/project/penpot/issue/12384)
 - Fix nested variant in a component doesn't keep inherited overrides [Taiga #12299](https://tree.taiga.io/project/penpot/issue/12299)
-- Fix selected colors not showing colors from children shapes in multiple selection [Taiga #12385](https://tree.taiga.io/project/penpot/issue/12385)
+- Fix selected colors not showing colors from children shapes in multiple selection [Taiga #12384](https://tree.taiga.io/project/penpot/issue/12385)
 - Fix scrollbar issue in design tab [Taiga #12367](https://tree.taiga.io/project/penpot/issue/12367)
 - Fix library update notificacions showing when they should not [Taiga #12397](https://tree.taiga.io/project/penpot/issue/12397)
 - Fix remove flex button doesn’t work within variant [Taiga #12314](https://tree.taiga.io/project/penpot/issue/12314)

CONTRIBUTING.md

@@ -13,17 +13,7 @@ Center](https://help.penpot.app/).
 - [Prerequisites](#prerequisites)
 - [Reporting Bugs](#reporting-bugs)
 - [Pull Requests](#pull-requests)
-  - [Workflow](#workflow)
-  - [Title format](#title-format)
-  - [Description](#description)
-  - [Branch naming](#branch-naming)
-  - [Review process](#review-process)
-  - [What we won't accept](#what-we-wont-accept)
-  - [Good first issues](#good-first-issues)
 - [Commit Guidelines](#commit-guidelines)
-  - [Commit types](#commit-types)
-  - [Rules](#rules)
-  - [Examples](#examples)
 - [Formatting and Linting](#formatting-and-linting)
 - [Changelog](#changelog)
 - [Code of Conduct](#code-of-conduct)
@@ -62,104 +52,18 @@ Advisories](https://github.com/penpot/penpot/security/advisories)
 
 1. **Read the DCO** — see [Developer's Certificate of Origin](#developers-certificate-of-origin-dco)
    below. All code patches must include a `Signed-off-by` line.
-2. **Discuss before building** — open a [GitHub
-   Issue](https://github.com/penpot/penpot/issues) before starting work on
-   a new feature or significant change. For planned features on the roadmap,
-   reference the corresponding Taiga story. Do not expect your contribution
-   to be accepted if you submit it without prior discussion — this applies
-   to new features, planned features, and quick wins alike.
+2. **Discuss before building** — open a question/discussion issue before
+   starting work on a new feature or significant change. No PR will be
+   accepted without prior discussion, whether it is a new feature, a planned
+   one, or a quick win.
 3. **Bug fixes** — you may submit a PR directly, but we still recommend
    filing an issue first so we can track it independently of your fix.
 4. **Format and lint** — run the checks described in
    [Formatting and Linting](#formatting-and-linting) before submitting.
 
-### Title format
-
-Pull request titles **must** follow the same convention as commit subjects:
-
-```
-:emoji: <subject>
-```
-
-- Use the **imperative mood** (e.g. "Fix", not "Fixed").
-- Capitalize the first letter of the subject.
-- Do not end the subject with a period.
-- Keep the subject to **70 characters** or fewer.
-- Use one of the [commit type emojis](#commit-types) listed below.
-
-When a PR contains multiple unrelated commits, choose the emoji that
-best represents the dominant change.
-
-**Examples:**
-
-```
-:bug: Fix unexpected error on launching modal
-:sparkles: Enable new modal for profile
-:zap: Improve performance of dashboard navigation
-```
-
-> **Note:** When a PR is squash-merged, the PR title becomes the
-> commit message on the main branch. Getting the title right matters.
-
-### Description
-
-Every pull request should include a description that helps reviewers
-understand the change quickly:
-
-1. **What and why** — describe the change and its motivation.
-2. **Link related issues** — use `Closes #1234` or reference a Taiga
-   story (e.g. `Taiga #5678`).
-3. **Screenshots or recordings** — required for any UI-visible change.
-4. **Testing notes** — how did you verify the change? Any edge cases?
-5. **Breaking changes** — call out anything that affects existing users
-   or requires migration steps.
-
-### Branch naming
-
-Use a descriptive branch name that reflects the type and scope of the
-change:
-
-```
-<type>/<short-description>
-```
-
-Types: `fix`, `feat`, `refactor`, `docs`, `chore`, `perf`.
-
-Optionally include the issue number:
-
-```
-fix/9122-email-blacklisting
-feat/export-webp
-refactor/layout-sizing
-```
-
-### Review process
-
-- We are a small team and maintainers juggle reviews alongside other
-  tasks. Please do not expect your code to be reviewed instantly.
-- Reviews are handled in dedicated blocks of time, usually in the order
-  PRs arrive. It may take a few days to get a first review, especially
-  when urgent tasks come up.
-- Address review feedback by **pushing new commits** — do not
-  force-push during review, as it breaks comment threads.
-- PRs require at least **one approval** before merge.
-- We use **squash-merge** by default. The PR title becomes the final
-  commit message, so follow the [title format](#title-format) above.
-
-### What we won't accept
-
-To save time on both sides, please avoid submitting PRs that:
-
-- Introduce new dependencies without prior discussion.
-- Change the build system or CI configuration without maintainer
-  approval.
-- Mix unrelated changes in a single PR — keep PRs focused on one
-  concern.
-- Skip the [discussion step](#workflow) for non-bug-fix changes.
-
 ### Good first issues
 
-We use the `good first issue` label to mark issues appropriate for newcomers.
+We use the `easy fix` label to mark issues appropriate for newcomers.
 
 ## Commit Guidelines
 
@@ -175,26 +79,26 @@ Commit messages must follow this format:
 
 ### Commit types
 
-| Emoji                  | Description                |
-| ---------------------- | -------------------------- |
-| :bug:                  | Bug fix                    |
-| :sparkles:             | Improvement or enhancement |
-| :tada:                 | New feature                |
-| :recycle:              | Refactor                   |
-| :lipstick:             | Cosmetic changes           |
-| :ambulance:            | Critical bug fix           |
-| :books:                | Documentation              |
-| :construction:         | Work in progress           |
-| :boom:                 | Breaking change            |
-| :wrench:               | Configuration update       |
-| :zap:                  | Performance improvement    |
-| :whale:                | Docker-related change      |
-| :paperclip:            | Other non-relevant changes |
-| :arrow_up:             | Dependency update          |
-| :arrow_down:           | Dependency downgrade       |
-| :fire:                 | Removal of code or files   |
+| Emoji | Description |
+|-------|-------------|
+| :bug: | Bug fix |
+| :sparkles: | Improvement or enhancement |
+| :tada: | New feature |
+| :recycle: | Refactor |
+| :lipstick: | Cosmetic changes |
+| :ambulance: | Critical bug fix |
+| :books: | Documentation |
+| :construction: | Work in progress |
+| :boom: | Breaking change |
+| :wrench: | Configuration update |
+| :zap: | Performance improvement |
+| :whale: | Docker-related change |
+| :paperclip: | Other non-relevant changes |
+| :arrow_up: | Dependency update |
+| :arrow_down: | Dependency downgrade |
+| :fire: | Removal of code or files |
 | :globe_with_meridians: | Add or update translations |
-| :rocket:               | Epic or highlight          |
+| :rocket: | Epic or highlight |
 
 ### Rules
 
@@ -231,19 +135,6 @@ We use [cljfmt](https://github.com/weavejester/cljfmt) for formatting and
 ./scripts/lint
 ```
 
-For frontend SCSS, we use `stylelint` for linting and
-`Prettier` for formatting:
-
-```bash
-cd frontend
-
-# Lint SCSS
-pnpm run lint:scss (does not modify files)
-
-# Fix SCSS formatting (modifies files in place)
-pnpm run fmt:scss
-```
-
 Ideally, run these as git pre-commit hooks.
 [Husky](https://typicode.github.io/husky/#/) is a convenient option for
 setting this up.
@@ -273,23 +164,23 @@ By submitting code you agree to and can certify the following:
 > By making a contribution to this project, I certify that:
 >
 > (a) The contribution was created in whole or in part by me and I have the
-> right to submit it under the open source license indicated in the file; or
+>     right to submit it under the open source license indicated in the file; or
 >
 > (b) The contribution is based upon previous work that, to the best of my
-> knowledge, is covered under an appropriate open source license and I have
-> the right under that license to submit that work with modifications,
-> whether created in whole or in part by me, under the same open source
-> license (unless I am permitted to submit under a different license), as
-> indicated in the file; or
+>     knowledge, is covered under an appropriate open source license and I have
+>     the right under that license to submit that work with modifications,
+>     whether created in whole or in part by me, under the same open source
+>     license (unless I am permitted to submit under a different license), as
+>     indicated in the file; or
 >
 > (c) The contribution was provided directly to me by some other person who
-> certified (a), (b) or (c) and I have not modified it.
+>     certified (a), (b) or (c) and I have not modified it.
 >
 > (d) I understand and agree that this project and the contribution are public
-> and that a record of the contribution (including all personal information
-> I submit with it, including my sign-off) is maintained indefinitely and
-> may be redistributed consistent with this project or the open source
-> license(s) involved.
+>     and that a record of the contribution (including all personal information
+>     I submit with it, including my sign-off) is maintained indefinitely and
+>     may be redistributed consistent with this project or the open source
+>     license(s) involved.
 
 ### Signed-off-by
 

README.md

@@ -1,56 +1,53 @@
-<img width="100%" src="https://github.com/user-attachments/assets/da17b160-f289-436f-b140-972083a08602" />
 
 [uri_license]: https://www.mozilla.org/en-US/MPL/2.0
 [uri_license_image]: https://img.shields.io/badge/MPL-2.0-blue.svg
 
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://penpot.app/images/readme/github-dark-mode.png">
+  <source media="(prefers-color-scheme: light)" srcset="https://penpot.app/images/readme/github-light-mode.png">
+  <img alt="penpot header image" src="https://penpot.app/images/readme/github-light-mode.png">
+</picture>
+
 <p align="center">
-  <a href="https://www.digitalpublicgoods.net/r/penpot" rel="nofollow">
-    <img alt="Verified DPG" src="https://img.shields.io/badge/Verified-DPG-blue.svg">
-  </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">
-  </a>
-  <a href="https://tree.taiga.io/project/penpot/" rel="nofollow">
-    <img alt="Managed with Taiga.io" src="https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg">
-  </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">
-  </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://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>
 </p>
 
 <p align="center">
-  <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://penpot.app/learning-center"><b>Learning Center</b></a>  •
-  <a href="https://community.penpot.app/"><b>Community</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://penpot.app/learning-center"><b>Learning Center</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://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://instagram.com/penpot.app"><b>Instagram</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://twitter.com/penpotapp"><b>X</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://www.linkedin.com/company/penpot/"><b>Linkedin</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://bsky.app/profile/penpot.app"><b>Bluesky</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 is the open-source design platform for teams that build digital products at scale.
+[Penpot video](https://github.com/user-attachments/assets/7c67fd7c-04d3-4c9b-88ec-b6f5e23f8332
+)
 
-Penpot’s key strength lies in giving you **full ownership of your design infrastructure**. Built on open source and designed for [self-hosting](https://help.penpot.app/technical-guide/getting-started/), it puts teams in complete control of their design environment supporting strict compliance and governance requirements. Whether used in the **browser or deployed on your own servers**, Penpot **works with open standards** like SVG, CSS, HTML, and JSON. 
+<br />
 
-Real-time collaboration strengthens this foundation, helping teams scale and bring design closer to the product through top-tier capabilities. Additionally, developers feel at home using Penpot, because design is expressed as code, enabling a direct translation and shipping products faster. 
+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.
 
-Best-in-class native [Design Tokens](https://penpot.dev/collaboration/design-tokens) provide a single source of truth between design and development. They ensure consistency, improve collaboration, and make it easier to manage complex design systems.
+Available on browser or self-hosted, Penpot works with open standards like SVG, CSS, HTML and JSON, and it’s free!
 
-The [MCP server](https://penpot.app/penpot-mcp-server) takes it further by enabling multi-directional workflows between design and code. A [powerful open API](https://help.penpot.app/mcp/#quick-start) and plugin system makes the workspace programmable, enabling automation, AI-driven workflows, and integrations with the tools and systems you already use.
+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)
 
-With [CSS Grid and Flex Layout](https://help.penpot.app/user-guide/designing/flexible-layouts/), teams can design responsive interfaces that behave like real code from the start.
-
-Combined, these features turn Penpot into a **full-stack design platform** for building scalable design systems and fully integrated product development processes.
-
-If your organization is scaling and needs extra support, we’re here to help. [Talk to us](https://penpot.app/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 ##
 
@@ -63,78 +60,101 @@ If your organization is scaling and needs extra support, we’re here to help. [
 
 ## Why Penpot ##
 
-Penpot connects design, code, and AI workflows through a code-based approach, making designs readable by developers and AI via the MCP server. This approach helps teams ship what’s actually designed and manage design systems at scale with powerful design tokens. As a self-hosted, open-source and real-time collaboration platform, Penpot offers full flexibility, security, and ownership without vendor lock-in. Learn more about [why Penpot](https://penpot.app/why-penpot) is the platform for your team.
+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.
 
-Penpot offers [integration](https://penpot.app/integrations-api) 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  ###
+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.
 
-### Building Design Systems: design tokens, components and variants ###
 
-Penpot brings [design systems](https://penpot.app/design/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 />
 
-<img width="100%" alt="Penpot Design Systems" src="https://github.com/user-attachments/assets/cce75ad6-f783-473f-8803-da9eb8255fef">
+<p align="center">
+ <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://site-assets.plasmic.app/2168cf524dd543caeff32384eb9ea0a1.svg" alt="Open Source" style="width: 65%;">
+</p>
+<br />
 
 ## Community ##
 
 We love the Open Source software community. Contributing is our passion and if it’s yours too, participate and [improve](https://community.penpot.app/c/help-us-improve-penpot/7) Penpot. All your designs, code and ideas are welcome!
 
-Want to go a step further? Become a [Penpot Ambassador](https://penpot.app/ambassador-program) and help grow the Penpot community in your region while contributing to a global, open design ecosystem.
-
 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/)!
 
-Categories include:
-
+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)
+- [#MadeWithPenpot](https://community.penpot.app/c/madewithpenpot/9)
 - [Events and Announcements](https://community.penpot.app/c/announcements/5)
+- [Inside Penpot](https://community.penpot.app/c/inside-penpot/21)
 - [Penpot in your language](https://community.penpot.app/c/penpot-in-your-language/12)
-- [Education](https://community.penpot.app/c/education/28)
+- [Design and Code Essentials](https://community.penpot.app/c/design-and-code-essentials/22)
 
-<img width="100%" alt="Pentpot Community" src="https://github.com/user-attachments/assets/4b2a4360-12b5-4994-bd45-641449f86c4e" />
+
+<br />
+
+<p align="center">
+  <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 ###
+
+## 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.
-- 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).
+- 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)
+- 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).
-- Become a [translator](https://help.penpot.app/contributing-guide/translations).
-- 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.
+- 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)
+- 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
 
 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/).
 
-<img width="100%" alt="Penpot hub" src="https://github.com/user-attachments/assets/0abc02f0-625c-45ab-ad81-4927bec7a055" />
+<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 ##
 
@@ -150,8 +170,6 @@ You can ask and answer questions, have open-ended conversations, and follow alon
 
 📚 [Dev Diaries](https://penpot.app/dev-diaries.html)
 
-🧑‍🏫​ [UI Design Course](https://penpot.app/courses/)
-
 
 ## License ##
 

backend/AGENTS.md

@@ -8,10 +8,7 @@ Redis for messaging/caching.
 ## General Guidelines
 
 To ensure consistency across the Penpot JVM stack, all contributions must adhere
-to these criteria.
-
-IMPORTANT: all CLI commands should be executed under backend/
-subdirectory for make them work correctly.
+to these criteria:
 
 ### 1. Testing & Validation
 
@@ -24,7 +21,7 @@ subdirectory for make them work correctly.
 
 ### 2. Code Quality & Formatting
 
-* **Linting:** All code must pass linter checks (run `pnpm run lint:clj` or `pnpm run lint` on the repository root)
+* **Linting:** All code must pass `clj-kondo` checks (run `pnpm run lint:clj`)
 * **Formatting:** All the code must pass the formatting check (run `pnpm run
   check-fmt`). Use `pnpm run fmt` to fix formatting issues. Avoid "dirty"
   diffs caused by unrelated whitespace changes.
@@ -86,52 +83,7 @@ are config maps with `::ig/ref` for dependencies. Components implement
 `ig/init-key` / `ig/halt-key!`.
 
 
-### Connecting to the Database
-
-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)
+### Database Access
 
 `app.db` wraps next.jdbc. Queries use a SQL builder that auto-converts kebab-case ↔ snake_case.
 
@@ -194,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="{{organization-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">
-                              {% if organization-initials %}{{organization-initials}}{% endif %}
-                            </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 %}
-                         part of the organization “{{ organization|abbreviate:25 }}”{% endif %}.</div>
+                        {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.</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

backend/src/app/auth/ldap.clj

@@ -111,7 +111,7 @@
    [:host {:optional true} :string]
    [:port {:optional true} ::sm/int]
    [:bind-dn {:optional true} :string]
-   [:bind-password {:optional true} :string]
+   [:bind-passwor {:optional true} :string]
    [:query {:optional true} :string]
    [:base-dn {:optional true} :string]
    [:attrs-email {:optional true} :string]

backend/src/app/auth/oidc.clj

@@ -43,7 +43,7 @@
 (defn- discover-oidc-config
   [cfg {:keys [base-uri] :as provider}]
   (let [uri (u/join base-uri ".well-known/openid-configuration")
-        rsp (http/req cfg {:method :get :uri (dm/str uri)})]
+        rsp (http/req! cfg {:method :get :uri (dm/str uri)})]
 
     (if (= 200 (:status rsp))
       (let [data       (-> rsp :body json/decode)
@@ -105,7 +105,7 @@
 
 (defn- fetch-oidc-jwks
   [cfg jwks-uri]
-  (let [{:keys [status body]} (http/req cfg {:method :get :uri jwks-uri})]
+  (let [{:keys [status body]} (http/req! cfg {:method :get :uri jwks-uri})]
     (if (= 200 status)
       (-> body json/decode :keys process-oidc-jwks)
       (ex/raise :type ::internal
@@ -235,7 +235,7 @@
                     :timeout 6000
                     :method :get}
 
-            {:keys [status body]} (http/req cfg params)]
+            {:keys [status body]} (http/req! cfg params)]
 
         (when-not (int-in-range? status 200 300)
           (ex/raise :type :internal
@@ -401,9 +401,8 @@
 
 (defn- parse-attr-path
   [provider path]
-  (let [separator        (if (str/includes? path "__") "__" ".")
-        [fitem & items]  (str/split path separator)]
-    (into [(keyword (:type provider) (str/kebab fitem))] (map keyword) items)))
+  (let [[fitem & items] (str/split path "__")]
+    (into [(keyword (:type provider) fitem)] (map keyword) items)))
 
 (defn- build-redirect-uri
   []
@@ -453,7 +452,7 @@
            :grant-type (:grant_type params)
            :redirect-uri (:redirect_uri params))
 
-    (let [{:keys [status body]} (http/req cfg req)]
+    (let [{:keys [status body]} (http/req! cfg req)]
       (if (= status 200)
         (let [data (json/decode body)
               data {:token/access (get data :access_token)
@@ -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)))
-          props   (qualify-props provider info)
-          email   (get-email props)]
+    (let [info  (assoc info :provider-id (str (:id provider)))
+          props (qualify-props provider info)
+          email (get-email props)]
       {:backend  (:type provider)
        :fullname (or (get-name props) email)
        :email email
@@ -508,7 +507,7 @@
                   :headers {"Authorization" (str (:token/type tdata) " " (:token/access tdata))}
                   :timeout 6000
                   :method :get}
-        response (http/req cfg params)]
+        response (http/req! cfg params)]
 
     (l/trc :hint "user info response"
            :status (:status response)
@@ -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))
-                 :token    (dissoc claims :exp :iss :iat :aud :sid)
+        info   (case (get provider :user-info-source)
+                 :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))
-                               (fetch-user-info cfg provider tdata)))
+                 (or (some-> claims (dissoc :exp :iss :iat :aud :sub :sid))
+                     (fetch-user-info cfg provider tdata)))
 
         info   (process-user-info provider tdata info)]
 
@@ -818,12 +804,12 @@
                 props   (audit/profile->props profile)
                 context (d/without-nils {:external-session-id (:external-session-id info)})]
 
-            (audit/submit cfg {:type "action"
-                               :name "login-with-oidc"
-                               :profile-id (:id profile)
-                               :ip-addr (inet/parse-request request)
-                               :props props
-                               :context context})
+            (audit/submit! cfg {::audit/type "action"
+                                ::audit/name "login-with-oidc"
+                                ::audit/profile-id (:id profile)
+                                ::audit/ip-addr (inet/parse-request request)
+                                ::audit/props props
+                                ::audit/context context})
 
             (->> (redirect-to-verify-token token)
                  (sxf request)))))

backend/src/app/binfile/common.clj

@@ -315,8 +315,8 @@
 (defn get-file
   "Get file, resolve all features and apply migrations.
 
-  Useful when you have plan to apply massive or not surgical
-  operations on file, because it removes the overhead of lazy fetching
+  Usefull when you have plan to apply massive or not cirurgical
+  operations on file, because it removes the ovehead of lazy fetching
   and decoding."
   [cfg file-id & {:as opts}]
   (db/run! cfg get-file* file-id opts))

backend/src/app/binfile/v3.clj

@@ -281,7 +281,7 @@
 
         thumbnails   (bfc/get-file-object-thumbnails cfg file-id)]
 
-    (events/tap :progress {:section :file :id file-id :name (:name file)})
+    (events/tap :progress {:section :file :id file-id})
 
     (vswap! bfc/*state* update :files assoc file-id
             {:id file-id
@@ -301,7 +301,6 @@
       (write-entry! output path file))
 
     (doseq [[index page-id] (d/enumerate pages)]
-
       (let [path    (str "files/" file-id "/pages/" page-id ".json")
             page    (get pages-index page-id)
             objects (:objects page)
@@ -312,8 +311,6 @@
 
         (write-entry! output path page)
 
-        (events/tap :progress {:section :page :id page-id :name (:name page) :file-id file-id})
-
         (doseq [[shape-id shape] objects]
           (let [path  (str "files/" file-id "/pages/" page-id "/" shape-id ".json")
                 shape (assoc shape :page-id page-id)
@@ -326,8 +323,6 @@
     (doseq [{:keys [id] :as media} media]
       (let [path  (str "files/" file-id "/media/" id ".json")
             media (encode-media media)]
-
-        (events/tap :progress {:section :media :id id  :file-id file-id})
         (write-entry! output path media)))
 
     (doseq [thumbnail thumbnails]
@@ -337,13 +332,11 @@
             data (-> data
                      (assoc :media-id (:media-id thumbnail))
                      (encode-file-thumbnail))]
-        (events/tap :progress {:section :thumbnails :id (:object-id thumbnail) :file-id file-id})
         (write-entry! output path data)))
 
     (doseq [[id component] components]
       (let [path      (str "files/" file-id "/components/" id ".json")
             component (encode-component component)]
-        (events/tap :progress {:section :component :id id :file-id file-id})
         (write-entry! output path component)))
 
     (doseq [[id color] colors]
@@ -354,20 +347,17 @@
                     (and (contains? color :path)
                          (str/empty? (:path color)))
                     (dissoc :path))]
-        (events/tap :progress {:section :color :id id :file-id file-id})
         (write-entry! output path color)))
 
     (doseq [[id object] typographies]
       (let [path       (str "files/" file-id "/typographies/" id ".json")
             typography (encode-typography object)]
-        (events/tap :progress {:section :typography :id id :file-id file-id})
         (write-entry! output path typography)))
 
     (when (and tokens-lib
                (not (ctob/empty-lib? tokens-lib)))
       (let [path           (str "files/" file-id "/tokens.json")
             encoded-tokens (encode-tokens-lib tokens-lib)]
-        (events/tap :progress {:section :tokens-lib :file-id file-id})
         (write-entry! output path encoded-tokens)))))
 
 (defn- export-files
@@ -610,7 +600,6 @@
                  (let [object (->> (read-entry input entry)
                                    (decode-color)
                                    (validate-color))]
-                   (events/tap :progress {:section :color :id id :file-id file-id})
                    (if (= id (:id object))
                      (assoc result id object)
                      result)))
@@ -642,7 +631,6 @@
                                      (clean-component-pre-decode)
                                      (decode-component)
                                      (clean-component-post-decode))]
-                     (events/tap :progress {:section :component :id id :file-id file-id})
                      (if (= id (:id object))
                        (assoc result id object)
                        result)))
@@ -656,7 +644,6 @@
                  (let [object (->> (read-entry input entry)
                                    (decode-typography)
                                    (validate-typography))]
-                   (events/tap :progress {:section :typography :id id :file-id file-id})
                    (if (= id (:id object))
                      (assoc result id object)
                      result)))
@@ -666,7 +653,6 @@
 (defn- read-file-tokens-lib
   [{:keys [::bfc/input ::entries]} file-id]
   (when-let [entry (d/seek (match-tokens-lib-entry-fn file-id) entries)]
-    (events/tap :progress {:section :tokens-lib :file-id file-id})
     (->> (read-plain-entry input entry)
          (decode-tokens-lib)
          (validate-tokens-lib))))
@@ -692,7 +678,6 @@
                (let [page (->> (read-entry input entry)
                                (decode-page))
                      page (dissoc page :options)]
-                 (events/tap :progress {:section :page :id id :file-id file-id})
                  (when (= id (:id page))
                    (let [objects (read-file-shapes cfg file-id id)]
                      (assoc page :objects objects))))))
@@ -708,7 +693,6 @@
                  (let [object (->> (read-entry input entry)
                                    (decode-file-thumbnail)
                                    (validate-file-thumbnail))]
-
                    (if (and (= frame-id (:frame-id object))
                             (= page-id (:page-id object))
                             (= tag (:tag object)))
@@ -749,6 +733,8 @@
 
     (vswap! bfc/*state* update :index bfc/update-index media :id)
 
+    (events/tap :progress {:section :media :file-id file-id})
+
     (doseq [item media]
       (let [params (-> item
                        (update :id bfc/lookup-index)
@@ -756,8 +742,6 @@
                        (d/update-when :media-id bfc/lookup-index)
                        (d/update-when :thumbnail-id bfc/lookup-index))]
 
-        (events/tap :progress {:section :media :id (:id params) :file-id file-id})
-
         (l/dbg :hint "inserting media object"
                :file-id (str file-id')
                :id (str (:id params))
@@ -769,6 +753,8 @@
         (db/insert! conn :file-media-object params
                     ::db/on-conflict-do-nothing? (::bfc/overwrite cfg))))
 
+    (events/tap :progress {:section :thumbnails :file-id file-id})
+
     (doseq [item thumbnails]
       (let [media-id  (bfc/lookup-index (:media-id item))
             object-id (-> (assoc item :file-id file-id')
@@ -783,8 +769,6 @@
                :media-id (str media-id)
                ::l/sync? true)
 
-        (events/tap :progress {:section :thumbnail :file-id file-id :object-id object-id})
-
         (db/insert! conn :file-tagged-object-thumbnail params
                     ::db/on-conflict-do-nothing? true)))
 

backend/src/app/config.clj

@@ -82,14 +82,7 @@
    :initial-project-skey "initial-project"
 
    ;; time to avoid email sending after profile modification
-   :email-verify-threshold "15m"
-
-   :quotes-upload-sessions-per-profile 5
-   :quotes-upload-chunks-per-session 20
-
-   ;; SSRF protection
-   :ssrf-allowed-hosts #{}
-   :ssrf-extra-blocked-cidrs #{}})
+   :email-verify-threshold "15m"})
 
 (def schema:config
   (do #_sm/optional-keys
@@ -110,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]
@@ -161,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]
@@ -249,26 +239,17 @@
     [:objects-storage-fs-directory {:optional true} :string]
     [:objects-storage-s3-bucket {:optional true} :string]
     [:objects-storage-s3-region {:optional true} :keyword]
-    [:objects-storage-s3-endpoint {:optional true} ::sm/uri]
-
-    ;; SSRF protection
-    [:ssrf-allowed-hosts {:optional true} [::sm/set :string]]
-    [:ssrf-extra-blocked-cidrs {:optional true} [::sm/set :string]]]))
+    [:objects-storage-s3-endpoint {:optional true} ::sm/uri]]))
 
 (defn- parse-flags
   [config]
   (let [public-uri  (c/get config :public-uri)
         public-uri  (some-> public-uri (u/uri))
-        extra-flags (cond-> #{}
-                      ;; When public-uri is http (non-localhost), disable secure cookies
-                      (and public-uri
-                           (= (:scheme public-uri) "http")
-                           (not= (:host public-uri) "localhost"))
-                      (conj :disable-secure-session-cookies)
-
-                      ;; When telemetry-enabled config is true, add :telemetry flag
-                      (true? (c/get config :telemetry-enabled))
-                      (conj :enable-telemetry))]
+        extra-flags (if (and public-uri
+                             (= (:scheme public-uri) "http")
+                             (not= (:host public-uri) "localhost"))
+                      #{:disable-secure-session-cookies}
+                      #{})]
     (flags/parse flags/default extra-flags (:flags config))))
 
 (defn read-env
@@ -293,7 +274,7 @@
   (sm/explainer schema:config))
 
 (defn read-config
-  "Reads the configuration from environment variables and decodes all
+  "Reads the configuration from enviroment variables and decodes all
   known values."
   [& {:keys [prefix default] :or {prefix "penpot"}}]
   (->> (read-env prefix)
@@ -345,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/email.clj

@@ -31,25 +31,6 @@
    jakarta.mail.Transport
    java.util.Properties))
 
-(defn clean
-  "Clean and normalizes email address string"
-  [email]
-  (let [email (str/lower email)
-        email (if (str/starts-with? email "mailto:")
-                (subs email 7)
-                email)
-        email (if (or (str/starts-with? email "<")
-                      (str/ends-with? email ">"))
-                (str/trim email "<>")
-                email)]
-    email))
-
-(defn get-domain
-  [email]
-  (let [email      (clean email)
-        [_ domain] (str/split email "@" 2)]
-    domain))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; EMAIL IMPL
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -431,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]
-   [:organization-initials [:maybe :string]]
-   [:organization-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/features/file_snapshots.clj

@@ -112,9 +112,8 @@
                   THEN (c.deleted_at IS NULL OR c.deleted_at >= ?::timestamptz)
               END"))
 
-(defn get-snapshot-data
-  "Get a fully decoded snapshot for read-only preview or restoration.
-  Returns the snapshot map with decoded :data field."
+(defn- get-snapshot
+  "Get snapshot with decoded data"
   [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/assets.clj

@@ -12,56 +12,43 @@
    [app.common.time :as ct]
    [app.common.uri :as u]
    [app.db :as db]
-   [app.http.session :as session]
    [app.storage :as sto]
    [integrant.core :as ig]
    [yetti.response :as-alias yres]))
 
-(def ^:private default-cache-max-age
+(def ^:private cache-max-age
   (ct/duration {:hours 24}))
 
-(def ^:private default-signature-max-age
+(def ^:private signature-max-age
   (ct/duration {:hours 24 :minutes 15}))
 
-;; Buckets that are legitimately public and do not require authentication.
-;; These are used by public shared board viewing, profile photos in UI,
-;; and embedded export/binfile flows.
-(def ^:private public-buckets
-  #{"file-media-object"
-    "file-object-thumbnail"
-    "team-font-variant"
-    "file-data-fragment"})
-
 (defn get-id
   [{:keys [path-params]}]
   (or (some-> path-params :id d/parse-uuid)
       (ex/raise :type :not-found
-                :hint "object not found")))
+                :hunt "object not found")))
 
 (defn- get-file-media-object
   [pool id]
   (db/get pool :file-media-object {:id id} {::db/remove-deleted false}))
 
 (defn- serve-object-from-s3
-  [{:keys [::sto/storage ::signature-max-age ::cache-max-age] :as cfg} obj]
-  (let [sig-max-age (or signature-max-age default-signature-max-age)
-        cch-max-age (or cache-max-age default-cache-max-age)
-        {:keys [host port] :as url} (sto/get-object-url storage obj {:max-age sig-max-age})]
+  [{:keys [::sto/storage] :as cfg} obj]
+  (let [{:keys [host port] :as url} (sto/get-object-url storage obj {:max-age signature-max-age})]
     {::yres/status  307
      ::yres/headers {"location" (str url)
                      "x-host"   (cond-> host port (str ":" port))
                      "x-mtype"  (-> obj meta :content-type)
-                     "cache-control" (str "max-age=" (inst-ms cch-max-age))}}))
+                     "cache-control" (str "max-age=" (inst-ms cache-max-age))}}))
 
 (defn- serve-object-from-fs
-  [{:keys [::path ::cache-max-age]} obj]
-  (let [cch-max-age (or cache-max-age default-cache-max-age)
-        purl    (u/join (u/uri path)
+  [{:keys [::path]} obj]
+  (let [purl    (u/join (u/uri path)
                         (sto/object->relative-path obj))
         mdata   (meta obj)
         headers {"x-accel-redirect" (:path purl)
                  "content-type" (:content-type mdata)
-                 "cache-control" (str "max-age=" (inst-ms cch-max-age))}]
+                 "cache-control" (str "max-age=" (inst-ms cache-max-age))}]
     {::yres/status 204
      ::yres/headers headers}))
 
@@ -73,28 +60,14 @@
     (:s3 :assets-s3) (serve-object-from-s3 cfg obj)
     (:fs :assets-fs) (serve-object-from-fs cfg obj)))
 
-(defn- requires-auth?
-  "Check if the storage object requires authentication based on its bucket."
-  [obj]
-  (let [bucket (-> obj meta :bucket)]
-    (not (contains? public-buckets bucket))))
-
 (defn objects-handler
-  "Handler that serves storage objects by id.
-   For non-public buckets (e.g. profile), requires an authenticated session."
+  "Handler that servers storage objects by id."
   [{:keys [::sto/storage] :as cfg} request]
   (let [id  (get-id request)
         obj (sto/get-object storage id)]
-    (cond
-      (nil? obj)
-      {::yres/status 404}
-
-      (and (requires-auth? obj)
-           (nil? (::session/profile-id request)))
-      {::yres/status 401}
-
-      :else
-      (serve-object cfg obj))))
+    (if obj
+      (serve-object cfg obj)
+      {::yres/status 404})))
 
 (defn- generic-handler
   "A generic handler helper/common code for file-media based handlers."
@@ -123,12 +96,11 @@
 (defmethod ig/assert-key ::routes
   [_ params]
   (assert (sto/valid-storage? (::sto/storage params)) "expected valid storage instance")
-  (assert (session/manager? (::session/manager params)) "expected valid session manager")
   (assert (string? (::path params))))
 
 (defmethod ig/init-key ::routes
   [_ cfg]
-  ["/assets" {:middleware [[session/authz cfg]]}
+  ["/assets"
    ["/by-id/:id" {:handler (partial objects-handler cfg)}]
    ["/by-file-media-id/:id" {:handler (partial file-objects-handler cfg)}]
    ["/by-file-media-id/:id/thumbnail" {:handler (partial file-thumbnails-handler cfg)}]])

backend/src/app/http/awsns.clj

@@ -53,7 +53,7 @@
         (let [surl   (get body "SubscribeURL")
               stopic (get body "TopicArn")]
           (l/info :action "subscription received" :topic stopic :url surl)
-          (http/req cfg {:uri surl :method :post :timeout 10000} {:sync? true}))
+          (http/req! cfg {:uri surl :method :post :timeout 10000} {:sync? true}))
 
         (= mtype "Notification")
         (when-let [message (parse-json (get body "Message"))]

backend/src/app/http/client.clj

@@ -5,24 +5,13 @@
 ;; Copyright (c) KALEIDOS INC
 
 (ns app.http.client
-  "Http client abstraction layer.
-
-   All outbound requests made through `req` and `req-with-redirects`
-   are validated against the SSRF blocklist by default. Pass
-   `:skip-ssrf-check? true` in the options map only when the target
-   is a well-known, operator-configured endpoint that cannot be
-   influenced by user input (e.g. internal telemetry, error webhooks)."
+  "Http client abstraction layer."
   (:require
    [app.common.schema :as sm]
-   [app.util.ssrf :as ssrf]
-   [cuerdas.core :as str]
    [integrant.core :as ig]
    [java-http-clj.core :as http])
   (:import
-   java.net.http.HttpClient
-   java.net.URI))
-
-(def default-max-redirects 5)
+   java.net.http.HttpClient))
 
 (defn client?
   [o]
@@ -34,8 +23,8 @@
 
 (defmethod ig/init-key ::client
   [_ _]
-  (http/build-client {:connect-timeout 30000
-                      :follow-redirects :never}))
+  (http/build-client {:connect-timeout 30000 ;; 10s
+                      :follow-redirects :always}))
 
 (defn send!
   ([client req] (send! client req {}))
@@ -55,82 +44,14 @@
     :else
     (throw (UnsupportedOperationException. "invalid arguments"))))
 
-(defn req
-  "Issue a single HTTP request.  SSRF validation is applied to the
-   target URI by default; pass `:skip-ssrf-check? true` in `options`
-   to bypass it for known-safe, operator-configured endpoints."
+(defn req!
+  "A convencience toplevel function for gradual migration to a new API
+  convention."
   ([cfg-or-client request]
-   (req cfg-or-client request {}))
-  ([cfg-or-client request {:keys [skip-ssrf-check?] :as options}]
-   (let [request (if skip-ssrf-check?
-                   (update request :uri str)
-                   (update request :uri ssrf/validate-uri))
-         client  (resolve-client cfg-or-client)]
-     (send! client request (dissoc options :skip-ssrf-check?)))))
-
-(defn- resolve-location
-  "Resolve a Location header value against the original request URI.
-   Handles:
-     - Absolute URLs (http:// or https://) — returned as-is.
-     - Protocol-relative URLs (//host/path) — inherit the scheme from base-uri.
-     - Path-absolute and relative URLs — resolved against base-uri via URI.resolve."
-  [^String base-uri ^String location]
-  (cond
-    (or (str/starts-with? location "http://")
-        (str/starts-with? location "https://"))
-    location
-
-    (str/starts-with? location "//")
-    (let [scheme (.getScheme (URI. base-uri))]
-      (str scheme ":" location))
-
-    :else
-    (str (.resolve (URI. base-uri) location))))
-
-(defn- redirect-request
-  "Build the next request for a 3xx redirect.
-   Per RFC 7231 §6.4:
-     - 303 always issues GET (body dropped).
-     - 301/302 with non-GET/HEAD methods: downgrade to GET (body dropped).
-     - 307/308 preserve the original method and body.
-   The Location URI has already been resolved by the caller."
-  [orig-request ^String next-uri status]
-  (let [method (:method orig-request)]
-    (if (or (= status 303)
-            (and (contains? #{301 302} status)
-                 (not (contains? #{:get :head} method))))
-      ;; Downgrade to GET, drop body and content-type
-      (-> orig-request
-          (assoc :uri next-uri :method :get)
-          (dissoc :body)
-          (update :headers dissoc "content-type" "content-length"))
-      ;; Preserve method/body (307, 308, or GET/HEAD 301/302)
-      (assoc orig-request :uri next-uri))))
-
-(defn req-with-redirects
-  "Like `req`, but follows up to `max-redirects` HTTP 3xx redirects.
-   SSRF validation is applied before every hop (initial request and
-   each redirect target) unless `:skip-ssrf-check? true` is passed.
-   Redirect semantics follow RFC 7231 §6.4: 301/302 POST is downgraded
-   to GET; 303 always uses GET; 307/308 preserve the original method."
-  ([cfg-or-client request]
-   (req-with-redirects cfg-or-client request {}))
-  ([cfg-or-client request {:keys [max-redirects skip-ssrf-check?]
-                           :or   {max-redirects default-max-redirects}
-                           :as opts}]
-   (let [send-opts  (dissoc opts :max-redirects :skip-ssrf-check?)
-         uri-coerce (if skip-ssrf-check? str ssrf/validate-uri)]
-     (loop [current-req (update request :uri uri-coerce)
-            hops        0]
-       (let [client (resolve-client cfg-or-client)
-             resp   (send! client current-req send-opts)
-             status (:status resp)]
-         (if (and (<= 300 status 399)
-                  (< hops max-redirects))
-           (if-let [location (get-in resp [:headers "location"])]
-             (let [next-uri (resolve-location (str (:uri current-req)) location)]
-               (recur (update (redirect-request current-req next-uri status) :uri uri-coerce)
-                      (inc hops)))
-             ;; No Location header on a 3xx — return the response as-is
-             resp)
-           resp))))))
+   (let [client  (resolve-client cfg-or-client)
+         request (update request :uri str)]
+     (send! client request {})))
+  ([cfg-or-client request options]
+   (let [client  (resolve-client cfg-or-client)
+         request (update request :uri str)]
+     (send! client request options))))

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/sse.clj

@@ -21,7 +21,7 @@
 
 (defn- write!
   [^OutputStream output ^bytes data]
-  (l/trc :hint "writing data" :data data :length (alength data))
+  (l/trc :hint "writting data" :data data :length (alength data))
   (.write output data)
   (.flush output))
 
@@ -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

@@ -16,12 +16,12 @@
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
-   [app.email :as email]
    [app.http :as-alias http]
    [app.http.access-token :as-alias actoken]
    [app.loggers.audit.tasks :as-alias tasks]
    [app.loggers.webhooks :as-alias webhooks]
    [app.rpc :as-alias rpc]
+   [app.rpc.retry :as rtry]
    [app.setup :as-alias setup]
    [app.util.inet :as inet]
    [app.util.services :as-alias sv]
@@ -33,63 +33,6 @@
 ;; HELPERS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def ^:private filter-auth-events
-  #{"login-with-oidc" "login-with-password" "register-profile" "update-profile"})
-
-(def ^:private safe-backend-context-keys
-  #{:version
-    :initiator
-    :client-version
-    :client-user-agent})
-
-(def ^:private safe-frontend-context-keys
-  #{:version
-    :locale
-    :browser
-    :browser-version
-    :engine
-    :engine-version
-    :os
-    :os-version
-    :device-type
-    :device-arch
-    :screen-width
-    :screen-height
-    :screen-color-depth
-    :screen-orientation
-    :event-origin
-    :event-namespace
-    :event-symbol})
-
-(def profile-props
-  [:id
-   :is-active
-   :is-muted
-   :auth-backend
-   :email
-   :default-team-id
-   :default-project-id
-   :fullname
-   :lang])
-
-(def ^:private event-keys
-  #{:id
-    :name
-    :type
-    :profile-id
-    :ip-addr
-    :props
-    :context
-    :source
-    :tracked-at
-    :created-at})
-
-(def reserved-props
-  #{:session-id
-    :password
-    :old-password
-    :token})
-
 (defn extract-utm-params
   "Extracts additional data from params and namespace them under
   `penpot` ns."
@@ -104,6 +47,17 @@
                 (assoc (->> sk str/kebab (keyword "penpot")) v))))]
     (reduce-kv process-param {} params)))
 
+(def profile-props
+  [:id
+   :is-active
+   :is-muted
+   :auth-backend
+   :email
+   :default-team-id
+   :default-project-id
+   :fullname
+   :lang])
+
 (defn profile->props
   [profile]
   (-> profile
@@ -111,6 +65,12 @@
       (merge (:props profile))
       (d/without-nils)))
 
+(def reserved-props
+  #{:session-id
+    :password
+    :old-password
+    :token})
+
 (defn clean-props
   [props]
   (into {}
@@ -160,17 +120,16 @@
 ;; an external storage and data cleared.
 
 (def ^:private schema:event
-  [:map {:title "AuditEvent"}
-   [:id {:optional true} ::sm/uuid]
-   [:type ::sm/text]
-   [:name ::sm/text]
-   [:profile-id ::sm/uuid]
-   [:props [:map-of :keyword :any]]
-   [:context [:map-of :keyword :any]]
-   [:tracked-at ::ct/inst]
-   [:created-at ::ct/inst]
-   [:source ::sm/text]
-   [:ip-addr {:optional true} ::sm/text]
+  [:map {:title "event"}
+   [::type ::sm/text]
+   [::name ::sm/text]
+   [::profile-id ::sm/uuid]
+   [::ip-addr {:optional true} ::sm/text]
+   [::props {:optional true} [:map-of :keyword :any]]
+   [::context {:optional true} [:map-of :keyword :any]]
+   [::tracked-at {:optional true} ::ct/inst]
+   [::created-at {:optional true} ::ct/inst]
+   [::source {:optional true} ::sm/text]
    [::webhooks/event? {:optional true} ::sm/boolean]
    [::webhooks/batch-timeout {:optional true} ::ct/duration]
    [::webhooks/batch-key {:optional true}
@@ -182,156 +141,7 @@
 (def valid-event?
   (sm/validator schema:event))
 
-(defn- prepare-context-from-request
-  "Prepare backend event context from request"
-  [request]
-  (let [client-event-origin (get-client-event-origin request)
-        client-version      (get-client-version request)
-        client-user-agent   (get-client-user-agent request)
-        session-id          (get-external-session-id request)
-        key-id              (::http/auth-key-id request)
-        token-id            (::actoken/id request)
-        token-type          (::actoken/type request)]
-    {:external-session-id session-id
-     :initiator (or key-id "app")
-     :access-token-id (some-> token-id str)
-     :access-token-type (some-> token-type str)
-     :client-event-origin client-event-origin
-     :client-user-agent client-user-agent
-     :client-version client-version
-     :version (:full cf/version)}))
-
-(defn- append-audit-entry
-  [cfg params]
-  (let [params (-> params
-                   (assoc :id (uuid/next))
-                   (update :props db/tjson)
-                   (update :context db/tjson)
-                   (update :ip-addr db/inet))
-        params (select-keys params event-keys)]
-    (db/insert! cfg :audit-log params)))
-
-(def ^:private xf:filter-telemetry-props
-  "Transducer that keeps only map entries whose values are UUIDs,
-  booleans or numbers."
-  (filter (fn [[k v]]
-            (and (simple-keyword? k)
-                 (or (uuid? v) (boolean? v) (number? v))))))
-
-(declare filter-telemetry-props)
-(declare filter-telemetry-context)
-
-(defn- process-event
-  [cfg event]
-  (when (contains? cf/flags :audit-log-logger)
-    (l/log! ::l/logger "app.audit"
-            ::l/level :info
-            :profile-id (str (:profile-id event))
-            :ip-addr (str (:ip-addr event))
-            :type (:type event)
-            :name (:name event)
-            :props (json/encode (:props event) :key-fn json/write-camel-key)
-            :context (json/encode (:context event) :key-fn json/write-camel-key)))
-
-  (when (contains? cf/flags :audit-log)
-    (append-audit-entry cfg event))
-
-  (when (contains? cf/flags :telemetry)
-    ;; NOTE: when both audit-log and telemetry are enabled, events are stored
-    ;; twice: once with full details (above) and once stripped of props and
-    ;; ip-addr, tagged with source="telemetry" so the telemetry task can
-    ;; collect and ship them.  The profile-id is preserved (UUIDs are already
-    ;; anonymous random identifiers).  Only a safe subset of context fields
-    ;; is kept: initiator, version, client-version and client-user-agent.
-    ;; Timestamps are truncated to day precision to avoid leaking exact event
-    ;; timing.
-    (let [event (-> event
-                    (filter-telemetry-props)
-                    (filter-telemetry-context)
-                    (update :created-at ct/truncate :days)
-                    (update :tracked-at ct/truncate :days)
-                    (assoc :source "telemetry:backend")
-                    (assoc :ip-addr "0.0.0.0"))]
-      (append-audit-entry cfg event)))
-
-  (when (and (contains? cf/flags :webhooks)
-             (::webhooks/event? event))
-    (let [batch-key     (::webhooks/batch-key event)
-          batch-timeout (::webhooks/batch-timeout event)
-          label         (dm/str "rpc:" (:name event))
-          label         (cond
-                          (ifn? batch-key)    (dm/str label ":" (batch-key (::rpc/params event)))
-                          (string? batch-key) (dm/str label ":" batch-key)
-                          :else               label)
-          dedupe?       (boolean (and batch-key batch-timeout))]
-
-      (wrk/submit! (-> cfg
-                       (assoc ::wrk/task :process-webhook-event)
-                       (assoc ::wrk/queue :webhooks)
-                       (assoc ::wrk/max-retries 0)
-                       (assoc ::wrk/delay (or batch-timeout 0))
-                       (assoc ::wrk/dedupe dedupe?)
-                       (assoc ::wrk/label label)
-                       (assoc ::wrk/params (-> event
-                                               (d/without-qualified)
-                                               (dissoc :source)
-                                               (dissoc :context)
-                                               (dissoc :ip-addr)
-                                               (dissoc :type)))))))
-  event)
-
-(defn submit*
-  "A public API, lower-level than submit, assumes all required fields are filled"
-  [cfg event]
-  (try
-    (let [event (check-event event)]
-      (db/tx-run! cfg process-event event))
-    (catch Throwable cause
-      (l/error :hint "unexpected error processing event" :cause cause))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; PUBLIC API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn filter-telemetry-props
-  [{:keys [source name props type] :as params}]
-  (cond
-    (or (and (= source "frontend")
-             (= type "identify"))
-        (and (= source "backend")
-             (filter-auth-events name)))
-
-    (let [props' (into {} xf:filter-telemetry-props props)
-          props' (-> props'
-                     (assoc :lang (:lang props))
-                     (assoc :auth-backend (:auth-backend props))
-                     (assoc :email-domain (email/get-domain (:email props)))
-                     (d/without-nils))]
-      (assoc params :props props'))
-
-    (and (= source "backend")
-         (= type "trigger")
-         (= name "instance-start"))
-    params
-
-    (and (= source "frontend")
-         (= type "action")
-         (= name "navigate"))
-    (assoc params :props (select-keys props [:route :file-id :team-id :page-id]))
-
-    :else
-    (let [props (into {} xf:filter-telemetry-props props)]
-      (assoc params :props props))))
-
-(defn filter-telemetry-context
-  [{:keys [source context] :as params}]
-  (let [context (case source
-                  "backend"  (select-keys context safe-backend-context-keys)
-                  "frontend" (select-keys context safe-frontend-context-keys)
-                  {})]
-    (assoc params :context context)))
-
-(defn prepare-rpc-event
+(defn prepare-event
   [cfg mdata params result]
   (let [resultm      (meta result)
         request      (-> params meta ::http/request)
@@ -344,29 +154,23 @@
                              (merge params (::props resultm)))
                          (clean-props))
 
-        context      (-> (::context resultm)
-                         (merge (prepare-context-from-request request))
-                         (assoc :request-id (::rpc/request-id params))
-                         (d/without-nils))
-
+        context      (merge (::context resultm)
+                            (prepare-context-from-request request))
         ip-addr      (inet/parse-request request)
         module       (get cfg ::rpc/module)]
 
-    {:type (or (::type resultm)
-               (::rpc/type cfg))
-     :name (or (::name resultm)
-               (let [sname (::sv/name mdata)]
-                 (if (not= module "main")
-                   (str module "-" sname)
-                   sname)))
+    {::type (or (::type resultm)
+                (::rpc/type cfg))
+     ::name (or (::name resultm)
+                (let [sname (::sv/name mdata)]
+                  (if (not= module "main")
+                    (str module "-" sname)
+                    sname)))
 
-     :profile-id profile-id
-     :ip-addr ip-addr
-     :props props
-     :context context
-
-     :created-at (::rpc/request-at params)
-     :tracked-at (::rpc/request-at params)
+     ::profile-id profile-id
+     ::ip-addr ip-addr
+     ::props props
+     ::context context
 
      ;; NOTE: for batch-key lookup we need the params as-is
      ;; because the rpc api does not need to know the
@@ -386,49 +190,148 @@
          (::webhooks/event? resultm)
          false)}))
 
+(defn- prepare-context-from-request
+  "Prepare backend event context from request"
+  [request]
+  (let [client-event-origin (get-client-event-origin request)
+        client-version      (get-client-version request)
+        client-user-agent   (get-client-user-agent request)
+        session-id          (get-external-session-id request)
+        key-id              (::http/auth-key-id request)
+        token-id            (::actoken/id request)
+        token-type          (::actoken/type request)]
+    (d/without-nils
+     {:external-session-id session-id
+      :initiator (or key-id "app")
+      :access-token-id (some-> token-id str)
+      :access-token-type (some-> token-type str)
+      :client-event-origin client-event-origin
+      :client-user-agent client-user-agent
+      :client-version client-version
+      :version (:full cf/version)})))
+
 (defn event-from-rpc-params
   "Create a base event skeleton with pre-filled some important
   data that can be extracted from RPC params object"
   [params]
-  (let [context    (some-> params meta ::http/request prepare-context-from-request)
-        context    (assoc context :request-id (::rpc/request-id params))
-        request-at (::rpc/request-at params)]
-    {:type "action"
-     :profile-id (::rpc/profile-id params)
-     :created-at request-at
-     :tracked-at request-at
-     :ip-addr (::rpc/ip-addr params)
-     :context (d/without-nils context)}))
+  (let [context (some-> params meta ::http/request prepare-context-from-request)
+        event   {::type "action"
+                 ::profile-id (or (::rpc/profile-id params) uuid/zero)
+                 ::ip-addr (::rpc/ip-addr params)}]
+    (cond-> event
+      (some? context)
+      (assoc ::context context))))
 
-(defn submit
-  "Submit an event to be registered under audit-log subsystem"
+(defn- event->params
+  [event]
+  (let [params {:id (uuid/next)
+                :name (::name event)
+                :type (::type event)
+                :profile-id (::profile-id event)
+                :ip-addr (::ip-addr event)
+                :context (::context event {})
+                :props (::props event {})
+                :source "backend"}
+        tnow   (::tracked-at event)]
+
+    (cond-> params
+      (some? tnow)
+      (assoc :tracked-at tnow))))
+
+(defn- append-audit-entry
+  [cfg params]
+  (let [params (-> params
+                   (update :props db/tjson)
+                   (update :context db/tjson)
+                   (update :ip-addr db/inet))]
+    (db/insert! cfg :audit-log params)))
+
+(defn- handle-event!
   [cfg event]
-  (let [tnow  (ct/now)
-        event (-> event
-                  (assoc :created-at tnow)
-                  (update :profile-id d/nilv uuid/zero)
-                  (update :tracked-at d/nilv tnow)
-                  (update :ip-addr d/nilv "0.0.0.0")
-                  (update :props d/nilv {})
-                  (update :context d/nilv {})
-                  (assoc :source "backend")
-                  (d/without-nils))]
-    (submit* cfg event)))
+  (let [tnow   (ct/now)
+        params (-> (event->params event)
+                   (assoc :created-at tnow)
+                   (update :tracked-at #(or % tnow)))]
 
-(defn insert
+    (when (contains? cf/flags :audit-log-logger)
+      (l/log! ::l/logger "app.audit"
+              ::l/level :info
+              :profile-id (str (::profile-id event))
+              :ip-addr (str (::ip-addr event))
+              :type (::type event)
+              :name (::name event)
+              :props (json/encode (::props event) :key-fn json/write-camel-key)
+              :context (json/encode (::context event) :key-fn json/write-camel-key)))
+
+    (when (contains? cf/flags :audit-log)
+      ;; NOTE: this operation may cause primary key conflicts on inserts
+      ;; because of the timestamp precission (two concurrent requests), in
+      ;; this case we just retry the operation.
+      (append-audit-entry cfg params))
+
+    (when (and (or (contains? cf/flags :telemetry)
+                   (cf/get :telemetry-enabled))
+               (not (contains? cf/flags :audit-log)))
+      ;; NOTE: this operation may cause primary key conflicts on inserts
+      ;; because of the timestamp precission (two concurrent requests), in
+      ;; this case we just retry the operation.
+      ;;
+      ;; NOTE: this is only executed when general audit log is disabled
+      (let [params (-> params
+                       (assoc :props {})
+                       (assoc :context {}))]
+        (append-audit-entry cfg params)))
+
+    (when (and (contains? cf/flags :webhooks)
+               (::webhooks/event? event))
+      (let [batch-key     (::webhooks/batch-key event)
+            batch-timeout (::webhooks/batch-timeout event)
+            label         (dm/str "rpc:" (:name params))
+            label         (cond
+                            (ifn? batch-key)    (dm/str label ":" (batch-key (::rpc/params event)))
+                            (string? batch-key) (dm/str label ":" batch-key)
+                            :else               label)
+            dedupe?       (boolean (and batch-key batch-timeout))]
+
+        (wrk/submit! (-> cfg
+                         (assoc ::wrk/task :process-webhook-event)
+                         (assoc ::wrk/queue :webhooks)
+                         (assoc ::wrk/max-retries 0)
+                         (assoc ::wrk/delay (or batch-timeout 0))
+                         (assoc ::wrk/dedupe dedupe?)
+                         (assoc ::wrk/label label)
+                         (assoc ::wrk/params (-> params
+                                                 (dissoc :source)
+                                                 (dissoc :context)
+                                                 (dissoc :ip-addr)
+                                                 (dissoc :type)))))))
+    params))
+
+(defn submit!
+  "Submit audit event to the collector."
+  [cfg event]
+  (try
+    (let [event (-> (d/without-nils event)
+                    (check-event))
+          cfg   (-> cfg
+                    (assoc ::rtry/when rtry/conflict-exception?)
+                    (assoc ::rtry/max-retries 6)
+                    (assoc ::rtry/label "persist-audit-log"))]
+      (rtry/invoke! cfg db/tx-run! handle-event! event))
+    (catch Throwable cause
+      (l/error :hint "unexpected error processing event" :cause cause))))
+
+(defn insert!
   "Submit audit event to the collector, intended to be used only from
   command line helpers because this skips all webhooks and telemetry
   logic."
   [cfg event]
   (when (contains? cf/flags :audit-log)
-    (let [tnow  (ct/now)
-          event (-> event
-                    (assoc :created-at tnow)
-                    (update :tracked-at d/nilv tnow)
-                    (update :profile-id d/nilv uuid/zero)
-                    (update :props d/nilv {})
-                    (update :context d/nilv {})
-                    (assoc :source "backend")
-                    (select-keys event-keys)
+    (let [event (-> (d/without-nils event)
                     (check-event))]
-      (db/run! cfg append-audit-entry event))))
+      (db/run! cfg (fn [cfg]
+                     (let [tnow   (ct/now)
+                           params (-> (event->params event)
+                                      (assoc :created-at tnow)
+                                      (update :tracked-at #(or % tnow)))]
+                       (append-audit-entry cfg params)))))))

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 {:skip-ssrf-check? true})]
-
+        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 :backend/host (cf/get :host))
-                 (assoc :backend/public-uri (str (cf/get :public-uri)))
+                 (assoc :service/tenant (cf/get :tenant))
+                 (assoc :service/host (cf/get :host))
+                 (assoc :service/public-uri (str (cf/get :public-uri)))
                  (assoc :backend/version (:full cf/version))
                  (assoc :logger/name logger)
                  (assoc :logger/level level)
@@ -97,7 +97,7 @@
       (l/warn :hint "unexpected exception on database error logger" :cause cause))))
 
 (defn- audit-event->report
-  [{:keys [context props ip-addr] :as record}]
+  [{:keys [::audit/context ::audit/props ::audit/ip-addr] :as record}]
   (let [context
         (reduce-kv (fn [context k v]
                      (let [k' (keyword "frontend" (name k))]
@@ -117,14 +117,14 @@
 
     {:context (-> (into (sorted-map) context)
                   (pp/pprint-str :length 50))
-     :origin  (:name record)
+     :origin  (::audit/name record)
      :href    (get props :href)
      :hint    (get props :hint)
      :report  (get props :report)}))
 
 (defn- handle-audit-event
   "Convert the log record into a report object and persist it on the database"
-  [{:keys [::db/pool]} {:keys [id] :as event}]
+  [{:keys [::db/pool]} {:keys [::audit/id] :as event}]
   (try
     (let [uri    (cf/get :public-uri)
           report (-> event audit-event->report d/without-nils)]
@@ -189,12 +189,12 @@
                          (::l/id item)
                          (handle-log-record cfg item)
 
+                         (::audit/id item)
+                         (handle-audit-event cfg item)
+
                          (::rlimit/id item)
                          (handle-rlimit-event cfg item)
 
-                         (-> item meta ::audit/event)
-                         (handle-audit-event cfg item)
-
                          :else
                          (l/warn :hint "received unexpected item" :item item))
 
@@ -226,3 +226,4 @@
   [cfg event]
   (when-let [{:keys [::input]} (get cfg ::reporter)]
     (sp/put! input event)))
+

backend/src/app/loggers/mattermost.clj

@@ -52,12 +52,12 @@
                          trace
                          "```")))
 
-        resp (http/req cfg
-                       {:uri (cf/get :error-report-webhook)
-                        :method :post
-                        :headers {"content-type" "application/json"}
-                        :body (json/encode-str {:text text})}
-                       {:sync? true})]
+        resp (http/req! cfg
+                        {:uri (cf/get :error-report-webhook)
+                         :method :post
+                         :headers {"content-type" "application/json"}
+                         :body (json/encode-str {:text text})}
+                        {:sync? true})]
 
     (when (not= 200 (:status resp))
       (l/warn :hint "error on sending data"
@@ -83,7 +83,7 @@
      :trace            (ex/format-throwable cause :detail? false :header? false)}))
 
 (defn- audit-event->report
-  [{:keys [context props id] :as event}]
+  [{:keys [::audit/context ::audit/props ::audit/id] :as event}]
   {:id               id
    :type             "exception"
    :origin           "audit-log"
@@ -92,7 +92,7 @@
    :host             (cf/get :host)
    :backend-version  (:full cf/version)
    :frontend-version (:version context)
-   :profile-id       (:profile-id event)
+   :profile-id       (:audit/profile-id event)
    :href             (get props :href)})
 
 (defn- rlimit-event->report
@@ -148,12 +148,12 @@
                              (::l/id item)
                              (handle-event cfg item log-record->report)
 
+                             (::audit/id item)
+                             (handle-event cfg item audit-event->report)
+
                              (::rlimit/id item)
                              (handle-event cfg item rlimit-event->report)
 
-                             (-> item meta ::audit/event)
-                             (handle-event cfg item audit-event->report)
-
                              :else
                              (l/warn :hint "received unexpected item" :item item)))
 

backend/src/app/loggers/webhooks.clj

@@ -70,14 +70,14 @@
   (fn [{:keys [props] :as task}]
 
     (let [items (lookup-webhooks cfg props)
-          event {:profile-id (:profile-id props)
-                 :name "webhook"
-                 :type "trigger"
-                 :props {:name (get props :name)
-                         :event-id (get props :id)
-                         :total-affected (count items)}}]
+          event {::audit/profile-id (:profile-id props)
+                 ::audit/name "webhook"
+                 ::audit/type "trigger"
+                 ::audit/props {:name (get props :name)
+                                :event-id (get props :id)
+                                :total-affected (count items)}}]
 
-      (audit/insert cfg event)
+      (audit/insert! cfg event)
 
       (when items
         (l/trc :hint "webhooks found for event" :total (count items))
@@ -159,7 +159,7 @@
                    :method :post
                    :body body}]
           (try
-            (let [rsp (http/req cfg req {:response-type :input-stream :sync? true})
+            (let [rsp (http/req! cfg req {:response-type :input-stream :sync? true})
                   err (interpret-response rsp)]
               (report-delivery! whook req rsp err)
               (update-webhook! whook err))
@@ -190,11 +190,4 @@
     "invalid-uri"
 
     (instance? java.net.http.HttpConnectTimeoutException cause)
-    "timeout"
-
-    :else
-    (let [data (ex-data cause)]
-      (if (and (= :validation (:type data))
-               (= :ssrf-blocked-target (:code data)))
-        (str "blocked-request:" (:hint data))
-        nil))))
+    "timeout"))

backend/src/app/main.clj

@@ -304,11 +304,10 @@
     ::session/manager (ig/ref ::session/manager)}
 
    :app.http.assets/routes
-   {::http.assets/path              (cf/get :assets-path)
-    ::http.assets/cache-max-age     (ct/duration {:hours 24})
-    ::http.assets/signature-max-age (ct/duration {:hours 24 :minutes 15})
-    ::sto/storage                   (ig/ref ::sto/storage)
-    ::session/manager               (ig/ref ::session/manager)}
+   {::http.assets/path  (cf/get :assets-path)
+    ::http.assets/cache-max-age (ct/duration {:hours 24})
+    ::http.assets/cache-max-agesignature-max-age (ct/duration {:hours 24 :minutes 5})
+    ::sto/storage  (ig/ref ::sto/storage)}
 
    ::rpc/climit
    {::mtx/metrics        (ig/ref ::mtx/metrics)
@@ -389,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)
@@ -425,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)}
@@ -471,17 +466,16 @@
 
    ::setup/shared-keys
    {::setup/props (ig/ref ::setup/props)
-    :nexus        (cf/get :nexus-shared-key)
-    :nitrate      (cf/get :nitrate-shared-key)
-    :exporter     (cf/get :exporter-shared-key)}
+    :nitrate (cf/get :nitrate-shared-key)
+    :exporter (cf/get :exporter-shared-key)}
 
    ::setup/clock
    {}
 
    :app.loggers.audit.archive-task/handler
-   {::setup/shared-keys  (ig/ref ::setup/shared-keys)
-    ::http.client/client (ig/ref ::http.client/client)
-    ::db/pool            (ig/ref ::db/pool)}
+   {::setup/props        (ig/ref ::setup/props)
+    ::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)}
@@ -549,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}
 
@@ -659,8 +650,9 @@
   [& _args]
   (try
     (let [p (promise)]
-      (l/inf :hint "start nrepl server" :port 6064)
-      (nrepl/start-server :bind "0.0.0.0" :port 6064)
+      (when (contains? cf/flags :nrepl-server)
+        (l/inf :hint "start nrepl server" :port 6064)
+        (nrepl/start-server :bind "0.0.0.0" :port 6064))
 
       (start)
       (deref p))

backend/src/app/media.clj

@@ -18,7 +18,6 @@
    [app.config :as cf]
    [app.db :as-alias db]
    [app.http.client :as http]
-   [app.media.sanitize :as sanitize]
    [app.storage :as-alias sto]
    [app.storage.tmp :as tmp]
    [buddy.core.bytes :as bb]
@@ -55,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!
@@ -326,11 +325,9 @@
 
     (let [{:keys [body] :as response}
           (try
-            (http/req-with-redirects
-             client
-             {:method :get :uri uri}
-             {:response-type :input-stream
-              :max-redirects 3})
+            (http/req! client
+                       {:method :get :uri uri}
+                       {:response-type :input-stream})
             (catch java.net.ConnectException cause
               (ex/raise :type :validation
                         :code :unable-to-download-image
@@ -361,11 +358,9 @@
                   :code :mismatch-write-size
                   :hint "unexpected state: unable to write to file"))
 
-      ;; Sanitize: strip trailing data after image EOF markers
-      (let [new-size (sanitize/truncate-after-eof path mtype)]
-        {:path  path
-         :mtype mtype
-         :size  new-size}))))
+      {;; :size size
+       :path path
+       :mtype mtype})))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; FONTS
@@ -414,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]
@@ -479,27 +458,4 @@
 
               (= stype :ttf)
               (-> (assoc "font/otf" (ttf->otf 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))))))))
+                  (assoc "font/ttf" sfnt)))))))))

backend/src/app/media/sanitize.clj

@@ -1,191 +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.media.sanitize
-  "Image EOF truncation helpers — strips trailing data after image EOF
-   markers to prevent exfiltration of non-image bytes appended to
-   valid image files."
-  (:require
-   [app.common.buffer :as buf]
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.util.nio :as nio])
-  (:import
-   java.nio.ByteOrder
-   java.nio.channels.FileChannel))
-
-(set! *warn-on-reflection* true)
-
-(defn- scan-backwards
-  "Scan byte array `arr` backwards (from the end) for the byte pattern
-   `marker`. Returns the index in `arr` where the marker starts, or -1
-   if not found."
-  [^bytes arr ^bytes marker]
-  (let [arr-len    (alength arr)
-        marker-len (alength marker)]
-    (loop [i (- arr-len marker-len)]
-      (if (< i 0)
-        -1
-        (if (loop [j 0]
-              (if (>= j marker-len)
-                true
-                (if (= (aget arr (+ i j)) (aget marker j))
-                  (recur (inc j))
-                  false)))
-          i
-          (recur (dec i)))))))
-
-(defn- find-last-png-iend
-  "Find the byte offset of the end of the PNG IEND chunk (12 bytes:
-   4-byte length + 4-byte 'IEND' + 4-byte CRC32). Returns the offset
-   AFTER the CRC32, or nil if not found."
-  [^FileChannel channel]
-  (let [size (nio/channel-size channel)]
-    (when (> size 8)
-      (let [buf-size (min (int size) (* 1024 1024))
-            marker   (byte-array [0x49 0x45 0x4E 0x44])] ;; "IEND"
-        (loop [pos (max 0 (- size buf-size))]
-          (when (< pos size)
-            (let [arr (nio/read-at channel pos buf-size)
-                  idx (scan-backwards arr marker)]
-              (if (neg? idx)
-                ;; Not found in this chunk, try earlier
-                (let [next-pos (max 0 (- pos (- buf-size 4)))]
-                  (when (< next-pos pos)
-                    (recur next-pos)))
-                ;; Found "IEND" at idx. Chunk starts 4 bytes before.
-                (let [chunk-start (- (+ pos idx) 4)]
-                  (when (>= chunk-start 0)
-                    ;; PNG chunk length is big-endian (network byte order).
-                    ;; buf/wrap defaults to little-endian, so set it to big-endian.
-                    (let [len-arr (nio/read-at channel chunk-start 4)
-                          len-buf (buf/set-order (buf/wrap len-arr) ByteOrder/BIG_ENDIAN)
-                          chunk-len (buf/read-int len-buf 0)]
-                      (when (zero? chunk-len)
-                        (+ chunk-start 12)))))))))))))
-
-(defn- find-last-jpeg-eoi
-  "Find the byte offset of the last JPEG EOI marker (0xFF 0xD9).
-   Returns the offset AFTER the marker, or nil if not found."
-  [^FileChannel channel]
-  (let [size (nio/channel-size channel)]
-    (when (> size 2)
-      (let [buf-size (min (int size) (* 1024 1024))
-            marker   (byte-array [(unchecked-byte 0xFF) (unchecked-byte 0xD9)])]
-        (loop [pos (max 0 (- size buf-size))]
-          (when (< pos size)
-            (let [arr (nio/read-at channel pos buf-size)
-                  idx (scan-backwards arr marker)]
-              (if (neg? idx)
-                (let [next-pos (max 0 (- pos (- buf-size 2)))]
-                  (when (< next-pos pos)
-                    (recur next-pos)))
-                (+ pos idx 2)))))))))
-
-(defn- find-last-gif-trailer
-  "Find the byte offset immediately after the last GIF trailer byte (0x3B).
-   Scans backwards through the file so that appended data after the real
-   trailer is truncated even when it ends with 0x3B.
-   Returns the offset AFTER the trailer byte, or nil if 0x3B is not found."
-  [^FileChannel channel]
-  (let [size (nio/channel-size channel)]
-    (when (pos? size)
-      (let [buf-size (min (int size) (* 1024 1024))
-            marker   (byte-array [(unchecked-byte 0x3B)])]
-        (loop [pos (max 0 (- size buf-size))]
-          (when (< pos size)
-            (let [arr (nio/read-at channel pos buf-size)
-                  idx (scan-backwards arr marker)]
-              (if (neg? idx)
-                (let [next-pos (max 0 (- pos (- buf-size 1)))]
-                  (when (< next-pos pos)
-                    (recur next-pos)))
-                (+ pos idx 1)))))))))
-
-(defn- find-webp-end
-  "Parse the WebP RIFF header to find the declared file size.
-   WebP format: 'RIFF' (4 bytes) + uint32 total-size (4 bytes, little-endian)
-   + 'WEBP' (4 bytes). The total size is the offset of the end of the file.
-   Returns nil if the RIFF or WEBP magic bytes are missing."
-  [^FileChannel channel]
-  (let [size (nio/channel-size channel)]
-    (when (>= size 12)
-      (let [^bytes arr (nio/read-at channel 0 12)
-            buf  (buf/wrap arr)]
-        ;; Check RIFF magic (bytes 0-3) AND WEBP FourCC (bytes 8-11)
-        (when (and (= (aget arr 0) (byte 0x52))   ;; 'R'
-                   (= (aget arr 1) (byte 0x49))   ;; 'I'
-                   (= (aget arr 2) (byte 0x46))   ;; 'F'
-                   (= (aget arr 3) (byte 0x46))   ;; 'F'
-                   (= (aget arr 8)  (byte 0x57))  ;; 'W'
-                   (= (aget arr 9)  (byte 0x45))  ;; 'E'
-                   (= (aget arr 10) (byte 0x42))  ;; 'B'
-                   (= (aget arr 11) (byte 0x50))) ;; 'P'
-          (let [riff-size (bit-and (buf/read-int buf 4) 0xFFFFFFFF)]
-            ;; RIFF size field is the size of the file minus 8 bytes
-            (+ riff-size 8)))))))
-
-(defn truncate-after-eof
-  "Given a `java.nio.file.Path` to a freshly-downloaded media file and a
-   declared MIME type, truncate the file in place to the position of the
-   format's EOF marker:
-     - image/png  → end of the IEND chunk (12 bytes: 4-byte length + 4-byte type + 4-byte CRC32)
-     - image/jpeg → 2 bytes after FFD9
-     - image/gif  → immediately after the last GIF trailer byte 0x3B
-     - image/webp → end of RIFF chunk declared in bytes 4..8
-     - image/svg+xml → no-op (text format; processed by SAX parser)
-     - other → no-op (return path unchanged)
-   Returns the new file size. Raises `:validation/:invalid-image` if no
-   EOF marker is found within the file."
-  [^java.nio.file.Path path ^String mtype]
-  (try
-    (with-open [channel (nio/open-channel path)]
-      (let [size (nio/channel-size channel)]
-        (if (zero? size)
-          0
-          (let [needs-eof-marker? (or (= mtype "image/png")
-                                      (= mtype "image/jpeg")
-                                      (= mtype "image/gif")
-                                      (= mtype "image/webp"))
-
-                eof-offset
-                (cond
-                  (= mtype "image/png")  (find-last-png-iend channel)
-                  (= mtype "image/jpeg") (find-last-jpeg-eoi channel)
-                  (= mtype "image/gif")  (find-last-gif-trailer channel)
-                  (= mtype "image/webp") (find-webp-end channel)
-                  :else                  nil)]
-
-            (cond
-              ;; No EOF marker applicable (SVG or other) — no-op
-              (nil? eof-offset)
-              (if needs-eof-marker?
-                (ex/raise :type :validation
-                          :code :invalid-image
-                          :hint "image format EOF marker not found")
-                size)
-
-              ;; Truncate if needed
-              (< eof-offset size)
-              (do
-                (l/dbg :hint "truncating trailing data"
-                       :path (str path)
-                       :mtype mtype
-                       :original-size size
-                       :truncated-to eof-offset)
-                (nio/truncate channel eof-offset)
-                eof-offset)
-
-              ;; Already at correct size or marker at end
-              :else
-              eof-offset)))))
-    (catch Exception e
-      (if (ex/exception? e)
-        (throw e)
-        (ex/raise :type :validation
-                  :code :invalid-image
-                  :hint "failed to sanitize image"
-                  :cause e)))))

backend/src/app/migrations.clj

@@ -463,25 +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-audit-log-table"
-    :fn (mg/resource "app/migrations/sql/0146-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")}
-
-   {:name "0148-add-variant-name-team-font-variant"
-    :fn (mg/resource "app/migrations/sql/0148-add-variant-name-team-font-variant.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-add-audit-log-telemetry-index.sql

@@ -1,5 +0,0 @@
--- Add index on audit_log (source, created_at) to support efficient
--- queries for the telemetry batch collection mode.
-
-CREATE INDEX IF NOT EXISTS audit_log__source__created_at__idx
-    ON audit_log (source, created_at ASC);

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/0146-mod-audit-log-table.sql

@@ -1,5 +0,0 @@
--- Add index on audit_log (source, created_at) to support efficient
--- queries for the telemetry batch collection mode.
-
-CREATE INDEX IF NOT EXISTS audit_log__source__created_at__idx
-    ON audit_log (source, created_at ASC);

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/migrations/sql/0148-add-variant-name-team-font-variant.sql

@@ -1,2 +0,0 @@
-ALTER TABLE team_font_variant
-  ADD COLUMN variant_name text NULL;

backend/src/app/nitrate.clj

@@ -1,24 +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.data.macros :as dm]
-   [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]))
 
@@ -27,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
-                           :headers {"content-type" "application/json"
-                                     "accept" "application/json"
-                                     "x-shared-key" shared-key
-                                     "x-profile-id" (str profile-id)}
-                           :uri uri
-                           :version :http1.1}
-                    (= method :post) (assoc :body (json/encode request-params :key-fn json/write-camel-key))))))
+    (http/req! cfg {:method method
+                    :headers {"content-type" "application/json"
+                              "accept" "application/json"
+                              "x-shared-key" shared-key
+                              "x-profile-id" (str profile-id)}
+                    :uri uri
+                    :version :http1.1})))
+
 
 (defn- with-retries
   [handler max-retries]
@@ -56,49 +45,24 @@
           result)))))
 
 
-(defn- with-validate [handler uri schema & {:keys [throw-on-error?]}]
+(defn- with-validate [handler uri schema]
   (fn []
-    (let [response (handler)
-          status (:status response)]
-      (when-not status
-        (l/error :hint "could't do the nitrate request, it is probably down"
-                 :uri uri)
-        ;; TODO decide what to do when Nitrate is inaccesible
-        nil)
-      (cond
-        (>= status 400)
-        ;; 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)))
-          (if throw-on-error?
-            (ex/raise :type :nitrate-http-error
-                      :status status
-                      :hint (str "nitrate HTTP " status " at " uri))
-            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)))))))
+    (let [coercer-http (sm/coercer schema
+                                   :type :validation
+                                   :hint (str "invalid data received calling " uri))]
+      (try
+        (coercer-http (-> (handler) :body json/decode))
+        (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 throw-on-error?] :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 :throw-on-error? throw-on-error?))]
+                           (with-validate uri schema))]
     (full-http-call)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -114,263 +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]
-   [:type [:enum
-           "unlimited"
-           "professional"
-           "enterprise"
-           "nitrate"]]
-   [:status [:enum
-             "active"
-             "canceled"
-             "incomplete"
-             "incomplete_expired"
-             "past_due"
-             "paused"
-             "trialing"
-             "unpaid"]]
+   [:name ::sm/text]])
 
-   [:billing-period [:enum
-                     "month"
-                     "day"
-                     "week"
-                     "year"]]
-   [:manual :boolean]
-   [: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
+(def ^:private schema:user
   [: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
-                        (str baseuri
-                             "/api/teams/"
-                             team-id)
-                        cto/schema:team-with-organization params)))
+    (request-to-nitrate cfg :get (str baseuri "/api/teams/" (str team-id)) schema:organization params)))
 
-(defn- get-org-membership-api
-  [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- get-owned-orgs-api
+(defn- is-valid-user
   [cfg {:keys [profile-id] :as params}]
   (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/users/"
-                             profile-id
-                             "/owned-organizations")
-                        [:vector 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 (dm/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
-                        (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)))
-
-(def ^:private schema:redeem-result
-  [:map
-   [:cancel-at [:maybe schema:timestamp]]])
-
-(defn- get-org-permissions-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
-                             "/permissions")
-                        [:map
-                         [:organization-id ::sm/uuid]
-                         [:owner-id ::sm/uuid]
-                         [:permissions [:map-of :keyword :string]]]
-                        params)))
-
-(defn- redeem-activation-code-api
-  [cfg params]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :post
-                        (str baseuri "/api/activation-codes/redeem")
-                        schema:redeem-result
-                        (assoc params :throw-on-error? true))))
+    (request-to-nitrate cfg :get (str baseuri "/api/users/" (str profile-id)) schema:user params)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; INITIALIZATION
@@ -379,21 +104,8 @@
 (defmethod ig/init-key ::client
   [_ cfg]
   (when (contains? cf/flags :nitrate)
-    {:get-team-org                 (partial get-team-org-api cfg)
-     :set-team-org                 (partial set-team-org-api 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)
-     :get-owned-orgs               (partial get-owned-orgs-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)
-     :get-org-permissions          (partial get-org-permissions-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)
-     :redeem-activation-code       (partial redeem-activation-code-api cfg)}))
+    {:get-team-org (partial get-team-org cfg)
+     :is-valid-user (partial is-valid-user cfg)}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; UTILS
@@ -401,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)})]
-      (assoc profile :subscription subscription))
+    (let [nitrate-licence (call cfg :is-valid-user {:profile-id (:id profile)})]
+      (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
-  "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."
+(defn add-org-to-team
   [cfg team params]
-  (try
-    (let [params        (assoc (or params {}) :team-id (:id team))
-          team-with-org (call cfg :get-team-org params)
-          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))
-
-
-
-
+  (let [params (assoc (or params {}) :team-id (:id team))
+        org (call cfg :get-team-org params)]
+    (assoc team :organization-id (:id org) :organization-name (:name org))))

backend/src/app/rpc.clj

@@ -73,13 +73,9 @@
                                      (if (nil? result)
                                        204
                                        200))
-
-                         headers (::http/headers mdata {})
-                         headers (cond-> headers
-                                   (and (yres/stream-body? result)
-                                        (not (contains? headers "content-type")))
+                         headers (cond-> (::http/headers mdata {})
+                                   (yres/stream-body? result)
                                    (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,8 +104,6 @@
                              (assoc ::handler-name handler-name)
                              (assoc ::ip-addr ip-addr)
                              (assoc ::request-at (ct/now))
-                             (assoc ::request-id (uuid/next))
-                             (assoc ::session-id (some-> session-id uuid/parse*))
                              (assoc ::cond/key etag)
                              (cond-> (uuid? profile-id)
                                (assoc ::profile-id profile-id)))
@@ -166,13 +159,12 @@
 (defn- wrap-audit
   [_ f mdata]
   (if (or (contains? cf/flags :webhooks)
-          (contains? cf/flags :audit-log)
-          (contains? cf/flags :telemetry))
+          (contains? cf/flags :audit-log))
     (if-not (::audit/skip mdata)
       (fn [cfg params]
         (let [result (f cfg params)]
-          (->> (audit/prepare-rpc-event cfg mdata params result)
-               (audit/submit cfg))
+          (->> (audit/prepare-event cfg mdata params result)
+               (audit/submit! cfg))
           result))
       f)
     f))
@@ -266,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]
-   [:type {:optional true} :string]])
+   [:expiration {:optional true} ::ct/duration]])
 
 (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/audit.clj

@@ -15,7 +15,7 @@
    [app.config :as cf]
    [app.db :as db]
    [app.http :as-alias http]
-   [app.loggers.audit :as audit]
+   [app.loggers.audit :as-alias audit]
    [app.loggers.database :as loggers.db]
    [app.loggers.mattermost :as loggers.mm]
    [app.rpc :as-alias rpc]
@@ -23,8 +23,7 @@
    [app.rpc.doc :as-alias doc]
    [app.rpc.helpers :as rph]
    [app.util.inet :as inet]
-   [app.util.services :as sv]
-   [clojure.set :as set]))
+   [app.util.services :as sv]))
 
 (def ^:private event-columns
   [:id
@@ -39,31 +38,31 @@
    :context])
 
 (defn- event->row [event]
-  [(:id event)
-   (:name event)
-   (:source event)
-   (:type event)
-   (:tracked-at event)
-   (:created-at event)
-   (:profile-id event)
-   (db/inet (:ip-addr event))
-   (db/tjson (:props event))
-   (db/tjson (d/without-nils (:context event)))])
+  [(::audit/id event)
+   (::audit/name event)
+   (::audit/source event)
+   (::audit/type event)
+   (::audit/tracked-at event)
+   (::audit/created-at event)
+   (::audit/profile-id event)
+   (db/inet (::audit/ip-addr event))
+   (db/tjson (::audit/props event))
+   (db/tjson (d/without-nils (::audit/context event)))])
 
 (defn- adjust-timestamp
-  [{:keys [tracked-at created-at] :as event}]
+  [{:keys [::audit/tracked-at ::audit/created-at] :as event}]
   (let [margin (inst-ms (ct/diff tracked-at created-at))]
     (if (or (neg? margin)
             (> margin 3600000))
       ;; If event is in future or lags more than 1 hour, we reasign
       ;; tracked-at to the server creation date
       (-> event
-          (assoc :tracked-at created-at)
-          (update :context assoc :original-tracked-at tracked-at))
+          (assoc ::audit/tracked-at created-at)
+          (update ::audit/context assoc :original-tracked-at tracked-at))
       event)))
 
 (defn- exception-event?
-  [{:keys [type name] :as ev}]
+  [{:keys [::audit/type ::audit/name] :as ev}]
   (and (= "action" type)
        (or (= "unhandled-exception" name)
            (= "exception-page" name))))
@@ -73,44 +72,28 @@
    (map adjust-timestamp)
    (map event->row)))
 
-(defn- prepare-events
+(defn- get-events
   [{:keys [::rpc/request-at ::rpc/profile-id events] :as params}]
   (let [request (-> params meta ::http/request)
         ip-addr (inet/parse-request request)
-        xform   (comp
-                 (map (fn [event]
-                        {:id (uuid/next)
-                         :type (:type event)
-                         :name (:name event)
-                         :props (:props event)
-                         :context (:context event)
-                         :profile-id profile-id
-                         :ip-addr ip-addr
-                         :source "frontend"
-                         :tracked-at (:timestamp event)
-                         :created-at request-at}))
-                 (map (fn [item]
-                        (with-meta item {::audit/event true}))))]
+
+        xform   (map (fn [event]
+                       {::audit/id (uuid/next)
+                        ::audit/type (:type event)
+                        ::audit/name (:name event)
+                        ::audit/props (:props event)
+                        ::audit/context (:context event)
+                        ::audit/profile-id profile-id
+                        ::audit/ip-addr ip-addr
+                        ::audit/source "frontend"
+                        ::audit/tracked-at (:timestamp event)
+                        ::audit/created-at request-at}))]
 
     (sequence xform events)))
 
-(def ^:private xf:map-telemetry-event-row
-  (comp
-   (map adjust-timestamp)
-   (map (fn [event]
-          (-> event
-              (assoc :id (uuid/next))
-              (update :created-at ct/truncate :days)
-              (update :tracked-at ct/truncate :days)
-              (audit/filter-telemetry-props)
-              (audit/filter-telemetry-context)
-              (assoc :ip-addr "0.0.0.0")
-              (assoc :source "telemetry:frontend"))))
-   (map event->row)))
-
 (defn- handle-events
   [{:keys [::db/pool] :as cfg} params]
-  (let [events (prepare-events params)]
+  (let [events (get-events params)]
 
     ;; Look for error reports and save them on internal reports table
     (when-let [events (->> events
@@ -119,18 +102,9 @@
       (run! (partial loggers.db/emit cfg) events)
       (run! (partial loggers.mm/emit cfg) events))
 
-    (when (contains? cf/flags :audit-log)
-      ;; Process and save full audit events when audit-log flag is active
-      (when-let [rows (-> (sequence xf:map-event-row events)
-                          (not-empty))]
-        (db/insert-many! pool :audit-log event-columns rows)))
-
-    (when (contains? cf/flags :telemetry)
-      ;; Store anonymized frontend events so the telemetry task can ship them
-      ;; in batches. Runs independently from the audit-log insert above so
-      ;; both modes can be active simultaneously.
-      (when-let [rows (-> (sequence xf:map-telemetry-event-row events)
-                          (not-empty))]
+    ;; Process and save events
+    (when (seq events)
+      (let [rows (sequence xf:map-event-row events)]
         (db/insert-many! pool :audit-log event-columns rows)))))
 
 (def ^:private valid-event-types
@@ -164,26 +138,17 @@
    ::doc/skip true
    ::doc/added "1.17"}
   [{:keys [::db/pool] :as cfg} params]
-  (let [telemetry? (contains? cf/flags :telemetry)
-        audit-log? (contains? cf/flags :audit-log)
-        enabled?   (and (not (db/read-only? pool))
-                        (or audit-log? telemetry?))]
-    (when enabled?
+  (if (or (db/read-only? pool)
+          (not (contains? cf/flags :audit-log)))
+    (do
+      (l/warn :hint "audit: http handler disabled or db is read-only")
+      (rph/wrap nil))
+
+    (do
       (try
         (handle-events cfg params)
         (catch Throwable cause
           (l/error :hint "unexpected error on persisting audit events from frontend"
-                   :cause cause))))
+                   :cause cause)))
 
-    (rph/wrap nil)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; GET-ENABLED-FLAGS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(sv/defmethod ::get-enabled-flags
-  {::audit/skip true
-   ::doc/skip true
-   ::doc/added "1.20"}
-  [_cfg _params]
-  (set/intersection cf/flags #{:audit-log :telemetry}))
+      (rph/wrap nil))))

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

@@ -258,44 +258,24 @@
   (validate-register-attempt! cfg params)
 
   (let [email   (profile/clean-email email)
-        profile (profile/get-profile-by-email pool 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)
+                 :invitation-token (:invitation-token params)
+                 :backend "penpot"
+                 :iss :prepared-register
+                 :profile-id (:id profile)
+                 :exp (ct/in-future {:days 7})
+                 :props props}
+        params (d/without-nils params)
+        token  (tokens/generate cfg params)]
 
-    ;; SECURITY: refuse to issue a prepared-register token when an active
-    ;; profile already exists for this email.
-    ;;
-    ;; Active accounts must use the standard login flow; existing-but-
-    ;; not-yet-active profiles fall through to the duplicate-detection branch in
-    ;; `register-profile`, which never creates a session.
-    (when (and (some? profile)
-               (true? (:is-active profile)))
-      (ex/raise :type :validation
-                :code :email-already-exists
-                :hint "email already exists"))
-
-    (let [props  (-> (audit/extract-utm-params params)
-                     (cond-> (:accept-newsletter-updates params)
-                       (assoc :newsletter-updates true)))
-          ;; SECURITY: do NOT embed `:profile-id` of an existing
-          ;; profile into the prepared-register JWE. Doing so would
-          ;; let an anonymous caller, in possession of a valid
-          ;; team-invitation JWE, ask `register-profile` to load that
-          ;; profile by id and mint a session for it without password
-          ;; verification. `register-profile` independently re-detects
-          ;; duplicates by email and handles them in the
-          ;; "repeated-registry" branch.
-          params {:email email
-                  :fullname fullname
-                  :password (:password params)
-                  :invitation-token (:invitation-token params)
-                  :backend "penpot"
-                  :iss :prepared-register
-                  :exp (ct/in-future {:days 7})
-                  :props props}
-          params (d/without-nils params)
-          token  (tokens/generate cfg params)]
-
-      (-> {:token token}
-          (with-meta {::audit/profile-id uuid/zero})))))
+    (-> {:token token}
+        (with-meta {::audit/profile-id uuid/zero}))))
 
 (def schema:prepare-register-profile
   [:map {:title "prepare-register-profile"}
@@ -392,11 +372,9 @@
           (throw cause))))))
 
 (defn create-profile-rels
-  [{:keys [::db/conn] :as cfg} {:keys [id] :as profile}]
-  (assert (db/connection-map? cfg)
-          "expected cfg with valid connection")
+  [conn {:keys [id] :as profile}]
   (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
@@ -409,32 +387,25 @@
         (profile/decode-row))))
 
 (defn send-email-verification!
-  ([cfg profile] (send-email-verification! cfg profile nil))
-  ([{:keys [::db/conn] :as cfg} profile invitation-token]
-   (let [vclaims (cond-> {:iss :verify-email
-                          :exp (ct/in-future "72h")
-                          :profile-id (:id profile)
-                          :email (:email profile)}
-                   ;; If the user registered through a team-invitation flow but
-                   ;; their profile is not yet active, we carry the invitation
-                   ;; token inside the verify-email JWE so the team-invitation
-                   ;; flow can resume after the user clicks the email link.
-                   (some? invitation-token)
-                   (assoc :invitation-token invitation-token))
-         vtoken  (tokens/generate cfg vclaims)
-         ;; NOTE: this token is mainly used for possible complains
-         ;; identification on the sns webhook
-         ptoken  (tokens/generate cfg
-                                  {:iss :profile-identity
-                                   :profile-id (:id profile)
-                                   :exp (ct/in-future {:days 30})})]
-     (eml/send! {::eml/conn conn
-                 ::eml/factory eml/register
-                 :public-uri (cf/get :public-uri)
-                 :to (:email profile)
-                 :name (:fullname profile)
-                 :token vtoken
-                 :extra-data ptoken}))))
+  [{:keys [::db/conn] :as cfg} profile]
+  (let [vtoken (tokens/generate cfg
+                                {:iss :verify-email
+                                 :exp (ct/in-future "72h")
+                                 :profile-id (:id profile)
+                                 :email (:email profile)})
+        ;; NOTE: this token is mainly used for possible complains
+        ;; identification on the sns webhook
+        ptoken (tokens/generate cfg
+                                {:iss :profile-identity
+                                 :profile-id (:id profile)
+                                 :exp (ct/in-future {:days 30})})]
+    (eml/send! {::eml/conn conn
+                ::eml/factory eml/register
+                :public-uri (cf/get :public-uri)
+                :to (:email profile)
+                :name (:fullname profile)
+                :token vtoken
+                :extra-data ptoken})))
 
 (defn register-profile
   [{:keys [::db/conn ::wrk/executor] :as cfg} {:keys [token] :as params}]
@@ -443,16 +414,23 @@
                      (:accept-newsletter-updates params)
                      (update :props assoc :newsletter-updates true))
 
-        profile    (or (profile/get-profile-by-email conn (:email claims))
-                       (let [is-active (or (boolean (:is-active claims))
-                                           (boolean (:email-verified claims))
-                                           (not (contains? cf/flags :email-verification)))
-                             params    (-> params
-                                           (assoc :is-active is-active)
-                                           (update :password auth/derive-password))
-                             profile   (->> (create-profile cfg params)
-                                            (create-profile-rels cfg))]
-                         (vary-meta profile assoc :created true)))
+        profile    (if-let [profile-id (:profile-id claims)]
+                     (profile/get-profile conn profile-id)
+                     ;; NOTE: we first try to match existing profile
+                     ;; by email, that in normal circumstances will
+                     ;; not return anything, but when a user tries to
+                     ;; reuse the same token multiple times, we need
+                     ;; to detect if the profile is already registered
+                     (or (profile/get-profile-by-email conn (:email claims))
+                         (let [is-active (or (boolean (:is-active claims))
+                                             (boolean (:email-verified claims))
+                                             (not (contains? cf/flags :email-verification)))
+                               params    (-> params
+                                             (assoc :is-active is-active)
+                                             (update :password auth/derive-password))
+                               profile   (->> (create-profile cfg params)
+                                              (create-profile-rels conn))]
+                           (vary-meta profile assoc :created true))))
 
         created?   (-> profile meta :created true?)
 
@@ -483,67 +461,48 @@
            ::audit/profile-id (:id profile)
            ::audit/name "register-profile-retry"}))
 
-      ;; A profile was just created in this call. Invitation handling is a
-      ;; sub-case of "newly created profile": we never honor invitations for
-      ;; pre-existing profiles via this anonymous RPC. The split below mirrors
-      ;; the non-invitation branches but threads the invitation through the
-      ;; appropriate path:
-      ;;
-      ;;   - active     + matching invitation → mint session and
-      ;;     return :invitation-token. The frontend redirects to
-      ;;     :auth-verify-token, which immediately accepts the
-      ;;     invitation.
-      ;;   - active     + no/mismatched invitation → mint session
-      ;;     ("login" action). New profile, no further action.
-      ;;   - not-active + matching invitation → send the
-      ;;     verify-email mail with the invitation token EMBEDDED
-      ;;     into the verify-email JWE. No session yet. When the
-      ;;     user clicks the link, verify-token activates the
-      ;;     profile, mints a session, and propagates the
-      ;;     invitation token to the frontend so it can complete
-      ;;     the team-invitation flow.
-      ;;   - not-active + no/mismatched invitation → standard
-      ;;     "check your email" verification flow.
-      created?
-      (let [accept-invitation? (and (some? invitation)
-                                    (= (:email profile)
-                                       (:member-email invitation)))]
-        (cond
-          (and (:is-active profile) accept-invitation?)
-          (let [invitation (assoc invitation :member-id (:id profile))
-                token      (tokens/generate cfg invitation)]
-            (-> {:id (:id profile)
-                 :email (:email profile)
-                 :invitation-token token}
-                (rph/with-transform (session/create-fn cfg profile claims))
-                (rph/with-defer create-welcome-file-when-needed)
-                (rph/with-meta {::audit/replace-props props
-                                ::audit/context {:action "accept-invitation"}
-                                ::audit/profile-id (:id profile)})))
+      ;; If invitation token comes in params, this is because the user
+      ;; comes from team-invitation process; in this case, regenerate
+      ;; token and send back to the user a new invitation token (and
+      ;; mark current session as logged). This happens only if the
+      ;; invitation email matches with the register email.
+      (and (some? invitation)
+           (= (:email profile)
+              (:member-email invitation)))
+      (let [invitation (assoc invitation :member-id  (:id profile))
+            token      (tokens/generate cfg invitation)]
+        (-> {:id (:id profile)
+             :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"}
+                            ::audit/profile-id (:id profile)})))
 
-          (:is-active profile)
-          (-> (profile/strip-private-attrs profile)
-              (rph/with-transform (session/create-fn cfg profile claims))
+      ;; When a new user is created and it is already activated by
+      ;; configuration or specified by OIDC, we just mark the profile
+      ;; as logged-in
+      created?
+      (if (:is-active profile)
+        (-> (profile/strip-private-attrs profile)
+            (rph/with-transform (session/create-fn cfg profile claims))
+            (rph/with-defer create-welcome-file-when-needed)
+            (rph/with-meta
+              {::audit/replace-props props
+               ::audit/context {:action "login"}
+               ::audit/profile-id (:id profile)}))
+
+        (do
+          (when-not (eml/has-reports? conn (:email profile))
+            (send-email-verification! cfg profile))
+
+          (-> {:id (:id profile)
+               :email (:email profile)}
               (rph/with-defer create-welcome-file-when-needed)
               (rph/with-meta
                 {::audit/replace-props props
-                 ::audit/context {:action "login"}
-                 ::audit/profile-id (:id profile)}))
-
-          :else
-          (do
-            (when-not (eml/has-reports? conn (:email profile))
-              (send-email-verification! cfg profile
-                                        (when accept-invitation?
-                                          (:invitation-token params))))
-
-            (-> {:id (:id profile)
-                 :email (:email profile)}
-                (rph/with-defer create-welcome-file-when-needed)
-                (rph/with-meta
-                  {::audit/replace-props props
-                   ::audit/context {:action "email-verification"}
-                   ::audit/profile-id (:id profile)})))))
+                 ::audit/context {:action "email-verification"}
+                 ::audit/profile-id (:id profile)}))))
 
       :else
       (let [elapsed? (elapsed-verify-threshold? profile)

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]}]
-  (let [team
-        (teams/get-team pool
-                        :profile-id profile-id
-                        :project-id project-id)
+  [{:keys [::db/pool] :as cfg} {:keys [profile-id project-id version name file]}]
+  (let [team   (teams/get-team pool
+                               :profile-id profile-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
-        (-> 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))
-
-        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))))]
+        result (case (int version)
+                 1 (bf.v1/import-files! cfg)
+                 3 (bf.v3/import-files! cfg))]
 
     (db/update! pool :project
                 {:modified-at (ct/now)}
@@ -117,18 +103,13 @@
     result))
 
 (def ^:private schema:import-binfile
-  [:and
-   [:map {:title "import-binfile"}
-    [:name [:or [:string {:max 250}]
-            [:map-of ::sm/uuid [:string {:max 250}]]]]
-    [:project-id ::sm/uuid]
-    [:file-id {:optional true} ::sm/uuid]
-    [:version {:optional true} ::sm/int]
-    [: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)))]])
+  [:map {:title "import-binfile"}
+   [:name [:or [:string {:max 250}]
+           [:map-of ::sm/uuid [:string {:max 250}]]]]
+   [:project-id ::sm/uuid]
+   [:file-id {:optional true} ::sm/uuid]
+   [:version {:optional true} ::sm/int]
+   [:file media/schema:upload]])
 
 (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"
-                  "2.15" "Add upload-id param for chunked upload support"]
+                  "1.20" "Set default version to 3"]
 
    ::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)
-        params  (-> params
-                    (assoc :profile-id profile-id)
-                    (assoc :version version))
+  (let [version  (or version 3)
+        params   (-> params
+                     (assoc :profile-id profile-id)
+                     (assoc :version version))
 
-        cfg     (cond-> cfg
-                  (uuid? file-id)
-                  (assoc ::bfc/file-id file-id))
+        cfg      (cond-> cfg
+                   (uuid? file-id)
+                   (assoc ::bfc/file-id file-id))
 
-        params
-        (if (some? upload-id)
-          (let [file (db/tx-run! cfg media-cmd/assemble-chunks upload-id)]
-            (assoc params :file file))
-          params)
-
-        manifest
-        (case (int version)
-          1 nil
-          3 (bf.v3/get-manifest (-> params :file :path)))]
+        manifest (case (int version)
+                   1 nil
+                   3 (bf.v3/get-manifest (:path file)))]
 
     (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
@@ -1226,39 +1155,38 @@
       AND t.id = ?
       AND f.id = ANY(?::uuid[])")
 
-(def ^:private sql:restore-files
-  "UPDATE file SET deleted_at = null, has_media_trimmed = false
-    WHERE id = ANY(?::uuid[])")
+(defn- restore-file
+  [conn file-id]
+  (db/update! conn :file
+              {:deleted-at nil
+               :has-media-trimmed false}
+              {:id file-id}
+              {::db/return-keys false})
 
-(def ^:private sql:restore-file-media-objects
-  "UPDATE file_media_object SET deleted_at = null
-    WHERE file_id = ANY(?::uuid[])")
+  (db/update! conn :file-media-object
+              {:deleted-at nil}
+              {:file-id file-id}
+              {::db/return-keys false})
 
-(def ^:private sql:restore-file-changes
-  "UPDATE file_change SET deleted_at = null
-    WHERE file_id = ANY(?::uuid[])")
+  (db/update! conn :file-change
+              {:deleted-at nil}
+              {:file-id file-id}
+              {::db/return-keys false})
 
-(def ^:private sql:restore-file-data
-  "UPDATE file_data SET deleted_at = null
-    WHERE file_id = ANY(?::uuid[])")
+  (db/update! conn :file-data
+              {:deleted-at nil}
+              {:file-id file-id}
+              {::db/return-keys false})
 
-(def ^:private sql:restore-file-thumbnails
-  "UPDATE file_thumbnail SET deleted_at = null
-    WHERE file_id = ANY(?::uuid[])")
+  (db/update! conn :file-thumbnail
+              {:deleted-at nil}
+              {:file-id file-id}
+              {::db/return-keys false})
 
-(def ^:private sql:restore-file-tagged-object-thumbnails
-  "UPDATE file_tagged_object_thumbnail SET deleted_at = null
-    WHERE file_id = ANY(?::uuid[])")
-
-(defn- restore-files
-  [conn file-ids]
-  (let [file-ids (db/create-array conn "uuid" file-ids)]
-    (db/exec-one! conn [sql:restore-files file-ids])
-    (db/exec-one! conn [sql:restore-file-media-objects file-ids])
-    (db/exec-one! conn [sql:restore-file-changes file-ids])
-    (db/exec-one! conn [sql:restore-file-data file-ids])
-    (db/exec-one! conn [sql:restore-file-thumbnails file-ids])
-    (db/exec-one! conn [sql:restore-file-tagged-object-thumbnails file-ids])))
+  (db/update! conn :file-tagged-object-thumbnail
+              {:deleted-at nil}
+              {:file-id file-id}
+              {::db/return-keys false}))
 
 (def ^:private sql:restore-projects
   "UPDATE project SET deleted_at = null WHERE id = ANY(?::uuid[])")
@@ -1279,18 +1207,17 @@
         (reduce (fn [result {:keys [id project-id]}]
                   (let [index (-> result :files count)]
                     (events/tap :progress {:file-id id :index (inc index) :total total-files})
+                    (restore-file conn id)
+
                     (-> result
                         (update :files conj id)
                         (update :projects conj project-id))))
-                {:files #{} :projects #{}}
+
+                {:files #{} :projectes #{}}
                 (db/plan conn [sql:resolve-editable-files team-id
                                (db/create-array conn "uuid" ids)]))]
 
-    (when (seq files)
-      (restore-files conn files))
-
-    (when (seq projects)
-      (restore-projects conn projects))
+    (restore-projects conn projects)
 
     files))
 

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

@@ -112,30 +112,22 @@
                         ::quotes/profile-id profile-id
                         ::quotes/project-id project-id})
 
-    ;; Acquire a row-level lock on the team and re-read its features
-    ;; inside the same transaction before the read-modify-write below.
-    ;; Without the lock, two concurrent create-file calls on the same
-    ;; team can both observe the same team.features value, each
-    ;; compute a different union, and the second UPDATE silently
-    ;; overwrites the first (lost update under READ COMMITTED).
-    (let [team-features (-> (db/exec-one! conn
-                                          ["SELECT features FROM team WHERE id = ? FOR UPDATE"
-                                           team-id])
-                            :features
-                            (db/decode-pgarray #{}))]
-      (when-let [new-features (-> features
-                                  (set/difference team-features)
-                                  (set/difference cfeat/no-team-inheritable-features)
-                                  (not-empty))]
-        (let [features (-> new-features
-                           (set/union team-features)
-                           (set/difference cfeat/no-team-inheritable-features)
-                           (into-array))]
+    ;; FIXME: IMPORTANT: this code can have race conditions, because
+    ;; we have no locks for updating team so, creating two files
+    ;; concurrently can lead to lost team features updating
+    (when-let [features (-> features
+                            (set/difference (:features team))
+                            (set/difference cfeat/no-team-inheritable-features)
+                            (not-empty))]
+      (let [features (-> features
+                         (set/union (:features team))
+                         (set/difference cfeat/no-team-inheritable-features)
+                         (into-array))]
 
-          (db/update! conn :team
-                      {:features features}
-                      {:id team-id}
-                      {::db/return-keys false}))))
+        (db/update! conn :team
+                    {:features features}
+                    {:id (:id team)}
+                    {::db/return-keys false})))
 
     (-> (create-file cfg params)
         (vary-meta assoc ::audit/props {:team-id team-id}))))

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
-                           :session-id session-id
+                 :message {:type :file-restore
                            :file-id (:id file)
                            :vern vern})
       nil)))

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

@@ -409,7 +409,10 @@
 
   [cfg {:keys [::rpc/profile-id file-id] :as params}]
   (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
-                    (files/check-edition-permissions! conn profile-id file-id)
+                    ;; TODO For now we check read permissions instead of write,
+                    ;; to allow viewer users to update thumbnails. We might
+                    ;; review this approach on the future.
+                    (files/check-read-permissions! conn profile-id file-id)
                     (when-not (db/read-only? conn)
                       (let [media (create-file-thumbnail cfg params)]
                         {:uri (files/resolve-public-uri (:id media))

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.zip.ZipEntry
-   java.util.zip.ZipOutputStream))
+   java.util.Collections))
 
 (set! *warn-on-reflection* true)
 
@@ -98,8 +94,7 @@
    [:font-id ::sm/uuid]
    [:font-family ::sm/text]
    [:font-weight [::sm/one-of {:format "number"} valid-weight]]
-   [:font-style [::sm/one-of {:format "string"} valid-style]]
-   [:variant-name {:optional true} [:maybe ::sm/text]]])
+   [:font-style [::sm/one-of {:format "string"} valid-style]]])
 
 ;; FIXME: IMPORTANT: refactor this, we should not hold a whole db
 ;; connection around the font creation
@@ -185,7 +180,6 @@
                          :font-family (:font-family params)
                          :font-weight (:font-weight params)
                          :font-style (:font-style params)
-                         :variant-name (:variant-name params)
                          :woff1-file-id (:id woff1)
                          :woff2-file-id (:id woff2)
                          :otf-file-id (:id otf)
@@ -302,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

@@ -42,7 +42,7 @@
   (when-not provider
     (ex/raise :type :restriction
               :code :ldap-not-initialized
-              :hint "ldap auth provider is not initialized"))
+              :hide "ldap auth provider is not initialized"))
 
   (let [info (ldap/authenticate provider params)]
     (when-not info
@@ -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]})
@@ -439,10 +425,10 @@
                     (doseq [file-id result]
                       (let [props (assoc props :id file-id)
                             event (-> (audit/event-from-rpc-params params)
-                                      (assoc :profile-id profile-id)
-                                      (assoc :name "create-file")
-                                      (assoc :props props))]
-                        (audit/submit cfg event))))))
+                                      (assoc ::audit/profile-id profile-id)
+                                      (assoc ::audit/name "create-file")
+                                      (assoc ::audit/props props))]
+                        (audit/submit! cfg event))))))
 
     result))
 

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]
-   [datoteka.io :as io])
-  (:import
-   java.io.OutputStream))
+   [app.util.services :as sv]))
 
 (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,335 +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.common.time :as ct]
-   [app.common.types.nitrate-permissions :as nitrate-perms]
-   [app.config :as cf]
-   [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 schema:redeem-activation-code-params
-  [:map {:title "RedeemActivationCodeParams"}
-   [:activation-code ::sm/text]])
-
-(def ^:private schema:redeem-activation-code-result
-  [:map {:title "RedeemActivationCodeResult"}
-   [:cancel-at [:maybe ct/schema:inst]]])
-
-(sv/defmethod ::redeem-nitrate-activation-code
-  {::rpc/auth true
-   ::doc/added "2.14"
-   ::sm/params schema:redeem-activation-code-params
-   ::sm/result schema:redeem-activation-code-result}
-  [cfg {:keys [::rpc/profile-id activation-code]}]
-  (let [profile (db/get cfg :profile {:id profile-id})]
-    (try
-      (let [result (nitrate/call cfg :redeem-activation-code
-                                 {:request-params  {:code      activation-code
-                                                    :penpot-id profile-id
-                                                    :email     (:email profile)}})]
-        (when-not result
-          (ex/raise :type :validation
-                    :code :invalid-activation-code
-                    :hint "The activation code is invalid, expired or fully redeemed"))
-        result)
-      (catch Exception cause
-        (let [{:keys [type status]} (ex-data cause)]
-          (if (= type :nitrate-http-error)
-            (ex/raise :type :validation
-                      :code (case status
-                              410 :expired-activation-code
-                              :invalid-activation-code)
-                      :cause cause)
-            (throw cause)))))))
-
-(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 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)
-
-  (when (contains? cf/flags :nitrate)
-    (let [org-perms (nitrate/call cfg :get-org-permissions
-                                  {:organization-id organization-id})]
-      (if (nil? org-perms)
-        (ex/raise :type :validation
-                  :code :not-allowed
-                  :hint "Unable to verify organization permissions")
-        (when-not (nitrate-perms/allowed? :create-team
-                                          {:org-perms org-perms
-                                           :profile-id profile-id})
-          (ex/raise :type :validation
-                    :code :not-allowed
-                    :hint "You are not allowed to add teams in this organization")))))
-
-  (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,8 +48,6 @@
 (def schema:props
   [:map {:title "ProfileProps"}
    [:plugins {:optional true} schema:plugin-registry]
-   [:renderer {:optional true} [::sm/one-of #{:svg :wasm}]]
-   [: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]
@@ -110,10 +108,8 @@
         (nitrate/add-nitrate-licence-to-profile cfg profile)
         profile))
 
-    (catch Throwable cause
-      (if (= :not-found (-> cause ex-data :type))
-        {:id uuid/zero :fullname "Anonymous User"}
-        (throw cause)))))
+    (catch Throwable _
+      {:id uuid/zero :fullname "Anonymous User"})))
 
 (defn get-profile
   "Get profile by id. Throws not-found exception if no profile found."
@@ -317,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!)
@@ -484,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

@@ -12,7 +12,6 @@
    [app.common.features :as cfeat]
    [app.common.schema :as sm]
    [app.common.time :as ct]
-   [app.common.types.nitrate-permissions :as nitrate-perms]
    [app.common.types.team :as types.team]
    [app.common.uuid :as uuid]
    [app.config :as cf]
@@ -194,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,
@@ -472,8 +471,8 @@
 ;; --- COMMAND QUERY: get-team-info
 
 (defn get-team-info
-  [cfg {:keys [id] :as params}]
-  (-> (db/get* cfg :team
+  [{:keys [::db/conn] :as cfg} {:keys [id] :as params}]
+  (-> (db/get* conn :team
                {:id id}
                {::sql/columns [:id :is-default :features]})
       (decode-row)))
@@ -498,36 +497,18 @@
 
 (def ^:private schema:create-team
   [:map {:title "create-team"}
-   [:name types.team/schema:team-name]
+   [:name [:string {:max 250}]]
    [:features {:optional true} ::cfeat/features]
-   [:id {:optional true} ::sm/uuid]
-   [:organization-id {:optional true} ::sm/uuid]
-   [:is-default {:optional true} :boolean]])
+   [:id {:optional true} ::sm/uuid]])
 
 (sv/defmethod ::create-team
   {::doc/added "1.17"
    ::sm/params schema:create-team}
-  [cfg {:keys [::rpc/profile-id organization-id] :as params}]
+  [cfg {:keys [::rpc/profile-id] :as params}]
 
   (quotes/check! cfg {::quotes/id ::quotes/teams-per-profile
                       ::quotes/profile-id profile-id})
 
-  ;; When creating inside an org, verify the user has permission to do so.
-  ;; Fail closed: if org permissions cannot be fetched, deny the operation.
-  (when (and organization-id (contains? cf/flags :nitrate))
-    (let [org-perms (nitrate/call cfg :get-org-permissions
-                                  {:organization-id organization-id})]
-      (if (nil? org-perms)
-        (ex/raise :type :validation
-                  :code :not-allowed
-                  :hint "Unable to verify organization permissions")
-        (when-not (nitrate-perms/allowed? :create-team
-                                          {:org-perms org-perms
-                                           :profile-id profile-id})
-          (ex/raise :type :validation
-                    :code :not-allowed
-                    :hint "You are not allowed to create teams in this organization")))))
-
   (let [features (-> (cfeat/get-enabled-features cf/flags)
                      (set/difference cfeat/frontend-only-features)
                      (set/difference cfeat/no-team-inheritable-features))
@@ -539,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]
-  (assert (db/connection-map? cfg)
-          "expected cfg with valid connection")
-  (let [team    (create-team* conn params)
+  [cfg-or-conn params]
+  (let [conn    (db/get-connection cfg-or-conn)
+        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)
-    ;; 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))
+    (create-team-role conn params)
     (assoc team :default-project-id (:id project))))
 
 (defn- create-team*
@@ -637,13 +546,11 @@
     (decode-row team)))
 
 (defn- create-team-role
-  [cfg {:keys [profile-id team-id role] :as params}]
-  (assert (db/connection-map? cfg)
-          "expected cfg with valid connection")
+  [conn {:keys [profile-id team-id role] :as params}]
   (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}]
@@ -684,7 +591,7 @@
 
 (def ^:private schema:update-team
   [:map {:title "update-team"}
-   [:name types.team/schema:team-name]
+   [:name [:string {:max 250}]]
    [:id ::sm/uuid]])
 
 (sv/defmethod ::update-team
@@ -702,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)]
 
@@ -717,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
-      ;; the owner
-      (and reassign-to (not= reassign-to profile-id) (:is-owner perms))
+      (and reassign-to (not= reassign-to profile-id))
       (let [member (d/seek #(= reassign-to (:id %)) members)]
         (when-not member
           (ex/raise :type :not-found :code :member-does-not-exist))
@@ -733,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})
-
-        ;; notify new owner
-        (mbus/pub! msgbus
-                   :topic reassign-to
-                   :message {:type :team-role-change
-                             :topic reassign-to
-                             :team-id id
-                             :role :owner}))
+                    {:team-id id :profile-id reassign-to}))
 
       ;; and finally, if all other conditions does not match and the
       ;; current profile is owner, we dont allow it because there
@@ -766,59 +663,32 @@
   {::doc/added "1.17"
    ::sm/params schema:leave-team
    ::db/transaction true}
-  [cfg {:keys [::rpc/profile-id] :as params}]
-  (leave-team cfg (assoc params :profile-id profile-id)))
-
+  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id] :as params}]
+  (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] :as params}]
+  [conn {:keys [id] :as team}]
 
-  (let [team  (get-team conn :profile-id profile-id :team-id team-id)
-        team  (if (contains? cf/flags :nitrate)
-                (nitrate/add-org-info-to-team cfg team params)
-                team)
-        perms (get team :permissions)]
+  (let [delay (ldel/get-deletion-delay team)
+        team  (db/update! conn :team
+                          {:deleted-at (ct/in-future delay)}
+                          {:id id}
+                          {::db/return-keys true})]
 
     (when (:is-default team)
       (ex/raise :type :validation
                 :code :non-deletable-team
                 :hint "impossible to delete default team"))
 
-    ;; Check delete permissions based on organization settings.
-    ;; For non-org teams or when nitrate is disabled, only owners can delete.
-    (if (and (:organization team) (contains? cf/flags :nitrate))
-      (let [org-perms {:owner-id    (dm/get-in team [:organization :owner-id])
-                       :permissions (dm/get-in team [:organization :permissions])}]
-        (when-not (nitrate-perms/allowed? :delete-team
-                                          {:org-perms  org-perms
-                                           :profile-id profile-id
-                                           :team-perms perms})
-          (ex/raise :type :validation
-                    :code :not-allowed
-                    :hint "You are not allowed to delete teams in this organization")))
-      (when-not (:is-owner perms)
-        (ex/raise :type :validation
-                  :code :only-owner-can-delete-team)))
-
-    (let [delay (ldel/get-deletion-delay team)
-          team  (db/update! conn :team
-                            {:deleted-at (ct/in-future delay)}
-                            {:id team-id}
-                            {::db/return-keys true})]
-
-      ;; 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)))
+    (wrk/submit! {::db/conn conn
+                  ::wrk/task :delete-object
+                  ::wrk/params {:object :team
+                                :deleted-at (:deleted-at team)
+                                :id id}})
+    team))
 
 (def ^:private schema:delete-team
   [:map {:title "delete-team"}
@@ -828,9 +698,16 @@
   {::doc/added "1.17"
    ::sm/params schema:delete-team
    ::db/transaction true}
-  [cfg {:keys [::rpc/profile-id id] :as params}]
-  (delete-team cfg {:team-id id :profile-id profile-id})
-  nil)
+  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id id] :as params}]
+  (let [team  (get-team conn :profile-id profile-id :team-id id)
+        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

@@ -22,7 +22,6 @@
    [app.email.blacklist :as email.blacklist]
    [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]
@@ -37,29 +36,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)
-   values (?, ?, null, ?, ?, ?, ?)
+  "insert into team_invitation(id, team_id, email_to, created_by, role, valid_until)
+   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}))
 
@@ -85,41 +75,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]
-     [:initials [:maybe :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)
-          "expected cfg with valid connection")
-  (if organization
-    (assert (check-create-org-invitation-params params))
-    (assert (check-create-invitation-params params)))
+  (assert (db/connection? conn) "expected valid connection on cfg parameter")
+  (assert (check-create-invitation-params params))
 
   (let [email  (profile/clean-email email)
         member (profile/get-profile-by-email conn email)]
@@ -142,12 +110,9 @@
                            :profile-id (:id member)}
                           (get types.team/permissions-for-role role))]
 
-        (if organization
-          ;; Insert the invited member to the org
-          (when (contains? cf/flags :nitrate)
-            (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}))
+        ;; Insert the invited member to the team
+        (db/insert! conn :team-profile-rel 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.
@@ -164,30 +129,18 @@
         (teams/check-email-spam conn email true)
 
         (let [id         (uuid/next)
-              expire     (if organization
-                           (ct/in-future "876000h")  ;; Organization invitations doesn't expire
-                           (ct/in-future "168h")) ;; 7 days
-              invitation (db/exec-one! conn (if organization
-                                              [sql:upsert-org-invitation id
-                                               (:id organization)
-                                               (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]))
+              expire     (ct/in-future "168h") ;; 7 days
+              invitation (db/exec-one! conn [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}
@@ -199,58 +152,28 @@
 
           (let [props  (-> (dissoc tprops :profile-id)
                            (audit/clean-props))
-                evname (cond
-                         (and updated? organization) "update-org-invitation"
-                         updated? "update-team-invitation"
-                         organization "create-org-invitation"
-                         :else "create-team-invitation")
+                evname (if updated?
+                         "update-team-invitation"
+                         "create-team-invitation")
                 event (-> (audit/event-from-rpc-params params)
-                          (assoc :name evname)
-                          (assoc :props props))]
-            (audit/submit cfg event))
+                          (assoc ::audit/name evname)
+                          (assoc ::audit/props props))]
+            (audit/submit! cfg event))
 
           (when (allow-invitation-emails? member)
-            (if organization
-              (when (contains? cf/flags :nitrate)
-                (eml/send! {::eml/conn conn
-                            ::eml/factory eml/invite-to-org
-                            :public-uri (cf/get :public-uri)
-                            :to email
-                            :invited-by (:fullname profile)
-                            :user-name (:fullname member)
-                            :organization-name (:name organization)
-                            :organization-logo (:logo organization)
-                            :organization-initials (:initials 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 (dm/get-in team [:organization :name])
-                            :token itoken
-                            :extra-data ptoken}))))
+            (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)
+                        :token itoken
+                        :extra-data ptoken}))
 
           itoken)))))
 
-(defn create-org-invitation
-  [cfg {:keys [::rpc/profile-id id name initials logo] :as params}]
-  (let [profile  (db/get-by-id cfg :profile profile-id)]
-    (create-invitation cfg
-                       (assoc params
-                              :organization {:id id :name name :initials initials :logo logo}
-                              :profile profile
-                              :role :editor))))
-
 (defn- add-member-to-team
-  [{:keys [::db/conn] :as cfg} profile team role member]
-  (assert (db/connection-map? cfg)
-          "expected cfg with valid connection")
+  [conn profile team role member]
 
   (let [team-id (:id team)
         params  (merge
@@ -270,7 +193,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
@@ -352,7 +275,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))
@@ -487,9 +410,9 @@
 
     (let [props {:name name :features features}
           event (-> (audit/event-from-rpc-params params)
-                    (assoc :name "create-team")
-                    (assoc :props props))]
-      (audit/submit cfg event))
+                    (assoc ::audit/name "create-team")
+                    (assoc ::audit/props props))]
+      (audit/submit! cfg event))
 
     ;; Create invitations for all provided emails.
     (let [profile     (db/get-by-id conn :profile profile-id)

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]
@@ -74,11 +72,6 @@
                   {:is-active true}
                   {:id (:id profile)}))
 
-    ;; NOTE: `claims` is returned verbatim (besides :profile). When the
-    ;; verify-email JWE was minted by `register-profile` for a not-yet-
-    ;; active profile that came from an invitation flow, `:invitation-
-    ;; token` will be present here and the frontend will use it to
-    ;; complete the team-invitation flow after login.
     (-> claims
         (rph/with-transform (session/create-fn cfg profile))
         (rph/with-meta {::audit/name "verify-profile-email"
@@ -93,74 +86,52 @@
 ;; --- Team Invitation
 
 (defn- accept-invitation
-  [{:keys [::db/conn] :as cfg}
-   {:keys [team-id organization-id role member-email] :as claims} invitation member]
+  [{:keys [::db/conn] :as cfg} {:keys [team-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/profile-id id-member
-                          ::quotes/team-id team-id}))
+    (quotes/check! cfg {::quotes/id ::quotes/profiles-per-team
+                        ::quotes/profile-id (:id member)
+                        ::quotes/team-id team-id})
 
-    (let [params (merge
-                  {:team-id team-id
-                   :profile-id id-member}
-                  (get types.team/permissions-for-role role))
+    ;; Insert the invited member to the team
+    (db/insert! conn :team-profile-rel params {::db/on-conflict-do-nothing? true})
 
-          accepted-team-id (if organization-id
-                             ;; Insert the invited member to the org
-                             (when (contains? cf/flags :nitrate)
-                               (teams/initialize-user-in-nitrate-org cfg id-member organization-id member-email))
-                             ;; Insert the invited member to the team
-                             (do (teams/add-profile-to-team! cfg params {::db/on-conflict-do-nothing? true})
-                                 team-id))]
+    ;; If profile is not yet verified, mark it as verified because
+    ;; accepting an invitation link serves as verification.
+    (when-not (:is-active member)
+      (db/update! conn :profile
+                  {:is-active true}
+                  {:id (:id member)}))
 
-      (when-not accepted-team-id
-        (ex/raise :type :internal
-                  :code :accept-invitation-failed
-                  :hint "the accept invitation has failed"))
+    ;; Delete the invitation
+    (db/delete! conn :team-invitation
+                {:team-id team-id :email-to member-email})
 
+    ;; 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
-      ;; 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)))
+    (assoc member :is-active true)))
 
 (def schema:team-invitation-claims
-  [:and
-   [:map {:title "TeamInvitationClaims"}
-    [:iss :keyword]
-    [:exp ::ct/inst]
-    [:profile-id ::sm/uuid]
-    [:role types.team/schema:role]
-    [:team-id {:optional true} ::sm/uuid]
-    [:organization-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)))]])
+  [:map {:title "TeamInvitationClaims"}
+   [:iss :keyword]
+   [:exp ::ct/inst]
+   [:profile-id ::sm/uuid]
+   [:role types.team/schema:role]
+   [:team-id ::sm/uuid]
+   [:member-email ::sm/email]
+   [:member-id {:optional true} ::sm/uuid]])
 
 (def valid-team-invitation-claims?
   (sm/lazy-validator schema:team-invitation-claims))
@@ -168,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
@@ -176,45 +147,19 @@
               :hint "invitation token contains unexpected data"))
 
   (let [invitation             (db/get* conn :team-invitation
-                                        (cond-> {:email-to member-email}
-                                          team-id (assoc :team-id team-id)
-                                          organization-id  (assoc :org-id organization-id)))
+                                        {:team-id team-id :email-to member-email})
         profile                (db/get* conn :profile
                                         {:id profile-id}
-                                        {:columns [:id :email :default-team-id]})
-        registration-disabled? (not (contains? cf/flags :registration))
-
-        org-invitation?        (and (contains? cf/flags :nitrate) organization-id)
-        membership             (when org-invitation?
-                                 (nitrate/call cfg :get-org-membership {:profile-id profile-id
-                                                                        :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
-                    :reason :email-mismatch
-                    :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"))
+                                        {:columns [:id :email]})
+        registration-disabled? (not (contains? cf/flags :registration))]
+    (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
@@ -223,33 +168,36 @@
                      :role (:role claims)
                      :invitation-id (:id invitation)}]
 
-          (audit/submit cfg
-                        (-> (audit/event-from-rpc-params params)
-                            (assoc :name "accept-team-invitation")
-                            (assoc :props props)))
+          (audit/submit!
+           cfg
+           (-> (audit/event-from-rpc-params params)
+               (assoc ::audit/name "accept-team-invitation")
+               (assoc ::audit/props props)))
 
           ;; NOTE: Backward compatibility; old invitations can
           ;; have the `created-by` to be nil; so in this case we
           ;; don't submit this event to the audit-log
           (when-let [created-by (:created-by invitation)]
-            (audit/submit cfg
-                          (-> (audit/event-from-rpc-params params)
-                              (assoc :profile-id created-by)
-                              (assoc :name "accept-team-invitation-from")
-                              (assoc :props (assoc props
-                                                   :profile-id (:id profile)
-                                                   :email (:email profile))))))
+            (audit/submit!
+             cfg
+             (-> (audit/event-from-rpc-params params)
+                 (assoc ::audit/profile-id created-by)
+                 (assoc ::audit/name "accept-team-invitation-from")
+                 (assoc ::audit/props (assoc props
+                                             :profile-id (:id profile)
+                                             :email (:email profile))))))
 
-          (let [accepted-team-id (accept-invitation cfg claims invitation profile)]
-            (cond-> (assoc claims :state :created)
-              ;; when the invitation is to an org, instead of a team, add the
-              ;; accepted-team-id as :org-team-id
-              (:organization-id claims)
-              (assoc :org-team-id accepted-team-id)))))
+          (accept-invitation cfg claims invitation profile)
+          (assoc claims :state :created))
+
+        (ex/raise :type :validation
+                  :code :invalid-token
+                  :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/commands/webhooks.clj

@@ -50,27 +50,24 @@
 (defn- validate-webhook!
   [cfg whook params]
   (when (not= (:uri whook) (:uri params))
-    (try
-      (let [response (http/req cfg
+    (let [response (ex/try!
+                    (http/req! cfg
                                {:method :head
                                 :uri (str (:uri params))
-                                :timeout (ct/duration "3s")})]
+                                :timeout (ct/duration "3s")}
+                               {:sync? true}))]
+      (if (ex/exception? response)
+        (if-let [hint (webhooks/interpret-exception response)]
+          (ex/raise :type :validation
+                    :code :webhook-validation
+                    :hint hint)
+          (ex/raise :type :internal
+                    :code :webhook-validation
+                    :cause response))
         (when-let [hint (webhooks/interpret-response response)]
           (ex/raise :type :validation
                     :code :webhook-validation
-                    :hint hint)))
-
-      (catch Throwable cause
-        (if-let [hint (webhooks/interpret-exception cause)]
-          (ex/raise :type :validation
-                    :code :webhook-validation
-                    :hint hint
-                    :webhook-uri (str (:uri params))
-                    :cause cause)
-          (ex/raise :type :internal
-                    :code :webhook-validation
-                    :webhook-uri (str (:uri params))
-                    :cause cause))))))
+                    :hint hint))))))
 
 (defn- validate-quotes!
   [{:keys [::db/pool]} {:keys [team-id]}]

backend/src/app/rpc/cond.clj

@@ -19,7 +19,7 @@
     of the object. This function can be applied to the object returned by the
     `get-object` but also to the RPC return value (in case you don't provide
     the return value calculated key under `::key` metadata prop.
-  - `::reuse-key?` enables reusing the key calculated on first time; useful
+  - `::reuse-key?` enables reusing the key calculated on first time; usefull
     when the target object is not retrieved on the RPC (typical on retrieving
     dependent objects).
   "

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

@@ -8,35 +8,17 @@
   "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.time :as ct]
-   [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.nitrate :as nitrate]
+   [app.msgbus :as mbus]
    [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]
-   [app.worker :as wrk]))
-
-
-(defn- profile-to-map [profile]
-  {:id            (:id profile)
-   :name          (:fullname profile)
-   :email         (:email profile)
-   :photo-url     (files/resolve-public-uri (get profile :photo-id))})
+   [app.util.services :as sv]))
 
 ;; ---- API: authenticate
 
@@ -46,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)]
-    (-> (profile-to-map profile)
-        (assoc :theme (:theme profile)))))
+  (let [profile (profile/get-profile cfg profile-id)]
+    {:id (get profile :id)
+     :name (get profile :fullname)
+     :email (get profile :email)
+     :photo-url (files/resolve-public-uri (get profile :photo-id))}))
 
 ;; ---- API: get-teams
 
@@ -61,32 +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
-    [:map
-     [:full [:maybe ::sm/text]]
-     [:branch [:maybe ::sm/text]]
-     [:base [:maybe ::sm/text]]
-     [:main [:maybe ::sm/text]]
-     [:major [:maybe ::sm/text]]
-     [:minor [:maybe ::sm/text]]
-     [:patch [:maybe ::sm/text]]
-     [:modifier [:maybe ::sm/text]]
-     [:commit [:maybe ::sm/text]]
-     [:commit-hash [:maybe ::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
-   ::rpc/auth false}
-  [_cfg _params]
-  {:version cf/version})
-
 (def ^:private schema:get-teams-result
   [:vector schema:team])
 
@@ -100,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]
-  (notifications/notify-team-change cfg (select-keys team [:id :is-your-penpot :organization]) nil)
-  nil)
-
-;; ---- API: notify-user-added-to-organization
-
-(def ^:private schema:notify-user-added-to-organization
-  [:map
-   [:profile-id ::sm/uuid]
-   [:organization-id ::sm/uuid]
-   [: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))
+  [cfg {:keys [id organization-id organization-name]}]
+  (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-id id
+                         :organization-id organization-id
+                         :organization-name organization-name})))
 
 
 ;; ---- API: get-managed-profiles
@@ -189,441 +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 sql:get-teams-files-counts
-  "SELECT p.team_id, COUNT(f.*) AS total
-     FROM file AS f
-     JOIN project AS p ON (p.id = f.project_id)
-     JOIN team AS t ON (t.id = p.team_id)
-    WHERE t.id = ANY(?)
-      AND t.deleted_at IS NULL
-      AND p.deleted_at IS NULL
-      AND f.deleted_at IS NULL
- GROUP BY p.team_id;")
-
-(def ^:private sql:soft-delete-teams
-  "UPDATE team
-      SET deleted_at = ?
-    WHERE id = ANY(?)
-RETURNING id, deleted_at;")
-
-
-;; ---- API: notify-organization-deletion
-
-(def ^:private schema:notify-organization-deletion
-  [:map
-   [:organization-id ::sm/uuid]])
-
-
-(defn- soft-delete-teams!
-  "Soft-delete the provided team ids and submit a delete task per team."
-  [{:keys [::db/conn] :as cfg} team-ids]
-  (when (seq team-ids)
-    (let [delay      (cf/get-deletion-delay)
-          deleted-at (ct/in-future delay)
-          updated    (db/exec! conn [sql:soft-delete-teams
-                                     deleted-at
-                                     (db/create-array conn "uuid" team-ids)])]
-      (doseq [{:keys [id deleted-at]} updated]
-        (wrk/submit! {::db/conn conn
-                      ::wrk/task :delete-object
-                      ::wrk/params {:object :team
-                                    :deleted-at deleted-at
-                                    :id id}}))))
-  nil)
-
-(defn manage-deleted-organization-teams
-  "For a list of teams, rename those with files and delete those without, then notify users."
-  [cfg {:keys [teams organization-name]}]
-  (let [teams (->> teams (filter uuid?) distinct (into []))]
-    (when (seq teams)
-      (let [org-prefix (str "[" (d/sanitize-string organization-name) "] ")]
-        (db/tx-run!
-         cfg
-         (fn [{:keys [::db/conn] :as cfg}]
-           (let [teams-array      (db/create-array conn "uuid" teams)
-                 teams-with-files (->> (db/exec! conn [sql:get-teams-files-counts teams-array])
-                                       (filter (fn [{:keys [total]}] (pos? total)))
-                                       (map :team-id)
-                                       (into #{}))
-                 teams-to-keep    (->> teams (filter teams-with-files) (into []))
-                 teams-to-delete  (->> teams (remove teams-with-files) (into []))]
-
-             ;; Rename teams that have files in one go
-             (when (seq teams-to-keep)
-               (db/exec! conn [sql:prefix-teams-name-and-unset-default
-                               org-prefix
-                               (db/create-array conn "uuid" teams-to-keep)]))
-
-             ;; Soft-delete empty teams in one go
-             (soft-delete-teams! cfg teams-to-delete)
-
-             (notifications/notify-organization-deletion cfg organization-name teams teams-to-delete)
-             nil)))))))
-
-
-(sv/defmethod ::notify-organization-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-organization-deletion
-   ::rpc/auth false}
-  [cfg {:keys [organization-id]}]
-  (let [org-summary (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        teams       (->> (:teams org-summary)
-                         (map :id))]
-    (manage-deleted-organization-teams cfg {:teams teams :organization-name (:name org-summary)})
-    nil))
-
-;; ---- API: notify-user-organizations-deletion
-
-(def ^:private schema:notify-user-organizations-deletion
-  [:map
-   [:profile-id ::sm/uuid]])
-
-(sv/defmethod ::notify-user-organizations-deletion
-  "For a given user, find all owned organizations and rename or delete their teams."
-  {::doc/added "2.18"
-   ::sm/params schema:notify-user-organizations-deletion}
-  [cfg {:keys [profile-id]}]
-  (let [owned-orgs (nitrate/call cfg :get-owned-orgs {:profile-id profile-id})]
-    (doseq [org owned-orgs]
-      (let [organization-name (:name org)
-            teams (map :id (:teams org))]
-        (manage-deleted-organization-teams cfg {:teams teams :organization-name organization-name}))))
-  nil)
-
-
-
-
-;; ---- 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]
-                [:initials [:maybe :string]]
-                [: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,44 +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})))
-
-
-(defn notify-organization-deletion
-  [cfg organization-name teams deleted-teams]
-  (let [msgbus (::mbus/msgbus cfg)]
-    (mbus/pub! msgbus
-               :topic uuid/zero
-               :message {:type :organization-deleted
-                         :organization-name organization-name
-                         :teams teams
-                         :deleted-teams deleted-teams})))

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

@@ -11,9 +11,7 @@
    [app.common.logging :as l]
    [app.common.schema :as sm]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.db :as db]
-   [app.loggers.audit :as audit]
    [app.main :as-alias main]
    [app.setup.keys :as keys]
    [app.setup.templates]
@@ -37,20 +35,22 @@
        (into {})))
 
 (defn- handle-instance-id
-  [instance-id conn]
+  [instance-id conn read-only?]
   (or instance-id
       (let [instance-id (uuid/random)]
-        (try
-          (db/insert! conn :server-prop
-                      {:id "instance-id"
-                       :preload true
-                       :content (db/tjson instance-id)})
-          (catch Throwable cause
-            (l/warn :hint "unable to persist instance-id"
-                    :instance-id instance-id
-                    :cause cause)))
+        (when-not read-only?
+          (try
+            (db/insert! conn :server-prop
+                        {:id "instance-id"
+                         :preload true
+                         :content (db/tjson instance-id)})
+            (catch Throwable cause
+              (l/warn :hint "unable to persist instance-id"
+                      :instance-id instance-id
+                      :cause cause))))
         instance-id)))
 
+
 (def sql:add-prop
   "INSERT INTO server_prop (id, content, preload)
    VALUES (?, ?, ?)
@@ -77,47 +77,50 @@
   (assert (db/pool? (::db/pool params)) "expected valid database pool"))
 
 (defmethod ig/init-key ::props
-  [_ {:keys [::key] :as cfg}]
-  (audit/submit cfg {:type "trigger"
-                     :name "instance-start"
-                     :props {:version (:full cf/version)
-                             :flags (mapv name cf/flags)
-                             :public-uri (str (cf/get :public-uri))}})
+  [_ {:keys [::db/pool ::key] :as cfg}]
 
   (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 "
-                                        "on each restart and will invalidate "
-                                        "all sessions on each restart, it is highly "
-                                        "recommended setting up the "
-                                        "PENPOT_SECRET_KEY environment variable")))
+                      (l/warn :hint (str "using autogenerated secret-key, it will change on each restart and will invalidate "
+                                         "all sessions on each restart, it is highly 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))))))
+                          (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]
-              (let [key (or (get cfg id)
-                            (-> (keys/derive secret :salt (name id))
-                                (bc/bytes->b64-str true)))]
-                (if (or (str/empty? key)
-                        (str/blank? key))
-                  (do
-                    (l/wrn :id (name id) :hint "key is disabled because empty string found")
-                    keys)
-                  (do
-                    (l/inf :id (name id) :hint "key initialized" :key (d/obfuscate-string key))
-                    (assoc keys id key)))))
-            {}
-            [:exporter
-             :nitrate
-             :nexus])))
+    (d/without-nils
+     {:exporter
+      (let [key (or (get cfg :exporter)
+                    (-> (keys/derive secret :salt "exporter")
+                        (bc/bytes->b64-str true)))]
+        (if (or (str/empty? key)
+                (str/blank? key))
+          (do
+            (l/wrn :hint "exporter key is disabled because empty string found")
+            nil)
+          (do
+            (l/inf :hint "exporter key initialized" :key (d/obfuscate-string key))
+            key)))
 
-(sm/register! ::props [:map-of :keyword ::sm/any])
-(sm/register! ::shared-keys [:map-of :keyword ::sm/text])
+      :nitrate
+      (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/setup/templates.clj

@@ -57,9 +57,9 @@
 
       (if (fs/exists? path)
         (io/input-stream path)
-        (let [resp (http/req cfg
-                             {:method :get :uri (:file-uri template)}
-                             {:response-type :input-stream :sync? true})]
+        (let [resp (http/req! cfg
+                              {:method :get :uri (:file-uri template)}
+                              {:response-type :input-stream :sync? true})]
           (when-not (= 200 (:status resp))
             (ex/raise :type :internal
                       :code :unexpected-status-code

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

@@ -553,13 +553,14 @@
   (let [file-id (h/parse-uuid file-id)
         tnow    (ct/now)]
 
-    (audit/insert main/system
-                  {:name "delete-file"
-                   :type "action"
-                   :props {:id file-id}
-                   :context {:triggered-by "srepl"
-                             :cause "explicit call to delete-file!"}
-                   :tracked-at tnow})
+    (audit/insert! main/system
+                   {::audit/name "delete-file"
+                    ::audit/type "action"
+                    ::audit/profile-id uuid/zero
+                    ::audit/props {:id file-id}
+                    ::audit/context {:triggered-by "srepl"
+                                     :cause "explicit call to delete-file!"}
+                    ::audit/tracked-at tnow})
     (wrk/invoke! (-> main/system
                      (assoc ::wrk/task :delete-object)
                      (assoc ::wrk/params {:object :file
@@ -577,14 +578,17 @@
                                            {:id file-id}
                                            {::db/remove-deleted false
                                             ::sql/columns [:id :name]})]
-                    (audit/insert system
-                                  {:name "restore-file"
-                                   :type "action"
-                                   :props file
-                                   :context {:triggered-by "srepl"
-                                             :cause "explicit call to restore-file!"}})
+                    (audit/insert! system
+                                   {::audit/name "restore-file"
+                                    ::audit/type "action"
+                                    ::audit/profile-id uuid/zero
+                                    ::audit/props file
+                                    ::audit/context {:triggered-by "srepl"
+                                                     :cause "explicit call to restore-file!"}
+                                    ::audit/tracked-at (ct/now)})
 
-                    (#'files/restore-files conn [file-id]))
+
+                    (#'files/restore-file conn file-id))
                   :restored))))
 
 (defn delete-project!
@@ -593,13 +597,14 @@
   (let [project-id (h/parse-uuid project-id)
         tnow       (ct/now)]
 
-    (audit/insert main/system
-                  {:name "delete-project"
-                   :type "action"
-                   :props {:id project-id}
-                   :context {:triggered-by "srepl"
-                             :cause "explicit call to delete-project!"}
-                   :tracked-at tnow})
+    (audit/insert! main/system
+                   {::audit/name "delete-project"
+                    ::audit/type "action"
+                    ::audit/profile-id uuid/zero
+                    ::audit/props {:id project-id}
+                    ::audit/context {:triggered-by "srepl"
+                                     :cause "explicit call to delete-project!"}
+                    ::audit/tracked-at tnow})
 
     (wrk/invoke! (-> main/system
                      (assoc ::wrk/task :delete-object)
@@ -617,7 +622,7 @@
   (doseq [{:keys [id]} (db/query conn :file
                                  {:project-id project-id}
                                  {::sql/columns [:id]})]
-    (#'files/restore-files conn [id]))
+    (#'files/restore-file conn id))
 
   :restored)
 
@@ -630,12 +635,14 @@
                   (when-let [project (db/get* system :project
                                               {:id project-id}
                                               {::db/remove-deleted false})]
-                    (audit/insert system
-                                  {:name "restore-project"
-                                   :type "action"
-                                   :props project
-                                   :context {:triggered-by "srepl"
-                                             :cause "explicit call to restore-team!"}})
+                    (audit/insert! system
+                                   {::audit/name "restore-project"
+                                    ::audit/type "action"
+                                    ::audit/profile-id uuid/zero
+                                    ::audit/props project
+                                    ::audit/context {:triggered-by "srepl"
+                                                     :cause "explicit call to restore-team!"}
+                                    ::audit/tracked-at (ct/now)})
 
                     (restore-project* system project-id))))))
 
@@ -645,13 +652,14 @@
   (let [team-id (h/parse-uuid team-id)
         tnow    (ct/now)]
 
-    (audit/insert main/system
-                  {:name "delete-team"
-                   :type "action"
-                   :props {:id team-id}
-                   :context {:triggered-by "srepl"
-                             :cause "explicit call to delete-profile!"}
-                   :tracked-at tnow})
+    (audit/insert! main/system
+                   {::audit/name "delete-team"
+                    ::audit/type "action"
+                    ::audit/profile-id uuid/zero
+                    ::audit/props {:id team-id}
+                    ::audit/context {:triggered-by "srepl"
+                                     :cause "explicit call to delete-profile!"}
+                    ::audit/tracked-at tnow})
 
     (wrk/invoke! (-> main/system
                      (assoc ::wrk/task :delete-object)
@@ -687,12 +695,14 @@
                                                    {:id team-id}
                                                    {::db/remove-deleted false})
                                           (teams/decode-row))]
-                    (audit/insert system
-                                  {:name "restore-team"
-                                   :type "action"
-                                   :props team
-                                   :context {:triggered-by "srepl"
-                                             :cause "explicit call to restore-team!"}})
+                    (audit/insert! system
+                                   {::audit/name "restore-team"
+                                    ::audit/type "action"
+                                    ::audit/profile-id uuid/zero
+                                    ::audit/props team
+                                    ::audit/context {:triggered-by "srepl"
+                                                     :cause "explicit call to restore-team!"}
+                                    ::audit/tracked-at (ct/now)})
 
                     (restore-team* system team-id))))))
 
@@ -702,12 +712,13 @@
   (let [profile-id (h/parse-uuid profile-id)
         tnow       (ct/now)]
 
-    (audit/insert main/system
-                  {:name "delete-profile"
-                   :type "action"
-                   :context {:triggered-by "srepl"
-                             :cause "explicit call to delete-profile!"}
-                   :tracked-at tnow})
+    (audit/insert! main/system
+                   {::audit/name "delete-profile"
+                    ::audit/type "action"
+                    ::audit/profile-id uuid/zero
+                    ::audit/context {:triggered-by "srepl"
+                                     :cause "explicit call to delete-profile!"}
+                    ::audit/tracked-at tnow})
 
     (wrk/invoke! (-> main/system
                      (assoc ::wrk/task :delete-object)
@@ -726,12 +737,14 @@
                                                       {:id profile-id}
                                                       {::db/remove-deleted false})
                                              (profile/decode-row))]
-                    (audit/insert system
-                                  {:name "restore-profile"
-                                   :type "action"
-                                   :props (audit/profile->props profile)
-                                   :context {:triggered-by "srepl"
-                                             :cause "explicit call to restore-profile!"}})
+                    (audit/insert! system
+                                   {::audit/name "restore-profile"
+                                    ::audit/type "action"
+                                    ::audit/profile-id uuid/zero
+                                    ::audit/props (audit/profile->props profile)
+                                    ::audit/context {:triggered-by "srepl"
+                                                     :cause "explicit call to restore-profile!"}
+                                    ::audit/tracked-at (ct/now)})
 
                     (db/update! system :profile
                                 {:deleted-at nil}
@@ -755,14 +768,14 @@
                                                   {::db/remove-deleted false})
                                          (profile/decode-row))]
                   (do
-                    (audit/insert system
-                                  {:name "delete-profile"
-                                   :type "action"
-                                   :profile-id (:id profile)
-                                   :tracked-at deleted-at
-                                   :props (audit/profile->props profile)
-                                   :context {:triggered-by "srepl"
-                                             :cause "explicit call to delete-profiles-in-bulk!"}})
+                    (audit/insert! system
+                                   {::audit/name "delete-profile"
+                                    ::audit/type "action"
+                                    ::audit/profile-id (:id profile)
+                                    ::audit/tracked-at deleted-at
+                                    ::audit/props (audit/profile->props profile)
+                                    ::audit/context {:triggered-by "srepl"
+                                                     :cause "explicit call to delete-profiles-in-bulk!"}})
                     (wrk/invoke! (-> system
                                      (assoc ::wrk/task :delete-object)
                                      (assoc ::wrk/params {:object :profile
@@ -892,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 threshold)))))
+    (process-touched! (assoc cfg ::timestamp (ct/now)))))
 

backend/src/app/tasks/telemetry.clj

@@ -11,27 +11,43 @@
   (:require
    [app.common.data :as d]
    [app.common.exceptions :as ex]
-   [app.common.logging :as l]
    [app.config :as cf]
    [app.db :as db]
    [app.http.client :as http]
    [app.main :as-alias main]
    [app.setup :as-alias setup]
-   [app.util.blob :as blob]
    [app.util.json :as json]
    [integrant.core :as ig]
    [promesa.exec :as px]))
 
-(defn- get-subscriptions
-  [cfg]
-  (let [sql "SELECT email FROM profile where props->>'~:newsletter-updates' = 'true'"]
-    (db/run! cfg (fn [{:keys [::db/conn]}]
-                   (->> (db/exec! conn [sql])
-                        (mapv :email))))))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; IMPL
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; LEGACY DATA COLLECTION
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defn- send!
+  [cfg data]
+  (let [request {:method :post
+                 :uri (cf/get :telemetry-uri)
+                 :headers {"content-type" "application/json"}
+                 :body (json/encode-str data)}
+        response (http/req! cfg request)]
+    (when (> (:status response) 206)
+      (ex/raise :type :internal
+                :code :invalid-response
+                :response-status (:status response)
+                :response-body (:body response)))))
+
+(defn- get-subscriptions-newsletter-updates
+  [conn]
+  (let [sql "SELECT email FROM profile where props->>'~:newsletter-updates' = 'true'"]
+    (->> (db/exec! conn [sql])
+         (mapv :email))))
+
+(defn- get-subscriptions-newsletter-news
+  [conn]
+  (let [sql "SELECT email FROM profile where props->>'~:newsletter-news' = 'true'"]
+    (->> (db/exec! conn [sql])
+         (mapv :email))))
 
 (defn- get-num-teams
   [conn]
@@ -145,9 +161,8 @@
 (def ^:private sql:get-counters
   "SELECT name, count(*) AS count
      FROM audit_log
-    WHERE source LIKE 'telemetry:%'
-      AND created_at >= date_trunc('day', now())
-      AND created_at <  date_trunc('day', now()) + interval '1 day'
+    WHERE source = 'backend'
+      AND tracked_at >= date_trunc('day', now())
     GROUP BY 1
     ORDER BY 2 DESC")
 
@@ -159,13 +174,23 @@
     {:total-accomulated-events total
      :event-counters counters}))
 
-(defn- get-legacy-stats
-  [{:keys [::db/conn]}]
+(def ^:private sql:clean-counters
+  "DELETE FROM audit_log
+    WHERE ip_addr = '0.0.0.0'::inet -- we know this is from telemetry
+      AND tracked_at < (date_trunc('day', now()) - '1 day'::interval)")
+
+(defn- clean-counters-data!
+  [conn]
+  (when-not (contains? cf/flags :audit-log)
+    (db/exec-one! conn [sql:clean-counters])))
+
+(defn- get-stats
+  [conn]
   (let [referer (if (cf/get :telemetry-with-taiga)
                   "taiga"
                   (cf/get :telemetry-referer))]
     (-> {:referer             referer
-         :public-uri          (str (cf/get :public-uri))
+         :public-uri          (cf/get :public-uri)
          :total-teams         (get-num-teams conn)
          :total-projects      (get-num-projects conn)
          :total-files         (get-num-files conn)
@@ -182,124 +207,6 @@
          (get-action-counters conn))
         (d/without-nils))))
 
-(defn- make-legacy-request
-  [cfg data]
-  (let [request {:method :post
-                 :uri (cf/get :telemetry-uri)
-                 :headers {"content-type" "application/json"}
-                 :body (json/encode-str data)}
-        response (http/req cfg request {:skip-ssrf-check? true})]
-    (when (> (:status response) 206)
-      (ex/raise :type :internal
-                :code :invalid-response
-                :response-status (:status response)
-                :response-body (:body response)))))
-
-(defn- send-legacy-data
-  [{:keys [::setup/props] :as cfg} stats subs]
-  (let [data (cond-> {:type        :telemetry-legacy-report
-                      :version     (:full cf/version)
-                      :instance-id (:instance-id props)}
-               (some? stats)
-               (assoc :stats stats)
-
-               (seq subs)
-               (assoc :subscriptions subs))]
-
-    (make-legacy-request cfg data)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; AUDIT-EVENT BATCH (TELEMETRY MODE)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Telemetry events older than this are purged by the GC step so the
-;; buffer stays bounded.
-(def ^:private batch-size 10000)
-
-(def ^:private sql:gc-events
-  "DELETE FROM audit_log
-    WHERE source LIKE 'telemetry:%'
-      AND created_at < now() - interval '7 days'")
-
-(defn- gc-events
-  "Delete telemetry-mode events older than `telemetry-retention-days`
-  so that the buffer stays bounded."
-  [{:keys [::db/conn]}]
-  (let [result (db/exec-one! conn [sql:gc-events])]
-    (when (pos? (:next.jdbc/update-count result))
-      (l/warn :hint "purged stale telemetry events"
-              :count (:next.jdbc/update-count result)))))
-
-(def ^:private sql:fetch-telemetry-events
-  "SELECT id, name, type, source, tracked_at, profile_id, props, context
-     FROM audit_log
-    WHERE source LIKE 'telemetry:%'
-    ORDER BY created_at ASC
-    LIMIT ?")
-
-(defn- row->event
-  [{:keys [name type source tracked-at profile-id props context]}]
-  (d/without-nils
-   {:name       name
-    :type       type
-    :source     source
-    :tracked-at tracked-at
-    :profile-id profile-id
-    :props      (or (some-> props db/decode-transit-pgobject) {})
-    :context    (or (some-> context db/decode-transit-pgobject) {})}))
-
-(defn- encode-batch
-  "Encode a sequence of event maps into a fressian+zstd base64 string
-  suitable for JSON transport."
-  ^String [events]
-  (blob/encode-str events {:version 4}))
-
-(defn send-event-batch
-  "Send a single batch of events to the telemetry endpoint. Returns
-  true on success."
-  [{:keys [::setup/props] :as cfg} batch]
-  (let [payload {:type :telemetry-events
-                 :version (:full cf/version)
-                 :instance-id (:instance-id props)
-                 :events (encode-batch batch)}
-        request {:method  :post
-                 :uri     (cf/get :telemetry-uri)
-                 :headers {"content-type" "application/json"}
-                 :body    (json/encode-str payload)}
-        resp    (http/req cfg request {:skip-ssrf-check? true})]
-    (if (<= (:status resp) 206)
-      true
-      (do
-        (l/warn :hint "telemetry event batch send failed"
-                :status (:status resp)
-                :body   (:body resp))
-        false))))
-
-(defn- delete-sent-events
-  "Delete rows by their ids after a successful send."
-  [conn ids]
-  (let [arr (db/create-array conn "uuid" ids)]
-    (db/exec-one! conn ["DELETE FROM audit_log WHERE id = ANY(?)" arr])))
-
-(defn- collect-and-send-audit-events
-  "Collect anonymous telemetry-mode audit events and ship them to the
-  telemetry endpoint in a loop. Each iteration fetches one page of
-  `batch-size` rows, encodes and sends them, then deletes the rows on
-   success. The loop stops as soon as a send returns false, leaving
-   remaining rows intact for the next run."
-  [{:keys [::db/conn] :as cfg}]
-  (loop [counter 1]
-    (when-let [rows (-> (db/exec! conn [sql:fetch-telemetry-events batch-size])
-                        (not-empty))]
-      (let [events (mapv row->event rows)
-            ids    (mapv :id rows)]
-        (l/dbg :hint "shipping telemetry event batch"
-               :total (count events)
-               :batch counter)
-        (when (send-event-batch cfg events)
-          (delete-sent-events conn ids)
-          (recur (inc counter)))))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; TASK ENTRY POINT
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -311,47 +218,46 @@
   (assert (some? (::setup/props params)) "expected setup props to be available"))
 
 (defmethod ig/init-key ::handler
-  [_ cfg]
+  [_ {:keys [::db/pool ::setup/props] :as cfg}]
   (fn [task]
     (let [params   (:props task)
           send?    (get params :send? true)
           enabled? (or (get params :enabled? false)
-                       (contains? cf/flags :telemetry))
-          subs     (get-subscriptions cfg)]
+                       (contains? cf/flags :telemetry)
+                       (cf/get :telemetry-enabled))
 
+          subs     {:newsletter-updates (get-subscriptions-newsletter-updates pool)
+                    :newsletter-news (get-subscriptions-newsletter-news pool)}
 
-      ;; If we have telemetry enabled, then proceed the normal
-      ;; operation sending legacy report
+          data     {:subscriptions subs
+                    :version (:full cf/version)
+                    :instance-id (:instance-id props)}]
 
-      (if enabled?
-        (when send?
-          (db/run! cfg gc-events)
-          ;; Randomize start time to avoid thundering herd when multiple
-          ;; instances restart at the same time.
-          (px/sleep (rand-int 10000))
+      (when enabled?
+        (clean-counters-data! pool))
 
-          (try
-            (let [stats (db/run! cfg get-legacy-stats)]
-              (send-legacy-data cfg stats subs))
-            (catch Exception cause
-              (l/wrn :hint "unable to send legacy report"
-                     :cause cause)))
-
-          ;; Ship any anonymous audit-log events accumulated in
-          ;; telemetry mode (only when audit-log feature is off).
-          (when-not (contains? cf/flags :audit-log)
-            (try
-              (db/run! cfg collect-and-send-audit-events)
-              (catch Exception cause
-                (l/wrn :hint "unable to send events"
-                       :cause cause)))))
+      (cond
+        ;; If we have telemetry enabled, then proceed the normal
+        ;; operation.
+        enabled?
+        (let [data (merge data (get-stats pool))]
+          (when send?
+            (px/sleep (rand-int 10000))
+            (send! cfg data))
+          data)
 
         ;; If we have telemetry disabled, but there are users that are
         ;; explicitly checked the newsletter subscription on the
         ;; onboarding dialog or the profile section, then proceed to
         ;; send a limited telemetry data, that consists in the list of
         ;; subscribed emails and the running penpot version.
-        (when (and send? (seq subs))
-          (px/sleep (rand-int 10000))
-          (ex/ignoring
-           (send-legacy-data cfg nil subs)))))))
+        (or (seq (:newsletter-updates subs))
+            (seq (:newsletter-news subs)))
+        (do
+          (when send?
+            (px/sleep (rand-int 10000))
+            (send! cfg data))
+          data)
+
+        :else
+        data))))

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/src/app/util/blob.clj

@@ -19,7 +19,6 @@
    java.io.DataOutputStream
    java.io.InputStream
    java.io.OutputStream
-   java.util.Base64
    net.jpountz.lz4.LZ4Compressor
    net.jpountz.lz4.LZ4Factory
    net.jpountz.lz4.LZ4FastDecompressor
@@ -50,13 +49,6 @@
        5 (encode-v5 data)
        (throw (ex-info "unsupported version" {:version version}))))))
 
-(defn encode-str
-  "Encode data to a blob and return it as a URL-safe base64 string
-  (no padding). Accepts the same options as `encode`."
-  (^String [data] (encode-str data nil))
-  (^String [data opts]
-   (.encodeToString (.withoutPadding (Base64/getUrlEncoder)) ^bytes (encode data opts))))
-
 (defn decode
   "A function used for decode persisted blobs in the database."
   [^bytes data]
@@ -71,11 +63,6 @@
         5 (decode-v5 data)
         (throw (ex-info "unsupported version" {:version version}))))))
 
-(defn decode-str
-  "Decode a URL-safe base64 string produced by `encode-str` back to data."
-  [^String s]
-  (decode (.decode (Base64/getUrlDecoder) s)))
-
 ;; --- IMPL
 
 (defn- encode-v1

backend/src/app/util/nio.clj

@@ -1,91 +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.util.nio
-  "NIO helpers for working with files and byte arrays.
-
-   These are thin wrappers around java.nio that provide a
-   Clojure-idiomatic API. Candidates for porting to datoteka."
-  (:import
-   java.nio.ByteBuffer
-   java.nio.channels.FileChannel
-   java.nio.file.Files
-   java.nio.file.OpenOption
-   java.nio.file.Path
-   java.nio.file.StandardOpenOption))
-
-(set! *warn-on-reflection* true)
-
-;; ----------------------------------------------------------------
-;; File operations (via java.nio.file.Files)
-;; ----------------------------------------------------------------
-
-(defn read-bytes
-  "Read all bytes from a file at `path`. Returns a byte array."
-  ^bytes [^Path path]
-  (Files/readAllBytes path))
-
-(defn write-bytes
-  "Write `data` (byte array) to a file at `path`, replacing existing
-   content. Returns `path`."
-  [^Path path ^bytes data]
-  (Files/write path data ^"[Ljava.nio.file.OpenOption;" (into-array OpenOption []))
-  path)
-
-(defn append-bytes
-  "Append `data` (byte array) to the end of the file at `path`.
-   Creates the file if it does not exist. Returns `path`."
-  [^Path path ^bytes data]
-  (Files/write path data
-               ^"[Ljava.nio.file.OpenOption;"
-               (into-array OpenOption
-                           [StandardOpenOption/CREATE
-                            StandardOpenOption/APPEND]))
-  path)
-
-;; ----------------------------------------------------------------
-;; FileChannel operations (internal API)
-;; ----------------------------------------------------------------
-
-(def ^:private read-write-opts
-  (into-array OpenOption
-              [StandardOpenOption/READ StandardOpenOption/WRITE]))
-
-(defn open-channel
-  "Open a FileChannel for read/write on the given path."
-  ^FileChannel [^Path path]
-  (FileChannel/open path read-write-opts))
-
-(defn channel-size
-  "Return the size of the file backed by the channel."
-  ^long [^FileChannel channel]
-  (.size channel))
-
-(defn read-at
-  "Read `length` bytes from `channel` starting at `position` into a
-   new byte array. Returns the byte array.
-   Loops until the ByteBuffer is fully populated to guard against OS
-   partial reads, which would otherwise cause BufferUnderflowException
-   when copying from the buffer into the result array."
-  ^bytes [^FileChannel channel ^long position ^long length]
-  (let [buf (ByteBuffer/allocate (int length))]
-    (.position channel position)
-    (loop []
-      (when (.hasRemaining buf)
-        (let [n (.read channel buf)]
-          (when (pos? n)
-            (recur)))))
-    (.flip buf)
-    (let [remaining (.remaining buf)
-          arr       (byte-array remaining)]
-      (.get buf arr)
-      arr)))
-
-(defn truncate
-  "Truncate the file to the given size. Returns the channel."
-  [^FileChannel channel ^long size]
-  (.truncate channel size)
-  channel)

backend/src/app/util/ssrf.clj

@@ -1,229 +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.util.ssrf
-  "URL/host validation to prevent Server-Side Request Forgery."
-  (:require
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.config :as cf]
-   [cuerdas.core :as str])
-  (:import
-   com.google.common.net.InetAddresses
-   java.net.InetAddress
-   java.net.UnknownHostException
-   java.net.URI))
-
-(def ^:private allowed-schemes
-  #{"http" "https"})
-
-(def ^:private cloud-metadata-ips
-  "Exact IP addresses for cloud metadata services."
-  #{"169.254.169.254"
-    "fd00:ec2::254"})
-
-(def ^:private extra-blocked-ranges
-  "CIDR ranges not covered by standard JDK InetAddress predicates.
-   Each entry is [base-address prefix-length]."
-  ;; Carrier-grade NAT
-  [[100 64 0 0 10]
-   ;; RFC 6890 / documentation / reserved
-   [192 0 0 0 24]
-   [192 0 2 0 24]
-   [198 18 0 0 15]
-   [198 51 100 0 24]
-   [203 0 113 0 24]
-   ;; Reserved / future-use (broadcast and above)
-   [240 0 0 0 4]])
-
-(defn- ip4-to-long
-  "Convert a 4-element byte array (IPv4) to a 32-bit long."
-  ^long [^bytes bs]
-  (bit-or (bit-shift-left (bit-and (aget bs 0) 0xFF) 24)
-          (bit-shift-left (bit-and (aget bs 1) 0xFF) 16)
-          (bit-shift-left (bit-and (aget bs 2) 0xFF) 8)
-          (bit-and (aget bs 3) 0xFF)))
-
-(defn- prefix-mask
-  "Return a 32-bit mask for the given prefix length."
-  ^long [^long prefix-len]
-  (if (zero? prefix-len)
-    0
-    (bit-shift-left (unsigned-bit-shift-right 0xFFFFFFFF (- 32 prefix-len)) (- 32 prefix-len))))
-
-(defn- in-cidr4?
-  "Check if an IPv4 address (as byte array) falls within a CIDR range
-   specified as [a b c d prefix-len]."
-  [^bytes addr [^long a ^long b ^long c ^long d ^long prefix-len]]
-  (let [base   (bit-or (bit-shift-left (bit-and a 0xFF) 24)
-                       (bit-shift-left (bit-and b 0xFF) 16)
-                       (bit-shift-left (bit-and c 0xFF) 8)
-                       (bit-and d 0xFF))
-        mask   (prefix-mask prefix-len)
-        ip-val (ip4-to-long addr)]
-    (= (bit-and ip-val mask) (bit-and base mask))))
-
-(defn- parse-cidr*
-  "Parse a CIDR string like '10.0.0.0/8' into [a b c d prefix-len]. Throws on invalid input."
-  [^String cidr]
-  (let [parts      (str/split cidr #"/" 2)
-        prefix-len (when (= 2 (count parts))
-                     (parse-long (nth parts 1)))]
-    (when-not prefix-len
-      (ex/raise :type :internal
-                :code :invalid-cidr
-                :hint (str "invalid CIDR notation: " cidr)))
-    (let [octets (str/split (first parts) #"\.")]
-      (when (not= 4 (count octets))
-        (ex/raise :type :internal
-                  :code :invalid-cidr
-                  :hint (str "invalid CIDR notation (expected IPv4): " cidr)))
-      (let [[a b c d] (map parse-long octets)]
-        (when (or (nil? a) (nil? b) (nil? c) (nil? d)
-                  (not (<= 0 a 255)) (not (<= 0 b 255))
-                  (not (<= 0 c 255)) (not (<= 0 d 255))
-                  (not (<= 0 prefix-len 32)))
-          (ex/raise :type :internal
-                    :code :invalid-cidr
-                    :hint (str "invalid CIDR notation: " cidr)))
-        [a b c d prefix-len]))))
-
-(defn parse-cidr
-  "Parse a CIDR string like '10.0.0.0/8' into [a b c d prefix-len].
-   Returns nil and logs a warning on invalid input."
-  [^String cidr]
-  (try
-    (parse-cidr* cidr)
-    (catch Exception _
-      (l/warn :hint "ignoring invalid CIDR" :cidr cidr)
-      nil)))
-
-(defonce ^:dynamic extra-blocked-cidrs
-  (into #{} (keep parse-cidr) (cf/get :ssrf-extra-blocked-cidrs #{})))
-
-(defn- ipv6-ula?
-  "Check if an IPv6 address is in the Unique Local Address range (fc00::/7)."
-  [^InetAddress addr]
-  (let [bs (.getAddress addr)]
-    (and (>= (alength bs) 16)
-         (= (bit-and (aget bs 0) 0xFE) 0xFC))))
-
-(defn- ipv4-mapped-loopback?
-  "Check if an IPv4-mapped IPv6 address maps to loopback (::ffff:127.x.x.x)."
-  [^InetAddress addr]
-  (let [bs (.getAddress addr)]
-    (and (= (alength bs) 16)
-         ;; Check it's an IPv4-mapped address: ::ffff:x.x.x.x
-         (= (aget bs 10) (byte -1)) ;; 0xFF
-         (= (aget bs 11) (byte -1)) ;; 0xFF
-         ;; Check the embedded IPv4 is loopback (127.x.x.x)
-         (= (bit-and (aget bs 12) 0xFF) 127))))
-
-(defn- blocked-address?
-  "Check if an InetAddress should be blocked. Returns true if blocked."
-  [^InetAddress addr]
-  (or
-   (.isAnyLocalAddress addr)    ;; 0.0.0.0 or ::
-   (.isLoopbackAddress addr)    ;; 127/8 or ::1
-   (.isLinkLocalAddress addr)   ;; 169.254/16 or fe80::/10
-   (.isSiteLocalAddress addr)   ;; 10/8, 172.16/12, 192.168/16
-   (.isMulticastAddress addr)
-
-   ;; IPv6 ULA (fc00::/7)
-   (ipv6-ula? addr)
-
-   ;; IPv4-mapped loopback
-   (ipv4-mapped-loopback? addr)
-
-   ;; Cloud metadata IPs (exact match)
-   (contains? cloud-metadata-ips (.getHostAddress addr))
-
-   ;; Extra blocked CIDRs (IPv4 only)
-   (let [bs (.getAddress addr)]
-     (if (= (alength bs) 4)
-       (or (some #(in-cidr4? bs %) extra-blocked-ranges)
-           (some #(in-cidr4? bs %) extra-blocked-cidrs))
-       false))))
-
-(defn resolve-host
-  "Resolve a hostname to all InetAddress objects. Wraps InetAddress/getAllByName
-   so it can be stubbed in tests."
-  [^String hostname]
-  (try
-    (InetAddress/getAllByName hostname)
-    (catch UnknownHostException _
-      nil)))
-
-(defn validate-uri
-  "Validates `uri-or-string`:
-    - scheme must be http or https,
-    - host must resolve to at least one address, and
-    - **every** resolved address must NOT be in the blocklist
-      (loopback, link-local, site-local, multicast, any-local,
-      cloud-metadata 169.254.169.254, IPv6 ULA fc00::/7, IPv4-mapped
-       IPv6 of any blocked IPv4, plus operator-supplied CIDRs).
-   When the host is an IP literal (decimal/octal/hex/IPv6) it is
-   normalized via `com.google.common.net.InetAddresses` before the
-   check.
-   Hosts in `:ssrf-allowed-hosts` (case-insensitive exact match) bypass
-   the IP check.
-   Throws `ex/raise :type :validation :code :ssrf-blocked-target` with
-   a hint that does NOT echo the resolved IP (avoid info leak)."
-  [uri-or-string]
-  (let [uri    (if (instance? URI uri-or-string)
-                 uri-or-string
-                 (URI. (str uri-or-string)))
-        scheme (.getScheme uri)
-        host   (.getHost uri)]
-
-    ;; Validate scheme
-    (when (or (nil? scheme)
-              (not (contains? allowed-schemes (str/lower scheme))))
-      (ex/raise :type :validation
-                :code :ssrf-blocked-target
-                :hint "url scheme is not allowed"))
-
-    ;; Validate host presence
-    (when (or (nil? host) (str/blank? host))
-      (ex/raise :type :validation
-                :code :ssrf-blocked-target
-                :hint "url host is missing"))
-
-    ;; Check allowlist
-    (let [allowed-hosts (cf/get :ssrf-allowed-hosts #{})
-          host-lower    (str/lower host)]
-
-      (when-not (contains? allowed-hosts host-lower)
-        ;; Normalize the host: if it looks like an IP literal, normalize it
-        ;; via Guava to catch decimal/octal/hex encodings
-        (let [normalized (if (InetAddresses/isInetAddress host)
-                           (InetAddresses/forString host)
-                           nil)
-              host-to-resolve (if normalized
-                                (.getHostAddress ^InetAddress normalized)
-                                host)
-              addresses (resolve-host host-to-resolve)]
-
-          (when (or (nil? addresses) (zero? (alength addresses)))
-            (ex/raise :type :validation
-                      :code :ssrf-blocked-target
-                      :hint "url host could not be resolved"))
-
-          ;; All-or-nothing: if ANY resolved address is blocked, reject
-          (when (some blocked-address? (seq addresses))
-            (ex/raise :type :validation
-                      :code :ssrf-blocked-target
-                      :hint "url target is not allowed")))))
-    (str uri)))
-
-(defn safe-url?
-  "Predicate version of `validate-uri`. Returns `true` if safe."
-  [uri-or-string]
-  (try
-    (validate-uri uri-or-string)
-    true
-    (catch Exception _
-      false)))

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)))))