WIP

.circleci/config.yml

@@ -2,20 +2,26 @@ version: 2
 jobs:
   build:
     docker:
+      # specify the version you desire here
       - image: penpotapp/devenv:latest
-      - image: cimg/postgres:14.5
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+      - image: circleci/postgres:13.3-ram
         environment:
           POSTGRES_USER: penpot_test
           POSTGRES_PASSWORD: penpot_test
           POSTGRES_DB: penpot_test
-      - image: cimg/redis:7.0.5
+
+      - image: circleci/redis:6.0.8
 
     working_directory: ~/repo
-    resource_class: medium+
 
     environment:
-      JAVA_OPTS: -Xmx4g -Xms100m -XX:+UseSerialGC
-      NODE_OPTIONS: --max-old-space-size=4096
+      # Customize the JVM maximum heap limit
+      JVM_OPTS: -Xmx1g
 
     steps:
       - checkout
@@ -27,103 +33,76 @@ jobs:
            # fallback to using the latest cache if no exact match is found
            - v1-dependencies-
 
-      - run: cd .clj-kondo && cat config.edn
-      - run: cat .cljfmt.edn
-      - run: clj-kondo --version
-
       - run:
-          name: "backend fmt check"
-          working_directory: "./backend"
-          command: |
-            yarn install
-            yarn run fmt:clj:check
-
-      - run:
-          name: "exporter fmt check"
-          working_directory: "./exporter"
-          command: |
-            yarn install
-            yarn run fmt:clj:check
-
-      - run:
-          name: "common fmt check"
+          name: common lint
           working_directory: "./common"
           command: |
-            yarn install
-            yarn run fmt:clj:check
+            clj-kondo --version
+            clj-kondo --parallel --lint src/
 
       - run:
-          name: "frontend fmt check"
+          name: frontend lint
+          working_directory: "./frontend"
+          command: |
+            clj-kondo --version
+            clj-kondo --parallel --lint src/
+
+      - run:
+          name: frontend styles prettier
           working_directory: "./frontend"
           command: |
             yarn install
-            yarn run fmt:clj:check
+            yarn run lint-scss
 
       - run:
-          name: "common linter check"
-          working_directory: "./common"
-          command: |
-            yarn install
-            yarn run lint:clj
-
-      - run:
-          name: "frontend linter check"
-          working_directory: "./frontend"
-          command: |
-            yarn install
-            yarn run lint:scss
-            yarn run lint:clj
-
-      - run:
-          name: "backend linter check"
+          name: backend lint
           working_directory: "./backend"
           command: |
-            yarn install
-            yarn run lint:clj
+            clj-kondo --version
+            clj-kondo --parallel --lint src/
 
+      # run backend test
       - run:
-          name: "exporter linter check"
-          working_directory: "./exporter"
-          command: |
-            yarn install
-            yarn run lint:clj
-
-      - run:
-          name: "common tests"
-          working_directory: "./common"
-          command: |
-            yarn test
-            clojure -M:dev:test
-
-      - run:
-          name: "frontend tests"
-          working_directory: "./frontend"
-          command: |
-            yarn install
-            yarn test
-
-      - run:
-          name: "frontend integration tests"
-          working_directory: "./frontend"
-          command: |
-            yarn install
-            yarn run compile
-            clojure -M:dev:shadow-cljs release main
-            yarn playwright install --with-deps chromium
-            yarn e2e:test
-
-      - run:
-          name: "backend tests"
+          name: backend test
           working_directory: "./backend"
-          command: |
-            clojure -M:dev:test
-
+          command: "clojure -X:dev:test"
           environment:
             PENPOT_TEST_DATABASE_URI: "postgresql://localhost/penpot_test"
             PENPOT_TEST_DATABASE_USERNAME: penpot_test
             PENPOT_TEST_DATABASE_PASSWORD: penpot_test
             PENPOT_TEST_REDIS_URI: "redis://localhost/1"
 
+      - run:
+          name: frontend tests
+          working_directory: "./frontend"
+          command: |
+            yarn install
+            clojure -M:dev:shadow-cljs compile test
+            node target/tests.js
+
+          environment:
+            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
+
+      # - run:
+      #     working_directory: "./common"
+      #     name: common tests (cljs)
+      #     command: |
+      #       yarn install
+      #       yarn run compile-test
+      #       node target/test.js
+      # 
+      #     environment:
+      #       PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
+
+      - run:
+          working_directory: "./common"
+          name: common tests (clj)
+          command: |
+            clojure -X:dev:test
+
+          environment:
+            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
+
       - save_cache:
          paths:
            - ~/.m2

.clj-kondo/config.edn

@@ -1,42 +1,24 @@
 {:lint-as
  {promesa.core/let clojure.core/let
-  promesa.core/->> clojure.core/->>
-  promesa.core/-> clojure.core/->
-  promesa.exec.csp/go-loop clojure.core/loop
-  rumext.v2/defc clojure.core/defn
-  promesa.util/with-open clojure.core/with-open
-  app.common.schema.generators/let clojure.core/let
+  rumext.alpha/defc clojure.core/defn
+  rumext.alpha/fnc clojure.core/fn
   app.common.data/export clojure.core/def
-  app.common.data.macros/get-in clojure.core/get-in
-  app.common.data.macros/with-open clojure.core/with-open
-  app.common.data.macros/select-keys clojure.core/select-keys
+  app.db/with-atomic clojure.core/with-open
   app.common.logging/with-context clojure.core/do}
 
  :hooks
  {:analyze-call
-  {app.common.data.macros/export hooks.export/export
+  {app.common.data/export hooks.export/export
+   potok.core/reify hooks.export/potok-reify
    app.util.services/defmethod hooks.export/service-defmethod
-   app.common.record/defrecord hooks.export/penpot-defrecord
-   app.db/with-atomic hooks.export/penpot-with-atomic
-   potok.v2.core/reify hooks.export/potok-reify
-   rumext.v2/fnc hooks.export/rumext-fnc
-   rumext.v2/lazy-component hooks.export/rumext-lazycomponent
-   shadow.lazy/loadable hooks.export/rumext-lazycomponent
    }}
 
  :output
  {:exclude-files
   ["data_readers.clj"
-   "src/app/util/perf.cljs"
-   "src/app/common/logging.cljc"
-   "src/app/common/exceptions.cljc"
-   "^(?:backend|frontend|exporter|common)/build.clj"
-   "^(?:backend|frontend|exporter|common)/deps.edn"
-   "^(?:backend|frontend|exporter|common)/scripts/"
-   "^(?:backend|frontend|exporter|common)/dev/"
-   "^(?:backend|frontend|exporter|common)/test/"]
-
-  :linter-name true}
+   "app/util/perf.cljs"
+   "app/common/logging.cljc"
+   "app/common/exceptions.cljc"]}
 
  :linters
  {:unsorted-required-namespaces
@@ -52,23 +34,12 @@
   :single-key-in
   {:level :warning}
 
-  :non-arg-vec-return-type-hint
-  {:level :off}
-
   :redundant-do
   {:level :off}
 
-  :earmuffed-var-not-dynamic
-  {:level :off}
-
-  :dynamic-var-not-earmuffed
-  {:level :off}
-
-  :used-underscored-binding
-  {:level :warning}
-
   :unused-binding
   {:exclude-destructured-as true
    :exclude-destructured-keys-in-fn-args false
    }
   }}
+

.clj-kondo/hooks/export.clj

@@ -12,7 +12,6 @@
 
 (def registry (atom {}))
 
-
 (defn potok-reify
   [{:keys [:node :filename] :as params}]
   (let [[rnode rtype & other] (:children node)
@@ -38,76 +37,8 @@
                           (api/token-node rsym)
                           (api/vector-node [])]
                          other))]
-
-      ;; (prn (api/sexpr result))
-
       {:node result})))
 
-(defn penpot-with-atomic
-  [{:keys [node]}]
-  (let [[params & body] (rest (:children node))]
-    (if (api/vector-node? params)
-      (let [[sym val opts] (:children params)]
-        (when-not (and sym val)
-          (throw (ex-info "No sym and val provided" {})))
-        {:node (api/list-node
-                (list*
-                 (api/token-node 'let)
-                 (api/vector-node [sym val])
-                 opts
-                 body))})
-
-      {:node (api/list-node
-              (into [(api/token-node 'let)
-                     (api/vector-node [params params])]
-                    body))})))
-
-(defn rumext-fnc
-  [{:keys [node]}]
-  (let [[cname mdata params & body] (rest (:children node))
-        [params body] (if (api/vector-node? mdata)
-                        [mdata (cons params body)]
-                        [params body])]
-    (let [result (api/list-node
-                  (into [(api/token-node 'fn)
-                         params]
-                        (cons mdata body)))]
-      {:node result})))
-
-
-(defn rumext-lazycomponent
-  [{:keys [node]}]
-  (let [[cname mdata params & body] (rest (:children node))
-        [params body] (if (api/vector-node? mdata)
-                        [mdata (cons params body)]
-                        [params body])]
-    (let [result (api/list-node [(api/token-node 'constantly) nil])]
-      ;; (prn (api/sexpr result))
-      {:node result})))
-
-
-(defn penpot-defrecord
-  [{:keys [:node]}]
-  (let [[rnode rtype rparams & other] (:children node)
-
-        nodes [(api/token-node (symbol "do"))
-               (api/list-node
-                (into [(api/token-node (symbol (name (:value rnode)))) rtype rparams] other))
-               (api/list-node
-                [(api/token-node (symbol "defn"))
-                 (api/token-node (symbol (str "pos->" (:string-value rtype))))
-                 (api/vector-node
-                  (->> (:children rparams)
-                       (mapv (fn [t]
-                               (api/token-node (symbol (str "_" (:string-value t))))))))
-                 (api/token-node nil)])]
-
-        result (api/list-node nodes)]
-
-    ;; (prn "=====>" (into {} rparams))
-    ;; (prn (api/sexpr result))
-    {:node result}))
-
 (defn clojure-specify
   [{:keys [:node]}]
   (let [[rnode rtype & other] (:children node)
@@ -117,41 +48,29 @@
                        other))]
     {:node result}))
 
+
 (defn service-defmethod
   [{:keys [:node]}]
   (let [[rnode rtype ?meta & other] (:children node)
         rsym    (gensym (name (:k rtype)))
-
-        [?docs other] (if (api/string-node? ?meta)
-                        [?meta other]
-                        [nil (cons ?meta other)])
-
-        [?meta other] (let [?meta (first other)]
-                        (if (api/map-node? ?meta)
-                          [?meta (rest other)]
-                          [nil   other]))
-
-        nodes         [(api/token-node (symbol "do"))
-                       (api/list-node
-                        [(api/token-node (symbol "declare"))
-                         (api/token-node rsym)])
-
-                       (when ?docs
-                         (api/list-node
-                          [(api/token-node (symbol "comment")) ?docs]))
-
-                       (when ?meta
-                         (api/list-node
-                          [(api/token-node (symbol "reset-meta!"))
-                           (api/token-node rsym)
-                           ?meta]))
-                       (api/list-node
-                        (into [(api/token-node (symbol "defmethod"))
-                               (api/token-node rsym)
-                               rtype]
-                              other))]
-        result  (api/list-node (filterv some? nodes))]
-
-    ;; (prn "=====>" rtype)
+        result  (api/list-node
+                 [(api/token-node (symbol "do"))
+                  (api/list-node
+                   [(api/token-node (symbol "declare"))
+                    (api/token-node rsym)])
+                  (if (= :map (:tag ?meta))
+                    (api/list-node
+                     [(api/token-node (symbol "reset-meta!"))
+                      (api/token-node rsym)
+                      ?meta])
+                    (api/list-node
+                     [(api/token-node (symbol "comment"))
+                      (api/token-node rsym)]))
+                  (api/list-node
+                   (into [(api/token-node (symbol "defmethod"))
+                          (api/token-node rsym)
+                          rtype]
+                         (cons ?meta other)))])]
+    ;; (prn "==============" rtype (into {} ?meta))
     ;; (prn (api/sexpr result))
     {:node result}))

.cljfmt.edn

@@ -1,9 +0,0 @@
-{:sort-ns-references? true
- :remove-multiple-non-indenting-spaces? false
- :remove-surrounding-whitespace? true
- :remove-consecutive-blank-lines? false
- :extra-indents {rumext.v2/fnc [[:inner 0]]
-                 cljs.test/async [[:inner 0]]
-                 promesa.exec/thread [[:inner 0]]
-                 specify! [[:inner 0] [:inner 1]]}
- }

.editorconfig

@@ -1,13 +0,0 @@
-root = true
-
-[*.{cljs,cljc,clj,js,css,scss,html,yml,yaml,json,mustache}]
-charset = utf-8
-
-indent_size = 2
-indent_style = space
-
-end_of_line = lf
-
-insert_final_newline = true
-
-trim_trailing_whitespace = true

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,89 +0,0 @@
-description: Create a report to help us improve
-labels: ["bug"]
-name: Bug report
-title: "bug: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Before you start
-
-        Please search our [existing issues](https://github.com/penpot/penpot/issues) and open [pull requests](https://github.com/penpot/penpot/pulls) to lessen the change of filing duplicate issues or feature requests. Thank you.
-
-        ---
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        Steps to reproduce the behavior:
-        1.  Go to '...'
-        2.  Click on '....'
-        3.  Scroll down to '....'
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      description: A clear and concise description of what you expected to happen.
-      label: Expected behavior
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      description: A clear and concise description of what happens instead; what the bug is.
-      label: Actual behavior
-    validations:
-      required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      description: If applicable, add screenshots to help explain your problem.
-      label: Screenshots or video
-  - type: textarea
-    id: desktop
-    attributes:
-      label: Desktop (please complete the following information)
-      placeholder: |
-        - OS (e.g. iOS):
-        - Browser & version (e.g. Chrome 89.0):
-  - type: textarea
-    id: mobile
-    attributes:
-      label: Smartphone (please complete the following information)
-      placeholder: |
-        - Device & model (e.g. iPhone 6):
-        - OS & version (e.g. iOS 8.1):
-        - Browser & version (e.g. stock browser 22):
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment (please complete the following information)
-      placeholder: |
-        - Host (e.g. https://design.penpot.app, local instance):
-
-        *If self-hosted:*
-        - OS Version (e.g. Ubuntu 16.04):
-        - Docker / Docker-compose version (e.g. Docker version 18.03.0-ce, build 0520e24):
-        - Image version (e.g. Alpine):
-
-        Docker commands or docker-compose file (if possible and if proceed.x):
-        ```
-
-        ```
-  - type: textarea
-    id: frontend-trace
-    attributes:
-      label: Frontend Stack Trace
-      render: console
-  - type: textarea
-    id: backend-trace
-    attributes:
-      label: Backend Stack Trace
-      render: console
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Any other context about the problem.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,73 @@
+---
+
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**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.
+
+**Screenshots**
+If applicable, add 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)
+
+**Environment (please complete the following information):**
+Specify if using SAAS (https://design.penpot.app) or self-hosted instance.
+
+If self-hosted instance, add OS and runtime information to help explain your problem.
+
+-   OS Version: (e.g. Ubuntu 16.04)
+
+Also provide Docker commands or docker-compose file if possible and if proceed.x
+
+-   Docker / Docker-compose Version: (e.g. Docker version 18.03.0-ce, build 0520e24)
+-   Image (e.g. alpine)
+
+**Frontend Stack Trace (if self-hosted)**
+
+<details>
+
+```
+
+```
+
+</details>
+
+**Backend Stack Trace (if self-hosted)**
+
+<details>
+
+```
+
+```
+
+</details>
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,37 +0,0 @@
-description: Suggest an idea for this project.
-labels: ["needs triage", "enhancement"]
-name: "Feature request"
-title: "feature: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Before you start
-
-        Please search our [existing issues](https://github.com/penpot/penpot/issues) and open [pull requests](https://github.com/penpot/penpot/pulls) to lessen the change of filing duplicate issues or feature requests. Thank you.
-
-        ---
-  - type: textarea
-    id: problem
-    attributes:
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when (...)
-      label: Is your feature request related to a problem? Please describe.
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      description: A clear and concise description of what you want to happen.
-      label: Describe the solution you'd like.
-    validations:
-      required: true
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Describe alternatives you've considered.
-      description: A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**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.

.gitignore

@@ -1,75 +1,49 @@
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
+figwheel_server.log
+*jar
 *-init.clj
-*.css.json
-*.jar
-*.orig
-*.penpot
-*.css.json
-.calva
-.clj-kondo
-.cpcache
-.lsp
-.nrepl-port
-.nyc_output
-.rebel_readline_history
+.lein-deps-sum
+.lein-failures
+.lein-repl-history
+.lein-plugins/
 .repl
-.shadow-cljs
-/*.jpg
-/*.md
-/*.png
-/*.svg
-/*.sql
-/*.txt
-/*.yml
-/*.zip
-/.clj-kondo/.cache
-/_dump
-/backend/*.md
-/backend/*.sql
-/backend/*.txt
+.nrepl-port
+.cpcache
+.rebel_readline_history
+.nyc_output
+/vendor/**/target
+/cd.md
+node_modules
+/backend/target/
+/backend/resources/public/media
+/backend/resources/public/assets
 /backend/assets/
-/backend/builtin-templates
 /backend/dist/
 /backend/logs/
-/backend/resources/public/assets
-/backend/resources/public/media
-/backend/target/
-/bundle*
-/cd.md
-/clj-profiler/
-/common/coverage
-/common/target
-/deploy
-/docker/images/bundle*
-/exporter/target
-/frontend/cypress/fixtures/validuser.json
-/frontend/cypress/videos/*/
-/frontend/cypress/videos/*/
-/frontend/dist/
-/frontend/npm-debug.log
-/frontend/out/
-/frontend/package-lock.json
-/frontend/resources/fonts/experiments
-/frontend/resources/public/*
-/frontend/storybook-static/
-/frontend/target/
-/other/
-/scripts/
+/backend/-
 /telemetry/
-/tmp/
-/vendor/**/target
-/vendor/svgclean/bundle*.js
-/web
+/frontend/npm-debug.log
+/frontend/target/
+/frontend/dist/
+/frontend/out/
+/frontend/.shadow-cljs
+/frontend/resources/public/*
+/frontend/resources/fonts/experiments
+/exporter/target
+/exporter/.shadow-cljs
+/docker/images/bundle*
+/common/.shadow-cljs
+/common/target
+/common/coverage
+/.clj-kondo/.cache
 clj-profiler/
-node_modules
-frontend/.storybook/preview-body.html
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
+/bundle*
+/media
+/deploy
+/web
+/_dump
+/vendor/svgclean/bundle*.js
+
+.calva
+.clj-kondo
+.lsp
+/frontend/cypress/videos/*/

.vscode/settings.json

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

.yarnrc.yml

@@ -1,11 +0,0 @@
-enableGlobalCache: true
-
-enableImmutableCache: false
-
-enableImmutableInstalls: false
-
-enableTelemetry: false
-
-httpTimeout: 600000
-
-nodeLinker: node-modules

CONTRIBUTING.md

@@ -54,7 +54,7 @@ We will use the `easy fix` mark for tag for indicate issues that are
 easy for beginners.
 
 
-## Commit Guidelines ##
+## Commit Message Guidelines ##
 
 We have very precise rules over how our git commit messages can be formatted.
 
@@ -78,6 +78,7 @@ Where type is:
 - :ambulance: `:ambulance:` a commit that fixes critical bug
 - :books: `:books:` a commit that improves or adds documentation
 - :construction: `:construction:`: a wip commit
+- :construction_worker: `:construction_worker:` a commit with CI related stuff
 - :boom: `:boom:` a commit with breaking changes
 - :wrench: `:wrench:` a commit for config updates
 - :zap: `:zap:` a commit with performance improvements
@@ -90,25 +91,12 @@ More info:
  - https://gist.github.com/parmentf/035de27d6ed1dce0b36a
  - https://gist.github.com/rxaviers/7360908
 
-Each commit should have:
+The subject should be:
 
-- A concise subject using imperative mood.
-- The subject should have capitalized the first letter, without period
-  at the end and no larger than 65 characters.
-- A blank line between the subject line and the body.
-- An entry on the CHANGES.md file if applicable, referencing the
-  github or taiga issue/user-story using the these same rules.
-
-Examples of good commit messages:
-
-- `:bug: Fix unexpected error on launching modal`
-- `:bug: Set proper error message on generic error`
-- `:sparkles: Enable new modal for profile`
-- `:zap: Improve performance of dashboard navigation`
-- `:wrench: Update default backend configuration`
-- `:books: Add more documentation for authentication process`
-- `:ambulance: Fix critical bug on user registration process`
-- `:tada: Add new approach for user registration`
+- Use the imperative mood.
+- Capitalize the first letter.
+- Don't put a period at the end of the subject line.
+- Put a blank line between the subject line and the body.
 
 
 ## Code of conduct ##

README.md

@@ -2,160 +2,86 @@
 [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>
+<h1 align="center">
+  <br>
+  <img src="https://penpot.app/images/readme/readme-logo.jpg" alt="PENPOT">
+</h1>
 
 <p align="center"><a href="https://www.mozilla.org/en-US/MPL/2.0" rel="nofollow"><img src="https://camo.githubusercontent.com/3fcf3d6b678ea15fde3cf7d6af0e242160366282d62a7c182d83a50bfee3f45e/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4d504c2d322e302d626c75652e737667" alt="License: MPL-2.0" data-canonical-src="https://img.shields.io/badge/MPL-2.0-blue.svg" style="max-width:100%;"></a>
 <a href="https://gitter.im/penpot/community" rel="nofollow"><img src="https://camo.githubusercontent.com/5b0aecb33434f82a7b158eab7247544235ada0cf7eeb9ce8e52562dd67f614b7/68747470733a2f2f6261646765732e6769747465722e696d2f736572656e6f2d78797a2f636f6d6d756e6974792e737667" alt="Gitter" data-canonical-src="https://badges.gitter.im/sereno-xyz/community.svg" style="max-width:100%;"></a>
 <a href="https://tree.taiga.io/project/penpot/" title="Managed with Taiga.io" rel="nofollow"><img src="https://camo.githubusercontent.com/4a1d1112f0272e3393b1e8da312ff4435418e9e2eb4c0964881e3680f90a653c/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6d616e61676564253230776974682d54414947412e696f2d3730396631342e737667" alt="Managed with Taiga.io" data-canonical-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 src="https://camo.githubusercontent.com/daadb4894128d1e19b72d80236f5959f1f2b47f9fe081373f3246131f0189f6c/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f476974706f642d72656164792d2d746f2d2d636f64652d626c75653f6c6f676f3d676974706f64" alt="Gitpod ready-to-code" data-canonical-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/technical-guide/getting-started/"><b>Getting Started</b></a>  •  
-    <a href="https://help.penpot.app/user-guide/"><b>User Guide</b></a>  •  
-    <a href="https://help.penpot.app/user-guide/introduction/info/"><b>Tutorials & Info</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://twitter.com/penpotapp"><b>X</b></a>
-
-</p>
-
-<br />
-
-[Penpot video](https://github.com/penpot/penpot/assets/5446186/b8ad0764-585e-4ddc-b098-9b4090d337cc)
-
-<br />
-
-Penpot is the first **open-source** design tool for design and code collaboration. Designers can create stunning designs, interactive prototypes, design systems at scale, while developers enjoy ready-to-use code and make their workflow easy and fast. And all of this with no handoff drama.
-
-Penpot is available on browser and [self host](https://penpot.app/self-host). It’s web-based and works with open standards (SVG, CSS and HTML). And last but not least, it’s free! 
-
-Penpot’s latest [huge release 2.0](https://penpot.app/dev-diaries), takes 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. Plus, it's faster and more accessible. 
+![PENPOT](https://penpot.app/images/readme/home-ui.jpg)
 
 
-🎇 **Penpot Fest** is our design, code & Open Source event. Check out the highlights from [Penpot Fest 2023 edition](https://www.youtube.com/watch?v=sOpLZaK5mDc)!
+## What is Penpot? ##
 
-## Table of contents ##
+Penpot is the first **Open Source design** and prototyping platform meant for cross-domain teams. Non dependent on operating systems, Penpot is web based and works with open web standards (SVG). For all and empowered by the community.
 
-- [Why Penpot](#why-penpot)
-- [Getting Started](#getting-started)
-- [Community](#community)
-- [Resources](#resources)
+- [How to use](#how-to-use)
+- [Help center](#help-center)
+- [Contributing](#contributing)
+- [Give feedback](#give-feedback)
+- [Tutorials](#tutorials)
 - [License](#license)
 
-## Why Penpot ##
+## How to use ##
 
-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.
+Login or Register on our Penpot cloud app. Create a team to work together on projects and share design assets or jump right away into Penpot and **start designing** by your own.
 
-### 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".
+✏️ [Start using Penpot](https://design.penpot.app)
 
-### 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.
+You can also install Penpot in a local environment. This section details everything you need to know to get Penpot up and running in production environments. Although it can be installed in many ways, the recommended approach is using **docker** and **docker-compose**.
 
-### 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.
+🐳 [Install docker](https://help.penpot.app/technical-guide/getting-started/)
 
-### Integrations ###
-Penpot offers integration into the development toolchain, thanks to its support for webhooks and an API accessible through access tokens.
+## Help center ##
 
-### What’s great for design ###
-With Penpot you can design libraries to share and reuse; turn design elements into components and tokens to allow reusability and scalability; and build realistic user flows and interactions.
+In this documentation you will find (almost) everything you need to know about how to work with Penpot. From the interface basics to advanced functionality.
 
-<br />
+📖 [User guide](https://help.penpot.app/user-guide/)
 
-<p align="center">
-  <img src="https://img.plasmic.app/img-optimizer/v1/img?src=https%3A%2F%2Fimg.plasmic.app%2Fimg-optimizer%2Fv1%2Fimg%2F9dd677c36afb477e9666ccd1d3f009ad.png" alt="Open Source" style="width: 65%;">
-</p>
+❓ [FAQs](https://help.penpot.app/faqs/)
 
-<br />
+🖥️ [Technical guide](https://help.penpot.app/technical-guide/)
 
-## Getting started ##
+❤️ [Contributing guide](https://help.penpot.app/contributing-guide/)
 
-### Install with Elestio ###
-Penpot is the only design & prototype platform that is deployment agnostic. You can use it or deploy it anywhere.
-
-Learn how to install it with Elestio and Docker, 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!
-
-If you need help or have any questions; if you’d like to share your experience using Penpot or get inspired; if you’d rather meet our community of developers and designers, [join our Community](https://community.penpot.app/)!
-
-You will find the following categories:
-- [Ask the Community](https://community.penpot.app/c/ask-for-help-using-penpot/6)
-- [Troubleshooting](https://community.penpot.app/c/technical/8)
-- [Help us Improve Penpot](https://community.penpot.app/c/help-us-improve-penpot/7)
-- [#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)
-- [Design and Code Essentials](https://community.penpot.app/c/design-and-code-essentials/22)
-
-
-<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 />
+![User guide](https://penpot.app/images/readme/help-center.jpg)
 
 ## 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)
-- Star this repo 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) and [X](https://twitter.com/penpotapp).
-- 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
-
-To find (almost) everything you need to know on how to contribute to Penpot, refer to the [contributing guide](https://help.penpot.app/contributing-guide/).
-
-<br />
-
 <p align="center">
-  <img src="https://github.com/penpot/penpot/assets/5446186/fea18923-dc06-49be-86ad-c3496a7956e6" alt="Libraries and templates" style="width: 65%;">
+  <img src="https://penpot.app/images/open-source.png" alt="Open Source">
 </p>
 
-<br />
+**Open to you!**
 
-## Resources ##
+We love the open source software community. Contributing is our
+passion and because of this, we'll be glad if you want to participate
+and improve Penpot. All your awesome ideas and code are welcome!
+
+Please refer to the [Contributing Guide](./CONTRIBUTING.md)
+
+## Give feedback ##
 
 You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.
 
-💾 [Documentation](https://help.penpot.app/technical-guide/)
+✉️ [Mail us](mailto:info@penpot.app)
 
-🚀 [Getting Started](https://help.penpot.app/technical-guide/getting-started/)
+💬 [GitHub discussions](https://github.com/penpot/penpot/discussions)
 
-✏️ [Tutorials](https://www.youtube.com/playlist?list=PLgcCPfOv5v54WpXhHmNO7T-YC7AE-SRsr)
+🐞 [GitHub issues](https://github.com/penpot/penpot/issues)
 
-🏘️ [Architecture](https://help.penpot.app/technical-guide/developer/architecture/)
+✍️️ [Gitter](https://gitter.im/penpot/community)
 
-📚 [Dev Diaries](https://penpot.app/dev-diaries.html)
+## Tutorials ##
 
+You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.
+Would you like to know more about Penpot? We recommend you to visit our youtube channel and learn more about the functionalities and possibilities of Penpot with our video tutorials.
+
+🎞️ [YouTube channel](https://www.youtube.com/channel/UCAqS8G72uv9P5HG1IfgnQ9g)
 
 ## License ##
 
@@ -164,6 +90,5 @@ 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
+Copyright (c) UXBOX Labs SL
 ```
-Penpot is a Kaleidos’ [open source project](https://kaleidos.net/)

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security issues to `support@penpot.app`

THANKYOU.md

@@ -1,106 +0,0 @@
-# THANK YOU
-
-We want to thank to the amazing people that help us! Thank you! You're the best!
-
-Feel free you make a PR updating this file if you miss you in the
-list.
-
-## Security
-
-* Husnain Iqbal (CEO OF ALPHA INFERNO PVT LTD)
-* [Shiraz Ali Khan](https://www.linkedin.com/in/shiraz-ali-khan-1ba508180/)
-* Vaibhav Shukla
-* Hassan Ahmed (Alias Xen Lee)
-* Michal Biesiada (@mbiesiad)
-
-## Internationalization
-
-* [00ff88](https://hosted.weblate.org/user/00ff88)
-* [AhmadHB](https://hosted.weblate.org/user/AhmadHB)
-* [Aimee](https://hosted.weblate.org/user/Aimee)
-* [alejandro.alonso](https://hosted.weblate.org/user/alejandro.alonso)
-* [alexpawlak](https://hosted.weblate.org/user/alexpawlak)
-* [allytiago](https://hosted.weblate.org/user/allytiago)
-* [alonso.torres](https://hosted.weblate.org/user/alonso.torres)
-* [andres.moya](https://hosted.weblate.org/user/andres.moya)
-* [antoniofsm](https://hosted.weblate.org/user/antoniofsm)
-* [ascarida](https://hosted.weblate.org/user/ascarida)
-* [Bechii](https://hosted.weblate.org/user/Bechii)
-* [Beeby](https://hosted.weblate.org/user/Beeby)
-* [bingling-sama](https://hosted.weblate.org/user/bingling-sama)
-* [devadarta](https://hosted.weblate.org/user/devadarta)
-* [diacritica](https://hosted.weblate.org/user/diacritica)
-* [dundzys.vincas](https://hosted.weblate.org/user/dundzys.vincas)
-* [Eranot](https://hosted.weblate.org/user/Eranot)
-* [erral](https://hosted.weblate.org/user/erral)
-* [ersen](https://hosted.weblate.org/user/ersen)
-* [filipepessanha](https://hosted.weblate.org/user/filipepessanha)
-* [fortx](https://hosted.weblate.org/user/fortx)
-* [foxbit](https://hosted.weblate.org/user/foxbit)
-* [georgelemon](https://hosted.weblate.org/user/georgelemon)
-* [girafic](https://hosted.weblate.org/user/girafic)
-* [gizemb](https://hosted.weblate.org/user/gizemb)
-* [greench](https://hosted.weblate.org/user/greench)
-* [guidimas](https://hosted.weblate.org/user/guidimas)
-* [hfigueira_1](https://hosted.weblate.org/user/hfigueira_1)
-* [hifiaz](https://hosted.weblate.org/user/hifiaz)
-* [httpsterio](https://hosted.weblate.org/user/httpsterio)
-* [humteus](https://hosted.weblate.org/user/humteus)
-* [iblueer](https://hosted.weblate.org/user/iblueer)
-* [insan](https://hosted.weblate.org/user/insan)
-* [Iphi](https://hosted.weblate.org/user/Iphi)
-* [iWangJiaxiang](https://hosted.weblate.org/user/iWangJiaxiang)
-* [jancborchardt](https://hosted.weblate.org/user/jancborchardt)
-* [jazz](https://hosted.weblate.org/user/jazz)
-* [johnterroa](https://hosted.weblate.org/user/johnterroa)
-* [jponsa](https://hosted.weblate.org/user/jponsa)
-* [kapler](https://hosted.weblate.org/user/kapler)
-* [kingu](https://hosted.weblate.org/user/kingu)
-* [KnahkAmath](https://hosted.weblate.org/user/KnahkAmath)
-* [laminne](https://hosted.weblate.org/user/laminne)
-* [lenildoleite](https://hosted.weblate.org/user/lenildoleite)
-* [liimee](https://hosted.weblate.org/user/liimee)
-* [lixeix](https://hosted.weblate.org/user/lixeix)
-* [locness3](https://hosted.weblate.org/user/locness3)
-* [maiwann](https://hosted.weblate.org/user/maiwann)
-* [MidooDj](https://hosted.weblate.org/user/MidooDj)
-* [Mohamed_amine_gdoura](https://hosted.weblate.org/user/Mohamed_amine_gdoura)
-* [myfunnyandy](https://hosted.weblate.org/user/myfunnyandy)
-* [NampoinaRal](https://hosted.weblate.org/user/NampoinaRal)
-* [nautilusx](https://hosted.weblate.org/user/nautilusx)
-* [niwinz](https://hosted.weblate.org/user/niwinz)
-* [pablo.alba](pablo.https://hosted.weblate.org/user/alba)
-* [PhilippeAccorsi](https://hosted.weblate.org/user/PhilippeAccorsi)
-* [rnarius](https://hosted.weblate.org/user/rnarius)
-* [rnd](https://hosted.weblate.org/user/rnd)
-* [RuanAragao](https://hosted.weblate.org/user/RuanAragao)
-* [ruben](https://hosted.weblate.org/user/ruben)
-* [semonxue](https://hosted.weblate.org/user/semonxue)
-* [shahab](https://hosted.weblate.org/user/shahab)
-* [shuaib85](https://hosted.weblate.org/user/shuaib85)
-* [SiderealArt](https://hosted.weblate.org/user/SiderealArt)
-* [swapnil.cx](swapnil.https://hosted.weblate.org/user/cx)
-* [syuza](https://hosted.weblate.org/user/syuza)
-* [th3ph4nt0m](https://hosted.weblate.org/user/th3ph4nt0m)
-* [tiwb](https://hosted.weblate.org/user/tiwb)
-* [tommi](https://hosted.weblate.org/user/tommi)
-* [val](https://hosted.weblate.org/user/val)
-* [vikt](https://hosted.weblate.org/user/vikt)
-* [VinLin](https://hosted.weblate.org/user/VinLin)
-* [vintprox](https://hosted.weblate.org/user/vintprox)
-* [Voxybuns](https://hosted.weblate.org/user/Voxybuns)
-* [winie](https://hosted.weblate.org/user/winie)
-* [Yaron](https://hosted.weblate.org/user/Yaron)
-* [yrd](https://hosted.weblate.org/user/yrd)
-* [YukiYuigishi](https://hosted.weblate.org/user/YukiYuigishi)
-* [zcraber](https://hosted.weblate.org/user/zcraber)
-
-## Libraries & templates
-
-* systxema
-* plumilla
-* victor crespo
-* xtech
-* candidexmedia
-* merih güz
-* klarr agency

backend/.gitignore

@@ -1,7 +0,0 @@
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions

backend/build.clj

@@ -16,11 +16,16 @@
    {:src-dirs ["src" "resources"]
     :target-dir class-dir})
 
+  (b/compile-clj
+   {:basis basis
+    :src-dirs ["src"]
+    :class-dir class-dir})
+
   (b/uber
    {:class-dir class-dir
     :uber-file jar-file
     :main 'clojure.main
-    :exclude [#".*Log4j2Plugins\.dat$"]
+    :exclude [#"goog.*" #"^javasist.*"]
     :basis basis}))
 
 (defn compile [_]
@@ -28,4 +33,4 @@
    {:src-dirs ["dev/java"]
     :class-dir class-dir
     :basis basis
-    :javac-opts ["-source" "17" "-target" "17"]}))
+    :javac-opts ["-source" "11" "-target" "11"]}))

backend/deps.edn

@@ -1,71 +1,58 @@
-{:mvn/repos
- {"sonatype" {:url "https://oss.sonatype.org/content/repositories/snapshots/"}}
-
- :deps
+{:deps
  {penpot/common {:local/root "../common"}
-  org.clojure/clojure {:mvn/version "1.12.0-alpha12"}
-  org.clojure/tools.namespace {:mvn/version "1.5.0"}
+  org.clojure/core.async {:mvn/version "1.5.648"}
 
-  com.github.luben/zstd-jni {:mvn/version "1.5.6-3"}
+  ;; Logging
+  org.zeromq/jeromq {:mvn/version "0.5.2"}
 
-  io.prometheus/simpleclient {:mvn/version "0.16.0"}
-  io.prometheus/simpleclient_hotspot {:mvn/version "0.16.0"}
-  io.prometheus/simpleclient_jetty
-  {:mvn/version "0.16.0"
-   :exclusions [org.eclipse.jetty/jetty-server
-                org.eclipse.jetty/jetty-servlet]}
+  com.taoensso/nippy {:mvn/version "3.1.1"}
+  com.github.luben/zstd-jni {:mvn/version "1.5.1-1"}
+  org.clojure/data.fressian {:mvn/version "1.0.0"}
 
-  io.prometheus/simpleclient_httpserver {:mvn/version "0.16.0"}
+  io.prometheus/simpleclient {:mvn/version "0.14.1"}
+  io.prometheus/simpleclient_hotspot {:mvn/version "0.14.1"}
+  io.prometheus/simpleclient_jetty {:mvn/version "0.14.1"
+                                    :exclusions [org.eclipse.jetty/jetty-server
+                                                 org.eclipse.jetty/jetty-servlet]}
+  io.prometheus/simpleclient_httpserver {:mvn/version "0.14.1"}
 
-  io.lettuce/lettuce-core {:mvn/version "6.3.2.RELEASE"}
+  io.lettuce/lettuce-core {:mvn/version "6.1.5.RELEASE"}
   java-http-clj/java-http-clj {:mvn/version "0.4.3"}
 
-  funcool/yetti
-  {:git/tag "v10.0"
-   :git/sha "520613f"
-   :git/url "https://github.com/funcool/yetti.git"
-   :exclusions [org.slf4j/slf4j-api]}
+  funcool/yetti {:git/tag "v4.0" :git/sha "59ed2a7"
+                 :git/url "https://github.com/funcool/yetti.git"
+                 :exclusions [org.slf4j/slf4j-api]}
 
-  com.github.seancorfield/next.jdbc {:mvn/version "1.3.939"}
-  metosin/reitit-core {:mvn/version "0.7.0"}
-  nrepl/nrepl {:mvn/version "1.1.2"}
-  cider/cider-nrepl {:mvn/version "0.48.0"}
+  com.github.seancorfield/next.jdbc {:mvn/version "1.2.761"}
+  metosin/reitit-ring {:mvn/version "0.5.15"}
+  org.postgresql/postgresql {:mvn/version "42.3.1"}
+  com.zaxxer/HikariCP {:mvn/version "5.0.0"}
+  funcool/datoteka {:mvn/version "2.0.0"}
 
-  org.postgresql/postgresql {:mvn/version "42.7.3"}
-  org.xerial/sqlite-jdbc {:mvn/version "3.46.0.0"}
-
-  com.zaxxer/HikariCP {:mvn/version "5.1.0"}
-
-  io.whitfin/siphash {:mvn/version "2.0.0"}
-
-  buddy/buddy-hashers {:mvn/version "2.0.167"}
-  buddy/buddy-sign {:mvn/version "3.5.351"}
-
-  com.github.ben-manes.caffeine/caffeine {:mvn/version "3.1.8"}
-
-  org.jsoup/jsoup {:mvn/version "1.17.2"}
-  org.im4java/im4java
-  {:git/tag "1.4.0-penpot-2"
-   :git/sha "e2b3e16"
-   :git/url "https://github.com/penpot/im4java"}
+  buddy/buddy-core {:mvn/version "1.10.1"}
+  buddy/buddy-hashers {:mvn/version "1.8.1"}
+  buddy/buddy-sign {:mvn/version "3.4.1"}
 
+  org.jsoup/jsoup {:mvn/version "1.14.3"}
+  org.im4java/im4java {:mvn/version "1.4.0"}
   org.lz4/lz4-java {:mvn/version "1.8.0"}
 
   org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"}
+  integrant/integrant {:mvn/version "0.8.0"}
 
-  dawran6/emoji {:mvn/version "0.1.5"}
-  markdown-clj/markdown-clj {:mvn/version "1.12.1"}
+  io.sentry/sentry {:mvn/version "5.5.2"}
 
   ;; Pretty Print specs
   pretty-spec/pretty-spec {:mvn/version "0.1.4"}
-  software.amazon.awssdk/s3 {:mvn/version "2.25.63"}
-  }
+  software.amazon.awssdk/s3 {:mvn/version "2.17.102"}}
 
  :paths ["src" "resources" "target/classes"]
  :aliases
  {:dev
   {:extra-deps
    {com.bhauman/rebel-readline {:mvn/version "RELEASE"}
+    org.clojure/tools.namespace {:mvn/version "RELEASE"}
+    org.clojure/test.check {:mvn/version "RELEASE"}
     clojure-humanize/clojure-humanize {:mvn/version "0.2.2"}
     org.clojure/data.csv {:mvn/version "RELEASE"}
     com.clojure-goes-fast/clj-async-profiler {:mvn/version "RELEASE"}
@@ -73,14 +60,19 @@
    :extra-paths ["test" "dev"]}
 
   :build
-  {:extra-deps
-   {io.github.clojure/tools.build {:git/tag "v0.10.3" :git/sha "15ead66"}}
+  {:extra-deps {io.github.clojure/tools.build {:git/tag "v0.7.4" :git/sha "ac442da"}}
    :ns-default build}
 
+  :kaocha
+  {:extra-deps {lambdaisland/kaocha {:mvn/version "RELEASE"}}
+   :main-opts ["-m" "kaocha.runner"]}
+
   :test
-  {:main-opts ["-m" "kaocha.runner"]
-   :jvm-opts ["-Dlog4j2.configurationFile=log4j2-devenv-repl.xml"]
-   :extra-deps {lambdaisland/kaocha {:mvn/version "1.91.1392"}}}
+  {:extra-paths ["test"]
+   :extra-deps {io.github.cognitect-labs/test-runner
+                {:git/url "https://github.com/cognitect-labs/test-runner.git"
+                 :sha "dd6da11611eeb87f08780a30ac8ea6012d4c05ce"}}
+   :exec-fn cognitect.test-runner.api/test}
 
   :outdated
   {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}}
@@ -88,8 +80,8 @@
 
   :jmx-remote
   {:jvm-opts ["-Dcom.sun.management.jmxremote"
-              "-Dcom.sun.management.jmxremote.port=9091"
-              "-Dcom.sun.management.jmxremote.rmi.port=9091"
+              "-Dcom.sun.management.jmxremote.port=9090"
+              "-Dcom.sun.management.jmxremote.rmi.port=9090"
               "-Dcom.sun.management.jmxremote.local.only=false"
               "-Dcom.sun.management.jmxremote.authenticate=false"
               "-Dcom.sun.management.jmxremote.ssl=false"

backend/dev/java/app/Experiments.java

@@ -0,0 +1,133 @@
+package app;
+
+import clojure.lang.Seqable;
+import clojure.lang.RT;
+import clojure.lang.ISeq;
+import clojure.lang.ILookup;
+import clojure.lang.Keyword;
+
+
+  // static public double[] multiply(final double[] m1, final double m2[]) {
+  //   var result = new double[6];
+  //   result[0] = (m1[0] * m2[0]) + (m1[2] * m2[1]);
+  //   result[1] = (m1[1] * m2[0]) + (m1[3] * m2[1]);
+  //   result[2] = (m1[0] * m2[2]) + (m1[2] * m2[3]);
+  //   result[3] = (m1[1] * m2[2]) + (m1[3] * m2[3]);o
+
+  //   result[4] = (m1[0] * m2[4]) + (m1[2] * m2[5]) + m1[4];
+  //   result[5] = (m1[1] * m2[4]) + (m1[3] * m2[5]) + m1[5];
+  //   return result;
+  // }
+
+
+public class Experiments {
+  static public class Matrix implements Seqable, ILookup {
+    public final double[] buff;
+
+    public Matrix(double a, double b, double c, double d, double e, double f) {
+      buff = new double[6];
+      buff[0] = a;
+      buff[1] = b;
+      buff[2] = c;
+      buff[3] = d;
+      buff[4] = e;
+      buff[5] = f;
+    }
+
+    public Matrix(final double [] otherBuffer) {
+      buff = otherBuffer;
+    }
+
+    public ISeq seq() {
+      return RT.seq(this.buff);
+    }
+
+    public Double valAt(final Object key) {
+      var name = ((Keyword) key).getName();
+      switch(name) {
+      case "a": return this.buff[0];
+      case "b": return this.buff[1];
+      case "c": return this.buff[2];
+      case "d": return this.buff[3];
+      case "e": return this.buff[4];
+      default: return this.buff[5];
+      }
+    }
+
+    public Double valAt(final Object key, Object notFound) {
+      throw new IllegalArgumentException("not supported");
+    }
+  }
+
+  static public Matrix create(double a, double b, double c, double d, double e, double f) {
+    var buff = new double[6];
+    buff[0] = a;
+    buff[1] = b;
+    buff[2] = c;
+    buff[3] = d;
+    buff[4] = e;
+    buff[5] = f;
+    return new Matrix(buff);
+  }
+
+  static public Matrix multiply(final Matrix mt1, final Matrix mt2) {
+    var result = new double[6];
+    var m1 = mt1.buff;
+    var m2 = mt1.buff;
+
+    result[0] = (m1[0] * m2[0]) + (m1[2] * m2[1]);
+    result[1] = (m1[1] * m2[0]) + (m1[3] * m2[1]);
+    result[2] = (m1[0] * m2[2]) + (m1[2] * m2[3]);
+    result[3] = (m1[1] * m2[2]) + (m1[3] * m2[3]);
+    result[4] = (m1[0] * m2[4]) + (m1[2] * m2[5]) + m1[4];
+    result[5] = (m1[1] * m2[4]) + (m1[3] * m2[5]) + m1[5];
+    return new Matrix(result);
+  }
+
+  static private void multiplyMutating(final double[] m1, final double[] m2) {
+
+    var m1a = m1[0];
+    var m1b = m1[1];
+    var m1c = m1[2];
+    var m1d = m1[3];
+    var m1e = m1[4];
+    var m1f = m1[5];
+
+    double[] result = m1;
+    result[0] = (m1a * m2[0]) + (m1c * m2[1]);
+    result[1] = (m1b * m2[0]) + (m1d * m2[1]);
+    result[2] = (m1a * m2[2]) + (m1c * m2[3]);
+    result[3] = (m1b * m2[2]) + (m1d * m2[3]);
+    result[4] = (m1a * m2[4]) + (m1c * m2[5]) + m1e;
+    result[5] = (m1b * m2[4]) + (m1d * m2[5]) + m1f;
+  }
+
+  static public Matrix multiplyBulk(final Matrix m1) {
+    return m1;
+  }
+
+  static public Matrix multiplyBulk(final Matrix m1, final Matrix m2) {
+    return multiply(m1, m2);
+  }
+
+  static public Matrix multiplyBulk(final Matrix m1, final Matrix m2, final Matrix m3) {
+    var result = multiply(m1, m2);
+    multiplyMutating(result.buff, m3.buff);
+    return result;
+  }
+
+  static public Matrix multiplyBulk(final Matrix m1, final Matrix m2, final Matrix m3, final Matrix m4) {
+    var result = multiply(m1, m2);
+    multiplyMutating(result.buff, m3.buff);
+    multiplyMutating(result.buff, m4.buff);
+    return result;
+  };
+
+  static public Matrix multiplyBulk(final Matrix m1, final Matrix m2, final Matrix m3, final Matrix m4, final Matrix m5) {
+    var result = multiply(m1, m2);
+    multiplyMutating(result.buff, m3.buff);
+    multiplyMutating(result.buff, m4.buff);
+    multiplyMutating(result.buff, m5.buff);
+    return result;
+  }
+}

backend/dev/script-fix-sobjects.clj

@@ -1,114 +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
-
-;; This is an example on how it can be executed:
-;; clojure -Scp $(cat classpath) -M dev/script-fix-sobjects.clj
-
-(require
- '[app.common.logging :as l]
- '[app.common.data :as d]
- '[app.common.pprint]
- '[app.db :as db]
- '[app.storage :as sto]
- '[app.storage.impl :as impl]
- '[app.util.time :as dt]
- '[integrant.core :as ig])
-
-;; --- HELPERS
-
-(l/info :hint "initializing script" :args *command-line-args*)
-
-(def noop? (some #(= % "noop") *command-line-args*))
-(def chunk-size 10)
-
-(def sql:retrieve-sobjects-chunk
-  "SELECT * FROM storage_object
-    WHERE created_at < ? AND deleted_at is NULL
-    ORDER BY created_at desc LIMIT ?")
-
-(defn get-chunk
-  [conn cursor]
-  (let [rows (db/exec! conn [sql:retrieve-sobjects-chunk cursor chunk-size])]
-    [(some->> rows peek :created-at) (seq rows)]))
-
-(defn get-candidates
-  [conn]
-  (->> (d/iteration (partial get-chunk conn)
-                    :vf second
-                    :kf first
-                    :initk (dt/now))
-       (sequence cat)))
-
-(def modules
-  [:app.db/pool
-   :app.storage/storage
-   [:app.main/default :app.worker/executor]
-   [:app.main/assets :app.storage.s3/backend]
-   [:app.main/assets :app.storage.fs/backend]])
-
-(def system
-  (let [config (select-keys app.main/system-config modules)
-        config (-> config
-                   (assoc :app.migrations/all {})
-                   (assoc :app.metrics/metrics nil))]
-    (ig/load-namespaces config)
-    (-> config ig/prep ig/init)))
-
-(defn update-fn
-  [{:keys [conn] :as storage} {:keys [id backend] :as row}]
-  (cond
-    (= backend "s3")
-    (do
-      (l/info :hint "rename storage object backend"
-              :id id
-              :from-backend backend
-              :to-backend :assets-s3)
-      (assoc row :backend "assets-s3"))
-
-    (= backend "assets-s3")
-    (do
-      (l/info :hint "ignoring storage object" :id id :backend backend)
-      nil)
-
-    (or (= backend "fs")
-        (= backend "assets-fs"))
-    (let [sobj (sto/row->storage-object row)
-          path (-> (sto/get-object-path storage sobj) deref)]
-      (l/info :hint "change storage object backend"
-              :id id
-              :from-backend backend
-              :to-backend :assets-s3)
-      (when-not noop?
-        (-> (impl/resolve-backend storage :assets-s3)
-            (impl/put-object sobj (sto/content path))
-            (deref)))
-      (assoc row :backend "assets-s3"))
-
-    :else
-    (throw (IllegalArgumentException. "unexpected backend found"))))
-
-(try
-  (db/with-atomic [conn (:app.db/pool system)]
-    (let [storage (:app.storage/storage system)
-          storage (assoc storage :conn conn)]
-      (loop [items (get-candidates conn)]
-        (when-let [item (first items)]
-          (when-let [{:keys [id] :as row} (update-fn storage item)]
-          (db/update! conn :storage-object (dissoc row :id) {:id (:id item)}))
-          (recur (rest items))))
-      (when noop?
-        (throw (ex-info "explicit rollback" {})))))
-
-  (catch Throwable cause
-    (cond
-      (= "explicit rollback" (ex-message cause))
-      (l/warn :hint "transaction aborted")
-
-      :else
-      (l/error :hint "unexpected exception" :cause cause))))
-
-(ig/halt! system)
-(System/exit 0)

backend/dev/user.clj

@@ -2,33 +2,18 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL
 
 (ns user
   (:require
-   [app.common.data :as d]
-   [app.common.debug :as debug]
    [app.common.exceptions :as ex]
-   [app.common.files.helpers :as cfh]
-   [app.common.fressian :as fres]
    [app.common.geom.matrix :as gmt]
-   [app.common.logging :as l]
    [app.common.perf :as perf]
-   [app.common.pprint :as pp]
-   [app.common.schema :as sm]
-   [app.common.schema.desc-js-like :as smdj]
-   [app.common.schema.desc-native :as smdn]
-   [app.common.schema.generators :as sg]
-   [app.common.spec :as us]
    [app.common.transit :as t]
-   [app.common.types.file :as ctf]
-   [app.common.uuid :as uuid]
-   [app.config :as cf]
-   [app.db :as db]
+   [app.config :as cfg]
    [app.main :as main]
-   [app.srepl.helpers :as srepl.helpers]
-   [app.srepl.main :as srepl]
    [app.util.blob :as blob]
+   [app.util.fressian :as fres]
    [app.util.json :as json]
    [app.util.time :as dt]
    [clj-async-profiler.core :as prof]
@@ -37,53 +22,23 @@
    [clojure.pprint :refer [pprint print-table]]
    [clojure.repl :refer :all]
    [clojure.spec.alpha :as s]
-   [clojure.stacktrace :as trace]
+   [clojure.spec.gen.alpha :as sgen]
+   [clojure.test :as test]
    [clojure.test :as test]
-   [clojure.test.check.generators :as tgen]
    [clojure.tools.namespace.repl :as repl]
    [clojure.walk :refer [macroexpand-all]]
-   [criterium.core  :as crit]
-   [cuerdas.core :as str]
-   [datoteka.fs :as fs]
-   [integrant.core :as ig]
-   [malli.core :as m]
-   [malli.dev.pretty :as mdp]
-   [malli.error :as me]
-   [malli.generator :as mg]
-   [malli.registry :as mr]
-   [malli.transform :as mt]
-   [malli.util :as mu]
-   [promesa.exec :as px]))
+   [datoteka.core]
+   [integrant.core :as ig]))
 
 (repl/disable-reload! (find-ns 'integrant.core))
-(repl/disable-reload! (find-ns 'app.common.debug))
-
 (set! *warn-on-reflection* true)
 
-(add-tap #'debug/tap-handler)
-
-;; --- Benchmarking Tools
-
-(defmacro run-quick-bench
-  [& exprs]
-  `(crit/with-progress-reporting (crit/quick-bench (do ~@exprs) :verbose)))
-
-(defmacro run-quick-bench'
-  [& exprs]
-  `(crit/quick-bench (do ~@exprs)))
-
-(defmacro run-bench
-  [& exprs]
-  `(crit/with-progress-reporting (crit/bench (do ~@exprs) :verbose)))
-
-(defmacro run-bench'
-  [& exprs]
-  `(crit/bench (do ~@exprs)))
+(defonce system nil)
 
 ;; --- Development Stuff
 
 (defn- run-tests
-  ([] (run-tests #"^backend-tests.*-test$"))
+  ([] (run-tests #"^app.*-test$"))
   ([o]
    (repl/refresh)
    (cond
@@ -98,16 +53,19 @@
 
 (defn- start
   []
-  (try
-    (main/start)
-    :started
-    (catch Throwable cause
-      (ex/print-throwable cause))))
+  (alter-var-root #'system (fn [sys]
+                             (when sys (ig/halt! sys))
+                             (-> main/system-config
+                                 (ig/prep)
+                                 (ig/init))))
+  :started)
 
 (defn- stop
   []
-  (main/stop)
-  :stopped)
+  (alter-var-root #'system (fn [sys]
+                             (when sys (ig/halt! sys))
+                             nil))
+  :stoped)
 
 (defn restart
   []
@@ -119,29 +77,79 @@
   (stop)
   (repl/refresh-all :after 'user/start))
 
-;; (defn compression-bench
-;;   [data]
-;;   (let [humanize (fn [v] (hum/filesize v :binary true :format " %.4f "))
-;;         v1 (time (humanize (alength (blob/encode data {:version 1}))))
-;;         v3 (time (humanize (alength (blob/encode data {:version 3}))))
-;;         v4 (time (humanize (alength (blob/encode data {:version 4}))))
-;;         v5 (time (humanize (alength (blob/encode data {:version 5}))))
-;;         v6 (time (humanize (alength (blob/encode data {:version 6}))))
-;;         ]
-;;     (print-table
-;;      [{
-;;        :v1 v1
-;;        :v3 v3
-;;        :v4 v4
-;;        :v5 v5
-;;        :v6 v6
-;;        }])))
+(defn compression-bench
+  [data]
+  (let [humanize (fn [v] (hum/filesize v :binary true :format " %.4f "))]
+    (print-table
+     [{:v1 (humanize (alength (blob/encode data {:version 1})))
+       :v2 (humanize (alength (blob/encode data {:version 2})))
+       :v3 (humanize (alength (blob/encode data {:version 3})))
+       :v4 (humanize (alength (blob/encode data {:version 4})))
+       }])))
+
+(defonce debug-tap
+  (do
+    (add-tap #(locking debug-tap
+                (prn "tap debug:" %)))
+    1))
 
 
-(defn calculate-frames
-  [{:keys [data]}]
-  (->> (vals (:pages-index data))
-       (mapcat (comp vals :objects))
-       (filter cfh/is-direct-child-of-root?)
-       (filter cfh/frame-shape?)
-       (count)))
+;; (import
+;;  'app.Experiments
+;;  'app.Experiments$Matrix)
+
+;; (defn bench-matrix-multiply
+;;   []
+;;   (let [ma1 (Experiments/create 1 2 3 4 5 6)
+;;         ma2 (Experiments/create 6 5 4 3 2 1)]
+;;     (perf/benchmark
+;;      :f (fn []
+;;           (dotimes [i 100]
+;;             (when-not (Experiments/multiply ma1 ma2)
+;;               (throw (ex-info "foobar" {}))))
+;;           :result)
+;;      :name "java matrix"))
+
+;;   (let [ma1 (gmt/matrix 1 2 3 4 5 6)
+;;         ma2 (gmt/matrix 6 5 4 3 2 1)]
+;;     (perf/benchmark
+;;      :f (fn []
+;;           (dotimes [i 100]
+;;             (when-not (gmt/multiply ma1 ma2)
+;;               (throw (ex-info "foobar" {}))))
+;;           :result)
+;;      :name "orig matrix")))
+
+
+;; (defn bench-matrix-multiply-bulk-5
+;;   []
+;;   (let [ma1 (Experiments/create 1 2 3 4 5 6)
+;;         ma2 (Experiments/create 6 5 4 3 2 1)
+;;         ma3 (Experiments/create 9 8 7 6 5 4)
+;;         ma4 (Experiments/create 7 6 5 4 3 2)
+;;         ma5 (Experiments/create 1 9 2 8 4 7)]
+
+;;     (prn "result1" (seq (Experiments/multiplyBulk ma1 ma2 ma3 ma4 ma5)))
+;;     (perf/benchmark
+;;      :f (fn []
+;;           (dotimes [i 100]
+;;             (when-not (Experiments/multiplyBulk ma1 ma2 ma3 ma4 ma5)
+;;               (throw (ex-info "foobar" {}))))
+;;           :result)
+;;      :name "java matrix"))
+
+;;   (let [ma1 (gmt/matrix 1 2 3 4 5 6)
+;;         ma2 (gmt/matrix 6 5 4 3 2 1)
+;;         ma3 (gmt/matrix 9 8 7 6 5 4)
+;;         ma4 (gmt/matrix 7 6 5 4 3 2)
+;;         ma5 (gmt/matrix 1 9 2 8 4 7)]
+
+;;     (prn "result2" (map second (gmt/multiply ma1 ma2 ma3 ma4 ma5)))
+;;     (perf/benchmark
+;;      :f (fn []
+;;           (dotimes [i 100]
+;;             (when-not (gmt/multiply ma1 ma2 ma3 ma4 ma5)
+;;               (throw (ex-info "foobar" {}))))
+;;           :result)
+;;      :name "orig matrix")))
+

backend/package.json

@@ -1,26 +1,18 @@
 {
-  "name": "backend",
-  "version": "1.0.0",
-  "license": "MPL-2.0",
-  "author": "Kaleidos INC",
-  "private": true,
-  "packageManager": "yarn@4.2.2",
+  "name": "uxbox-back",
+  "version": "0.1.0",
+  "description": "The Open-Source prototyping tool",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build-emails": "./scripts/build-email-templates.sh"
+  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/penpot/penpot"
-  },
-  "dependencies": {
-    "luxon": "^3.4.4",
-    "sax": "^1.4.1"
+    "url": "git+https://github.com/uxbox/uxbox.git"
   },
+  "author": "Uxbox",
+  "license": "SEE LICENSE IN <LICENSE>",
   "devDependencies": {
-    "nodemon": "^3.1.2",
-    "source-map-support": "^0.5.21",
-    "ws": "^8.17.0"
-  },
-  "scripts": {
-    "fmt:clj:check": "cljfmt check --parallel=false src/ test/",
-    "fmt:clj": "cljfmt fix --parallel=true src/ test/",
-    "lint:clj": "clj-kondo --parallel --lint src/"
+    "mjml": "^4.6.3"
   }
 }

backend/resources/api-doc.css

@@ -0,0 +1,101 @@
+* {
+  font-family: "JetBrains Mono", monospace;
+  font-size: 12px;
+}
+
+pre {
+  margin: 0px;
+}
+
+body {
+  margin: 0px;
+  padding: 0px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  display: flex;
+  justify-content: center;
+}
+
+main {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-width: 900px;
+  width: 900px;
+}
+
+header {
+  border-bottom: 1px solid #c0c0c0;
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}
+
+.rpc-doc-content {
+  margin-top: 20px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  /* border: 1px solid red; */
+  padding: 5px;
+}
+
+.rpc-doc-content > h2:not(:first-child) {
+  margin-top: 30px;
+}
+
+
+.rpc-items {
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+}
+
+.rpc-item {
+  /* border: 1px solid red; */
+  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+}
+
+.rpc-item:not(:last-child) {
+  margin-bottom: 3px;
+}
+
+.rpc-row-info {
+  cursor: pointer;
+  display: flex;
+  background-color: #eeeeee;
+  padding: 5px 10px;
+}
+
+.rpc-row-info > *:not(:last-child) {
+  margin-right: 10px;
+}
+
+.rpc-row-info > * {
+  /* border: 1px solid green; */
+}
+
+.rpc-row-info > .type {
+  font-weight: bold;
+  width: 70px;
+}
+
+.rpc-row-info > .name {
+  width: 280px;
+  /* font-weight: bold; */
+}
+
+.rpc-row-info > .tags > .tag > span:first-child {
+  font-weight: bold;
+}
+
+.hidden {
+  display: none;
+}
+
+.rpc-row-detail {
+  padding: 5px 10px;
+  padding-bottom: 20px;
+}

backend/resources/api-doc.tmpl

@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="robots" content="noindex,nofollow">
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <title>Builtin API Documentation - Penpot</title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
+    <style>
+      {% include "api-doc.css" %}
+    </style>
+    <script>
+      {% include "api-doc.js" %}
+    </script>
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>Penpot API Documentation</h1>
+      </header>
+      <section class="rpc-doc-content">
+
+        <h2>RPC QUERY METHODS:</h2>
+        <ul class="rpc-items">
+          {% for item in query-methods %}
+            <li class="rpc-item">
+              <div class="rpc-row-info">
+                {# <div class="type">{{item.type}}</div> #}
+                <div class="name">{{item.name}}</div>
+                <div class="tags">
+                  <span class="tag">
+                    <span>Auth:</span>
+                    <span>{% if item.auth %}YES{% else %}NO{% endif %}</span>
+                  </span>
+                </div>
+              </div>
+              <div class="rpc-row-detail hidden">
+                {% if item.docs %}
+                  <h3>DOCSTRING:</h3>
+                  <p>{{item.docs}}</p>
+                {% endif %}
+
+                <h3>SPEC EXPLAIN:</h3>
+                <pre>{{item.spec}}</pre>
+              </div>
+            </li>
+          {% endfor %}
+        </ul>
+
+        <h2>RPC MUTATION METHODS:</h2>
+        <ul class="rpc-items">
+          {% for item in mutation-methods %}
+            <li class="rpc-item">
+              <div class="rpc-row-info">
+                {# <div class="type">{{item.type}}</div> #}
+                <div class="name">{{item.name}}</div>
+                <div class="tags">
+                  <span class="tag">
+                    <span>Auth:</span>
+                    <span>{% if item.auth %}YES{% else %}NO{% endif %}</span>
+                  </span>
+                </div>
+              </div>
+              <div class="rpc-row-detail hidden">
+                {% if item.docs %}
+                  <h3>DOCSTRING:</h3>
+                  <p>{{item.docs}}</p>
+                {% endif %}
+
+                <h3>SPEC EXPLAIN:</h3>
+                <pre>{{item.spec}}</pre>
+              </div>
+            </li>
+          {% endfor %}
+        </ul>
+      </section>
+    </main>
+  </body>
+</html>
+

backend/resources/app/onboarding.edn

@@ -1,33 +0,0 @@
-[{:id "tutorial-for-beginners"
-  :name "Tutorial for beginners"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/tutorial-for-beginners.penpot"}
- {:id "lucide-icons"
-  :name "Lucide Icons"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Lucide-icons.penpot"}
- {:id "font-awesome"
-  :name "Font Awesome"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Font-Awesome.penpot"}
- {:id "plants-app"
-  :name "Plants app"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Plants-app.penpot"}
- {:id "wireframing-kit"
-  :name "Wireframing Kit"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/wireframing-kit.penpot"}
- {:id "black-white-mobile-templates"
-  :name "Black & White Mobile Templates"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Black-White-Mobile-Templates.penpot"}
- {:id "avataaars"
-  :name "Avataaars"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Avataaars-by-Pablo-Stanley.penpot"}
- {:id "ux-notes"
-  :name "UX Notes"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/UX-Notes.penpot"}
- {:id "whiteboarding-kit"
-  :name "Whiteboarding Kit"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Whiteboarding-mapping-kit.penpot"}
- {:id "open-color-scheme"
-  :name "Open Color Scheme"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Open-Color-Scheme.penpot"}
- {:id "flex-layout-playground"
-  :name "Flex Layout Playground"
-  :file-uri "https://github.com/penpot/penpot-files/raw/binary-files/Flex-Layout-Playground.penpot"}]

backend/resources/app/templates/api-doc-entry.tmpl

@@ -1,121 +0,0 @@
-<li class="rpc-item">
-  <div class="rpc-row-info">
-    <div class="module">{{item.module}}:</div>
-    <div class="name">{{item.name}}</div>
-    <div class="tags">
-      {% if item.deprecated %}
-        <span class="tag">
-          <span>DEPRECATED</span>
-        </span>
-      {% endif %}
-
-      {% if item.auth %}
-        <span class="tag">
-          <span>AUTH</span>
-        </span>
-      {% endif %}
-
-      {% if item.webhook %}
-        <span class="tag">
-          <span>WEBHOOK</span>
-        </span>
-      {% endif %}
-      {% if item.params-schema-js %}
-        <span class="tag">
-          <span>SCHEMA</span>
-        </span>
-      {% endif %}
-
-      {% if item.sse %}
-        <span class="tag">
-          <span>SSE</span>
-        </span>
-      {% endif %}
-    </div>
-  </div>
-  <div class="rpc-row-detail hidden">
-    <h4>DOCSTRING:</h4>
-
-    <section class="padded-section">
-      {% if item.added %}
-        <p class="small"><strong>Added:</strong> on v{{item.added}}</p>
-      {% endif %}
-
-      {% if item.deprecated %}
-        <p class="small"><strong>Deprecated:</strong> since v{{item.deprecated}}</p>
-      {% endif %}
-
-      {% if item.entrypoint %}
-        <p class="small"><strong>URI:</strong> <a href="{{item.entrypoint}}">{{item.entrypoint}}</a></p>
-      {% endif %}
-
-      {% if item.docs %}
-        <p class="docstring"> {{item.docs}}</p>
-      {% endif %}
-
-    </section>
-
-    {% if item.changes %}
-      <h4>CHANGES:</h4>
-      <section class="padded-section">
-
-        <ul class="changes">
-          {% for change in item.changes %}
-            <li><strong>{{change.0}}</strong> - {{change.1}}</li>
-          {% endfor %}
-        </ul>
-      </section>
-    {% endif %}
-
-    {% if item.spec %}
-      <h4>PARAMS (SPEC):</h4>
-      <section class="padded-section">
-        <pre class="spec-explain">{{item.spec}}</pre>
-      </section>
-    {% endif %}
-
-    {% if param-style = "js" %}
-      {% if item.params-schema-js %}
-        <h4>PARAMS:</h4>
-        <section class="padded-section">
-          <pre class="params-schema">{{item.params-schema-js}}</pre>
-        </section>
-      {% endif %}
-
-      {% if item.result-schema-js %}
-        <h4>RESPONSE:</h4>
-        <section class="padded-section">
-          <pre class="result">{{item.result-schema-js}}</pre>
-        </section>
-      {% endif %}
-
-      {% if item.webhook-schema-js %}
-        <h4>WEBHOOK PAYLOAD:</h4>
-        <section class="padded-section">
-          <pre class="webhook">{{item.webhook-schema-js}}</pre>
-        </section>
-      {% endif %}
-    {% else %}
-      {% if item.params-schema-clj %}
-        <h4>PARAMS:</h4>
-        <section class="padded-section">
-          <pre class="params-schema">{{item.params-schema-clj}}</pre>
-        </section>
-      {% endif %}
-
-      {% if item.result-schema-clj %}
-        <h4>RESPONSE:</h4>
-        <section class="padded-section">
-          <pre class="result">{{item.result-schema-clj}}</pre>
-        </section>
-      {% endif %}
-
-      {% if item.webhook-schema-clj %}
-        <h4>WEBHOOK PAYLOAD:</h4>
-        <section class="padded-section">
-          <pre class="webhook">{{item.webhook-schema-clj}}</pre>
-        </section>
-      {% endif %}
-    {% endif %}
-  </div>
-</li>

backend/resources/app/templates/api-doc.css

@@ -1,217 +0,0 @@
-* {
-  font-family: "JetBrains Mono", monospace;
-  font-size: 12px;
-}
-
-pre {
-  margin: 0px;
-}
-
-body {
-  margin: 0px;
-  padding: 0px;
-  padding-top: 20px;
-  padding-bottom: 20px;
-  display: flex;
-  justify-content: center;
-}
-
-main {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  min-width: 900px;
-  width: 900px;
-}
-
-header {
-  border-bottom: 1px solid #c0c0c0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-}
-
-header .menu {
-  display: flex;
-  align-items: center;
-  margin-top: 5px;
-  margin-bottom: 10px;
-}
-
-header .menu nav {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-  display: flex;
-  width: 45px;
-  justify-content: space-between;
-}
-
-header .menu nav > a {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-  cursor: pointer;
-}
-
-header .menu nav > a.selected {
-  font-weight: 600;
-}
-
-b {
-  font-weight: 500;
-}
-
-h2 {
-  margin-top: 30px;
-}
-
-h3 {
-  font-weight: 400;
-  font-size: 11px;
-  margin-top: 20px;
-  text-decoration: underline;
-}
-
-h4 {
-  font-weight: 300;
-  font-size: 11px;
-}
-
-.doc-content {
-  margin-top: 20px;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  /* border: 1px solid red; */
-  padding: 5px;
-}
-
-.doc-content p {
-  line-height: 22px;
-  margin-bottom: 0px;
-}
-
-.doc-content h3 {
-  margin-bottom: 0px;
-}
-
-.rpc-doc-content {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  /* border: 1px solid red; */
-  padding: 5px;
-}
-
-.rpc-doc-content > h2:not(:first-child) {
-  margin-top: 30px;
-}
-
-
-.rpc-items {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-}
-
-.rpc-item {
-  /* border: 1px solid red; */
-  /* cursor: pointer; */
-  display: flex;
-  flex-direction: column;
-}
-
-.rpc-item:not(:last-child) {
-  margin-bottom: 3px;
-}
-
-.rpc-row-info {
-  cursor: pointer;
-  display: flex;
-  background-color: #e5e5e5;
-  padding: 5px 10px;
-}
-
-.rpc-row-info > *:not(:last-child) {
-  margin-right: 10px;
-}
-
-.rpc-row-info > * {
-  /* border: 1px solid green; */
-}
-
-.rpc-row-info > .type {
-  font-weight: bold;
-  width: 70px;
-}
-
-.rpc-row-info > .name {
-  width: 280px;
-  /* font-weight: bold; */
-  border-right: 1px dotted #777;
-  padding-right: 10px;
-}
-
-.rpc-row-info > .module {
-  width: 150px;
-  font-weight: bold;
-  border-right: 1px dotted #777;
-  text-align: right;
-  padding-right: 10px;
-}
-
-.rpc-row-info > .tags > .tag > span:first-child {
-  font-weight: bold;
-}
-
-.hidden {
-  display: none;
-}
-
-.rpc-row-detail {
-  padding: 5px 10px;
-  padding-bottom: 20px;
-  border-left: 2px solid #e5e5e5;
-  border-right: 2px solid #e5e5e5;
-}
-
-.rpc-row-detail p {
-  font-weight: 200;
-}
-
-.rpc-row-detail p.small {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  font-size: 10px;
-}
-
-.rpc-row-detail p.small {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  font-size: 10px;
-}
-
-.rpc-row-detail strong {
-  font-weight: 500;
-}
-
-.rpc-row-detail .changes {
-  font-weight: 200;
-  list-style: none;
-  padding: 0px;
-}
-
-.rpc-row-detail .padded-section {
-  padding: 0px 10px;
-}
-
-p.small strong {
-  font-size: 10px;
-}
-
-p.small a {
-  font-size: 10px;
-}

backend/resources/app/templates/api-doc.tmpl

@@ -1,112 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="robots" content="noindex,nofollow">
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <title>Builtin API Documentation - Penpot</title>
-
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@200;300;400;500;700&display=swap" rel="stylesheet">
-    <style>
-      {% include "app/templates/api-doc.css" %}
-    </style>
-    <script>
-      {% include "app/templates/api-doc.js" %}
-    </script>
-  </head>
-  <body>
-    <main>
-      <header>
-        <h1>Penpot API Documentation (v{{version}})</h1>
-        <small class="menu">
-          [
-          <nav>
-            <a href="?type=js" {% if param-style = "js" %}class="selected"{% endif %}>JS</a>
-            <a href="?type=clj" {% if param-style = "cljs" %}class="selected"{% endif %}>CLJ</a>
-          </nav>
-          ]
-        </small>
-      </header>
-      <section class="doc-content">
-        <h2>INTRODUCTION</h2>
-        <p>This documentation is intended to be a general overview of the penpot RPC API.
-          If you prefer, you can use <a href="/api/openapi.json">OpenAPI</a>
-          and/or <a href="/api/openapi">SwaggerUI</a> as alternative.</p>
-
-        <h2>GENERAL NOTES</h2>
-
-        <h3>HTTP Transport & Methods</h3>
-        <p>The HTTP is the transport method for accesing this API; all
-        functions can be called using POST HTTP method; the functions
-        that starts with <b>get-</b> in the name, can use GET HTTP
-        method which in many cases benefits from the HTTP cache.</p>
-
-
-        <h3>Authentication</h3>
-        <p>The penpot backend right now offers two way for authenticate the request:
-        <b>cookies</b> (the same mechanism that we use ourselves on accessing the API from the
-        web application) and <b>access tokens</b>.</p>
-
-        <p>The cookie can be obtained using the <b>`login-with-password`</b> rpc method,
-        on successful login it sets the <b>`auth-token`</b> cookie with the session
-        token.</p>
-
-        <p>The access token can be obtained on the appropriate section on profile settings
-        and it should be provided using <b>`Authorization`</b> header with <b>`Token
-        &lt;token-string&gt;`</b> value.</p>
-
-        <h3>Content Negotiation</h3>
-        <p>The penpot API by default operates indistinctly with: <b>`application/json`</b>
-        and <b>`application/transit+json`</b> content types. You should specify the
-        desired content-type on the <b>`Accept`</b> header, the transit encoding is used
-        by default.</p>
-
-        <h3>SSE (Server-Sent Events)</h3>
-        <p>The methods marked with <b>SSE</b> returns
-        a <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html"> SSE
-        formatted</a> stream on the response body, always with status 200. The events are
-        always encoded using `application/transit+json` encoding (for now no content
-        negotiation is possible on methods that return SSE streams). </p>
-        <p>On the javascript side you can use
-        the <a href="https://github.com/rexxars/eventsource-parser">eventsoure-parser</a>
-        library for propertly parsing the response body using the
-        standard <a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API">Fetch
-        API</a></p>
-
-        <h3>Limits</h3>
-        <p>The rate limit work per user basis (this means that different api keys share
-        the same rate limit). For now the limits are not documented because we are
-        studying and analyzing the data. As a general rule, it should not be abused, if an
-        abusive use is detected, we will proceed to block the user's access to the
-        API.</p>
-
-        <h3>Webhooks</h3>
-        <p>All methods that emit webhook events are marked with flag <b>WEBHOOK</b>, the
-        data structure defined on each method represents the <i>payload</i> of the
-        event.</p>
-        <p>The webhook event structure has this aspect:</p>
-        <br/>
-
-        <pre>
-{
-  "id": "db601c95-045f-808b-8002-362f08fcb621",
-  "name": "rename-file",
-  "props": &lt;payload&gt;,
-  "profileId": "db601c95-045f-808b-8002-361312e63531"
-}
-        </pre>
-      </section>
-      <section class="rpc-doc-content">
-        <h2>RPC METHODS REFERENCE:</h2>
-        <ul class="rpc-items">
-          {% for item in methods %}
-            {% include "app/templates/api-doc-entry.tmpl" with item=item %}
-          {% endfor %}
-        </ul>
-      </section>
-    </main>
-  </body>
-</html>
-

backend/resources/app/templates/base.tmpl

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="robots" content="noindex,nofollow">
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <title>{% block title %}{% endblock %}</title>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
-    <style>
-      {% include "app/templates/styles.css"  %}
-    </style>
-  </head>
-  <body>
-    {% block content %}
-    {% endblock %}
-  </body>
-</html>
-

backend/resources/app/templates/debug.tmpl

@@ -1,185 +0,0 @@
-{% extends "app/templates/base.tmpl" %}
-
-{% block title %}
-Debug Main Page
-{% endblock %}
-
-{% block content %}
-<nav>
-  <div class="title">
-    <h1>ADMIN DEBUG INTERFACE</h1>
-  </div>
-</nav>
-<main class="dashboard">
-  <section class="widget">
-    <fieldset>
-      <legend>Error reports</legend>
-      <desc><a href="/dbg/error">CLICK HERE TO SEE THE ERROR REPORTS</a> </desc>
-    </fieldset>
-
-    <fieldset>
-      <legend>Download file data:</legend>
-      <desc>Given an FILE-ID, downloads the file data as file. The file data is encoded using transit.</desc>
-      <form method="get" action="/dbg/file/data">
-        <div class="row">
-          <input type="text" style="width:300px" name="file-id" placeholder="file-id" />
-        </div>
-        <div class="row">
-          <input type="submit" name="download" value="Download" />
-          <input type="submit" name="clone" value="Clone" />
-        </div>
-      </form>
-    </fieldset>
-
-    <fieldset>
-      <legend>Upload File Data:</legend>
-      <desc>Create a new file on your draft projects using the file downloaded from the previous section.</desc>
-      <form method="post" enctype="multipart/form-data" action="/dbg/file/data">
-        <div class="row">
-          <input type="file" name="file" value="" />
-        </div>
-        <div class="row">
-          <label>Import with same id?</label>
-          <input type="checkbox" name="reuseid" />
-        </div>
-
-        <div class="row">
-          <input type="submit" value="Upload" />
-        </div>
-      </form>
-    </fieldset>
-
-    <fieldset>
-      <legend>Profile Management</legend>
-      <form method="post" action="/dbg/actions/resend-email-verification">
-        <div class="row">
-          <input type="email" name="email" placeholder="example@example.com" value="" />
-        </div>
-
-        <div class="row">
-          <label for="force-verify">Are you sure?</label>
-          <input id="force-verify" type="checkbox" name="force" />
-          <br />
-          <small>
-            This is a just a security double check for prevent non intentional submits.
-          </small>
-        </div>
-
-        <div class="row">
-          <input type="submit" name="resend" value="Resend Verification" />
-          <input type="submit" name="verify" value="Verify" />
-        </div>
-
-        <div class="row">
-          <input type="submit" class="danger" name="block" value="Block" />
-          <input type="submit" class="danger" name="unblock" value="Unblock" />
-        </div>
-      </form>
-    </fieldset>
-
-
-
-  </section>
-
-  <section class="widget">
-    <fieldset>
-      <legend>Export binfile:</legend>
-      <desc>Given an FILE-ID, downloads the file and optionally all
-      the related libraries in a single custom formatted binary
-      file.</desc>
-
-      <form method="get" action="/dbg/file/export">
-        <div class="row set-of-inputs">
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-          <input type="text" style="width:300px" name="file-ids" placeholder="file-id" />
-        </div>
-
-        <div class="row">
-          <label>Include libraries?</label>
-          <input type="checkbox" name="includelibs" />
-        </div>
-
-        <div class="row">
-          <label>Embed assets?</label>
-          <input type="checkbox" name="embedassets" checked/>
-        </div>
-
-        <div class="row">
-          <input type="submit" name="download" value="Download" />
-          <input type="submit" name="clone" value="Clone" />
-        </div>
-      </form>
-    </fieldset>
-    <fieldset>
-      <legend>Import binfile:</legend>
-      <desc>Import penpot file in binary
-      format. If <strong>overwrite</strong> is checked, all files will
-      be overwritten using the same ids found in the file instead of
-      generating a new ones.</desc>
-
-      <form method="post" enctype="multipart/form-data" action="/dbg/file/import">
-        <div class="row">
-          <input type="file" name="file" value="" />
-        </div>
-
-        <div class="row">
-          <label>Overwrite?</label>
-          <input type="checkbox" name="overwrite" />
-          <br />
-          <small>
-            Instead of creating a new file with all relations remapped,
-            reuses all ids and updates/overwrites the objects that are
-            already exists on the database.
-            <strong>Warning, this operation should be used with caution.</strong>
-          </small>
-        </div>
-
-        <div class="row">
-          <label>Migrate?</label>
-          <input type="checkbox" name="migrate" />
-          <br />
-          <small>
-            Applies the file migrations on the importation process.
-          </small>
-        </div>
-
-        <div class="row">
-          <input type="submit" name="upload" value="Upload" />
-        </div>
-      </form>
-    </fieldset>
-  </section>
-
-  <section class="widget">
-    <fieldset>
-      <legend>Reset file version</legend>
-      <desc>Allows reset file data version to a specific number/</desc>
-
-      <form method="post" action="/dbg/actions/reset-file-version">
-        <div class="row">
-          <input type="text" style="width:300px" name="file-id" placeholder="file-id" />
-        </div>
-        <div class="row">
-          <input type="number" style="width:100px" name="version" placeholder="version" value="32" />
-        </div>
-
-        <div class="row">
-          <label for="force-version">Are you sure?</label>
-          <input id="force-version" type="checkbox" name="force" />
-          <br />
-          <small>
-            This is a just a security double check for prevent non intentional submits.
-          </small>
-        </div>
-
-
-        <div class="row">
-          <input type="submit" value="Submit" />
-        </div>
-      </form>
-    </fieldset>
-  </section>
-</main>
-{% endblock %}

backend/resources/app/templates/error-list.tmpl

@@ -1,25 +0,0 @@
-{% extends "app/templates/base.tmpl" %}
-
-{% block title %}
-penpot - error list
-{% endblock %}
-
-{% block content %}
-<nav>
-  <div class="title">
-    <h1>Error reports (last 200)</h1>
-  </div>
-</nav>
-<main class="horizontal-list">
-  <ul>
-    {% for item in items %}
-      <li>
-        <a class="date" href="/dbg/error/{{item.id}}">{{item.created-at}}</a>
-        <a class="hint" href="/dbg/error/{{item.id}}">
-          <span class="title">{{item.hint|abbreviate:150}}</span>
-        </a>
-      </li>
-    {% endfor %}
-  </ul>
-</main>
-{% endblock %}

backend/resources/app/templates/error-report.tmpl

@@ -1,98 +0,0 @@
-{% extends "app/templates/base.tmpl" %}
-
-{% block title %}
-penpot - error report {{id}}
-{% endblock %}
-
-{% block content %}
-<nav>
-  <div>[<a href="/dbg/error">⮜</a>]</div>
-  <div>[<a href="#context">context</a>]</div>
-  <div>[<a href="#params">request params</a>]</div>
-  {% if data %}
-  <div>[<a href="#edata">error data</a>]</div>
-  {% endif %}
-  {% if spec-explain %}
-  <div>[<a href="#spec-explain">spec explain</a>]</div>
-  {% endif %}
-  {% if spec-problems %}
-  <div>[<a href="#spec-problems">spec problems</a>]</div>
-  {% endif %}
-  {% if spec-value %}
-  <div>[<a href="#spec-value">spec value</a>]</div>
-  {% endif %}
-
-  {% if trace %}
-  <div>[<a href="#trace">error trace</a>]</div>
-  {% endif %}
-</nav>
-<main>
-  <div class="table">
-    <div class="table-row multiline">
-      <div id="context" class="table-key">CONTEXT: </div>
-
-      <div class="table-val">
-        <h1>{{hint}}</h1>
-      </div>
-
-      <div class="table-val">
-        <pre>{{context}}</pre>
-      </div>
-    </div>
-
-    {% if params %}
-    <div class="table-row multiline">
-      <div id="params" class="table-key">REQUEST PARAMS: </div>
-      <div class="table-val">
-        <pre>{{params}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if data %}
-    <div class="table-row multiline">
-      <div id="edata" class="table-key">ERROR DATA: </div>
-      <div class="table-val">
-        <pre>{{data}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-explain %}
-    <div class="table-row multiline">
-      <div id="spec-explain" class="table-key">SPEC EXPLAIN: </div>
-      <div class="table-val">
-        <pre>{{spec-explain}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-problems %}
-    <div class="table-row multiline">
-      <div id="spec-problems" class="table-key">SPEC PROBLEMS: </div>
-      <div class="table-val">
-        <pre>{{spec-problems}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-value %}
-    <div class="table-row multiline">
-      <div id="spec-value" class="table-key">SPEC VALUE: </div>
-      <div class="table-val">
-        <pre>{{spec-value}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if trace %}
-    <div class="table-row multiline">
-      <div id="trace" class="table-key">TRACE:</div>
-      <div class="table-val">
-        <pre>{{trace}}</pre>
-      </div>
-    </div>
-    {% endif %}
-  </div>
-</main>
-{% endblock %}

backend/resources/app/templates/error-report.v2.tmpl

@@ -1,112 +0,0 @@
- {% extends "app/templates/base.tmpl" %}
-
-{% block title %}
-penpot - error report v2 {{id}}
-{% endblock %}
-
-{% block content %}
-<nav>
-  <div>[<a href="/dbg/error">⮜</a>]</div>
-  <div>[<a href="#message">message</a>]</div>
-  <div>[<a href="#props">props</a>]</div>
-  <div>[<a href="#context">context</a>]</div>
-  {% if params %}
-  <div>[<a href="#params">request params</a>]</div>
-  {% endif %}
-  {% if data %}
-  <div>[<a href="#edata">error data</a>]</div>
-  {% endif %}
-  {% if spec-explain %}
-  <div>[<a href="#spec-explain">spec explain</a>]</div>
-  {% endif %}
-  {% if spec-problems %}
-  <div>[<a href="#spec-problems">spec problems</a>]</div>
-  {% endif %}
-  {% if spec-value %}
-  <div>[<a href="#spec-value">spec value</a>]</div>
-  {% endif %}
-  {% if trace %}
-  <div>[<a href="#trace">error trace</a>]</div>
-  {% endif %}
-</nav>
-<main>
-  <div class="table">
-    <div class="table-row multiline">
-      <div id="message" class="table-key">MESSAGE: </div>
-
-      <div class="table-val">
-        <h1>{{hint}}</h1>
-      </div>
-    </div>
-
-    <div class="table-row multiline">
-      <div id="props" class="table-key">LOG PROPS: </div>
-      <div class="table-val">
-        <pre>{{props}}</pre>
-      </div>
-    </div>
-
-    <div class="table-row multiline">
-      <div id="context" class="table-key">CONTEXT: </div>
-
-      <div class="table-val">
-        <pre>{{context}}</pre>
-      </div>
-    </div>
-
-    {% if params %}
-    <div class="table-row multiline">
-      <div id="params" class="table-key">REQUEST PARAMS: </div>
-      <div class="table-val">
-        <pre>{{params}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if data %}
-    <div class="table-row multiline">
-      <div id="edata" class="table-key">ERROR DATA: </div>
-      <div class="table-val">
-        <pre>{{data}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-explain %}
-    <div class="table-row multiline">
-      <div id="spec-explain" class="table-key">SPEC EXPLAIN: </div>
-      <div class="table-val">
-        <pre>{{spec-explain}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-problems %}
-    <div class="table-row multiline">
-      <div id="spec-problems" class="table-key">SPEC PROBLEMS: </div>
-      <div class="table-val">
-        <pre>{{spec-problems}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if spec-value %}
-    <div class="table-row multiline">
-      <div id="spec-value" class="table-key">SPEC VALUE: </div>
-      <div class="table-val">
-        <pre>{{spec-value}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if trace %}
-    <div class="table-row multiline">
-      <div id="trace" class="table-key">TRACE:</div>
-      <div class="table-val">
-        <pre>{{trace}}</pre>
-      </div>
-    </div>
-    {% endif %}
-  </div>
-</main>
-{% endblock %}

backend/resources/app/templates/error-report.v3.tmpl

@@ -1,101 +0,0 @@
- {% extends "app/templates/base.tmpl" %}
-
-{% block title %}
-Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v3)
-{% endblock %}
-
-{% block content %}
-<nav>
-  <div>[<a href="/dbg/error">⮜</a>]</div>
-  <div>[<a href="#head">head</a>]</div>
-  <div>[<a href="#props">props</a>]</div>
-  <div>[<a href="#context">context</a>]</div>
-  {% if params %}
-  <div>[<a href="#params">params</a>]</div>
-  {% endif %}
-  {% if data %}
-  <div>[<a href="#edata">data</a>]</div>
-  {% endif %}
-  {% if explain %}
-  <div>[<a href="#explain">explain</a>]</div>
-  {% endif %}
-  {% if value %}
-  <div>[<a href="#value">value</a>]</div>
-  {% endif %}
-  {% if trace %}
-  <div>[<a href="#trace">trace</a>]</div>
-  {% endif %}
-</nav>
-<main>
-  <div class="table">
-    <div class="table-row multiline">
-      <div id="head" class="table-key">HEAD</div>
-      <div class="table-val">
-        <h1><span class="not-important">Hint:</span> <br/> {{hint}}</h1>
-        <h2><span class="not-important">Reported at:</span> <br/> {{created-at}}</h2>
-        <h2><span class="not-important">Report ID:</span> <br/> {{id}}</h2>
-      </div>
-    </div>
-
-    <div class="table-row multiline">
-      <div id="props" class="table-key">LOG PROPS: </div>
-      <div class="table-val">
-        <pre>{{props}}</pre>
-      </div>
-    </div>
-
-    <div class="table-row multiline">
-      <div id="context" class="table-key">CONTEXT: </div>
-
-      <div class="table-val">
-        <pre>{{context}}</pre>
-      </div>
-    </div>
-
-    {% if params %}
-    <div class="table-row multiline">
-      <div id="params" class="table-key">PARAMS: </div>
-      <div class="table-val">
-        <pre>{{params}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if data %}
-    <div class="table-row multiline">
-      <div id="edata" class="table-key">DATA: </div>
-      <div class="table-val">
-        <pre>{{data}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if value %}
-    <div class="table-row multiline">
-      <div id="value" class="table-key">VALUE: </div>
-      <div class="table-val">
-        <pre>{{value}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if explain %}
-    <div class="table-row multiline">
-      <div id="explain" class="table-key">EXPLAIN: </div>
-      <div class="table-val">
-        <pre>{{explain}}</pre>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if trace %}
-    <div class="table-row multiline">
-      <div id="trace" class="table-key">TRACE:</div>
-      <div class="table-val">
-        <pre>{{trace}}</pre>
-      </div>
-    </div>
-    {% endif %}
-  </div>
-</main>
-{% endblock %}

backend/resources/app/templates/openapi.tmpl

@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta
-    name="description"
-    content="SwaggerUI"
-  />
-  <title>PENPOT Swagger UI</title>
-  <style>{{swagger-css|safe}}</style>
-</head>
-<body>
-<div id="swagger-ui"></div>
-<script>{{swagger-js|safe}}</script>
-<script>
-  window.onload = () => {
-    window.ui = SwaggerUIBundle({
-      url: '{{public-uri}}/api/openapi.json',
-      dom_id: '#swagger-ui',      
-      presets: [
-        SwaggerUIBundle.presets.apis,
-      ],
-    });
-  };
-</script>
-</body>
-</html>

backend/resources/app/templates/styles.css

@@ -1,224 +0,0 @@
-* {
-  font-family: "JetBrains Mono", monospace;
-  font-size: 12px;
-}
-
-body {
-  margin: 0px;
-  padding: 0px;
-}
-
-pre {
-  margin: 0px;
-  line-height: 16px;
-}
-
-desc {
-  margin-bottom: 10px;
-  font-size: 10px;
-  color: #666;
-}
-
-input[type=text], input[type=submit] {
-  padding: 3px;
-}
-
-pre {
-  white-space: pre-wrap;
-}
-
-main {
-  margin: 20px;
-}
-
-small {
-  font-size: 9px;
-  color: #888;
-}
-
-.not-important {
-  color: #888;
-  font-weight: 200;
-}
-
-small > strong {
-  font-size: 9px;
-}
-
-nav {
-  position: fixed;
-  width: 100vw;
-  top: 0;
-  left: 0;
-  padding: 5px 20px;
-  display: flex;
-  background: #e3e3e3;
-}
-
-nav > .title {
-  display: flex;
-  justify-content: center;
-  width: 100%;
-}
-
-nav > .title > h1 {
-  padding: 0px;
-  margin: 0px;
-  font-size: 11px;
-}
-
-nav > div {
-  text-transform: uppercase;
-  font-weight: bold;
-}
-
-nav > div:not(:last-child) {
-  margin-right: 10px;
-}
-
-.table {
-  margin-top: 25px;
-  display: flex;
-  flex-direction: column;
-}
-
-.table-row {
-  display: flex;
-  padding-bottom: 15px;
-  /* width: 100%; */
-  /* border: 1px solid red; */
-}
-
-.table-key {
-  font-weight: 600;
-  width: 60px;
-  padding: 4px;
-
-  padding-top: 40px;
-  margin-top: -40px;
-}
-
-.table-val {
-  font-weight: 200;
-  color: #333;
-  padding: 4px;
-}
-
-.multiline {
-  margin-top: 15px;
-  flex-direction: column;
-}
-
-.multiline .table-key {
-  margin-bottom: 10px;
-  border-bottom: 1px dashed #dddddd;
-  /* padding: 4px; */
-  width: unset;
-}
-
-.dashboard {
-  margin-top: 40px;
-  display: flex;
-}
-
-.widget {
-  max-width: 400px;
-  margin: 5px;
-  height: fit-content;
-}
-
-.widget input[type=submit] {
-  outline: none;
-  border: 1px solid gray;
-  border-radius: 2px;
-  padding: 3px 5px;
-}
-
-.widget input[type=submit].danger {
-  outline: none;
-  border: 1px solid red;
-  border-radius: 2px;
-  padding: 3px 5px;
-}
-
-
-
-.widget > fieldset {
-  padding: 10px;
-  background-color: #f9f9f9;
-}
-
-.widget > fieldset:not(:last-child) {
-  margin-bottom: 10px;
-}
-
-
-
-.dashboard fieldset:not(:first-child) {
-  margin-top: 15px;
-}
-
-
-.widget > h2 {
-  margin-top: 0px;
-}
-
-.horizontal-list {
-  margin: 20px;
-  margin-top: 40px;
-}
-
-.horizontal-list ul {
-  display: flex;
-  margin: 0px;
-  padding: 0px;
-  flex-direction: column;
-  justify-content: flex-start;
-}
-
-.horizontal-list li {
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-  line-height: 18px;
-  min-width: 210px;
-  margin: 0px 20px;
-  display: flex;
-  border-radius: 3px;
-}
-
-
-
-.horizontal-list li:hover {
-  background-color: #e9e9e9;
-}
-
-.horizontal-list li > *:not(:last-child) {
-  margin-right: 10px;
-}
-
-.horizontal-list li > a {
-  text-decoration: none;
-  color: inherit;
-}
-
-.horizontal-list li > .date {
-  font-weight: 200;
-  color: #686868;
-  min-width: 210px;
-}
-
-
-form .row {
-  padding: 5px 0;
-}
-
-.set-of-inputs {
-  flex-direction: column;
-  display: flex;
-}
-
-.set-of-inputs input:not(:last-child) {
-  margin-bottom: 3px;
-}
-

backend/resources/climit.edn

@@ -1,30 +0,0 @@
-;; Example climit.edn file
-;; Required: permits
-;; Optional: queue, ommited means Integer/MAX_VALUE
-;; Optional: timeout, ommited means no timeout
-;; Note: queue and timeout are excluding
-{:update-file/global {:permits 20}
- :update-file/by-profile
- {:permits 1 :queue 5}
-
- :process-font/global {:permits 4}
- :process-font/by-profile {:permits 1}
-
- :process-image/global {:permits 8}
- :process-image/by-profile {:permits 1}
-
- :auth/global {:permits 8}
-
- :root/global
- {:permits 40}
-
- :root/by-profile
- {:permits 10}
-
- :file-thumbnail-ops/global
- {:permits 20}
- :file-thumbnail-ops/by-profile
- {:permits 2}
-
- :submit-audit-events/by-profile
- {:permits 1 :queue 3}}

backend/resources/emails-mjml/change-email/en.mjml

@@ -0,0 +1,66 @@
+<mjml>
+
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+
+  <mj-body background-color="#E5E5E5">
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello {{name}}!</mj-text>
+        <mj-text>We received a request to change your current email to {{ pending-email }}.</mj-text>
+        <mj-text>Click to the link below to confirm the change:</mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/verify-token?token={{token}}">
+          Confirm email change
+        </mj-button>
+        <mj-text>
+          If you received this email by mistake, please consider changing your password
+          for security reasons.
+        </mj-text>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>

backend/resources/emails-mjml/invite-to-team/en.mjml

@@ -0,0 +1,59 @@
+<mjml>
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+  <mj-body background-color="#E5E5E5">
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello!</mj-text>
+        <mj-text>
+          {{invited-by}} has invited you to join the team “{{ team }}”.
+        </mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/verify-token?token={{token}}">
+          Accept invite
+        </mj-button>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>

backend/resources/emails-mjml/password-recovery/en.mjml

@@ -0,0 +1,68 @@
+<mjml>
+
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+
+  <mj-body background-color="#E5E5E5">
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello {{name}}!</mj-text>
+        <mj-text>
+          We have received a request to reset your password. Click the link
+          below to choose a new one:
+        </mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/recovery?token={{token}}">
+          Reset password
+        </mj-button>
+        <mj-text>
+          If you received this email by mistake, you can safely ignore
+          it. Your password won't be changed.
+        </mj-text>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>

backend/resources/emails-mjml/register/en.mjml

@@ -0,0 +1,65 @@
+<mjml>
+
+  <mj-head>
+    <mj-font name="Source Sans Pro" href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" />
+    <mj-attributes>
+      <mj-text font-family="Source Sans Pro, sans-serif" font-size="16px" color="#000000" line-height="150%" />
+      <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro, sans-serif" font-size="16px" />
+    </mj-attributes>
+  </mj-head>
+
+  <mj-body background-color="#E5E5E5">
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-image src="{{ public-uri }}/images/email/uxbox-title.png"
+                  width="97px" height="32px" align="left" padding="16px" />
+      </mj-column>
+    </mj-section>
+
+    <mj-section background-color="#FFFFFF">
+      <mj-column>
+        <mj-text font-size="24px" font-weight="600">Hello {{name}}!</mj-text>
+        <mj-text>
+          Thanks for signing up for your Penpot account! Please verify your
+          email using the link below and get started building mockups and
+          prototypes today!
+        </mj-text>
+        <mj-button href="{{ public-uri }}/#/auth/verify-token?token={{token}}">
+          Verify email
+        </mj-button>
+        <mj-text>Enjoy!</mj-text>
+        <mj-text>The Penpot team.</mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="24px 0 0 0">
+      <mj-column width="425px">
+        <mj-text align="center" font-size="14px" color="#64666A">
+          Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0">
+      <mj-column>
+        <mj-social icon-size="24px" mode="horizontal">
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://penpot.app/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpotapp" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/penpot/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/penpotapp/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
+        </mj-social>
+      </mj-column>
+    </mj-section>
+
+    <mj-section padding="0 0 24px 0">
+      <mj-column>
+        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+          Penpot © 2020 | Made with &lt;3 and Open Source
+        </mj-text>
+      </mj-column>
+    </mj-section>
+
+  </mg-body>
+</mjml>

backend/resources/emails/change-email/en.html

@@ -103,9 +103,9 @@
             <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;"
             >
@@ -129,9 +129,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -143,7 +143,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -157,9 +157,9 @@
             <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;"
             >
@@ -168,7 +168,7 @@
                 <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name|abbreviate:25}}!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name}}!</div>
                     </td>
                   </tr>
                   <tr>
@@ -211,9 +211,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -225,7 +225,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -239,9 +239,9 @@
             <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
               <!--[if mso | IE]>
                   <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
+                
         <tr>
-
+      
             <td
                class="" style="vertical-align:top;width:425px;"
             >
@@ -250,16 +250,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -271,7 +271,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -285,9 +285,9 @@
             <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;"
             >
@@ -301,7 +301,7 @@
          align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
       >
         <tr>
-
+      
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -321,7 +321,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -341,7 +341,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -361,7 +361,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -370,7 +370,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -381,7 +381,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -390,7 +390,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -401,7 +401,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
           </tr>
         </table>
       <![endif]-->
@@ -411,9 +411,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -425,7 +425,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -439,9 +439,9 @@
             <td style="direction:ltr;font-size:0px;padding:0 0 24px 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;"
             >
@@ -450,16 +450,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -475,4 +475,4 @@
   </div>
 </body>
 
-</html>
+</html>

backend/resources/emails/change-email/en.txt

@@ -1,4 +1,4 @@
-Hello {{name|abbreviate:25}}!
+Hello {{name}}!
 
 We received a request to change your current email to {{ pending-email }}.
 

backend/resources/emails/feedback/en.html

@@ -11,7 +11,7 @@
       {% if profile %}
         <span>
           <span>Name: </span>
-          <span><code>{{profile.fullname|abbreviate:25}}</code></span>
+          <span><code>{{profile.fullname}}</code></span>
         </span>
         <br />
 
@@ -34,7 +34,7 @@
     </p>
     <p>
       <strong>Subject:</strong><br />
-      <span>{{subject|abbreviate:300}}</span>
+      <span>{{subject}}</span>
     </p>
 
     <p>

backend/resources/emails/invite-to-team/en.html

@@ -103,9 +103,9 @@
             <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;"
             >
@@ -129,9 +129,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -143,7 +143,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -157,9 +157,9 @@
             <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;"
             >
@@ -173,7 +173,7 @@
                   </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;">{{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">{{invited-by}} has invited you to join the team “{{ team }}”.</div>
                     </td>
                   </tr>
                   <tr>
@@ -201,9 +201,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -215,7 +215,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -229,9 +229,9 @@
             <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
               <!--[if mso | IE]>
                   <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
+                
         <tr>
-
+      
             <td
                class="" style="vertical-align:top;width:425px;"
             >
@@ -240,16 +240,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -261,7 +261,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -275,9 +275,9 @@
             <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;"
             >
@@ -291,7 +291,7 @@
          align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
       >
         <tr>
-
+      
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -311,7 +311,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -331,7 +331,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -351,7 +351,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -360,7 +360,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -371,7 +371,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -380,7 +380,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -391,7 +391,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
           </tr>
         </table>
       <![endif]-->
@@ -401,9 +401,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -415,7 +415,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -429,9 +429,9 @@
             <td style="direction:ltr;font-size:0px;padding:0 0 24px 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;"
             >
@@ -440,16 +440,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -465,4 +465,4 @@
   </div>
 </body>
 
-</html>
+</html>

backend/resources/emails/invite-to-team/en.txt

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

backend/resources/emails/password-recovery/en.html

@@ -103,9 +103,9 @@
             <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;"
             >
@@ -129,9 +129,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -143,7 +143,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -157,9 +157,9 @@
             <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;"
             >
@@ -168,7 +168,7 @@
                 <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name|abbreviate:25}}!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name}}!</div>
                     </td>
                   </tr>
                   <tr>
@@ -206,9 +206,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -220,7 +220,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -234,9 +234,9 @@
             <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
               <!--[if mso | IE]>
                   <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
+                
         <tr>
-
+      
             <td
                class="" style="vertical-align:top;width:425px;"
             >
@@ -245,16 +245,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -266,7 +266,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -280,9 +280,9 @@
             <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;"
             >
@@ -296,7 +296,7 @@
          align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
       >
         <tr>
-
+      
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -316,7 +316,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -336,7 +336,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -356,7 +356,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -365,7 +365,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -376,7 +376,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -385,7 +385,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -396,7 +396,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
           </tr>
         </table>
       <![endif]-->
@@ -406,9 +406,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -420,7 +420,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -434,9 +434,9 @@
             <td style="direction:ltr;font-size:0px;padding:0 0 24px 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;"
             >
@@ -445,16 +445,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -470,4 +470,4 @@
   </div>
 </body>
 
-</html>
+</html>

backend/resources/emails/password-recovery/en.txt

@@ -1,4 +1,4 @@
-Hello {{name|abbreviate:25}}!
+Hello {{name}}!
 
 We received a request to reset your password. Click the link below to choose a
 new one:

backend/resources/emails/register/en.html

@@ -103,9 +103,9 @@
             <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;"
             >
@@ -129,9 +129,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -143,7 +143,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -157,9 +157,9 @@
             <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;"
             >
@@ -168,7 +168,7 @@
                 <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:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name|abbreviate:25}}!</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name}}!</div>
                     </td>
                   </tr>
                   <tr>
@@ -201,9 +201,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -215,7 +215,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -229,9 +229,9 @@
             <td style="direction:ltr;font-size:0px;padding:24px 0 0 0;text-align:center;">
               <!--[if mso | IE]>
                   <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-
+                
         <tr>
-
+      
             <td
                class="" style="vertical-align:top;width:425px;"
             >
@@ -240,16 +240,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source design and prototyping platform meant for cross-domain teams.</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -261,7 +261,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -275,9 +275,9 @@
             <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;"
             >
@@ -291,7 +291,7 @@
          align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
       >
         <tr>
-
+      
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -311,7 +311,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -331,7 +331,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -351,7 +351,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -360,7 +360,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://www.instagram.com/penpot.app/" target="_blank">
+                                  <a href="https://instagram.com/penpotapp/" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-instagram.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -371,7 +371,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
               <td>
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
@@ -380,7 +380,7 @@
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
-                                  <a href="https://tree.taiga.io/project/penpot" target="_blank">
+                                  <a href="https://tree.taiga.io/project/uxbox" target="_blank">
                                     <img height="24" src="{{ public-uri }}/images/email/logo-taiga.png" style="border-radius:3px;display:block;" width="24" />
                                   </a>
                                 </td>
@@ -391,7 +391,7 @@
                       </table>
                       <!--[if mso | IE]>
               </td>
-
+            
           </tr>
         </table>
       <![endif]-->
@@ -401,9 +401,9 @@
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>
@@ -415,7 +415,7 @@
           </td>
         </tr>
       </table>
-
+      
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
       >
@@ -429,9 +429,9 @@
             <td style="direction:ltr;font-size:0px;padding:0 0 24px 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;"
             >
@@ -440,16 +440,16 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot | Made with &lt;3 and Open Source</div>
+                      <div style="font-family:Source Sans Pro, sans-serif;font-size:14px;line-height:150%;text-align:center;color:#64666A;">Penpot @ 2021 | Made with &lt;3 and Open Source</div>
                     </td>
                   </tr>
                 </table>
               </div>
               <!--[if mso | IE]>
             </td>
-
+          
         </tr>
-
+      
                   </table>
                 <![endif]-->
             </td>

backend/resources/emails/register/en.txt

@@ -1,4 +1,4 @@
-Hello {{name|abbreviate:25}}!
+Hello {{name}}!
 
 Thanks for signing up for your Penpot account! Please verify your email using the
 link below and get started building mockups and prototypes today!

backend/resources/error-list.tmpl

@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="robots" content="noindex,nofollow">
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <title>penpot - error report {{id}}</title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
+    <style>
+      * {
+        font-family: "JetBrains Mono", monospace; 
+        font-size: 12px;
+      }
+
+      body {
+        margin: 0px;
+        padding: 0px;
+      }
+      
+      h1 {
+        padding: 0px;
+        margin: 0px;
+        font-size: 14px;
+      }
+
+      main {
+        margin: 20px;
+        margin-top: 40px;
+      }
+
+      nav {
+        position: fixed;
+        width: 100vw;
+        top: 0;
+        left: 0;
+        padding: 5px 20px;
+        display: flex;
+        background: #e3e3e3;
+      }
+
+      nav > div {
+        text-transform: uppercase;
+        font-weight: bold;
+      }
+
+      ul {
+        display: flex;
+        margin: 0px;
+        padding: 0px;
+        flex-direction: column;
+        flex-wrap: wrap;
+        height: calc(100vh - 75px);
+        justify-content: flex-start;
+      }
+
+      li {
+        list-style: none;
+        padding: 0px;
+        margin: 0px;
+        line-height: 18px;
+        min-width: 210px;
+        margin: 0px 20px;
+        cursor: pointer;
+        display: flex;
+        justify-content: center;
+        border-radius: 3px;
+      }
+
+      li:hover {
+        background-color: #e9e9e9;
+      }
+
+      li > a {
+        text-decoration: none;
+        color: inherit;
+      }
+
+    </style>
+  </head>
+  <body>
+
+    <nav>
+      <h1>Latest error reports:</h1>
+    </nav>
+    <main>
+      <ul>
+        {% for item in items %}
+          <li><a href="/dbg/error/{{item.id}}">{{item.created-at}}</a></li>
+        {% endfor %}
+      </ul>
+    </main>
+  </body>
+</html>
+

backend/resources/error-report.tmpl

@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="robots" content="noindex,nofollow">
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <title>penpot - error report {{id}}</title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
+    <style>
+      body {
+        margin: 0px;
+        padding: 0px;
+      }
+      pre {
+        margin: 0px;
+        line-height: 17px;
+      }
+
+      main {
+        margin: 20px;
+      }
+
+      nav {
+        position: fixed;
+        width: 100vw;
+        top: 0;
+        left: 0;
+        padding: 5px 20px;
+        display: flex;
+        background: #e3e3e3;
+      }
+
+      nav > div {
+        text-transform: uppercase;
+        font-weight: bold;
+      }
+
+      nav > div:not(:last-child) {
+        margin-right: 10px;
+      }
+
+      * {
+        font-family: "JetBrains Mono", monospace; 
+        font-size: 12px;
+      }
+      .table {
+        margin-top: 25px;
+        display: flex;
+        flex-direction: column;
+      }
+
+      .table-row {
+        display: flex;
+        /* width: 100%; */
+        /* border: 1px solid red; */
+      }
+
+      .table-key {
+        font-weight: 600;
+        width: 60px;
+        padding: 4px;
+
+        padding-top: 40px;
+        margin-top: -40px;
+      }
+
+      .table-val {
+        font-weight: 200;
+        color: #333;
+        padding: 4px;
+      }
+
+      .multiline {
+        margin-top: 30px;
+        flex-direction: column;
+      }
+
+      .multiline .table-key {
+        margin-bottom: 10px;
+        border-bottom: 1px dashed #dddddd;
+        /* padding: 4px; */
+        width: unset;
+      }
+
+    </style>
+  </head>
+  <body>
+
+    <nav>
+      
+      <div>[<a href="/dbg/error"><<</a>]</div>
+      <div>[<a href="#context">context</a>]</div>
+      <div>[<a href="#params">params</a>]</div>
+      {% if spec-problems %}
+      <div>[<a href="#edata">spec</a>]</div>
+      {% endif %}
+
+      {% if data %}
+      <div>[<a href="#edata">data</a>]</div>
+      {% endif %}
+      {% if trace %}
+      <div>[<a href="#trace">trace</a>]</div>
+      {% endif %}
+    </nav>
+    <main>
+      <div class="table">
+        <div class="table-row multiline">
+          <div id="context" class="table-key">CONTEXT: </div>
+          <div class="table-val">
+            <pre>{{context}}</pre>
+          </div>
+        </div>
+
+        {% if params %}
+        <div class="table-row multiline">
+          <div id="params" class="table-key">PARAMS: </div>
+          <div class="table-val">
+            <pre>{{params}}</pre>
+          </div>
+        </div>
+        {% endif %}
+
+        <!-- NOTE: this is legacy, for old error data saved on the database -->
+        {% if data %}
+        <div class="table-row multiline">
+          <div id="edata" class="table-key">ERROR DATA: </div>
+          <div class="table-val">
+            <pre>{{data}}</pre>
+          </div>
+        </div>
+        {% endif %}
+
+        {% if spec-problems %}
+        <div class="table-row multiline">
+          <div id="spec-problems" class="table-key">SPEC PROBLEMS: </div>
+          <div class="table-val">
+            <pre>{{spec-problems}}</pre>
+          </div>
+        </div>
+        {% endif %}
+
+        {% if trace %}
+        <div class="table-row multiline">
+          <div id="trace" class="table-key">TRACE:</div>
+          <div class="table-val">
+            <pre>{{trace}}</pre>
+          </div>
+        </div>
+        {% endif %}
+      </div>
+    </main>
+  </body>
+</html>
+

backend/resources/log4j2-devenv-repl.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info" monitorInterval="30">
-  <Appenders>
-    <Console name="console" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="true" />
-    </Console>
-
-    <RollingFile name="main" fileName="logs/main-latest.log" filePattern="logs/main-%i.log">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="true" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="50M"/>
-      </Policies>
-      <DefaultRolloverStrategy max="20"/>
-    </RollingFile>
-  </Appenders>
-
-  <Loggers>
-    <Logger name="io.lettuce" level="error" />
-    <Logger name="com.zaxxer.hikari" level="error"/>
-    <Logger name="org.postgresql" level="error" />
-
-    <Logger name="app.binfile" level="debug" />
-    <Logger name="app.storage.tmp" level="info" />
-    <Logger name="app.worker" level="trace" />
-    <Logger name="app.msgbus" level="info" />
-    <Logger name="app.http.websocket" level="info" />
-    <Logger name="app.http.sse" level="info" />
-    <Logger name="app.util.websocket" level="info" />
-    <Logger name="app.redis" level="info" />
-    <Logger name="app.rpc.rlimit" level="info" />
-    <Logger name="app.rpc.climit" level="debug" />
-    <Logger name="app.common.files.migrations" level="debug" />
-
-    <Logger name="app.loggers" level="debug" additivity="false">
-      <AppenderRef ref="main" level="debug" />
-    </Logger>
-
-    <Logger name="app" level="all" additivity="false">
-      <AppenderRef ref="main" level="trace" />
-    </Logger>
-
-    <Logger name="user" level="trace" additivity="false">
-      <AppenderRef ref="main" level="trace" />
-    </Logger>
-
-    <Root level="info">
-      <AppenderRef ref="main" />
-    </Root>
-  </Loggers>
-</Configuration>

backend/resources/log4j2-devenv.xml

@@ -2,55 +2,53 @@
 <Configuration status="info" monitorInterval="30">
   <Appenders>
     <Console name="console" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="true" />
+      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"/>
     </Console>
 
-    <RollingFile name="main" fileName="logs/main-latest.log" filePattern="logs/main-%i.log">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="true" />
+    <RollingFile name="main" fileName="logs/main.log" filePattern="logs/main-%i.log">
+      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"/>
       <Policies>
         <SizeBasedTriggeringPolicy size="50M"/>
       </Policies>
-      <DefaultRolloverStrategy max="20"/>
+      <DefaultRolloverStrategy max="9"/>
     </RollingFile>
+
+    <JeroMQ name="zmq">
+      <Property name="endpoint">tcp://localhost:45556</Property>
+      <JsonLayout complete="false" compact="true" includeTimeMillis="true" stacktraceAsString="true" properties="true" />
+    </JeroMQ>
   </Appenders>
 
   <Loggers>
-    <Logger name="io.lettuce" level="error" />
     <Logger name="com.zaxxer.hikari" level="error"/>
+    <Logger name="io.lettuce" level="error" />
+    <Logger name="org.eclipse.jetty" level="error" />
     <Logger name="org.postgresql" level="error" />
 
-    <Logger name="app.binfile" level="debug" />
-    <Logger name="app.storage.tmp" level="info" />
-    <Logger name="app.worker" level="trace" />
-    <Logger name="app.msgbus" level="info" />
-    <Logger name="app.http.websocket" level="info" />
-    <Logger name="app.http.sse" level="info" />
-    <Logger name="app.util.websocket" level="info" />
-    <Logger name="app.redis" level="info" />
-    <Logger name="app.rpc.rlimit" level="info" />
-    <Logger name="app.rpc.climit" level="debug" />
-    <Logger name="app.common.files.migrations" level="debug" />
+    <Logger name="app.cli" level="debug" additivity="false">
+      <AppenderRef ref="console"/>
+    </Logger>
 
     <Logger name="app.loggers" level="debug" additivity="false">
-      <AppenderRef ref="console" level="info" />
       <AppenderRef ref="main" level="debug" />
     </Logger>
 
     <Logger name="app" level="all" additivity="false">
       <AppenderRef ref="main" level="trace" />
-      <AppenderRef ref="console" level="debug" />
+      <AppenderRef ref="zmq" level="debug" />
+    </Logger>
+
+    <Logger name="penpot" level="debug" additivity="false">
+      <AppenderRef ref="main" level="debug" />
+      <AppenderRef ref="zmq" level="debug" />
     </Logger>
 
     <Logger name="user" level="trace" additivity="false">
       <AppenderRef ref="main" level="trace" />
-      <AppenderRef ref="console" level="info" />
     </Logger>
 
     <Root level="info">
       <AppenderRef ref="main" />
-      <AppenderRef ref="console" level="info" />
     </Root>
   </Loggers>
 </Configuration>

backend/resources/log4j2-experiments.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="info" monitorInterval="30">
-  <Appenders>
-    <Console name="console" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="true" />
-    </Console>
-
-    <RollingFile name="main" fileName="logs/main-latest.log" filePattern="logs/main-%i.log">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="true" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="50M"/>
-      </Policies>
-      <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-
-    <RollingFile name="reports" fileName="logs/reports-latest.log" filePattern="logs/reports-%i.log">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="true" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="100M"/>
-      </Policies>
-      <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-  </Appenders>
-
-  <Loggers>
-    <Logger name="io.lettuce" level="error" />
-    <Logger name="com.zaxxer.hikari" level="error"/>
-    <Logger name="org.postgresql" level="error" />
-
-    <Logger name="app.rpc.commands.binfile" level="debug" />
-    <Logger name="app.storage.tmp" level="info" />
-    <Logger name="app.worker" level="trace" />
-    <Logger name="app.msgbus" level="info" />
-    <Logger name="app.http.websocket" level="info" />
-    <Logger name="app.http.sse" level="info" />
-    <Logger name="app.util.websocket" level="info" />
-    <Logger name="app.redis" level="info" />
-    <Logger name="app.rpc.rlimit" level="info" />
-    <Logger name="app.rpc.climit" level="debug" />
-    <Logger name="app.common.files.migrations" level="info" />
-
-    <Logger name="app.loggers" level="debug" additivity="false">
-      <AppenderRef ref="main" level="debug" />
-    </Logger>
-
-    <Logger name="app.features" level="all" additivity="true">
-      <AppenderRef ref="reports" level="warn" />
-    </Logger>
-
-    <Logger name="app" level="all" additivity="false">
-      <AppenderRef ref="main" level="trace" />
-    </Logger>
-
-    <Logger name="user" level="trace" additivity="false">
-      <AppenderRef ref="main" level="trace" />
-    </Logger>
-
-    <Root level="info">
-      <AppenderRef ref="main" />
-    </Root>
-  </Loggers>
-</Configuration>

backend/resources/log4j2.xml

@@ -2,18 +2,22 @@
 <Configuration status="info" monitorInterval="60">
   <Appenders>
     <Console name="console" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"
-                     alwaysWriteExceptions="false" />
+      <PatternLayout pattern="[%d{YYYY-MM-dd HH:mm:ss.SSS}] %level{length=1} %logger{36} - %msg%n"/>
     </Console>
   </Appenders>
 
   <Loggers>
-    <Logger name="io.lettuce" level="error" />
     <Logger name="com.zaxxer.hikari" level="error" />
-    <Logger name="org.postgresql" level="error" />
-    <Logger name="app" level="info" additivity="false">
-      <AppenderRef ref="console" level="info" />
+    <Logger name="org.eclipse.jetty" level="error" />
+
+    <Logger name="app" level="debug" additivity="false">
+      <AppenderRef ref="console" />
     </Logger>
+
+    <Logger name="penpot" level="fatal" additivity="false">
+      <AppenderRef ref="console" />
+    </Logger>
+
     <Root level="info">
       <AppenderRef ref="console" />
     </Root>

backend/resources/rlimit.edn

@@ -1,11 +0,0 @@
-;; Example rlimit.edn file
-^{:refresh "30s"}
-{:default
- [[:default :window "200000/h"]]
-
- ;; #{:command/get-teams}
- ;; [[:burst :bucket "5/5/5s"]]
-
- ;; #{:command/get-profile}
- ;; [[:burst :bucket "60/60/1m"]]
- }

backend/scripts/build

@@ -8,18 +8,13 @@ rm -rf target;
 mkdir -p target/classes;
 mkdir -p target/dist;
 echo "$CURRENT_VERSION" > target/classes/version.txt;
-cp ../CHANGES.md target/classes/changelog.md;
 
 clojure -T:build jar;
 mv target/penpot.jar target/dist/penpot.jar
-cp resources/log4j2.xml target/dist/log4j2.xml
 cp scripts/run.template.sh target/dist/run.sh;
-cp scripts/manage.py target/dist/manage.py
+cp scripts/manage.template.sh target/dist/manage.sh;
 chmod +x target/dist/run.sh;
-chmod +x target/dist/manage.py
+chmod +x target/dist/manage.sh;
+
+
 
-# Prefetch templates
-rm -rf builtin-templates;
-mkdir builtin-templates;
-bb ./scripts/prefetch-templates.clj resources/app/onboarding.edn builtin-templates/
-cp -r builtin-templates target/dist/

backend/scripts/kill-repl.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -x
-
-jcmd |grep "rebel" |sed -nE 's/^([0-9]+).*$/\1/p' | xargs kill -9

backend/scripts/manage.py

@@ -1,235 +0,0 @@
-#!/usr/bin/env python3
-#
-# 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
-
-import argparse
-import json
-import socket
-import sys
-
-from tabulate import tabulate
-from getpass import getpass
-from urllib.parse import urlparse
-
-PREPL_URI = "tcp://localhost:6063"
-
-def get_prepl_conninfo():
-    uri_data = urlparse(PREPL_URI)
-    if uri_data.scheme != "tcp":
-        raise RuntimeError(f"invalid PREPL_URI: {PREPL_URI}")
-
-    if not isinstance(uri_data.netloc, str):
-        raise RuntimeError(f"invalid PREPL_URI: {PREPL_URI}")
-
-    host, port = uri_data.netloc.split(":", 2)
-
-    if port is None:
-        port = 6063
-
-    if isinstance(port, str):
-        port = int(port)
-
-    return host, port
-
-def send_eval(expr):
-    host, port = get_prepl_conninfo()
-
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.connect((host, port))
-        s.send(expr.encode("utf-8"))
-        s.send(b":repl/quit\n\n")
-
-        with s.makefile() as f:
-            while True:
-                line = f.readline()
-                result = json.loads(line)
-                tag = result.get("tag", None)
-                if tag == "ret":
-                    return result.get("val", None), result.get("exception", None)
-                elif tag == "out":
-                    print(result.get("val"), end="")
-                else:
-                    raise RuntimeError("unexpected response from PREPL")
-
-def encode(val):
-    return json.dumps(json.dumps(val))
-
-def print_error(res):
-    for error in res["via"]:
-        print("ERR:", error["message"])
-        break
-
-def run_cmd(params):
-    try:
-        expr = "(app.srepl.cli/exec {})".format(encode(params))
-        res, failed = send_eval(expr)
-        if failed:
-            print_error(res)
-            sys.exit(-1)
-
-        return res
-    except Exception as cause:
-        print("EXC:", str(cause))
-        sys.exit(-2)
-
-def create_profile(fullname, email, password):
-    params = {
-        "cmd": "create-profile",
-        "params": {
-            "fullname": fullname,
-            "email": email,
-            "password": password
-        }
-    }
-
-    res = run_cmd(params)
-    print(f"Created: {res['email']} / {res['id']}")
-
-def update_profile(email, fullname, password, is_active):
-    params = {
-        "cmd": "update-profile",
-        "params": {
-            "email": email,
-            "fullname": fullname,
-            "password": password,
-            "is_active": is_active
-        }
-    }
-
-    res = run_cmd(params)
-    if res is True:
-        print(f"Updated")
-    else:
-        print(f"No profile found with email {email}")
-
-def delete_profile(email, soft):
-    params = {
-        "cmd": "delete-profile",
-        "params": {
-            "email": email,
-            "soft": soft
-        }
-    }
-
-    res = run_cmd(params)
-    if res is True:
-        print(f"Deleted")
-    else:
-        print(f"No profile found with email {email}")
-
-def search_profile(email):
-    params = {
-        "cmd": "search-profile",
-        "params": {
-            "email": email,
-        }
-    }
-
-    res = run_cmd(params)
-
-    if isinstance(res, list):
-        print(tabulate(res, headers="keys"))
-
-def derive_password(password):
-    params = {
-        "cmd": "derive-password",
-        "params": {
-            "password": password,
-        }
-    }
-
-    res = run_cmd(params)
-    print(f"Derived password: \"{res}\"")
-
-
-def migrate_components_v2():
-    params = {
-        "cmd": "migrate-v2",
-        "params": {}
-    }
-
-    run_cmd(params)
-
-available_commands = (
-    "create-profile",
-    "update-profile",
-    "delete-profile",
-    "search-profile",
-    "derive-password",
-)
-
-parser = argparse.ArgumentParser(
-    description=(
-        "Penpot Command Line Interface (CLI)"
-    )
-)
-
-parser.add_argument("-V", "--version", action="version", version="Penpot CLI %%develop%%")
-parser.add_argument("action", action="store", choices=available_commands)
-parser.add_argument("-f", "--force", help="force operation", action="store_true")
-parser.add_argument("-n", "--fullname", help="fullname", action="store")
-parser.add_argument("-e", "--email", help="email", action="store")
-parser.add_argument("-p", "--password", help="password", action="store")
-parser.add_argument("-c", "--connect", help="connect to PREPL", action="store", default="tcp://localhost:6063")
-
-args = parser.parse_args()
-
-PREPL_URI = args.connect
-
-if args.action == "create-profile":
-    email = args.email
-    password = args.password
-    fullname = args.fullname
-
-    if email is None:
-        email = input("Email: ")
-
-    if fullname is None:
-        fullname = input("Fullname: ")
-
-    if password is None:
-        password = getpass("Password: ")
-
-    create_profile(fullname, email, password)
-
-elif args.action == "update-profile":
-    email = args.email
-    password = args.password
-
-    if email is None:
-        email = input("Email: ")
-
-    if password is None:
-        password = getpass("Password: ")
-
-    update_profile(email, None, password, None)
-
-elif args.action == "derive-password":
-    password = args.password
-
-    if password is None:
-        password = getpass("Password: ")
-
-    derive_password(password)
-
-elif args.action == "delete-profile":
-    email = args.email
-    soft = not args.force
-
-    if email is None:
-        email = input("Email: ")
-
-    delete_profile(email, soft)
-
-elif args.action == "search-profile":
-    email = args.email
-    if email is None:
-        email = input("Email: ")
-
-    search_profile(email)
-
-

backend/scripts/manage.template.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set +e
+JAVA_CMD=$(type -p java)
+
+set -e
+if [[ ! -n "$JAVA_CMD" ]]; then
+  if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
+    JAVA_CMD="$JAVA_HOME/bin/java"
+  else
+    >&2 echo "Couldn't find 'java'. Please set JAVA_HOME."
+    exit 1
+  fi
+fi
+
+if [ -f ./environ ]; then
+   source ./environ
+fi
+
+exec $JAVA_CMD $JVM_OPTS -jar penpot.jar -m app.cli.manage "$@"

backend/scripts/nrepl

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-clojure -J-Xms50m -J-Xmx256m -J-XX:+UseSerialGC -Sdeps '{:deps {reply/reply {:mvn/version "0.5.0"}}}' -M -m reply.main --attach localhost:6064 -e "(in-ns 'app.main)"

backend/scripts/prefetch-templates.clj

@@ -1,40 +0,0 @@
-#!/usr/bin/env bb
-
-(require '[babashka.curl :as curl]
-         '[babashka.fs :as fs])
-
-(defn download-if-needed!
-  [dest data]
-  (doseq [{:keys [id file-uri] :as item} data]
-    (let [file (fs/file dest id)
-          rsp  (curl/get file-uri {:as :stream})]
-
-      (when (not= 200 (:status rsp))
-        (println (format "unable to download %s (uri: %s)" id file-uri))
-        (System/exit -1))
-
-      (when-not (fs/exists? (str file))
-        (println (format "=> downloading %s" id))
-        (with-open [output (io/output-stream file)]
-          (io/copy (:body rsp) output))))))
-
-(defn read-defs-file
-  [path]
-  (with-open [content (io/reader path)]
-    (edn/read-string (slurp content))))
-
-(let [[path dest] *command-line-args*]
-  (when (or (nil? path)
-            (nil? dest))
-    (println "invalid arguments")
-    (System/exit -1))
-
-  (when-not (fs/exists? path)
-    (println (format "file %s does not exists" path))
-    (System/exit -1))
-
-  (when-not (fs/exists? dest)
-    (fs/create-dirs dest))
-
-  (let [data (read-defs-file path)]
-    (download-if-needed! dest data)))

backend/scripts/repl

@@ -1,106 +1,21 @@
 #!/usr/bin/env bash
 
-export PENPOT_HOST=devenv
-export PENPOT_TENANT=dev
-export PENPOT_FLAGS="\
-       $PENPOT_FLAGS \
-       enable-login-with-ldap \
-       enable-login-with-password
-       enable-login-with-oidc \
-       enable-login-with-google \
-       enable-login-with-github \
-       enable-login-with-gitlab \
-       enable-backend-worker \
-       enable-backend-asserts \
-       enable-feature-fdata-pointer-map \
-       enable-feature-fdata-objects-map \
-       enable-audit-log \
-       enable-transit-readable-response \
-       enable-demo-users \
-       disable-secure-session-cookies \
-       enable-smtp \
-       enable-prepl-server \
-       enable-urepl-server \
-       enable-rpc-climit \
-       enable-rpc-rlimit \
-       enable-soft-rpc-rlimit \
-       enable-webhooks \
-       enable-access-tokens \
-       enable-file-validation \
-       enable-file-schema-validation";
-
-# Default deletion delay for devenv
-export PENPOT_DELETION_DELAY="24h"
-
-# Setup default upload media file size to 100MiB
-export PENPOT_MEDIA_MAX_FILE_SIZE=104857600
-
-# Setup default multipart upload size to 300MiB
-export PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE=314572800
-
-# export PENPOT_DATABASE_URI="postgresql://172.17.0.1:5432/penpot"
-# export PENPOT_DATABASE_USERNAME="penpot"
-# export PENPOT_DATABASE_PASSWORD="penpot"
-# export PENPOT_DATABASE_READONLY=true
-
-# export PENPOT_DATABASE_URI="postgresql://172.17.0.1:5432/penpot_pre"
-# export PENPOT_DATABASE_USERNAME="penpot_pre"
-# export PENPOT_DATABASE_PASSWORD="penpot_pre"
-
-# export PENPOT_LOGGERS_LOKI_URI="http://172.17.0.1:3100/loki/api/v1/push"
-# export PENPOT_AUDIT_LOG_ARCHIVE_URI="http://localhost:6070/api/audit"
-
-# Initialize MINIO config
-mc alias set penpot-s3/ http://minio:9000 minioadmin minioadmin -q
-mc admin user add penpot-s3 penpot-devenv penpot-devenv -q
-mc admin user info penpot-s3 penpot-devenv |grep -F -q "readwrite"
-if [ "$?" = "1" ]; then
-    mc admin policy attach penpot-s3 readwrite --user=penpot-devenv -q
-fi
-mc mb penpot-s3/penpot -p -q
-
-export AWS_ACCESS_KEY_ID=penpot-devenv
-export AWS_SECRET_ACCESS_KEY=penpot-devenv
-export PENPOT_ASSETS_STORAGE_BACKEND=assets-s3
-export PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://minio:9000
-export PENPOT_STORAGE_ASSETS_S3_BUCKET=penpot
+export PENPOT_FLAGS="enable-asserts enable-audit-log $PENPOT_FLAGS"
 
 export OPTIONS="
-       -A:jmx-remote -A:dev \
+       -A:jmx-remote:dev \
        -J-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
-       -J-Djdk.attach.allowAttachSelf \
-       -J-Dpolyglot.engine.WarnInterpreterOnly=false \
-       -J-Dlog4j2.configurationFile=log4j2-devenv-repl.xml \
-       -J-XX:+EnableDynamicAgentLoading \
+       -J-Dlog4j2.configurationFile=log4j2-devenv.xml \
+       -J-XX:+UseZGC \
        -J-XX:-OmitStackTraceInFastThrow \
+       -J-Xms50m -J-Xmx512m \
+       -J-Djdk.attach.allowAttachSelf \
        -J-XX:+UnlockDiagnosticVMOptions \
-       -J-XX:+DebugNonSafepoints \
-       -J-Djdk.tracePinnedThreads=full"
+       -J-XX:+DebugNonSafepoints";
 
-# Enable preview
-export OPTIONS="$OPTIONS -J--enable-preview"
 
-# Setup HEAP
-# export OPTIONS="$OPTIONS -J-Xms50m -J-Xmx1024m"
-# export OPTIONS="$OPTIONS -J-Xms1100m -J-Xmx1100m -J-XX:+AlwaysPreTouch"
-
-# Increase virtual thread pool size
-# export OPTIONS="$OPTIONS -J-Djdk.virtualThreadScheduler.parallelism=16"
-
-# Disable C2 Compiler
-# export OPTIONS="$OPTIONS -J-XX:TieredStopAtLevel=1"
-
-# Disable all compilers
-# export OPTIONS="$OPTIONS -J-Xint"
-
-# Setup GC
-# export OPTIONS="$OPTIONS -J-XX:+UseG1GC"
-
-# Setup GC
-# export OPTIONS="$OPTIONS -J-XX:+UseZGC"
-
-# Enable ImageMagick v7.x support
-# export OPTIONS="-J-Dim4java.useV7=true $OPTIONS";
+# export OPTIONS="$OPTIONS -J-XX:+UnlockDiagnosticVMOptions";
+# export OPTIONS="$OPTIONS -J-XX:-TieredCompilation -J-XX:CompileThreshold=10000";
 
 export OPTIONS_EVAL="nil"
 # export OPTIONS_EVAL="(set! *warn-on-reflection* true)"

backend/scripts/repl-test

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-source /home/penpot/environ
-export PENPOT_FLAGS="$PENPOT_FLAGS disable-backend-worker"
-
-export OPTIONS="
-       -A:jmx-remote -A:dev \
-       -J-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
-       -J-Djdk.attach.allowAttachSelf \
-       -J-Dlog4j2.configurationFile=log4j2-experiments.xml \
-       -J-XX:-OmitStackTraceInFastThrow \
-       -J-XX:+UnlockDiagnosticVMOptions \
-       -J-XX:+DebugNonSafepoints \
-       -J-Djdk.tracePinnedThreads=full \
-       -J-XX:+UseTransparentHugePages \
-       -J-XX:ReservedCodeCacheSize=1g \
-       -J-Dpolyglot.engine.WarnInterpreterOnly=false \
-       -J--enable-preview";
-
-# Setup HEAP
-export OPTIONS="$OPTIONS -J-Xms320g -J-Xmx320g -J-XX:+AlwaysPreTouch"
-
-export PENPOT_HTTP_SERVER_IO_THREADS=2
-export PENPOT_HTTP_SERVER_WORKER_THREADS=2
-
-# Increase virtual thread pool size
-# export OPTIONS="$OPTIONS -J-Djdk.virtualThreadScheduler.parallelism=16"
-
-# Disable C2 Compiler
-# export OPTIONS="$OPTIONS -J-XX:TieredStopAtLevel=1"
-
-# Disable all compilers
-# export OPTIONS="$OPTIONS -J-Xint"
-
-# Setup GC
-export OPTIONS="$OPTIONS -J-XX:+UseG1GC -J-Xlog:gc:logs/gc.log"
-
-# Setup GC
-#export OPTIONS="$OPTIONS -J-XX:+UseZGC -J-XX:+ZGenerational -J-Xlog:gc:logs/gc.log"
-
-# Enable ImageMagick v7.x support
-# export OPTIONS="-J-Dim4java.useV7=true $OPTIONS";
-
-export OPTIONS_EVAL="nil"
-# export OPTIONS_EVAL="(set! *warn-on-reflection* true)"
-
-set -ex
-exec clojure $OPTIONS -M -e "$OPTIONS_EVAL" -m rebel-readline.main

backend/scripts/run.template.sh

@@ -1,26 +1,20 @@
 #!/usr/bin/env bash
+set +e
+JAVA_CMD=$(type -p java)
 
+set -e
 if [[ ! -n "$JAVA_CMD" ]]; then
-    if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
-        JAVA_CMD="$JAVA_HOME/bin/java"
-    else
-        set +e
-        JAVA_CMD=$(type -p java)
-        set -e
-        if [[ ! -n "$JAVA_CMD" ]]; then
-            >&2 echo "Couldn't find 'java'. Please set JAVA_HOME."
-            exit 1
-        fi
-    fi
+  if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
+    JAVA_CMD="$JAVA_HOME/bin/java"
+  else
+    >&2 echo "Couldn't find 'java'. Please set JAVA_HOME."
+    exit 1
+  fi
 fi
 
 if [ -f ./environ ]; then
-    source ./environ
+   source ./environ
 fi
 
-export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow -Dpolyglot.engine.WarnInterpreterOnly=false --enable-preview $JVM_OPTS"
-
-ENTRYPOINT=${1:-app.main};
-
-set -ex
-exec $JAVA_CMD $JVM_OPTS -jar penpot.jar -m $ENTRYPOINT
+set -x
+exec $JAVA_CMD $JVM_OPTS "$@" -jar penpot.jar -m app.main

backend/scripts/start-dev

@@ -1,66 +1,23 @@
 #!/usr/bin/env bash
 
-export PENPOT_HOST=devenv
-export PENPOT_TENANT=dev
-export PENPOT_FLAGS="\
-       $PENPOT_FLAGS \
-       enable-prepl-server \
-       enable-urepl-server \
-       enable-nrepl-server \
-       enable-webhooks \
-       enable-backend-asserts \
-       enable-audit-log \
-       enable-transit-readable-response \
-       enable-demo-users \
-       enable-feature-fdata-pointer-map \
-       enable-feature-fdata-objects-map \
-       disable-secure-session-cookies \
-       enable-rpc-climit \
-       enable-smtp \
-       enable-access-tokens \
-       enable-file-validation \
-       enable-file-schema-validation";
-
-export OPTIONS="
-       -A:jmx-remote -A:dev \
-       -J-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
-       -J-Djdk.attach.allowAttachSelf \
-       -J-Dpolyglot.engine.WarnInterpreterOnly=false \
-       -J-Dlog4j2.configurationFile=log4j2-devenv.xml \
-       -J-XX:+EnableDynamicAgentLoading \
-       -J-XX:-OmitStackTraceInFastThrow \
-       -J-XX:+UnlockDiagnosticVMOptions \
-       -J-XX:+DebugNonSafepoints"
-
-# Default deletion delay for devenv
-export PENPOT_DELETION_DELAY="24h"
-
-# Setup default upload media file size to 100MiB
-export PENPOT_MEDIA_MAX_FILE_SIZE=104857600
-
-# Setup default multipart upload size to 300MiB
-export PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE=314572800
-
-# Enable ImageMagick v7.x support
-# export OPTIONS="-J-Dim4java.useV7=true $OPTIONS";
-
-# Initialize MINIO config
-mc alias set penpot-s3/ http://minio:9000 minioadmin minioadmin -q
-mc admin user add penpot-s3 penpot-devenv penpot-devenv -q
-mc admin user info penpot-s3 penpot-devenv |grep -F -q "readwrite"
-if [ "$?" = "1" ]; then
-    mc admin policy attach penpot-s3 readwrite --user=penpot-devenv -q
-fi
-mc mb penpot-s3/penpot -p -q
-
-export AWS_ACCESS_KEY_ID=penpot-devenv
-export AWS_SECRET_ACCESS_KEY=penpot-devenv
-export PENPOT_ASSETS_STORAGE_BACKEND=assets-s3
-export PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://minio:9000
-export PENPOT_STORAGE_ASSETS_S3_BUCKET=penpot
-
-entrypoint=${1:-app.main};
+export PENPOT_FLAGS="$PENPOT_FLAGS enable-asserts"
 
 set -ex
 
-clojure $OPTIONS -A:dev -M -m $entrypoint;
+if [ "$1" = "--watch" ]; then
+    echo "Start Watch..."
+
+    clojure -A:dev -M -m app.main &
+    PID=$!
+
+    npx nodemon \
+        --watch src \
+        --watch ../common \
+        --ext "clj" \
+        --signal SIGKILL \
+        --exec 'echo "(user/restart)" | nc -N localhost 6062'
+
+    kill -9 $PID
+else
+    clojure -A:dev -M -m app.main
+fi

backend/src/app/auth.clj

@@ -1,27 +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.auth
-  (:require
-   [buddy.hashers :as hashers]))
-
-(def default-params
-  {:alg :argon2id
-   :memory 32768 ;; 32 MiB
-   :iterations 3
-   :parallelism 2})
-
-(defn derive-password
-  [password]
-  (hashers/derive password default-params))
-
-(defn verify-password
-  [attempt password]
-  (try
-    (hashers/verify attempt password)
-    (catch Throwable _
-      {:update false
-       :valid false})))

backend/src/app/auth/ldap.clj

@@ -1,139 +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.auth.ldap
-  (:require
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.spec :as us]
-   [app.config :as cf]
-   [clj-ldap.client :as ldap]
-   [clojure.spec.alpha :as s]
-   [clojure.string]
-   [integrant.core :as ig]))
-
-(defn- prepare-params
-  [cfg]
-  {:ssl?      (:ssl cfg)
-   :startTLS? (:tls cfg)
-   :bind-dn   (:bind-dn cfg)
-   :password  (:bind-password cfg)
-   :host      {:address (:host cfg)
-               :port    (:port cfg)}})
-
-(defn- connect
-  "Connects to the LDAP provider and returns a connection. An
-  exception is raised if no connection is possible."
-  ^java.lang.AutoCloseable
-  [cfg]
-  (try
-    (-> cfg prepare-params ldap/connect)
-    (catch Throwable cause
-      (ex/raise :type :restriction
-                :code :unable-to-connect-to-ldap
-                :hint "unable to connect to ldap server"
-                :cause cause))))
-
-(defn- replace-several [s & {:as replacements}]
-  (reduce-kv clojure.string/replace s replacements))
-
-(defn- search-user
-  [{:keys [::conn base-dn] :as cfg} email]
-  (let [query  (replace-several (:query cfg) ":username" email)
-        attrs  [(:attrs-username cfg)
-                (:attrs-email cfg)
-                (:attrs-fullname cfg)]
-        params  {:filter query
-                 :sizelimit 1
-                 :attributes attrs}]
-    (first (ldap/search conn base-dn params))))
-
-(defn- retrieve-user
-  [{:keys [::conn] :as cfg} {:keys [email password]}]
-  (when-let [{:keys [dn] :as user} (search-user cfg email)]
-    (when (ldap/bind? conn dn password)
-      {:fullname (get user (-> cfg :attrs-fullname keyword))
-       :email    email
-       :backend  "ldap"})))
-
-(s/def ::fullname ::us/not-empty-string)
-(s/def ::email ::us/email)
-(s/def ::backend ::us/not-empty-string)
-
-(s/def ::info-data
-  (s/keys :req-un [::fullname ::email ::backend]))
-
-(defn authenticate
-  [cfg params]
-  (with-open [conn (connect cfg)]
-    (when-let [user (-> (assoc cfg ::conn conn)
-                        (retrieve-user params))]
-      (when-not (s/valid? ::info-data user)
-        (let [explain (s/explain-str ::info-data user)]
-          (l/warn ::l/raw (str "invalid response from ldap, looks like ldap is not configured correctly\n" explain))
-          (ex/raise :type :restriction
-                    :code :wrong-ldap-response
-                    :explain explain)))
-      user)))
-
-(defn- try-connectivity
-  [cfg]
-  ;; If we have ldap parameters, try to establish connection
-  (when (and (:bind-dn cfg)
-             (:bind-password cfg)
-             (:host cfg)
-             (:port cfg))
-    (try
-      (with-open [_ (connect cfg)]
-        (l/info :hint "provider initialized"
-                :provider "ldap"
-                :host (:host cfg)
-                :port (:port cfg)
-                :tls? (:tls cfg)
-                :ssl? (:ssl cfg)
-                :bind-dn (:bind-dn cfg)
-                :base-dn (:base-dn cfg)
-                :query (:query cfg))
-        cfg)
-      (catch Throwable cause
-        (l/error :hint "unable to connect to LDAP server (LDAP auth provider disabled)"
-                 :host (:host cfg) :port (:port cfg) :cause cause)
-        nil))))
-
-(s/def ::enabled? ::us/boolean)
-(s/def ::host ::cf/ldap-host)
-(s/def ::port ::cf/ldap-port)
-(s/def ::ssl ::cf/ldap-ssl)
-(s/def ::tls ::cf/ldap-starttls)
-(s/def ::query ::cf/ldap-user-query)
-(s/def ::base-dn ::cf/ldap-base-dn)
-(s/def ::bind-dn ::cf/ldap-bind-dn)
-(s/def ::bind-password ::cf/ldap-bind-password)
-(s/def ::attrs-email ::cf/ldap-attrs-email)
-(s/def ::attrs-fullname ::cf/ldap-attrs-fullname)
-(s/def ::attrs-username ::cf/ldap-attrs-username)
-
-(s/def ::provider-params
-  (s/keys :opt-un [::host ::port
-                   ::ssl ::tls
-                   ::enabled?
-                   ::bind-dn
-                   ::bind-password
-                   ::query
-                   ::attrs-email
-                   ::attrs-username
-                   ::attrs-fullname]))
-(s/def ::provider
-  (s/nilable ::provider-params))
-
-(defmethod ig/pre-init-spec ::provider
-  [_]
-  (s/spec ::provider))
-
-(defmethod ig/init-key ::provider
-  [_ cfg]
-  (when (:enabled? cfg)
-    (try-connectivity cfg)))

backend/src/app/auth/oidc.clj

@@ -1,680 +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.auth.oidc
-  "OIDC client implementation."
-  (:require
-   [app.auth.oidc.providers :as-alias providers]
-   [app.common.data :as d]
-   [app.common.data.macros :as dm]
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.spec :as us]
-   [app.common.uri :as u]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.email.blacklist :as email.blacklist]
-   [app.email.whitelist :as email.whitelist]
-   [app.http.client :as http]
-   [app.http.session :as session]
-   [app.loggers.audit :as audit]
-   [app.rpc.commands.profile :as profile]
-   [app.setup :as-alias setup]
-   [app.tokens :as tokens]
-   [app.util.json :as json]
-   [app.util.time :as dt]
-   [buddy.sign.jwk :as jwk]
-   [buddy.sign.jwt :as jwt]
-   [clojure.set :as set]
-   [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
-   [integrant.core :as ig]
-   [ring.request :as rreq]
-   [ring.response :as-alias rres]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn obfuscate-string
-  [s]
-  (if (< (count s) 10)
-    (apply str (take (count s) (repeat "*")))
-    (str (subs s 0 5)
-         (apply str (take (- (count s) 5) (repeat "*"))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; OIDC PROVIDER (GENERIC)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- discover-oidc-config
-  [cfg {:keys [base-uri] :as opts}]
-  (let [uri (dm/str (u/join base-uri ".well-known/openid-configuration"))
-        rsp (http/req! cfg {:method :get :uri uri} {:sync? true})]
-    (if (= 200 (:status rsp))
-      (let [data      (-> rsp :body json/decode)
-            token-uri (get data :token_endpoint)
-            auth-uri  (get data :authorization_endpoint)
-            user-uri  (get data :userinfo_endpoint)
-            jwks-uri  (get data :jwks_uri)]
-
-        (l/debug :hint "oidc uris discovered"
-                 :token-uri token-uri
-                 :auth-uri auth-uri
-                 :user-uri user-uri
-                 :jwks-uri jwks-uri)
-
-        {:token-uri token-uri
-         :auth-uri  auth-uri
-         :user-uri  user-uri
-         :jwks-uri jwks-uri})
-      (do
-        (l/warn :hint "unable to discover OIDC configuration"
-                :discover-uri uri
-                :http-status (:status rsp))
-        nil))))
-
-(defn- prepare-oidc-opts
-  [cfg]
-  (let [opts {:base-uri      (cf/get :oidc-base-uri)
-              :client-id     (cf/get :oidc-client-id)
-              :client-secret (cf/get :oidc-client-secret)
-              :token-uri     (cf/get :oidc-token-uri)
-              :auth-uri      (cf/get :oidc-auth-uri)
-              :user-uri      (cf/get :oidc-user-uri)
-              :jwks-uri      (cf/get :oidc-jwks-uri)
-              :scopes        (cf/get :oidc-scopes #{"openid" "profile" "email"})
-              :roles-attr    (cf/get :oidc-roles-attr)
-              :roles         (cf/get :oidc-roles)
-              :name          "oidc"}
-
-        opts (d/without-nils opts)]
-
-    (when (and (string? (:base-uri opts))
-               (string? (:client-id opts))
-               (string? (:client-secret opts)))
-      (if (and (string? (:token-uri opts))
-               (string? (:user-uri opts))
-               (string? (:auth-uri opts)))
-        opts
-        (try
-          (-> (discover-oidc-config cfg opts)
-              (merge opts {:discover? true}))
-          (catch Throwable cause
-            (l/warn :hint "unable to discover OIDC configuration"
-                    :cause cause)))))))
-
-(defn- process-oidc-jwks
-  [keys]
-  (reduce (fn [result {:keys [kid] :as kdata}]
-            (let [pkey (ex/try! (jwk/public-key kdata))]
-              (if (ex/exception? pkey)
-                (do
-                  (l/warn :hint "unable to create public key"
-                          :kid (:kid kdata)
-                          :cause pkey)
-                  result)
-                (assoc result kid pkey))))
-          {}
-          keys))
-
-(defn- fetch-oidc-jwks
-  [cfg {:keys [jwks-uri]}]
-  (when jwks-uri
-    (try
-      (let [{:keys [status body]} (http/req! cfg {:method :get :uri jwks-uri} {:sync? true})]
-        (if (= 200 status)
-          (-> body json/decode :keys process-oidc-jwks)
-          (do
-            (l/warn :hint "unable to retrieve JWKs (unexpected response status code)"
-                    :http-status status
-                    :http-body  body)
-            nil)))
-      (catch Throwable cause
-        (l/warn :hint "unable to retrieve JWKs (unexpected exception)"
-                :cause cause)))))
-
-(defmethod ig/pre-init-spec ::providers/generic [_]
-  (s/keys :req [::http/client]))
-
-(defmethod ig/init-key ::providers/generic
-  [_ cfg]
-  (when (contains? cf/flags :login-with-oidc)
-    (if-let [opts (prepare-oidc-opts cfg)]
-      (let [jwks (fetch-oidc-jwks cfg opts)]
-        (l/info :hint "provider initialized"
-                :provider "oidc"
-                :method (if (:discover? opts) "discover" "manual")
-                :client-id (:client-id opts)
-                :client-secret (obfuscate-string (:client-secret opts))
-                :scopes     (str/join "," (:scopes opts))
-                :auth-uri   (:auth-uri opts)
-                :user-uri   (:user-uri opts)
-                :token-uri  (:token-uri opts)
-                :roles-attr (:roles-attr opts)
-                :roles      (:roles opts)
-                :keys       (str/join "," (map str (keys jwks))))
-        (assoc opts :jwks jwks))
-      (do
-        (l/warn :hint "unable to initialize auth provider, missing configuration" :provider "oidc")
-        nil))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; GOOGLE AUTH PROVIDER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defmethod ig/init-key ::providers/google
-  [_ _]
-  (let [opts {:client-id     (cf/get :google-client-id)
-              :client-secret (cf/get :google-client-secret)
-              :scopes        #{"openid" "email" "profile"}
-              :auth-uri      "https://accounts.google.com/o/oauth2/v2/auth"
-              :token-uri     "https://oauth2.googleapis.com/token"
-              :user-uri      "https://openidconnect.googleapis.com/v1/userinfo"
-              :name          "google"}]
-
-    (when (contains? cf/flags :login-with-google)
-      (if (and (string? (:client-id opts))
-               (string? (:client-secret opts)))
-        (do
-          (l/info :hint "provider initialized"
-                  :provider "google"
-                  :client-id (:client-id opts)
-                  :client-secret (obfuscate-string (:client-secret opts)))
-          opts)
-
-        (do
-          (l/warn :hint "unable to initialize auth provider, missing configuration" :provider "google")
-          nil)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; GITHUB AUTH PROVIDER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- retrieve-github-email
-  [cfg tdata props]
-  (or (some-> props :github/email)
-      (let [params {:uri "https://api.github.com/user/emails"
-                    :headers {"Authorization" (dm/str (:token/type tdata) " " (:token/access tdata))}
-                    :timeout 6000
-                    :method :get}
-
-            {:keys [status body]} (http/req! cfg params {:sync? true})]
-
-        (when-not (s/int-in-range? 200 300 status)
-          (ex/raise :type :internal
-                    :code :unable-to-retrieve-github-emails
-                    :hint "unable to retrieve github emails"
-                    :http-status status
-                    :http-body body))
-
-        (->> body json/decode (filter :primary) first :email))))
-
-(defmethod ig/pre-init-spec ::providers/github [_]
-  (s/keys :req [::http/client]))
-
-(defmethod ig/init-key ::providers/github
-  [_ cfg]
-  (let [opts {:client-id     (cf/get :github-client-id)
-              :client-secret (cf/get :github-client-secret)
-              :scopes        #{"read:user" "user:email"}
-              :auth-uri      "https://github.com/login/oauth/authorize"
-              :token-uri     "https://github.com/login/oauth/access_token"
-              :user-uri      "https://api.github.com/user"
-              :name          "github"
-
-              ;; Additional hooks for provider specific way of
-              ;; retrieve emails.
-              :get-email-fn  (partial retrieve-github-email cfg)}]
-
-    (when (contains? cf/flags :login-with-github)
-      (if (and (string? (:client-id opts))
-               (string? (:client-secret opts)))
-        (do
-          (l/info :hint "provider initialized"
-                  :provider "github"
-                  :client-id (:client-id opts)
-                  :client-secret (obfuscate-string (:client-secret opts)))
-          opts)
-
-        (do
-          (l/warn :hint "unable to initialize auth provider, missing configuration" :provider "github")
-          nil)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; GITLAB AUTH PROVIDER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defmethod ig/init-key ::providers/gitlab
-  [_ _]
-  (let [base (cf/get :gitlab-base-uri "https://gitlab.com")
-        opts {:base-uri      base
-              :client-id     (cf/get :gitlab-client-id)
-              :client-secret (cf/get :gitlab-client-secret)
-              :scopes        #{"openid" "profile" "email"}
-              :auth-uri      (str base "/oauth/authorize")
-              :token-uri     (str base "/oauth/token")
-              :user-uri      (str base "/oauth/userinfo")
-              :name          "gitlab"}]
-    (when (contains? cf/flags :login-with-gitlab)
-      (if (and (string? (:client-id opts))
-               (string? (:client-secret opts)))
-        (do
-          (l/info :hint "provider initialized"
-                  :provider "gitlab"
-                  :base-uri base
-                  :client-id (:client-id opts)
-                  :client-secret (obfuscate-string (:client-secret opts)))
-          opts)
-
-        (do
-          (l/warn :hint "unable to initialize auth provider, missing configuration" :provider "gitlab")
-          nil)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HANDLERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- parse-attr-path
-  [provider path]
-  (let [[fitem & items] (str/split path "__")]
-    (into [(keyword (:name provider) fitem)] (map keyword) items)))
-
-(defn- build-redirect-uri
-  [{:keys [::provider] :as cfg}]
-  (let [public (u/uri (cf/get :public-uri))]
-    (str (assoc public :path (str "/api/auth/oauth/" (:name provider) "/callback")))))
-
-(defn- build-auth-uri
-  [{:keys [::provider] :as cfg} state]
-  (let [params {:client_id (:client-id provider)
-                :redirect_uri (build-redirect-uri cfg)
-                :response_type "code"
-                :state state
-                :scope (str/join " " (:scopes provider []))}
-        query  (u/map->query-string params)]
-    (-> (u/uri (:auth-uri provider))
-        (assoc :query query)
-        (str))))
-
-(defn- qualify-prop-key
-  [provider k]
-  (keyword (:name provider) (name k)))
-
-(defn- qualify-props
-  [provider props]
-  (reduce-kv (fn [result k v]
-               (assoc result (qualify-prop-key provider k) v))
-             {}
-             props))
-
-(defn- fetch-access-token
-  [{:keys [::provider] :as cfg} code]
-  (let [params {:client_id (:client-id provider)
-                :client_secret (:client-secret provider)
-                :code code
-                :grant_type "authorization_code"
-                :redirect_uri (build-redirect-uri cfg)}
-        req    {:method :post
-                :headers {"content-type" "application/x-www-form-urlencoded"
-                          "accept" "application/json"}
-                :uri (:token-uri provider)
-                :body (u/map->query-string params)}]
-
-    (l/trace :hint "request access token"
-             :provider (:name provider)
-             :client-id (:client-id provider)
-             :client-secret (obfuscate-string (:client-secret provider))
-             :grant-type (:grant_type params)
-             :redirect-uri (:redirect_uri params))
-
-    (let [{:keys [status body]} (http/req! cfg req {:sync? true})]
-      (l/trace :hint "access token response" :status status :body body)
-      (if (= status 200)
-        (let [data (json/decode body)]
-          {:token/access (get data :access_token)
-           :token/id     (get data :id_token)
-           :token/type   (get data :token_type)})
-
-        (ex/raise :type :internal
-                  :code :unable-to-retrieve-token
-                  :hint "unable to retrieve token"
-                  :http-status status
-                  :http-body body)))))
-
-(defn- process-user-info
-  [provider tdata info]
-  (letfn [(get-email [props]
-            ;; Allow providers hook into this for custom email
-            ;; retrieval method.
-            (if-let [get-email-fn (:get-email-fn provider)]
-              (get-email-fn tdata props)
-              (let [attr-kw (cf/get :oidc-email-attr "email")
-                    attr-ph (parse-attr-path provider attr-kw)]
-                (get-in props attr-ph))))
-
-          (get-name [props]
-            (let [attr-kw (cf/get :oidc-name-attr "name")
-                  attr-ph (parse-attr-path provider attr-kw)]
-              (get-in props attr-ph)))]
-
-    (let [props (qualify-props provider info)
-          email (get-email props)]
-      {:backend  (:name provider)
-       :fullname (or (get-name props) email)
-       :email    email
-       :props    props})))
-
-(defn- fetch-user-info
-  [{:keys [::provider] :as cfg} tdata]
-  (l/trace :hint "fetch user info"
-           :uri (:user-uri provider)
-           :token (obfuscate-string (:token/access tdata)))
-
-  (let [params   {:uri (:user-uri provider)
-                  :headers {"Authorization" (str (:token/type tdata) " " (:token/access tdata))}
-                  :timeout 6000
-                  :method :get}
-        response (http/req! cfg params {:sync? true})]
-
-    (l/trace :hint "user info response"
-             :status (:status response)
-             :body   (:body response))
-
-    (when-not (s/int-in-range? 200 300 (:status response))
-      (ex/raise :type :internal
-                :code :unable-to-retrieve-user-info
-                :hint "unable to retrieve user info"
-                :http-status (:status response)
-                :http-body (:body response)))
-
-    (-> response :body json/decode)))
-
-(defn- get-user-info
-  [{:keys [::provider]} tdata]
-  (try
-    (when (:token/id tdata)
-      (let [{:keys [kid alg] :as theader} (jwt/decode-header (:token/id tdata))]
-        (when-let [key (if (str/starts-with? (name alg) "hs")
-                         (:client-secret provider)
-                         (get-in provider [:jwks kid]))]
-
-          (let [claims (jwt/unsign (:token/id tdata) key {:alg alg})]
-            (dissoc claims :exp :iss :iat :sid :aud :sub)))))
-    (catch Throwable cause
-      (l/warn :hint "unable to get user info from JWT token (unexpected exception)"
-              :cause cause))))
-
-(s/def ::backend ::us/not-empty-string)
-(s/def ::email ::us/not-empty-string)
-(s/def ::fullname ::us/not-empty-string)
-(s/def ::props (s/map-of ::us/keyword any?))
-(s/def ::info
-  (s/keys :req-un [::backend
-                   ::email
-                   ::fullname
-                   ::props]))
-
-(defn- get-info
-  [{:keys [::provider ::setup/props] :as cfg} {:keys [params] :as request}]
-  (when-let [error (get params :error)]
-    (ex/raise :type :internal
-              :code :error-on-retrieving-code
-              :error-id error
-              :error-desc (get params :error_description)))
-
-  (let [state  (get params :state)
-        code   (get params :code)
-        state  (tokens/verify props {:token state :iss :oauth})
-        tdata  (fetch-access-token cfg code)
-        info   (case (cf/get :oidc-user-info-source)
-                 :token (get-user-info cfg tdata)
-                 :userinfo (fetch-user-info cfg tdata)
-                 (or (get-user-info cfg tdata)
-                     (fetch-user-info cfg tdata)))
-
-        info   (process-user-info provider tdata info)]
-
-    (l/trace :hint "user info" :info info)
-
-    (when-not (s/valid? ::info info)
-      (l/warn :hint "received incomplete profile info object (please set correct scopes)" :info info)
-      (ex/raise :type :internal
-                :code :incomplete-user-info
-                :hint "inconmplete user info"
-                :info info))
-
-    ;; If the provider is OIDC, we can proceed to check
-    ;; roles if they are defined.
-    (when (and (= "oidc" (:name provider))
-               (seq (:roles provider)))
-
-      (let [expected-roles (into #{} (:roles provider))
-            current-roles  (let [roles-kw (cf/get :oidc-roles-attr "roles")
-                                 roles-ph (parse-attr-path provider roles-kw)
-                                 roles    (get-in (:props info) roles-ph)]
-                             (cond
-                               (string? roles) (into #{} (str/words roles))
-                               (vector? roles) (into #{} roles)
-                               :else #{}))]
-
-        ;; check if profile has a configured set of roles
-        (when-not (set/subset? expected-roles current-roles)
-          (ex/raise :type :internal
-                    :code :unable-to-auth
-                    :hint "not enough permissions"))))
-
-    (cond-> info
-      (some? (:invitation-token state))
-      (assoc :invitation-token (:invitation-token state))
-
-      (some? (:external-session-id state))
-      (assoc :external-session-id (:external-session-id state))
-
-      ;; If state token comes with props, merge them. The state token
-      ;; props can contain pm_ and utm_ prefixed query params.
-      (map? (:props state))
-      (update :props merge (:props state)))))
-
-(defn- get-profile
-  [cfg info]
-  (db/run! cfg (fn [{:keys [::db/conn]}]
-                 (some->> (:email info)
-                          (profile/clean-email)
-                          (profile/get-profile-by-email conn)))))
-
-(defn- redirect-response
-  [uri]
-  {::rres/status 302
-   ::rres/headers {"location" (str uri)}})
-
-(defn- redirect-with-error
-  ([error] (redirect-with-error error nil))
-  ([error hint]
-   (let [params {:error error :hint hint}
-         params (d/without-nils params)
-         uri    (-> (u/uri (cf/get :public-uri))
-                    (assoc :path "/#/auth/login")
-                    (assoc :query (u/map->query-string params)))]
-     (redirect-response uri))))
-
-(defn- redirect-to-register
-  [cfg info request]
-  (let [info   (assoc info
-                      :iss :prepared-register
-                      :exp (dt/in-future {:hours 48}))
-
-        params {:token (tokens/generate (::setup/props cfg) info)
-                :provider (:provider (:path-params request))
-                :fullname (:fullname info)}
-        params (d/without-nils params)]
-
-    (redirect-response
-     (-> (u/uri (cf/get :public-uri))
-         (assoc :path "/#/auth/register/validate")
-         (assoc :query (u/map->query-string params))))))
-
-(defn- redirect-to-verify-token
-  [token]
-  (let [params {:token token}
-        uri    (-> (u/uri (cf/get :public-uri))
-                   (assoc :path "/#/auth/verify-token")
-                   (assoc :query (u/map->query-string params)))]
-
-    (redirect-response uri)))
-
-(defn- provider-has-email-verified?
-  [{:keys [::provider] :as cfg} {:keys [props] :as info}]
-  (let [prop (qualify-prop-key provider :email_verified)]
-    (true? (get props prop))))
-
-(defn- profile-has-provider-props?
-  [{:keys [::provider] :as cfg} profile]
-  (let [prop (qualify-prop-key provider :email)]
-    (contains? (:props profile) prop)))
-
-(defn- provider-matches-profile?
-  [{:keys [::provider] :as cfg} profile info]
-  (or (= (:auth-backend profile) (:name provider))
-      (profile-has-provider-props? cfg profile)
-      (provider-has-email-verified? cfg info)))
-
-(defn- process-callback
-  [cfg request info profile]
-  (cond
-    (some? profile)
-    (cond
-      (:is-blocked profile)
-      (redirect-with-error "profile-blocked")
-
-      (not (provider-matches-profile? cfg profile info))
-      (redirect-with-error "auth-provider-not-allowed")
-
-      (not (:is-active profile))
-      (let [info (assoc info :profile-id (:id profile))]
-        (redirect-to-register cfg info request))
-
-      :else
-      (let [sxf     (session/create-fn cfg (:id profile))
-            token   (or (:invitation-token info)
-                        (tokens/generate (::setup/props cfg)
-                                         {:iss :auth
-                                          :exp (dt/in-future "15m")
-                                          :props (:props info)
-                                          :profile-id (:id profile)}))
-            props   (audit/profile->props profile)
-            context (d/without-nils {:external-session-id (:external-session-id info)})]
-
-        (audit/submit! cfg {::audit/type "command"
-                            ::audit/name "login-with-oidc"
-                            ::audit/profile-id (:id profile)
-                            ::audit/ip-addr (audit/parse-client-ip request)
-                            ::audit/props props
-                            ::audit/context context})
-
-        (->> (redirect-to-verify-token token)
-             (sxf request))))
-
-    (and (email.blacklist/enabled? cfg)
-         (email.blacklist/contains? cfg (:email info)))
-    (redirect-with-error "email-domain-not-allowed")
-
-    (and (email.whitelist/enabled? cfg)
-         (not (email.whitelist/contains? cfg (:email info))))
-    (redirect-with-error "email-domain-not-allowed")
-
-    :else
-    (let [info (assoc info :is-active (provider-has-email-verified? cfg info))]
-      (if (contains? cf/flags :registration)
-        (redirect-to-register cfg info request)
-        (redirect-with-error "registration-disabled")))))
-
-(defn- auth-handler
-  [cfg {:keys [params] :as request}]
-  (let [props (audit/extract-utm-params params)
-        esid  (rreq/get-header request "x-external-session-id")
-        state (tokens/generate (::setup/props cfg)
-                               {:iss :oauth
-                                :invitation-token (:invitation-token params)
-                                :external-session-id esid
-                                :props props
-                                :exp (dt/in-future "4h")})
-        uri   (build-auth-uri cfg state)]
-    {::rres/status 200
-     ::rres/body {:redirect-uri uri}}))
-
-(defn- callback-handler
-  [cfg request]
-  (try
-    (let [info    (get-info cfg request)
-          profile (get-profile cfg info)]
-      (process-callback cfg request info profile))
-    (catch Throwable cause
-      (l/err :hint "error on oauth process" :cause cause)
-      (redirect-with-error "unable-to-auth" (ex-message cause)))))
-
-(def provider-lookup
-  {:compile
-   (fn [& _]
-     (fn [handler {:keys [::providers] :as cfg}]
-       (fn [request]
-         (let [provider (some-> request :path-params :provider keyword)]
-           (if-let [provider (get providers provider)]
-             (handler (assoc cfg ::provider provider) request)
-             (ex/raise :type :restriction
-                       :code :provider-not-configured
-                       :provider provider
-                       :hint "provider not configured"))))))})
-
-(s/def ::client-id ::cf/oidc-client-id)
-(s/def ::client-secret ::cf/oidc-client-secret)
-(s/def ::base-uri ::cf/oidc-base-uri)
-(s/def ::token-uri ::cf/oidc-token-uri)
-(s/def ::auth-uri ::cf/oidc-auth-uri)
-(s/def ::user-uri ::cf/oidc-user-uri)
-(s/def ::scopes ::cf/oidc-scopes)
-(s/def ::roles ::cf/oidc-roles)
-(s/def ::roles-attr ::cf/oidc-roles-attr)
-(s/def ::email-attr ::cf/oidc-email-attr)
-(s/def ::name-attr ::cf/oidc-name-attr)
-
-(s/def ::provider
-  (s/keys :req-un [::client-id
-                   ::client-secret]
-          :opt-un [::base-uri
-                   ::token-uri
-                   ::auth-uri
-                   ::user-uri
-                   ::scopes
-                   ::roles
-                   ::roles-attr
-                   ::email-attr
-                   ::name-attr]))
-
-(s/def ::providers (s/map-of ::us/keyword (s/nilable ::provider)))
-
-(s/def ::routes vector?)
-
-(defmethod ig/pre-init-spec ::routes
-  [_]
-  (s/keys :req [::session/manager
-                ::http/client
-                ::setup/props
-                ::db/pool
-                ::providers]))
-
-(defmethod ig/init-key ::routes
-  [_ cfg]
-  (let [cfg (update cfg :provider d/without-nils)]
-    ["" {:middleware [[session/authz cfg]
-                      [provider-lookup cfg]]}
-     ["/auth/oauth"
-      ["/:provider"
-       {:handler auth-handler
-        :allowed-methods #{:post}}]
-      ["/:provider/callback"
-       {:handler callback-handler
-        :allowed-methods #{:get}}]]]))

backend/src/app/binfile/common.clj

@@ -1,492 +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.binfile.common
-  "A binfile related file processing common code, used for different
-  binfile format implementations and management rpc methods."
-  (:require
-   [app.common.data :as d]
-   [app.common.data.macros :as dm]
-   [app.common.exceptions :as ex]
-   [app.common.features :as cfeat]
-   [app.common.files.migrations :as fmg]
-   [app.common.files.validate :as fval]
-   [app.common.logging :as l]
-   [app.common.uuid :as uuid]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.db.sql :as sql]
-   [app.features.components-v2 :as feat.compv2]
-   [app.features.fdata :as feat.fdata]
-   [app.loggers.audit :as-alias audit]
-   [app.loggers.webhooks :as-alias webhooks]
-   [app.util.blob :as blob]
-   [app.util.pointer-map :as pmap]
-   [app.util.time :as dt]
-   [app.worker :as-alias wrk]
-   [clojure.set :as set]
-   [clojure.walk :as walk]
-   [cuerdas.core :as str]))
-
-(set! *warn-on-reflection* true)
-
-(def ^:dynamic *state* nil)
-(def ^:dynamic *options* nil)
-
-(def xf-map-id
-  (map :id))
-
-(def xf-map-media-id
-  (comp
-   (mapcat (juxt :media-id
-                 :thumbnail-id
-                 :woff1-file-id
-                 :woff2-file-id
-                 :ttf-file-id
-                 :otf-file-id))
-   (filter uuid?)))
-
-(def into-vec
-  (fnil into []))
-
-(def conj-vec
-  (fnil conj []))
-
-(defn collect-storage-objects
-  [state items]
-  (update state :storage-objects into xf-map-media-id items))
-
-(defn collect-summary
-  [state key items]
-  (update state key into xf-map-media-id items))
-
-(defn lookup-index
-  [id]
-  (when id
-    (let [val (get-in @*state* [:index id])]
-      (l/trc :fn "lookup-index" :id (str id) :result (some-> val str) ::l/sync? true)
-      (or val id))))
-
-(defn remap-id
-  [item key]
-  (cond-> item
-    (contains? item key)
-    (update key lookup-index)))
-
-(defn- index-object
-  [index obj & attrs]
-  (reduce (fn [index attr-fn]
-            (let [old-id (attr-fn obj)
-                  new-id (if (::overwrite *options*) old-id (uuid/next))]
-              (assoc index old-id new-id)))
-          index
-          attrs))
-
-(defn update-index
-  ([index coll]
-   (update-index index coll identity))
-  ([index coll attr]
-   (reduce #(index-object %1 %2 attr) index coll)))
-
-(defn decode-row
-  "A generic decode row helper"
-  [{:keys [data features] :as row}]
-  (cond-> row
-    features (assoc :features (db/decode-pgarray features #{}))
-    data     (assoc :data (blob/decode data))))
-
-(defn get-file
-  [cfg file-id]
-  (db/run! cfg (fn [{:keys [::db/conn] :as cfg}]
-                 (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg file-id)]
-                   (when-let [file (db/get* conn :file {:id file-id}
-                                            {::db/remove-deleted false})]
-                     (-> file
-                         (decode-row)
-                         (update :data feat.fdata/process-pointers deref)
-                         (update :data feat.fdata/process-objects (partial into {}))))))))
-
-(defn get-project
-  [cfg project-id]
-  (db/get cfg :project {:id project-id}))
-
-(defn get-team
-  [cfg team-id]
-  (-> (db/get cfg :team {:id team-id})
-      (decode-row)))
-
-(defn get-fonts
-  [cfg team-id]
-  (db/query cfg :team-font-variant
-            {:team-id team-id
-             :deleted-at nil}))
-
-(defn get-files-rels
-  "Given a set of file-id's, return all matching relations with the libraries"
-  [cfg ids]
-
-  (dm/assert!
-   "expected a set of uuids"
-   (and (set? ids)
-        (every? uuid? ids)))
-
-  (db/run! cfg (fn [{:keys [::db/conn]}]
-                 (let [ids (db/create-array conn "uuid" ids)
-                       sql (str "SELECT flr.* FROM file_library_rel AS flr "
-                                "  JOIN file AS l ON (flr.library_file_id = l.id) "
-                                " WHERE flr.file_id = ANY(?) AND l.deleted_at IS NULL")]
-                   (db/exec! conn [sql ids])))))
-
-(def ^:private sql:get-libraries
-  "WITH RECURSIVE libs AS (
-     SELECT fl.id
-       FROM file AS fl
-       JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
-      WHERE flr.file_id = ANY(?)
-    UNION
-     SELECT fl.id
-       FROM file AS fl
-       JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
-       JOIN libs AS l ON (flr.file_id = l.id)
-   )
-   SELECT DISTINCT l.id
-     FROM libs AS l")
-
-(defn get-libraries
-  "Get all libraries ids related to provided file ids"
-  [cfg ids]
-  (db/run! cfg (fn [{:keys [::db/conn]}]
-                 (let [ids' (db/create-array conn "uuid" ids)]
-                   (->> (db/exec! conn [sql:get-libraries ids'])
-                        (into #{} xf-map-id))))))
-
-(defn get-file-object-thumbnails
-  "Return all file object thumbnails for a given file."
-  [cfg file-id]
-  (db/query cfg :file-tagged-object-thumbnail
-            {:file-id file-id
-             :deleted-at nil}))
-
-(defn get-file-thumbnail
-  "Return the thumbnail for the specified file-id"
-  [cfg {:keys [id revn]}]
-  (db/get* cfg :file-thumbnail
-           {:file-id id
-            :revn revn
-            :data nil}
-           {::sql/columns [:media-id :file-id :revn]}))
-
-
-(def ^:private
-  xform:collect-media-id
-  (comp
-   (map :objects)
-   (mapcat vals)
-   (mapcat (fn [obj]
-             ;; NOTE: because of some bug, we ended with
-             ;; many shape types having the ability to
-             ;; have fill-image attribute (which initially
-             ;; designed for :path shapes).
-             (sequence
-              (keep :id)
-              (concat [(:fill-image obj)
-                       (:metadata obj)]
-                      (map :fill-image (:fills obj))
-                      (map :stroke-image (:strokes obj))
-                      (->> (:content obj)
-                           (tree-seq map? :children)
-                           (mapcat :fills)
-                           (map :fill-image))))))))
-
-(defn collect-used-media
-  "Given a fdata (file data), returns all media references."
-  [data]
-  (-> #{}
-      (into xform:collect-media-id (vals (:pages-index data)))
-      (into xform:collect-media-id (vals (:components data)))
-      (into (keys (:media data)))))
-
-(defn get-file-media
-  [cfg {:keys [data id] :as file}]
-  (db/run! cfg (fn [{:keys [::db/conn]}]
-                 (let [ids (collect-used-media data)
-                       ids (db/create-array conn "uuid" ids)
-                       sql (str "SELECT * FROM file_media_object WHERE id = ANY(?)")]
-
-                   ;; We assoc the file-id again to the file-media-object row
-                   ;; because there are cases that used objects refer to other
-                   ;; files and we need to ensure in the exportation process that
-                   ;; all ids matches
-                   (->> (db/exec! conn [sql ids])
-                        (mapv #(assoc % :file-id id)))))))
-
-(def ^:private sql:get-team-files
-  "SELECT f.id FROM file AS f
-     JOIN project AS p ON (p.id = f.project_id)
-    WHERE p.team_id = ?")
-
-(defn get-team-files
-  "Get a set of file ids for the specified team-id"
-  [{:keys [::db/conn]} team-id]
-  (->> (db/exec! conn [sql:get-team-files team-id])
-       (into #{} xf-map-id)))
-
-(def ^:private sql:get-team-projects
-  "SELECT p.id FROM project AS p
-    WHERE p.team_id = ?
-      AND p.deleted_at IS NULL")
-
-(defn get-team-projects
-  "Get a set of project ids for the team"
-  [{:keys [::db/conn]} team-id]
-  (->> (db/exec! conn [sql:get-team-projects team-id])
-       (into #{} xf-map-id)))
-
-(def ^:private sql:get-project-files
-  "SELECT f.id FROM file AS f
-    WHERE f.project_id = ?
-      AND f.deleted_at IS NULL")
-
-(defn get-project-files
-  "Get a set of file ids for the project"
-  [{:keys [::db/conn]} project-id]
-  (->> (db/exec! conn [sql:get-project-files project-id])
-       (into #{} xf-map-id)))
-
-(defn- relink-shapes
-  "A function responsible to analyze all file data and
-  replace the old :component-file reference with the new
-  ones, using the provided file-index."
-  [data]
-  (letfn [(process-map-form [form]
-            (cond-> form
-              ;; Relink image shapes
-              (and (map? (:metadata form))
-                   (= :image (:type form)))
-              (update-in [:metadata :id] lookup-index)
-
-              ;; Relink paths with fill image
-              (map? (:fill-image form))
-              (update-in [:fill-image :id] lookup-index)
-
-              ;; This covers old shapes and the new :fills.
-              (uuid? (:fill-color-ref-file form))
-              (update :fill-color-ref-file lookup-index)
-
-              ;; This covers the old shapes and the new :strokes
-              (uuid? (:stroke-color-ref-file form))
-              (update :stroke-color-ref-file lookup-index)
-
-              ;; This covers all text shapes that have typography referenced
-              (uuid? (:typography-ref-file form))
-              (update :typography-ref-file lookup-index)
-
-              ;; This covers the component instance links
-              (uuid? (:component-file form))
-              (update :component-file lookup-index)
-
-              ;; This covers the shadows and grids (they have directly
-              ;; the :file-id prop)
-              (uuid? (:file-id form))
-              (update :file-id lookup-index)))
-
-          (process-form [form]
-            (if (map? form)
-              (try
-                (process-map-form form)
-                (catch Throwable cause
-                  (l/warn :hint "failed form" :form (pr-str form) ::l/sync? true)
-                  (throw cause)))
-              form))]
-
-    (walk/postwalk process-form data)))
-
-(defn- relink-media
-  "A function responsible of process the :media attr of file data and
-  remap the old ids with the new ones."
-  [media]
-  (reduce-kv (fn [res k v]
-               (let [id (lookup-index k)]
-                 (if (uuid? id)
-                   (-> res
-                       (assoc id (assoc v :id id))
-                       (dissoc k))
-                   res)))
-             media
-             media))
-
-(defn- relink-colors
-  "A function responsible of process the :colors attr of file data and
-  remap the old ids with the new ones."
-  [colors]
-  (reduce-kv (fn [res k v]
-               (if (:image v)
-                 (update-in res [k :image :id] lookup-index)
-                 res))
-             colors
-             colors))
-
-(defn embed-assets
-  [cfg data file-id]
-  (letfn [(walk-map-form [form state]
-            (cond
-              (uuid? (:fill-color-ref-file form))
-              (do
-                (vswap! state conj [(:fill-color-ref-file form) :colors (:fill-color-ref-id form)])
-                (assoc form :fill-color-ref-file file-id))
-
-              (uuid? (:stroke-color-ref-file form))
-              (do
-                (vswap! state conj [(:stroke-color-ref-file form) :colors (:stroke-color-ref-id form)])
-                (assoc form :stroke-color-ref-file file-id))
-
-              (uuid? (:typography-ref-file form))
-              (do
-                (vswap! state conj [(:typography-ref-file form) :typographies (:typography-ref-id form)])
-                (assoc form :typography-ref-file file-id))
-
-              (uuid? (:component-file form))
-              (do
-                (vswap! state conj [(:component-file form) :components (:component-id form)])
-                (assoc form :component-file file-id))
-
-              :else
-              form))
-
-          (process-group-of-assets [data [lib-id items]]
-            ;; NOTE: there is a possibility that shape refers to an
-            ;; non-existant file because the file was removed. In this
-            ;; case we just ignore the asset.
-            (if-let [lib (get-file cfg lib-id)]
-              (reduce (partial process-asset lib) data items)
-              data))
-
-          (process-asset [lib data [bucket asset-id]]
-            (let [asset (get-in lib [:data bucket asset-id])
-                  ;; Add a special case for colors that need to have
-                  ;; correctly set the :file-id prop (pending of the
-                  ;; refactor that will remove it).
-                  asset (cond-> asset
-                          (= bucket :colors) (assoc :file-id file-id))]
-              (update data bucket assoc asset-id asset)))]
-
-    (let [assets (volatile! [])]
-      (walk/postwalk #(cond-> % (map? %) (walk-map-form assets)) data)
-      (->> (deref assets)
-           (filter #(as-> (first %) $ (and (uuid? $) (not= $ file-id))))
-           (d/group-by first rest)
-           (reduce (partial process-group-of-assets) data)))))
-
-(defn- fix-version
-  [file]
-  (let [file (fmg/fix-version file)]
-    ;; FIXME: We're temporarily activating all migrations because a
-    ;; problem in the environments messed up with the version numbers
-    ;; When this problem is fixed delete the following line
-    (if (> (:version file) 22)
-      (assoc file :version 22)
-      file)))
-
-(defn process-file
-  [{:keys [id] :as file}]
-  (-> file
-      (fix-version)
-      (update :data (fn [fdata]
-                      (-> fdata
-                          (assoc :id id)
-                          (dissoc :recent-colors))))
-      (fmg/migrate-file)
-      (update :data (fn [fdata]
-                      (-> fdata
-                          (update :pages-index relink-shapes)
-                          (update :components relink-shapes)
-                          (update :media relink-media)
-                          (update :colors relink-colors)
-                          (d/without-nils))))))
-
-(defn- upsert-file!
-  [conn file]
-  (let [sql (str "INSERT INTO file (id, project_id, name, revn, version, is_shared, data, created_at, modified_at) "
-                 "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) "
-                 "ON CONFLICT (id) DO UPDATE SET data=?, version=?")]
-    (db/exec-one! conn [sql
-                        (:id file)
-                        (:project-id file)
-                        (:name file)
-                        (:revn file)
-                        (:version file)
-                        (:is-shared file)
-                        (:data file)
-                        (:created-at file)
-                        (:modified-at file)
-                        (:data file)
-                        (:version file)])))
-
-(defn persist-file!
-  "Applies all the final validations and perist the file."
-  [{:keys [::db/conn ::timestamp] :as cfg} {:keys [id] :as file}]
-
-  (dm/assert!
-   "expected valid timestamp"
-   (dt/instant? timestamp))
-
-  (let [file   (-> file
-                   (assoc :created-at timestamp)
-                   (assoc :modified-at timestamp)
-                   (assoc :ignore-sync-until (dt/plus timestamp (dt/duration {:seconds 5})))
-                   (update :features
-                           (fn [features]
-                             (let [features (cfeat/check-supported-features! features)]
-                               (-> (::features cfg #{})
-                                   (set/difference cfeat/frontend-only-features)
-                                   (set/union features))))))
-
-        _      (when (contains? cf/flags :file-schema-validation)
-                 (fval/validate-file-schema! file))
-
-        _      (when (contains? cf/flags :soft-file-schema-validation)
-                 (let [result (ex/try! (fval/validate-file-schema! file))]
-                   (when (ex/exception? result)
-                     (l/error :hint "file schema validation error" :cause result))))
-
-        file   (if (contains? (:features file) "fdata/objects-map")
-                 (feat.fdata/enable-objects-map file)
-                 file)
-
-        file   (if (contains? (:features file) "fdata/pointer-map")
-                 (binding [pmap/*tracked* (pmap/create-tracked)]
-                   (let [file (feat.fdata/enable-pointer-map file)]
-                     (feat.fdata/persist-pointers! cfg id)
-                     file))
-                 file)
-
-        params (-> file
-                   (update :features db/encode-pgarray conn "text")
-                   (update :data blob/encode))]
-
-    (if (::overwrite cfg)
-      (upsert-file! conn params)
-      (db/insert! conn :file params ::db/return-keys false))
-
-    file))
-
-(defn apply-pending-migrations!
-  "Apply alredy registered pending migrations to files"
-  [cfg]
-  (doseq [[feature file-id] (-> *state* deref :pending-to-migrate)]
-    (case feature
-      "components/v2"
-      (feat.compv2/migrate-file! cfg file-id
-                                 :validate? (::validate cfg true)
-                                 :skip-on-graphic-error? true)
-
-      "fdata/shape-data-type"
-      nil
-
-      (ex/raise :type :internal
-                :code :no-migration-defined
-                :hint (str/ffmt "no migation for feature '%' on file importation" feature)
-                :feature feature))))

backend/src/app/binfile/v1.clj

@@ -1,779 +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.binfile.v1
-  "A custom, perfromance and efficiency focused binfile format impl"
-  (:refer-clojure :exclude [assert])
-  (:require
-   [app.binfile.common :as bfc]
-   [app.common.data :as d]
-   [app.common.data.macros :as dm]
-   [app.common.exceptions :as ex]
-   [app.common.features :as cfeat]
-   [app.common.fressian :as fres]
-   [app.common.logging :as l]
-   [app.common.spec :as us]
-   [app.common.types.file :as ctf]
-   [app.common.uuid :as uuid]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.loggers.audit :as-alias audit]
-   [app.loggers.webhooks :as-alias webhooks]
-   [app.media :as media]
-   [app.rpc :as-alias rpc]
-   [app.rpc.commands.teams :as teams]
-   [app.rpc.doc :as-alias doc]
-   [app.storage :as sto]
-   [app.storage.tmp :as tmp]
-   [app.tasks.file-gc]
-   [app.util.events :as events]
-   [app.util.time :as dt]
-   [app.worker :as-alias wrk]
-   [clojure.java.io :as jio]
-   [clojure.set :as set]
-   [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
-   [datoteka.io :as io]
-   [promesa.util :as pu]
-   [yetti.adapter :as yt])
-  (:import
-   com.github.luben.zstd.ZstdIOException
-   com.github.luben.zstd.ZstdInputStream
-   com.github.luben.zstd.ZstdOutputStream
-   java.io.DataInputStream
-   java.io.DataOutputStream
-   java.io.InputStream
-   java.io.OutputStream))
-
-(set! *warn-on-reflection* true)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; DEFAULTS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Threshold in MiB when we pass from using
-;; in-memory byte-array's to use temporal files.
-(def temp-file-threshold
-  (* 1024 1024 2))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; LOW LEVEL STREAM IO API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:const buffer-size (:xnio/buffer-size yt/defaults))
-(def ^:const penpot-magic-number 800099563638710213)
-
-
-;; A maximum (storage) object size allowed: 100MiB
-(def ^:const max-object-size
-  (* 1024 1024 100))
-
-(def ^:dynamic *position* nil)
-
-(defn get-mark
-  [id]
-  (case id
-    :header  1
-    :stream  2
-    :uuid    3
-    :label   4
-    :obj     5
-    (ex/raise :type :validation
-              :code :invalid-mark-id
-              :hint (format "invalid mark id %s" id))))
-
-(defmacro assert
-  [expr hint]
-  `(when-not ~expr
-     (ex/raise :type :validation
-               :code :unexpected-condition
-               :hint ~hint)))
-
-(defmacro assert-mark
-  [v type]
-  `(let [expected# (get-mark ~type)
-         val#      (long ~v)]
-     (when (not= val# expected#)
-       (ex/raise :type :validation
-                 :code :unexpected-mark
-                 :hint (format "received mark %s, expected %s" val# expected#)))))
-
-(defmacro assert-label
-  [expr label]
-  `(let [v# ~expr]
-     (when (not= v# ~label)
-       (ex/raise :type :assertion
-                 :code :unexpected-label
-                 :hint (format "received label %s, expected %s" v# ~label)))))
-
-;; --- PRIMITIVE IO
-
-(defn write-byte!
-  [^DataOutputStream output data]
-  (l/trace :fn "write-byte!" :data data :position @*position* ::l/sync? true)
-  (.writeByte output (byte data))
-  (swap! *position* inc))
-
-(defn read-byte!
-  [^DataInputStream input]
-  (let [v (.readByte input)]
-    (l/trace :fn "read-byte!" :val v :position @*position* ::l/sync? true)
-    (swap! *position* inc)
-    v))
-
-(defn write-long!
-  [^DataOutputStream output data]
-  (l/trace :fn "write-long!" :data data :position @*position* ::l/sync? true)
-  (.writeLong output (long data))
-  (swap! *position* + 8))
-
-
-(defn read-long!
-  [^DataInputStream input]
-  (let [v (.readLong input)]
-    (l/trace :fn "read-long!" :val v :position @*position* ::l/sync? true)
-    (swap! *position* + 8)
-    v))
-
-(defn write-bytes!
-  [^DataOutputStream output ^bytes data]
-  (let [size (alength data)]
-    (l/trace :fn "write-bytes!" :size size :position @*position* ::l/sync? true)
-    (.write output data 0 size)
-    (swap! *position* + size)))
-
-(defn read-bytes!
-  [^InputStream input ^bytes buff]
-  (let [size   (alength buff)
-        readed (.readNBytes input buff 0 size)]
-    (l/trace :fn "read-bytes!" :expected (alength buff) :readed readed :position @*position* ::l/sync? true)
-    (swap! *position* + readed)
-    readed))
-
-;; --- COMPOSITE IO
-
-(defn write-uuid!
-  [^DataOutputStream output id]
-  (l/trace :fn "write-uuid!" :position @*position* :WRITTEN? (.size output) ::l/sync? true)
-
-  (doto output
-    (write-byte! (get-mark :uuid))
-    (write-long! (uuid/get-word-high id))
-    (write-long! (uuid/get-word-low id))))
-
-(defn read-uuid!
-  [^DataInputStream input]
-  (l/trace :fn "read-uuid!" :position @*position* ::l/sync? true)
-  (let [m (read-byte! input)]
-    (assert-mark m :uuid)
-    (let [a (read-long! input)
-          b (read-long! input)]
-      (uuid/custom a b))))
-
-(defn write-obj!
-  [^DataOutputStream output data]
-  (l/trace :fn "write-obj!" :position @*position* ::l/sync? true)
-  (let [^bytes data (fres/encode data)]
-    (doto output
-      (write-byte! (get-mark :obj))
-      (write-long! (alength data))
-      (write-bytes! data))))
-
-(defn read-obj!
-  [^DataInputStream input]
-  (l/trace :fn "read-obj!" :position @*position* ::l/sync? true)
-  (let [m (read-byte! input)]
-    (assert-mark m :obj)
-    (let [size (read-long! input)]
-      (assert (pos? size) "incorrect header size found on reading header")
-      (let [buff (byte-array size)]
-        (read-bytes! input buff)
-        (fres/decode buff)))))
-
-(defn write-label!
-  [^DataOutputStream output label]
-  (l/trace :fn "write-label!" :label label :position @*position* ::l/sync? true)
-  (doto output
-    (write-byte! (get-mark :label))
-    (write-obj! label)))
-
-(defn read-label!
-  [^DataInputStream input]
-  (l/trace :fn "read-label!" :position @*position* ::l/sync? true)
-  (let [m (read-byte! input)]
-    (assert-mark m :label)
-    (read-obj! input)))
-
-(defn write-header!
-  [^OutputStream output version]
-  (l/trace :fn "write-header!"
-           :version version
-           :position @*position*
-           ::l/sync? true)
-  (let [vers   (-> version name (subs 1) parse-long)
-        output (io/data-output-stream output)]
-    (doto output
-      (write-byte! (get-mark :header))
-      (write-long! penpot-magic-number)
-      (write-long! vers))))
-
-(defn read-header!
-  [^InputStream input]
-  (l/trace :fn "read-header!" :position @*position* ::l/sync? true)
-  (let [input (io/data-input-stream input)
-        mark  (read-byte! input)
-        mnum  (read-long! input)
-        vers  (read-long! input)]
-
-    (when (or (not= mark (get-mark :header))
-              (not= mnum penpot-magic-number))
-      (ex/raise :type :validation
-                :code :invalid-penpot-file
-                :hint "invalid penpot file"))
-
-    (keyword (str "v" vers))))
-
-(defn copy-stream!
-  [^OutputStream output ^InputStream input ^long size]
-  (let [written (io/copy! input output :size size)]
-    (l/trace :fn "copy-stream!" :position @*position* :size size :written written ::l/sync? true)
-    (swap! *position* + written)
-    written))
-
-(defn write-stream!
-  [^DataOutputStream output stream size]
-  (l/trace :fn "write-stream!" :position @*position* ::l/sync? true :size size)
-  (doto output
-    (write-byte! (get-mark :stream))
-    (write-long! size))
-
-  (copy-stream! output stream size))
-
-(defn read-stream!
-  [^DataInputStream input]
-  (l/trace :fn "read-stream!" :position @*position* ::l/sync? true)
-  (let [m (read-byte! input)
-        s (read-long! input)
-        p (tmp/tempfile :prefix "penpot.binfile.")]
-    (assert-mark m :stream)
-
-    (when (> s max-object-size)
-      (ex/raise :type :validation
-                :code :max-file-size-reached
-                :hint (str/ffmt "unable to import storage object with size % bytes" s)))
-
-    (if (> s temp-file-threshold)
-      (with-open [^OutputStream output (io/output-stream p)]
-        (let [readed (io/copy! input output :offset 0 :size s)]
-          (l/trace :fn "read-stream*!" :expected s :readed readed :position @*position* ::l/sync? true)
-          (swap! *position* + readed)
-          [s p]))
-      [s (io/read-as-bytes input :size s)])))
-
-(defmacro assert-read-label!
-  [input expected-label]
-  `(let [readed# (read-label! ~input)
-         expected# ~expected-label]
-     (when (not= readed# expected#)
-       (ex/raise :type :validation
-                 :code :unexpected-label
-                 :hint (format "unexpected label found: %s, expected: %s" readed# expected#)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; --- HELPERS
-
-(defn zstd-input-stream
-  ^InputStream
-  [input]
-  (ZstdInputStream. ^InputStream input))
-
-(defn zstd-output-stream
-  ^OutputStream
-  [output & {:keys [level] :or {level 0}}]
-  (ZstdOutputStream. ^OutputStream output (int level)))
-
-(defn- get-files
-  [cfg ids]
-  (db/run! cfg (fn [{:keys [::db/conn]}]
-                 (let [sql (str "SELECT id FROM file "
-                                " WHERE id = ANY(?) ")
-                       ids (db/create-array conn "uuid" ids)]
-                   (->> (db/exec! conn [sql ids])
-                        (into [] (map :id))
-                        (not-empty))))))
-
-;; --- EXPORT WRITER
-
-(defmulti write-export ::version)
-(defmulti write-section ::section)
-
-(defn write-export!
-  [{:keys [::include-libraries ::embed-assets] :as cfg}]
-  (when (and include-libraries embed-assets)
-    (throw (IllegalArgumentException.
-            "the `include-libraries` and `embed-assets` are mutally excluding options")))
-
-  (write-export cfg))
-
-(defmethod write-export :default
-  [{:keys [::output] :as options}]
-  (write-header! output :v1)
-  (pu/with-open [output (zstd-output-stream output :level 12)
-                 output (io/data-output-stream output)]
-    (binding [bfc/*state* (volatile! {})]
-      (run! (fn [section]
-              (l/dbg :hint "write section" :section section ::l/sync? true)
-              (write-label! output section)
-              (let [options (-> options
-                                (assoc ::output output)
-                                (assoc ::section section))]
-                (binding [bfc/*options* options]
-                  (write-section options))))
-
-            [:v1/metadata :v1/files :v1/rels :v1/sobjects]))))
-
-(defmethod write-section :v1/metadata
-  [{:keys [::output ::ids ::include-libraries] :as cfg}]
-  (if-let [fids (get-files cfg ids)]
-    (let [lids (when include-libraries
-                 (bfc/get-libraries cfg ids))
-          ids  (into fids lids)]
-      (write-obj! output {:version cf/version :files ids})
-      (vswap! bfc/*state* assoc :files ids))
-    (ex/raise :type :not-found
-              :code :files-not-found
-              :hint "unable to retrieve files for export")))
-
-(defmethod write-section :v1/files
-  [{:keys [::output ::embed-assets ::include-libraries] :as cfg}]
-
-  ;; Initialize SIDS with empty vector
-  (vswap! bfc/*state* assoc :sids [])
-
-  (doseq [file-id (-> bfc/*state* deref :files)]
-    (let [detach?    (and (not embed-assets) (not include-libraries))
-          thumbnails (->> (bfc/get-file-object-thumbnails cfg file-id)
-                          (mapv #(dissoc % :file-id)))
-
-          file       (cond-> (bfc/get-file cfg file-id)
-                       detach?
-                       (-> (ctf/detach-external-references file-id)
-                           (dissoc :libraries))
-
-                       embed-assets
-                       (update :data #(bfc/embed-assets cfg % file-id))
-
-                       :always
-                       (assoc :thumbnails thumbnails))
-
-          media      (bfc/get-file-media cfg file)]
-
-      (l/dbg :hint "write penpot file"
-             :id (str file-id)
-             :name (:name file)
-             :thumbnails (count thumbnails)
-             :features (:features file)
-             :media (count media)
-             ::l/sync? true)
-
-      (doseq [item media]
-        (l/dbg :hint "write penpot file media object" :id (:id item) ::l/sync? true))
-
-      (doseq [item thumbnails]
-        (l/dbg :hint "write penpot file object thumbnail" :media-id (str (:media-id item)) ::l/sync? true))
-
-      (doto output
-        (write-obj! file)
-        (write-obj! media))
-
-      (vswap! bfc/*state* update :sids into bfc/xf-map-media-id media)
-      (vswap! bfc/*state* update :sids into bfc/xf-map-media-id thumbnails))))
-
-(defmethod write-section :v1/rels
-  [{:keys [::output ::include-libraries] :as cfg}]
-  (let [ids  (-> bfc/*state* deref :files set)
-        rels (when include-libraries
-               (bfc/get-files-rels cfg ids))]
-    (l/dbg :hint "found rels" :total (count rels) ::l/sync? true)
-    (write-obj! output rels)))
-
-(defmethod write-section :v1/sobjects
-  [{:keys [::sto/storage ::output]}]
-  (let [sids    (-> bfc/*state* deref :sids)
-        storage (media/configure-assets-storage storage)]
-
-    (l/dbg :hint "found sobjects"
-           :items (count sids)
-           ::l/sync? true)
-
-    ;; Write all collected storage objects
-    (write-obj! output sids)
-
-    (doseq [id sids]
-      (let [{:keys [size] :as obj} (sto/get-object storage id)]
-        (l/dbg :hint "write sobject" :id (str id) ::l/sync? true)
-
-        (doto output
-          (write-uuid! id)
-          (write-obj! (meta obj)))
-
-        (pu/with-open [stream (sto/get-object-data storage obj)]
-          (let [written (write-stream! output stream size)]
-            (when (not= written size)
-              (ex/raise :type :validation
-                        :code :mismatch-readed-size
-                        :hint (str/ffmt "found unexpected object size; size=% written=%" size written)))))))))
-
-;; --- EXPORT READER
-
-(defmulti read-import ::version)
-(defmulti read-section ::section)
-
-(s/def ::profile-id ::us/uuid)
-(s/def ::project-id ::us/uuid)
-(s/def ::input io/input-stream?)
-(s/def ::overwrite? (s/nilable ::us/boolean))
-(s/def ::ignore-index-errors? (s/nilable ::us/boolean))
-
-;; FIXME: replace with schema
-(s/def ::read-import-options
-  (s/keys :req [::db/pool ::sto/storage ::project-id ::profile-id ::input]
-          :opt [::overwrite? ::ignore-index-errors?]))
-
-(defn read-import!
-  "Do the importation of the specified resource in penpot custom binary
-  format. There are some options for customize the importation
-  behavior:
-
-  `::bfc/overwrite`: if true, instead of creating new files and remapping id references,
-  it reuses all ids and updates existing objects; defaults to `false`."
-  [{:keys [::input ::bfc/timestamp] :or {timestamp (dt/now)} :as options}]
-
-  (dm/assert!
-   "expected input stream"
-   (io/input-stream? input))
-
-  (dm/assert!
-   "expected valid instant"
-   (dt/instant? timestamp))
-
-  (let [version (read-header! input)]
-    (read-import (assoc options ::version version ::bfc/timestamp timestamp))))
-
-(defn- read-import-v1
-  [{:keys [::db/conn ::project-id ::profile-id ::input] :as cfg}]
-  (db/exec-one! conn ["SET LOCAL idle_in_transaction_session_timeout = 0"])
-  (db/exec-one! conn ["SET CONSTRAINTS ALL DEFERRED"])
-
-  (pu/with-open [input (zstd-input-stream input)
-                 input (io/data-input-stream input)]
-    (binding [bfc/*state* (volatile! {:media [] :index {}})]
-      (let [team      (teams/get-team conn
-                                      :profile-id profile-id
-                                      :project-id project-id)
-
-            features  (cfeat/get-team-enabled-features cf/flags team)]
-
-        ;; Process all sections
-        (run! (fn [section]
-                (l/dbg :hint "reading section" :section section ::l/sync? true)
-                (assert-read-label! input section)
-                (let [options (-> cfg
-                                  (assoc ::bfc/features features)
-                                  (assoc ::section section)
-                                  (assoc ::input input))]
-                  (binding [bfc/*options* options]
-                    (events/tap :progress {:op :import :section section})
-                    (read-section options))))
-              [:v1/metadata :v1/files :v1/rels :v1/sobjects])
-
-        (bfc/apply-pending-migrations! cfg)
-
-        ;; Knowing that the ids of the created files are in index,
-        ;; just lookup them and return it as a set
-        (let [files (-> bfc/*state* deref :files)]
-          (into #{} (keep #(get-in @bfc/*state* [:index %])) files))))))
-
-(defmethod read-import :v1
-  [options]
-  (db/tx-run! options read-import-v1))
-
-(defmethod read-section :v1/metadata
-  [{:keys [::input]}]
-  (let [{:keys [version files]} (read-obj! input)]
-    (l/dbg :hint "metadata readed"
-           :version (:full version)
-           :files (mapv str files)
-           ::l/sync? true)
-    (vswap! bfc/*state* update :index bfc/update-index files)
-    (vswap! bfc/*state* assoc :version version :files files)))
-
-(defn- remap-thumbnails
-  [thumbnails file-id]
-  (mapv (fn [thumbnail]
-          (-> thumbnail
-              (assoc :file-id file-id)
-              (update :object-id #(str/replace-first % #"^(.*?)/" (str file-id "/")))))
-        thumbnails))
-
-(defn- clean-features
-  [file]
-  (update file :features (fn [features]
-                           (if (set? features)
-                             (-> features
-                                 (cfeat/migrate-legacy-features)
-                                 (set/difference cfeat/backend-only-features))
-                             #{}))))
-
-(defmethod read-section :v1/files
-  [{:keys [::db/conn ::input ::project-id ::bfc/overwrite ::name] :as system}]
-
-  (doseq [[idx expected-file-id] (d/enumerate (-> bfc/*state* deref :files))]
-    (let [file       (read-obj! input)
-          media      (read-obj! input)
-
-          file-id    (:id file)
-          file-id'   (bfc/lookup-index file-id)
-
-          file       (clean-features file)
-          thumbnails (:thumbnails file)]
-
-      (when (not= file-id expected-file-id)
-        (ex/raise :type :validation
-                  :code :inconsistent-penpot-file
-                  :found-id file-id
-                  :expected-id expected-file-id
-                  :hint "the penpot file seems corrupt, found unexpected uuid (file-id)"))
-
-      (l/dbg :hint "processing file"
-             :id (str file-id)
-             :features (:features file)
-             :version (-> file :data :version)
-             :media (count media)
-             :thumbnails (count thumbnails)
-             ::l/sync? true)
-
-      (when (seq thumbnails)
-        (let [thumbnails (remap-thumbnails thumbnails file-id')]
-          (l/dbg :hint "updated index with thumbnails" :total (count thumbnails) ::l/sync? true)
-          (vswap! bfc/*state* update :thumbnails bfc/into-vec thumbnails)))
-
-      (when (seq media)
-        ;; Update index with media
-        (l/dbg :hint "update index with media" :total (count media) ::l/sync? true)
-        (vswap! bfc/*state* update :index bfc/update-index (map :id media))
-
-        ;; Store file media for later insertion
-        (l/dbg :hint "update media references" ::l/sync? true)
-        (vswap! bfc/*state* update :media into (map #(update % :id bfc/lookup-index)) media))
-
-      (let [file (-> file
-                     (assoc :id file-id')
-                     (cond-> (and (= idx 0) (some? name))
-                       (assoc :name name))
-                     (assoc :project-id project-id)
-                     (dissoc :thumbnails)
-                     (bfc/process-file))]
-
-        ;; All features that are enabled and requires explicit migration are
-        ;; added to the state for a posterior migration step.
-        (doseq [feature (-> (::bfc/features system)
-                            (set/difference cfeat/no-migration-features)
-                            (set/difference (:features file)))]
-          (vswap! bfc/*state* update :pending-to-migrate (fnil conj []) [feature file-id']))
-
-        (l/dbg :hint "create file" :id (str file-id') ::l/sync? true)
-        (bfc/persist-file! system file)
-
-        (when overwrite
-          (db/delete! conn :file-thumbnail {:file-id file-id'}))
-
-        file-id'))))
-
-(defmethod read-section :v1/rels
-  [{:keys [::db/conn ::input ::bfc/timestamp]}]
-  (let [rels (read-obj! input)
-        ids  (into #{} (-> bfc/*state* deref :files))]
-    ;; Insert all file relations
-    (doseq [{:keys [library-file-id] :as rel} rels]
-      (let [rel (-> rel
-                    (assoc :synced-at timestamp)
-                    (update :file-id bfc/lookup-index)
-                    (update :library-file-id bfc/lookup-index))]
-
-        (if (contains? ids library-file-id)
-          (do
-            (l/dbg :hint "create file library link"
-                   :file-id (:file-id rel)
-                   :lib-id (:library-file-id rel)
-                   ::l/sync? true)
-            (db/insert! conn :file-library-rel rel))
-
-          (l/warn :hint "ignoring file library link"
-                  :file-id (:file-id rel)
-                  :lib-id (:library-file-id rel)
-                  ::l/sync? true))))))
-
-(defmethod read-section :v1/sobjects
-  [{:keys [::sto/storage ::db/conn ::input ::bfc/overwrite ::bfc/timestamp]}]
-  (let [storage (media/configure-assets-storage storage)
-        ids     (read-obj! input)
-        thumb?  (into #{} (map :media-id) (:thumbnails @bfc/*state*))]
-
-    (doseq [expected-storage-id ids]
-      (let [id    (read-uuid! input)
-            mdata (read-obj! input)]
-
-        (when (not= id expected-storage-id)
-          (ex/raise :type :validation
-                    :code :inconsistent-penpot-file
-                    :hint "the penpot file seems corrupt, found unexpected uuid (storage-object-id)"))
-
-        (l/dbg :hint "readed storage object" :id (str id) ::l/sync? true)
-
-        (let [[size resource] (read-stream! input)
-              hash            (sto/calculate-hash resource)
-              content         (-> (sto/content resource size)
-                                  (sto/wrap-with-hash hash))
-
-              params          (-> mdata
-                                  (assoc ::sto/content content)
-                                  (assoc ::sto/deduplicate? true)
-                                  (assoc ::sto/touched-at timestamp))
-
-              params          (if (thumb? id)
-                                (assoc params :bucket "file-object-thumbnail")
-                                (assoc params :bucket "file-media-object"))
-
-              sobject         (sto/put-object! storage params)]
-
-          (l/dbg :hint "persisted storage object"
-                 :old-id (str id)
-                 :new-id (str (:id sobject))
-                 :is-thumbnail (boolean (thumb? id))
-                 ::l/sync? true)
-
-          (vswap! bfc/*state* update :index assoc id (:id sobject)))))
-
-    (doseq [item (:media @bfc/*state*)]
-      (l/dbg :hint "inserting file media object"
-             :id (str (:id item))
-             :file-id (str (:file-id item))
-             ::l/sync? true)
-
-      (let [file-id (bfc/lookup-index (:file-id item))]
-        (if (= file-id (:file-id item))
-          (l/warn :hint "ignoring file media object" :file-id (str file-id) ::l/sync? true)
-          (db/insert! conn :file-media-object
-                      (-> item
-                          (assoc :file-id file-id)
-                          (d/update-when :media-id bfc/lookup-index)
-                          (d/update-when :thumbnail-id bfc/lookup-index))
-                      {::db/on-conflict-do-nothing? overwrite}))))
-
-    (doseq [item (:thumbnails @bfc/*state*)]
-      (let [item (update item :media-id bfc/lookup-index)]
-        (l/dbg :hint "inserting file object thumbnail"
-               :file-id (str (:file-id item))
-               :media-id (str (:media-id item))
-               :object-id (:object-id item)
-               ::l/sync? true)
-        (db/insert! conn :file-tagged-object-thumbnail item
-                    {::db/on-conflict-do-nothing? overwrite})))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HIGH LEVEL API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn export-files!
-  "Do the exportation of a specified file in custom penpot binary
-  format. There are some options available for customize the output:
-
-  `::include-libraries`: additionally to the specified file, all the
-  linked libraries also will be included (including transitive
-  dependencies).
-
-  `::embed-assets`: instead of including the libraries, embed in the
-  same file library all assets used from external libraries."
-
-  [{:keys [::ids] :as cfg} output]
-
-  (dm/assert!
-   "expected a set of uuid's for `::ids` parameter"
-   (and (set? ids)
-        (every? uuid? ids)))
-
-  (dm/assert!
-   "expected instance of jio/IOFactory for `input`"
-   (satisfies? jio/IOFactory output))
-
-  (let [id (uuid/next)
-        tp (dt/tpoint)
-        ab (volatile! false)
-        cs (volatile! nil)]
-    (try
-      (l/info :hint "start exportation" :export-id (str id))
-      (pu/with-open [output (io/output-stream output)]
-        (binding [*position* (atom 0)]
-          (write-export! (assoc cfg ::output output))))
-
-      (catch java.io.IOException _cause
-        ;; Do nothing, EOF means client closes connection abruptly
-        (vreset! ab true)
-        nil)
-
-      (catch Throwable cause
-        (vreset! cs cause)
-        (vreset! ab true)
-        (throw cause))
-
-      (finally
-        (l/info :hint "exportation finished" :export-id (str id)
-                :elapsed (str (inst-ms (tp)) "ms")
-                :aborted @ab
-                :cause @cs)))))
-
-(defn import-files!
-  [cfg input]
-
-  (dm/assert!
-   "expected valid profile-id and project-id on `cfg`"
-   (and (uuid? (::profile-id cfg))
-        (uuid? (::project-id cfg))))
-
-  (dm/assert!
-   "expected instance of jio/IOFactory for `input`"
-   (satisfies? jio/IOFactory input))
-
-  (let [id (uuid/next)
-        tp (dt/tpoint)
-        cs (volatile! nil)]
-
-    (l/info :hint "import: started" :id (str id))
-    (try
-      (binding [*position* (atom 0)]
-        (pu/with-open [input (io/input-stream input)]
-          (read-import! (assoc cfg ::input input))))
-
-      (catch ZstdIOException cause
-        (ex/raise :type :validation
-                  :code :invalid-penpot-file
-                  :hint "invalid penpot file received: probably truncated"
-                  :cause cause))
-
-      (catch Throwable cause
-        (vreset! cs cause)
-        (throw cause))
-
-      (finally
-        (l/info :hint "import: terminated"
-                :id (str id)
-                :elapsed (dt/format-duration (tp))
-                :error? (some? @cs))))))
-

backend/src/app/binfile/v2.clj

@@ -1,442 +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.binfile.v2
-  "A sqlite3 based binary file exportation with support for exportation
-  of entire team (or multiple teams) at once."
-  (:refer-clojure :exclude [read])
-  (:require
-   [app.binfile.common :as bfc]
-   [app.common.data :as d]
-   [app.common.features :as cfeat]
-   [app.common.logging :as l]
-   [app.common.transit :as t]
-   [app.common.uuid :as uuid]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.db.sql :as sql]
-   [app.loggers.audit :as-alias audit]
-   [app.loggers.webhooks :as-alias webhooks]
-   [app.media :as media]
-   [app.storage :as sto]
-   [app.storage.tmp :as tmp]
-   [app.util.events :as events]
-   [app.util.time :as dt]
-   [app.worker :as-alias wrk]
-   [clojure.set :as set]
-   [cuerdas.core :as str]
-   [datoteka.io :as io]
-   [promesa.util :as pu])
-  (:import
-   java.sql.DriverManager))
-
-(set! *warn-on-reflection* true)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; LOW LEVEL API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- create-database
-  ([cfg]
-   (let [path (tmp/tempfile :prefix "penpot.binfile." :suffix ".sqlite")]
-     (create-database cfg path)))
-  ([cfg path]
-   (let [db (DriverManager/getConnection (str "jdbc:sqlite:" path))]
-     (assoc cfg ::db db ::path path))))
-
-(def ^:private
-  sql:create-kvdata-table
-  "CREATE TABLE kvdata (
-     tag text NOT NULL,
-     key text NOT NULL,
-     val text NOT NULL,
-     dat blob NULL
-   )")
-
-(def ^:private
-  sql:create-kvdata-index
-  "CREATE INDEX kvdata__tag_key__idx
-      ON kvdata (tag, key)")
-
-(defn- setup-schema!
-  [{:keys [::db]}]
-  (db/exec-one! db [sql:create-kvdata-table])
-  (db/exec-one! db [sql:create-kvdata-index]))
-
-(defn- write!
-  [{:keys [::db]} tag k v & [data]]
-  (db/insert! db :kvdata
-              {:tag (d/name tag)
-               :key (str k)
-               :val (t/encode-str v {:type :json-verbose})
-               :dat data}
-              {::db/return-keys false}))
-
-(defn- read-blob
-  [{:keys [::db]} tag k]
-  (let [obj (db/get db :kvdata
-                    {:tag (d/name tag)
-                     :key (str k)}
-                    {::sql/columns [:dat]})]
-    (:dat obj)))
-
-(defn- read-seq
-  ([{:keys [::db]} tag]
-   (->> (db/query db :kvdata
-                  {:tag (d/name tag)}
-                  {::sql/columns [::val]})
-        (map :val)
-        (map t/decode-str)))
-  ([{:keys [::db]} tag k]
-   (->> (db/query db :kvdata
-                  {:tag (d/name tag)
-                   :key (str k)}
-                  {::sql/columns [::val]})
-        (map :val)
-        (map t/decode-str))))
-
-(defn- read-obj
-  [{:keys [::db]} tag k]
-  (let [obj (db/get db :kvdata
-                    {:tag (d/name tag)
-                     :key (str k)}
-                    {::sql/columns [:val]})]
-    (-> obj :val t/decode-str)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; IMPORT/EXPORT IMPL
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(declare ^:private write-project!)
-(declare ^:private write-file!)
-
-(defn- write-team!
-  [cfg team-id]
-
-  (let [team  (bfc/get-team cfg team-id)
-        fonts (bfc/get-fonts cfg team-id)]
-
-    (events/tap :progress
-                {:op :export
-                 :section :write-team
-                 :id team-id
-                 :name (:name team)})
-
-    (l/trc :hint "write" :obj "team"
-           :id (str team-id)
-           :fonts (count fonts))
-
-    (when-let [photo-id (:photo-id team)]
-      (vswap! bfc/*state* update :storage-objects conj photo-id))
-
-    (vswap! bfc/*state* update :teams conj team-id)
-    (vswap! bfc/*state* bfc/collect-storage-objects fonts)
-
-    (write! cfg :team team-id team)
-
-    (doseq [{:keys [id] :as font} fonts]
-      (vswap! bfc/*state* update :team-font-variants conj id)
-      (write! cfg :team-font-variant id font))))
-
-(defn- write-project!
-  [cfg project-id]
-  (let [project (bfc/get-project cfg project-id)]
-    (events/tap :progress
-                {:op :export
-                 :section :write-project
-                 :id project-id
-                 :name (:name project)})
-    (l/trc :hint "write" :obj "project" :id (str project-id))
-    (write! cfg :project (str project-id) project)
-    (vswap! bfc/*state* update :projects conj project-id)))
-
-(defn- write-file!
-  [cfg file-id]
-  (let [file   (bfc/get-file cfg file-id)
-        thumbs (bfc/get-file-object-thumbnails cfg file-id)
-        media  (bfc/get-file-media cfg file)
-        rels   (bfc/get-files-rels cfg #{file-id})]
-
-    (events/tap :progress
-                {:op :export
-                 :section :write-file
-                 :id file-id
-                 :name (:name file)})
-
-    (vswap! bfc/*state* (fn [state]
-                          (-> state
-                              (update :files conj file-id)
-                              (update :file-media-objects into bfc/xf-map-id media)
-                              (bfc/collect-storage-objects thumbs)
-                              (bfc/collect-storage-objects media))))
-
-    (write! cfg :file file-id file)
-    (write! cfg :file-rels file-id rels)
-
-    (run! (partial write! cfg :file-media-object file-id) media)
-    (run! (partial write! cfg :file-object-thumbnail file-id) thumbs)
-
-    (when-let [thumb (bfc/get-file-thumbnail cfg file)]
-      (vswap! bfc/*state* bfc/collect-storage-objects [thumb])
-      (write! cfg :file-thumbnail file-id thumb))
-
-    (l/trc :hint "write" :obj "file"
-           :thumbnails (count thumbs)
-           :rels (count rels)
-           :media (count media))))
-
-(defn- write-storage-object!
-  [{:keys [::sto/storage] :as cfg} id]
-  (let [sobj (sto/get-object storage id)
-        data (with-open [input (sto/get-object-data storage sobj)]
-               (io/read-as-bytes input))]
-
-    (l/trc :hint "write" :obj "storage-object" :id (str id) :size (:size sobj))
-    (write! cfg :storage-object id (meta sobj) data)))
-
-(defn- read-storage-object!
-  [{:keys [::sto/storage ::bfc/timestamp] :as cfg} id]
-  (let [mdata   (read-obj cfg :storage-object id)
-        data    (read-blob cfg :storage-object id)
-        hash    (sto/calculate-hash data)
-
-        content (-> (sto/content data)
-                    (sto/wrap-with-hash hash))
-
-        params  (-> mdata
-                    (assoc ::sto/content content)
-                    (assoc ::sto/deduplicate? true)
-                    (assoc ::sto/touched-at timestamp))
-
-        sobject  (sto/put-object! storage params)]
-
-    (vswap! bfc/*state* update :index assoc id (:id sobject))
-
-    (l/trc :hint "read" :obj "storage-object"
-           :id (str id)
-           :new-id (str (:id sobject))
-           :size (:size sobject))))
-
-(defn read-team!
-  [{:keys [::db/conn ::bfc/timestamp] :as cfg} team-id]
-  (l/trc :hint "read" :obj "team" :id (str team-id))
-
-  (let [team (read-obj cfg :team team-id)
-        team (-> team
-                 (update :id bfc/lookup-index)
-                 (update :photo-id bfc/lookup-index)
-                 (assoc :created-at timestamp)
-                 (assoc :modified-at timestamp))]
-
-    (events/tap :progress
-                {:op :import
-                 :section :read-team
-                 :id team-id
-                 :name (:name team)})
-
-    (db/insert! conn :team
-                (update team :features db/encode-pgarray conn "text")
-                ::db/return-keys false)
-
-    (doseq [font (->> (read-seq cfg :team-font-variant)
-                      (filter #(= team-id (:team-id %))))]
-      (let [font (-> font
-                     (update :id bfc/lookup-index)
-                     (update :team-id bfc/lookup-index)
-                     (update :woff1-file-id bfc/lookup-index)
-                     (update :woff2-file-id bfc/lookup-index)
-                     (update :ttf-file-id bfc/lookup-index)
-                     (update :otf-file-id bfc/lookup-index)
-                     (assoc :created-at timestamp)
-                     (assoc :modified-at timestamp))]
-        (db/insert! conn :team-font-variant font
-                    ::db/return-keys false)))
-
-    team))
-
-(defn read-project!
-  [{:keys [::db/conn ::bfc/timestamp] :as cfg} project-id]
-  (l/trc :hint "read" :obj "project" :id (str project-id))
-
-  (let [project (read-obj cfg :project project-id)
-        project (-> project
-                    (update :id bfc/lookup-index)
-                    (update :team-id bfc/lookup-index)
-                    (assoc :created-at timestamp)
-                    (assoc :modified-at timestamp))]
-
-    (events/tap :progress
-                {:op :import
-                 :section :read-project
-                 :id project-id
-                 :name (:name project)})
-
-    (db/insert! conn :project project
-                ::db/return-keys false)))
-
-(defn read-file!
-  [{:keys [::db/conn ::bfc/timestamp] :as cfg} file-id]
-  (l/trc :hint "read" :obj "file" :id (str file-id))
-
-  (let [file (-> (read-obj cfg :file file-id)
-                 (update :id bfc/lookup-index)
-                 (update :project-id bfc/lookup-index)
-                 (bfc/process-file))]
-
-    (events/tap :progress
-                {:op :import
-                 :section :read-file
-                 :id file-id
-                 :name (:name file)})
-
-    ;; All features that are enabled and requires explicit migration are
-    ;; added to the state for a posterior migration step.
-    (doseq [feature (-> (::bfc/features cfg)
-                        (set/difference cfeat/no-migration-features)
-                        (set/difference (:features file)))]
-      (vswap! bfc/*state* update :pending-to-migrate (fnil conj []) [feature (:id file)]))
-
-    (bfc/persist-file! cfg file))
-
-  (doseq [thumbnail (read-seq cfg :file-object-thumbnail file-id)]
-    (let [thumbnail (-> thumbnail
-                        (update :file-id bfc/lookup-index)
-                        (update :media-id bfc/lookup-index))
-          file-id    (:file-id thumbnail)
-
-          thumbnail (update thumbnail :object-id
-                            #(str/replace-first % #"^(.*?)/" (str file-id "/")))]
-
-      (db/insert! conn :file-tagged-object-thumbnail thumbnail
-                  {::db/return-keys false})))
-
-  (doseq [rel (read-obj cfg :file-rels file-id)]
-    (let [rel (-> rel
-                  (update :file-id bfc/lookup-index)
-                  (update :library-file-id bfc/lookup-index)
-                  (assoc :synced-at timestamp))]
-      (db/insert! conn :file-library-rel rel
-                  ::db/return-keys false)))
-
-  (doseq [media (read-seq cfg :file-media-object file-id)]
-    (let [media (-> media
-                    (update :id bfc/lookup-index)
-                    (update :file-id bfc/lookup-index)
-                    (update :media-id bfc/lookup-index)
-                    (update :thumbnail-id bfc/lookup-index))]
-      (db/insert! conn :file-media-object media
-                  ::db/return-keys false
-                  ::sql/on-conflict-do-nothing true))))
-
-(def ^:private empty-summary
-  {:teams #{}
-   :files #{}
-   :projects #{}
-   :file-media-objects #{}
-   :team-font-variants #{}
-   :storage-objects #{}})
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; PUBLIC API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn export-team!
-  [cfg team-id]
-  (let [id  (uuid/next)
-        tp  (dt/tpoint)
-
-        cfg (-> (create-database cfg)
-                (update ::sto/storage media/configure-assets-storage))]
-
-    (l/inf :hint "start"
-           :operation "export"
-           :id (str id)
-           :path (str (::path cfg)))
-
-    (try
-      (db/tx-run! cfg (fn [cfg]
-                        (setup-schema! cfg)
-                        (binding [bfc/*state* (volatile! empty-summary)]
-                          (write-team! cfg team-id)
-
-                          (run! (partial write-project! cfg)
-                                (bfc/get-team-projects cfg team-id))
-
-                          (run! (partial write-file! cfg)
-                                (bfc/get-team-files cfg team-id))
-
-                          (run! (partial write-storage-object! cfg)
-                                (-> bfc/*state* deref :storage-objects))
-
-                          (write! cfg :manifest "team-id" team-id)
-                          (write! cfg :manifest "objects" (deref bfc/*state*))
-
-                          (::path cfg))))
-      (finally
-        (pu/close! (::db cfg))
-
-        (let [elapsed (tp)]
-          (l/inf :hint "end"
-                 :operation "export"
-                 :id (str id)
-                 :elapsed (dt/format-duration elapsed)))))))
-
-(defn import-team!
-  [cfg path]
-  (let [id  (uuid/next)
-        tp  (dt/tpoint)
-
-        cfg (-> (create-database cfg path)
-                (update ::sto/storage media/configure-assets-storage)
-                (assoc ::bfc/timestamp (dt/now)))]
-
-    (l/inf :hint "start"
-           :operation "import"
-           :id (str id)
-           :path (str (::path cfg)))
-
-    (try
-      (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
-                        (db/exec-one! conn ["SET idle_in_transaction_session_timeout = 0"])
-                        (db/exec-one! conn ["SET CONSTRAINTS ALL DEFERRED"])
-
-                        (binding [bfc/*state* (volatile! {:index {}})]
-                          (let [objects (read-obj cfg :manifest "objects")]
-
-                            ;; We first process all storage objects, they have
-                            ;; deduplication so we can't rely on simple reindex. This
-                            ;; operation populates the index for all storage objects.
-                            (run! (partial read-storage-object! cfg) (:storage-objects objects))
-
-                            ;; Populate index with all the incoming objects
-                            (vswap! bfc/*state* update :index
-                                    (fn [index]
-                                      (-> index
-                                          (bfc/update-index (:teams objects))
-                                          (bfc/update-index (:projects objects))
-                                          (bfc/update-index (:files objects))
-                                          (bfc/update-index (:file-media-objects objects))
-                                          (bfc/update-index (:team-font-variants objects)))))
-
-                            (let [team-id  (read-obj cfg :manifest "team-id")
-                                  team     (read-team! cfg team-id)
-                                  features (cfeat/get-team-enabled-features cf/flags team)
-                                  cfg      (assoc cfg ::bfc/features features)]
-
-                              (run! (partial read-project! cfg) (:projects objects))
-                              (run! (partial read-file! cfg) (:files objects))
-
-                              ;; (run-pending-migrations! cfg)
-
-                              team)))))
-      (finally
-        (pu/close! (::db cfg))
-
-        (let [elapsed (tp)]
-          (l/inf :hint "end"
-                 :operation "import"
-                 :id (str id)
-                 :elapsed (dt/format-duration elapsed)))))))

backend/src/app/cli/manage.clj

@@ -0,0 +1,169 @@
+;; 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) UXBOX Labs SL
+
+(ns app.cli.manage
+  "A manage cli api."
+  (:require
+   [app.common.logging :as l]
+   [app.db :as db]
+   [app.main :as main]
+   [app.rpc.mutations.profile :as profile]
+   [app.rpc.queries.profile :refer [retrieve-profile-data-by-email]]
+   [clojure.string :as str]
+   [clojure.tools.cli :refer [parse-opts]]
+   [integrant.core :as ig])
+  (:import
+   java.io.Console))
+
+;; --- IMPL
+
+(defn init-system
+  []
+  (let [data (-> main/system-config
+                 (select-keys [:app.db/pool :app.metrics/metrics])
+                 (assoc :app.migrations/all {}))]
+    (-> data ig/prep ig/init)))
+
+(defn- read-from-console
+  [{:keys [label type] :or {type :text}}]
+  (let [^Console console (System/console)]
+    (when-not console
+      (l/error :hint "no console found, can proceed")
+      (System/exit 1))
+
+    (binding [*out* (.writer console)]
+      (print label " ")
+      (.flush *out*))
+
+    (case type
+      :text (.readLine console)
+      :password (String. (.readPassword console)))))
+
+(defn create-profile
+  [options]
+  (let [system   (init-system)
+        email    (or (:email options)
+                     (read-from-console {:label "Email:"}))
+        fullname (or (:fullname options)
+                     (read-from-console {:label "Full Name:"}))
+        password (or (:password options)
+                     (read-from-console {:label "Password:"
+                                         :type :password}))]
+    (try
+      (db/with-atomic [conn (:app.db/pool system)]
+        (->> (profile/create-profile conn
+                                     {:fullname fullname
+                                      :email email
+                                      :password password
+                                      :is-active true
+                                      :is-demo false})
+             (profile/create-profile-relations conn)))
+
+      (when (pos? (:verbosity options))
+        (println "User created successfully."))
+      (System/exit 0)
+
+      (catch Exception _e
+        (when (pos? (:verbosity options))
+          (println "Unable to create user, already exists."))
+        (System/exit 1)))))
+
+(defn reset-password
+  [options]
+  (let [system (init-system)]
+    (try
+      (db/with-atomic [conn (:app.db/pool system)]
+        (let [email    (or (:email options)
+                           (read-from-console {:label "Email:"}))
+              profile  (retrieve-profile-data-by-email conn email)]
+          (when-not profile
+            (when (pos? (:verbosity options))
+              (println "Profile does not exists."))
+            (System/exit 1))
+
+          (let [password (or (:password options)
+                             (read-from-console {:label "Password:"
+                                                 :type :password}))]
+            (profile/update-profile-password! conn (assoc profile :password password))
+            (when (pos? (:verbosity options))
+              (println "Password changed successfully.")))))
+      (System/exit 0)
+      (catch Exception e
+        (when (pos? (:verbosity options))
+          (println "Unable to change password."))
+        (when (= 2 (:verbosity options))
+          (.printStackTrace e))
+        (System/exit 1)))))
+
+;; --- CLI PARSE
+
+(def cli-options
+  ;; An option with a required argument
+  [["-u" "--email EMAIL" "Email Address"]
+   ["-p" "--password PASSWORD" "Password"]
+   ["-n" "--name FULLNAME" "Full Name"
+    :id :fullname]
+   ["-v" nil "Verbosity level"
+    :id :verbosity
+    :default 1
+    :update-fn inc]
+   ["-q" nil "Dont' print to console"
+    :id :verbosity
+    :update-fn (constantly 0)]
+   ["-h" "--help"]])
+
+(defn usage
+  [options-summary]
+  (->> ["Penpot CLI management."
+        ""
+        "Usage: manage [options] action"
+        ""
+        "Options:"
+        options-summary
+        ""
+        "Actions:"
+        "  create-profile    Create new profile."
+        "  reset-password    Reset profile password."
+        ""]
+       (str/join \newline)))
+
+(defn error-msg [errors]
+  (str "The following errors occurred while parsing your command:\n\n"
+       (str/join \newline errors)))
+
+(defn validate-args
+  "Validate command line arguments. Either return a map indicating the program
+  should exit (with a error message, and optional ok status), or a map
+  indicating the action the program should take and the options provided."
+  [args]
+  (let [{:keys [options arguments errors summary] :as opts} (parse-opts args cli-options)]
+    ;; (pp/pprint opts)
+    (cond
+      (:help options) ; help => exit OK with usage summary
+      {:exit-message (usage summary) :ok? true}
+
+      errors ; errors => exit with description of errors
+      {:exit-message (error-msg errors)}
+
+      ;; custom validation on arguments
+      :else
+      (let [action (first arguments)]
+        (if (#{"create-profile" "reset-password"} action)
+          {:action (first arguments) :options options}
+          {:exit-message (usage summary)})))))
+
+(defn exit [status msg]
+  (println msg)
+  (System/exit status))
+
+(defn -main
+  [& args]
+  (let [{:keys [action options exit-message ok?]} (validate-args args)]
+    (if exit-message
+      (exit (if ok? 0 1) exit-message)
+      (case action
+        "create-profile" (create-profile options)
+        "reset-password" (reset-password options)))))

backend/src/app/cli/migrate_media.clj

@@ -0,0 +1,129 @@
+;; 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) UXBOX Labs SL
+
+(ns app.cli.migrate-media
+  (:require
+   [app.common.logging :as l]
+   [app.common.media :as cm]
+   [app.config :as cf]
+   [app.db :as db]
+   [app.main :as main]
+   [app.storage :as sto]
+   [cuerdas.core :as str]
+   [datoteka.core :as fs]
+   [integrant.core :as ig]))
+
+(declare migrate-profiles)
+(declare migrate-teams)
+(declare migrate-file-media)
+
+(defn run-in-system
+  [system]
+  (db/with-atomic [conn (:app.db/pool system)]
+    (let [system (assoc system ::conn conn)]
+      (migrate-profiles system)
+      (migrate-teams system)
+      (migrate-file-media system))
+    system))
+
+(defn run
+  []
+  (let [config (select-keys main/system-config
+                            [:app.db/pool
+                             :app.migrations/migrations
+                             :app.metrics/metrics
+                             :app.storage.s3/backend
+                             :app.storage.db/backend
+                             :app.storage.fs/backend
+                             :app.storage/storage])]
+    (ig/load-namespaces config)
+    (try
+      (-> (ig/prep config)
+          (ig/init)
+          (run-in-system)
+          (ig/halt!))
+      (catch Exception e
+        (l/error :hint "unhandled exception" :cause e)))))
+
+
+;; --- IMPL
+
+(defn migrate-profiles
+  [{:keys [::conn] :as system}]
+  (letfn [(retrieve-profiles [conn]
+            (->> (db/exec! conn ["select * from profile"])
+                 (filter #(not (str/empty? (:photo %))))
+                 (seq)))]
+    (let [base    (fs/path (cf/get :storage-fs-old-directory))
+          storage (-> (:app.storage/storage system)
+                      (assoc :conn conn))]
+      (doseq [profile (retrieve-profiles conn)]
+        (let [path  (fs/path (:photo profile))
+              full  (-> (fs/join base path)
+                        (fs/normalize))
+              ext   (fs/ext path)
+              mtype (cm/format->mtype (keyword ext))
+              obj   (sto/put-object storage {:content (sto/content full)
+                                             :content-type mtype})]
+          (db/update! conn :profile
+                      {:photo-id (:id obj)}
+                      {:id (:id profile)}))))))
+
+(defn migrate-teams
+  [{:keys [::conn] :as system}]
+  (letfn [(retrieve-teams [conn]
+            (->> (db/exec! conn ["select * from team"])
+                 (filter #(not (str/empty? (:photo %))))
+                 (seq)))]
+    (let [base    (fs/path (cf/get :storage-fs-old-directory))
+          storage (-> (:app.storage/storage system)
+                      (assoc :conn conn))]
+      (doseq [team (retrieve-teams conn)]
+        (let [path  (fs/path (:photo team))
+              full  (-> (fs/join base path)
+                        (fs/normalize))
+              ext   (fs/ext path)
+              mtype (cm/format->mtype (keyword ext))
+              obj   (sto/put-object storage {:content (sto/content full)
+                                             :content-type mtype})]
+          (db/update! conn :team
+                      {:photo-id (:id obj)}
+                      {:id (:id team)}))))))
+
+
+
+(defn migrate-file-media
+  [{:keys [::conn] :as system}]
+  (letfn [(retrieve-media-objects [conn]
+            (->> (db/exec! conn ["select fmo.id, fmo.path, fth.path as thumbnail_path
+                                    from file_media_object as fmo
+                                    join file_media_thumbnail as fth on (fth.media_object_id = fmo.id)"])
+                 (seq)))]
+    (let [base    (fs/path (cf/get :storage-fs-old-directory))
+          storage (-> (:app.storage/storage system)
+                      (assoc :conn conn))]
+      (doseq [mobj (retrieve-media-objects conn)]
+        (let [img-path  (fs/path (:path mobj))
+              thm-path  (fs/path (:thumbnail-path mobj))
+              img-path  (-> (fs/join base img-path)
+                            (fs/normalize))
+              thm-path  (-> (fs/join base thm-path)
+                            (fs/normalize))
+              img-ext   (fs/ext img-path)
+              thm-ext   (fs/ext thm-path)
+
+              img-mtype (cm/format->mtype (keyword img-ext))
+              thm-mtype (cm/format->mtype (keyword thm-ext))
+
+              img-obj   (sto/put-object storage {:content (sto/content img-path)
+                                                 :content-type img-mtype})
+              thm-obj   (sto/put-object storage {:content (sto/content thm-path)
+                                                 :content-type thm-mtype})]
+
+          (db/update! conn :file-media-object
+                      {:media-id (:id img-obj)
+                       :thumbnail-id (:id thm-obj)}
+                      {:id (:id mobj)}))))))

backend/src/app/config.clj

@@ -2,7 +2,7 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL
 
 (ns app.config
   "A configuration management."
@@ -19,7 +19,6 @@
    [clojure.pprint :as pprint]
    [clojure.spec.alpha :as s]
    [cuerdas.core :as str]
-   [datoteka.fs :as fs]
    [environ.core :refer [env]]
    [integrant.core :as ig]))
 
@@ -27,10 +26,6 @@
                clojure.lang.IRecord
                clojure.lang.IDeref)
 
-(prefer-method print-method
-               clojure.lang.IPersistentMap
-               clojure.lang.IDeref)
-
 (prefer-method pprint/simple-dispatch
                clojure.lang.IPersistentMap
                clojure.lang.IDeref)
@@ -46,28 +41,35 @@
     data))
 
 (def defaults
-  {:database-uri "postgresql://postgres/penpot"
+  {:http-server-port 6060
+   :http-server-host "localhost"
+   :host "devenv"
+   :tenant "dev"
+   :database-uri "postgresql://postgres/penpot"
    :database-username "penpot"
    :database-password "penpot"
 
-   :default-blob-version 5
-
-   :rpc-rlimit-config (fs/path "resources/rlimit.edn")
-   :rpc-climit-config (fs/path "resources/climit.edn")
+   :default-blob-version 3
+   :loggers-zmq-uri "tcp://localhost:45556"
 
    :file-change-snapshot-every 5
    :file-change-snapshot-timeout "3h"
 
    :public-uri "http://localhost:3449"
-   :host "localhost"
-   :tenant "default"
-
    :redis-uri "redis://redis/0"
 
+   :srepl-host "127.0.0.1"
+   :srepl-port 6062
+
    :assets-storage-backend :assets-fs
    :storage-assets-fs-directory "assets"
 
    :assets-path "/internal/assets/"
+
+   :rlimit-password 10
+   :rlimit-image 2
+   :rlimit-font 5
+
    :smtp-default-reply-to "Penpot <no-reply@example.com>"
    :smtp-default-from "Penpot <no-reply@example.com>"
 
@@ -79,71 +81,37 @@
 
    :telemetry-uri "https://telemetry.penpot.app/"
 
-   :media-max-file-size (* 1024 1024 30) ; 30MiB
-
    :ldap-user-query "(|(uid=:username)(mail=:username))"
    :ldap-attrs-username "uid"
    :ldap-attrs-email "mail"
    :ldap-attrs-fullname "cn"
+   :ldap-attrs-photo "jpegPhoto"
 
    ;; a server prop key where initial project is stored.
-   :initial-project-skey "initial-project"
+   :initial-project-skey "initial-project"})
 
-   ;; time to avoid email sending after profile modification
-   :email-verify-threshold "15m"})
+(s/def ::flags ::us/set-of-keywords)
 
-(s/def ::default-rpc-rlimit ::us/vector-of-strings)
-(s/def ::rpc-rlimit-config ::fs/path)
-(s/def ::rpc-climit-config ::fs/path)
-
-(s/def ::media-max-file-size ::us/integer)
-
-(s/def ::flags ::us/vector-of-keywords)
+;; DEPRECATED PROPERTIES: should be removed in 1.10
+(s/def ::registration-enabled ::us/boolean)
+(s/def ::smtp-enabled ::us/boolean)
 (s/def ::telemetry-enabled ::us/boolean)
+(s/def ::asserts-enabled ::us/boolean)
+;; END DEPRECATED
 
 (s/def ::audit-log-archive-uri ::us/string)
-(s/def ::audit-log-http-handler-concurrency ::us/integer)
+(s/def ::audit-log-gc-max-age ::dt/duration)
 
-(s/def ::email-domain-blacklist ::fs/path)
-(s/def ::email-domain-whitelist ::fs/path)
-
-(s/def ::deletion-delay ::dt/duration)
-
-(s/def ::admins ::us/set-of-valid-emails)
+(s/def ::admins ::us/set-of-str)
 (s/def ::file-change-snapshot-every ::us/integer)
 (s/def ::file-change-snapshot-timeout ::dt/duration)
 
-(s/def ::default-executor-parallelism ::us/integer)
-(s/def ::scheduled-executor-parallelism ::us/integer)
-
-(s/def ::worker-default-parallelism ::us/integer)
-(s/def ::worker-webhook-parallelism ::us/integer)
-
-(s/def ::auth-data-cookie-domain ::us/string)
-(s/def ::auth-token-cookie-name ::us/string)
-(s/def ::auth-token-cookie-max-age ::dt/duration)
-
 (s/def ::secret-key ::us/string)
 (s/def ::allow-demo-users ::us/boolean)
 (s/def ::assets-path ::us/string)
 (s/def ::database-password (s/nilable ::us/string))
 (s/def ::database-uri ::us/string)
 (s/def ::database-username (s/nilable ::us/string))
-(s/def ::database-readonly ::us/boolean)
-(s/def ::database-min-pool-size ::us/integer)
-(s/def ::database-max-pool-size ::us/integer)
-
-(s/def ::quotes-teams-per-profile ::us/integer)
-(s/def ::quotes-access-tokens-per-profile ::us/integer)
-(s/def ::quotes-projects-per-team ::us/integer)
-(s/def ::quotes-invitations-per-team ::us/integer)
-(s/def ::quotes-profiles-per-team ::us/integer)
-(s/def ::quotes-files-per-project ::us/integer)
-(s/def ::quotes-files-per-team ::us/integer)
-(s/def ::quotes-font-variants-per-team ::us/integer)
-(s/def ::quotes-comment-threads-per-file ::us/integer)
-(s/def ::quotes-comments-per-file ::us/integer)
-
 (s/def ::default-blob-version ::us/integer)
 (s/def ::error-report-webhook ::us/string)
 (s/def ::user-feedback-destination ::us/string)
@@ -155,27 +123,24 @@
 (s/def ::google-client-id ::us/string)
 (s/def ::google-client-secret ::us/string)
 (s/def ::oidc-client-id ::us/string)
-(s/def ::oidc-user-info-source ::us/keyword)
 (s/def ::oidc-client-secret ::us/string)
 (s/def ::oidc-base-uri ::us/string)
 (s/def ::oidc-token-uri ::us/string)
 (s/def ::oidc-auth-uri ::us/string)
 (s/def ::oidc-user-uri ::us/string)
-(s/def ::oidc-jwks-uri ::us/string)
-(s/def ::oidc-scopes ::us/set-of-strings)
-(s/def ::oidc-roles ::us/set-of-strings)
-(s/def ::oidc-roles-attr ::us/string)
-(s/def ::oidc-email-attr ::us/string)
-(s/def ::oidc-name-attr ::us/string)
+(s/def ::oidc-scopes ::us/set-of-str)
+(s/def ::oidc-roles ::us/set-of-str)
+(s/def ::oidc-roles-attr ::us/keyword)
 (s/def ::host ::us/string)
 (s/def ::http-server-port ::us/integer)
 (s/def ::http-server-host ::us/string)
-(s/def ::http-server-max-body-size ::us/integer)
-(s/def ::http-server-max-multipart-body-size ::us/integer)
-(s/def ::http-server-io-threads ::us/integer)
-(s/def ::http-server-worker-threads ::us/integer)
+(s/def ::http-session-idle-max-age ::dt/duration)
+(s/def ::http-session-updater-batch-max-age ::dt/duration)
+(s/def ::http-session-updater-batch-max-size ::us/integer)
+(s/def ::initial-project-skey ::us/string)
 (s/def ::ldap-attrs-email ::us/string)
 (s/def ::ldap-attrs-fullname ::us/string)
+(s/def ::ldap-attrs-photo ::us/string)
 (s/def ::ldap-attrs-username ::us/string)
 (s/def ::ldap-base-dn ::us/string)
 (s/def ::ldap-bind-dn ::us/string)
@@ -185,6 +150,8 @@
 (s/def ::ldap-ssl ::us/boolean)
 (s/def ::ldap-starttls ::us/boolean)
 (s/def ::ldap-user-query ::us/string)
+(s/def ::loggers-loki-uri ::us/string)
+(s/def ::loggers-zmq-uri ::us/string)
 (s/def ::media-directory ::us/string)
 (s/def ::media-uri ::us/string)
 (s/def ::profile-bounce-max-age ::dt/duration)
@@ -193,8 +160,10 @@
 (s/def ::profile-complaint-threshold ::us/integer)
 (s/def ::public-uri ::us/string)
 (s/def ::redis-uri ::us/string)
-(s/def ::registration-domain-whitelist ::us/set-of-strings)
-
+(s/def ::registration-domain-whitelist ::us/set-of-str)
+(s/def ::rlimit-font ::us/integer)
+(s/def ::rlimit-image ::us/integer)
+(s/def ::rlimit-password ::us/integer)
 (s/def ::smtp-default-from ::us/string)
 (s/def ::smtp-default-reply-to ::us/string)
 (s/def ::smtp-host ::us/string)
@@ -203,47 +172,37 @@
 (s/def ::smtp-ssl ::us/boolean)
 (s/def ::smtp-tls ::us/boolean)
 (s/def ::smtp-username (s/nilable ::us/string))
-(s/def ::urepl-host ::us/string)
-(s/def ::urepl-port ::us/integer)
-(s/def ::prepl-host ::us/string)
-(s/def ::prepl-port ::us/integer)
+(s/def ::srepl-host ::us/string)
+(s/def ::srepl-port ::us/integer)
 (s/def ::assets-storage-backend ::us/keyword)
+(s/def ::fdata-storage-backend ::us/keyword)
 (s/def ::storage-assets-fs-directory ::us/string)
 (s/def ::storage-assets-s3-bucket ::us/string)
 (s/def ::storage-assets-s3-region ::us/keyword)
-(s/def ::storage-assets-s3-endpoint ::us/string)
-(s/def ::storage-assets-s3-io-threads ::us/integer)
+(s/def ::storage-fdata-s3-bucket ::us/string)
+(s/def ::storage-fdata-s3-region ::us/keyword)
+(s/def ::storage-fdata-s3-prefix ::us/string)
 (s/def ::telemetry-uri ::us/string)
 (s/def ::telemetry-with-taiga ::us/boolean)
 (s/def ::tenant ::us/string)
-(s/def ::email-verify-threshold ::dt/duration)
+
+(s/def ::sentry-trace-sample-rate ::us/number)
+(s/def ::sentry-attach-stack-trace ::us/boolean)
+(s/def ::sentry-debug ::us/boolean)
+(s/def ::sentry-dsn ::us/string)
 
 (s/def ::config
   (s/keys :opt-un [::secret-key
                    ::flags
                    ::admins
-                   ::deletion-delay
                    ::allow-demo-users
                    ::audit-log-archive-uri
-                   ::audit-log-http-handler-concurrency
-                   ::auth-token-cookie-name
-                   ::auth-token-cookie-max-age
-                   ::authenticated-cookie-domain
+                   ::audit-log-gc-max-age
                    ::database-password
                    ::database-uri
                    ::database-username
-                   ::database-readonly
-                   ::database-min-pool-size
-                   ::database-max-pool-size
                    ::default-blob-version
-                   ::default-rpc-rlimit
-                   ::email-domain-blacklist
-                   ::email-domain-whitelist
                    ::error-report-webhook
-                   ::default-executor-parallelism
-                   ::scheduled-executor-parallelism
-                   ::worker-default-parallelism
-                   ::worker-webhook-parallelism
                    ::file-change-snapshot-every
                    ::file-change-snapshot-timeout
                    ::user-feedback-destination
@@ -256,26 +215,23 @@
                    ::google-client-secret
                    ::oidc-client-id
                    ::oidc-client-secret
-                   ::oidc-user-info-source
                    ::oidc-base-uri
                    ::oidc-token-uri
                    ::oidc-auth-uri
                    ::oidc-user-uri
-                   ::oidc-jwks-uri
                    ::oidc-scopes
                    ::oidc-roles-attr
-                   ::oidc-email-attr
-                   ::oidc-name-attr
                    ::oidc-roles
                    ::host
                    ::http-server-host
                    ::http-server-port
-                   ::http-server-max-body-size
-                   ::http-server-max-multipart-body-size
-                   ::http-server-io-threads
-                   ::http-server-worker-threads
+                   ::http-session-idle-max-age
+                   ::http-session-updater-batch-max-age
+                   ::http-session-updater-batch-max-size
+                   ::initial-project-skey
                    ::ldap-attrs-email
                    ::ldap-attrs-fullname
+                   ::ldap-attrs-photo
                    ::ldap-attrs-username
                    ::ldap-base-dn
                    ::ldap-bind-dn
@@ -286,68 +242,52 @@
                    ::ldap-starttls
                    ::ldap-user-query
                    ::local-assets-uri
-                   ::media-max-file-size
+                   ::loggers-loki-uri
+                   ::loggers-zmq-uri
                    ::profile-bounce-max-age
                    ::profile-bounce-threshold
                    ::profile-complaint-max-age
                    ::profile-complaint-threshold
                    ::public-uri
-
-                   ::quotes-teams-per-profile
-                   ::quotes-access-tokens-per-profile
-                   ::quotes-projects-per-team
-                   ::quotes-invitations-per-team
-                   ::quotes-profiles-per-team
-                   ::quotes-files-per-project
-                   ::quotes-files-per-team
-                   ::quotes-font-variants-per-team
-                   ::quotes-comment-threads-per-file
-                   ::quotes-comments-per-file
-
                    ::redis-uri
                    ::registration-domain-whitelist
-                   ::rpc-rlimit-config
-                   ::rpc-climit-config
-
-                   ::semaphore-process-font
-                   ::semaphore-process-image
-                   ::semaphore-update-file
-                   ::semaphore-auth
-
+                   ::registration-enabled
+                   ::rlimit-font
+                   ::rlimit-image
+                   ::rlimit-password
+                   ::sentry-dsn
+                   ::sentry-debug
+                   ::sentry-attach-stack-trace
+                   ::sentry-trace-sample-rate
                    ::smtp-default-from
                    ::smtp-default-reply-to
+                   ::smtp-enabled
                    ::smtp-host
                    ::smtp-password
                    ::smtp-port
                    ::smtp-ssl
                    ::smtp-tls
                    ::smtp-username
-
-                   ::urepl-host
-                   ::urepl-port
-                   ::prepl-host
-                   ::prepl-port
-
+                   ::srepl-host
+                   ::srepl-port
                    ::assets-storage-backend
                    ::storage-assets-fs-directory
                    ::storage-assets-s3-bucket
                    ::storage-assets-s3-region
-                   ::storage-assets-s3-endpoint
-                   ::storage-assets-s3-io-threads
+                   ::fdata-storage-backend
+                   ::storage-fdata-s3-bucket
+                   ::storage-fdata-s3-region
+                   ::storage-fdata-s3-prefix
                    ::telemetry-enabled
                    ::telemetry-uri
                    ::telemetry-referer
                    ::telemetry-with-taiga
-                   ::tenant
-                   ::email-verify-threshold]))
+                   ::tenant]))
 
 (def default-flags
-  [:enable-backend-api-doc
-   :enable-backend-openapi-doc
-   :enable-backend-worker
-   :enable-secure-session-cookies
-   :enable-email-verification
-   :enable-v2-migration])
+  [:enable-backend-asserts
+   :enable-backend-api-doc
+   :enable-secure-session-cookies])
 
 (defn- parse-flags
   [config]
@@ -374,12 +314,11 @@
          (merge defaults)
          (us/conform ::config))
     (catch Throwable e
-      (when (ex/error? e)
+      (when (ex/ex-info? e)
         (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;")
         (println "Error on validating configuration:")
-        (println (some-> e ex-data ex/explain))
-        (println (ex/explain (ex-data e)))
-        (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"))
+        (println (:explain (ex-data e))
+        (println ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;")))
       (throw e))))
 
 (def version
@@ -388,12 +327,11 @@
                        (str/trim))
                "%version%")))
 
-(defonce ^:dynamic config (read-config))
-(defonce ^:dynamic flags (parse-flags config))
+(def ^:dynamic config (read-config))
+(def ^:dynamic flags  (parse-flags config))
 
 (def deletion-delay
-  (or (c/get config :deletion-delay)
-      (dt/duration {:days 7})))
+  (dt/duration {:days 7}))
 
 (defn get
   "A configuration getter. Helps code be more testable."

backend/src/app/db.clj

@@ -2,10 +2,9 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL
 
 (ns app.db
-  (:refer-clojure :exclude [get run!])
   (:require
    [app.common.data :as d]
    [app.common.exceptions :as ex]
@@ -17,9 +16,9 @@
    [app.db.sql :as sql]
    [app.metrics :as mtx]
    [app.util.json :as json]
+   [app.util.migrations :as mg]
    [app.util.time :as dt]
    [clojure.java.io :as io]
-   [clojure.set :as set]
    [clojure.spec.alpha :as s]
    [integrant.core :as ig]
    [next.jdbc :as jdbc]
@@ -28,10 +27,9 @@
    com.zaxxer.hikari.HikariConfig
    com.zaxxer.hikari.HikariDataSource
    com.zaxxer.hikari.metrics.prometheus.PrometheusMetricsTrackerFactory
-   io.whitfin.siphash.SipHasher
-   io.whitfin.siphash.SipHasherContainer
    java.io.InputStream
    java.io.OutputStream
+   java.lang.AutoCloseable
    java.sql.Connection
    java.sql.Savepoint
    org.postgresql.PGConnection
@@ -49,62 +47,49 @@
 ;; Initialization
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(s/def ::connection-timeout ::us/integer)
-(s/def ::max-size ::us/integer)
-(s/def ::min-size ::us/integer)
+(declare instrument-jdbc!)
+(declare apply-migrations!)
+
 (s/def ::name keyword?)
-(s/def ::password ::us/string)
 (s/def ::uri ::us/not-empty-string)
-(s/def ::username ::us/string)
-(s/def ::validation-timeout ::us/integer)
-(s/def ::read-only? ::us/boolean)
+(s/def ::min-pool-size ::us/integer)
+(s/def ::max-pool-size ::us/integer)
+(s/def ::migrations map?)
+(s/def ::read-only ::us/boolean)
 
-(s/def ::pool-options
-  (s/keys :opt [::uri
-                ::name
-                ::min-size
-                ::max-size
-                ::connection-timeout
-                ::validation-timeout
-                ::username
-                ::password
-                ::mtx/metrics
-                ::read-only?]))
-
-(def defaults
-  {::name :main
-   ::min-size 0
-   ::max-size 60
-   ::connection-timeout 10000
-   ::validation-timeout 10000
-   ::idle-timeout 120000 ; 2min
-   ::max-lifetime 1800000 ; 30m
-   ::read-only? false})
-
-(defmethod ig/prep-key ::pool
-  [_ cfg]
-  (merge defaults (d/without-nils cfg)))
-
-;; Don't validate here, just validate that a map is received.
-(defmethod ig/pre-init-spec ::pool [_] ::pool-options)
+(defmethod ig/pre-init-spec ::pool [_]
+  (s/keys :req-un [::uri ::name ::min-pool-size ::max-pool-size]
+          :opt-un [::migrations ::mtx/metrics ::read-only]))
 
 (defmethod ig/init-key ::pool
-  [_ {:keys [::uri ::read-only?] :as cfg}]
-  (when uri
-    (l/info :hint "initialize connection pool"
-            :name (d/name (::name cfg))
-            :uri uri
-            :read-only read-only?
-            :with-credentials (and (contains? cfg ::username)
-                                   (contains? cfg ::password))
-            :min-size (::min-size cfg)
-            :max-size (::max-size cfg))
-    (create-pool cfg)))
+  [_ {:keys [migrations metrics name] :as cfg}]
+  (l/info :action "initialize connection pool" :name (d/name name) :uri (:uri cfg))
+  (some-> metrics :registry instrument-jdbc!)
+
+  (let [pool (create-pool cfg)]
+    (some->> (seq migrations) (apply-migrations! pool))
+    pool))
 
 (defmethod ig/halt-key! ::pool
   [_ pool]
-  (when pool
-    (.close ^HikariDataSource pool)))
+  (.close ^HikariDataSource pool))
+
+(defn- instrument-jdbc!
+  [registry]
+  (mtx/instrument-vars!
+   [#'next.jdbc/execute-one!
+    #'next.jdbc/execute!]
+   {:registry registry
+    :type :counter
+    :name "database_query_total"
+    :help "An absolute counter of database queries."}))
+
+(defn- apply-migrations!
+  [pool migrations]
+  (with-open [conn ^AutoCloseable (open pool)]
+    (mg/setup! conn)
+    (doseq [[name steps] migrations]
+      (mg/migrate! conn {:name (d/name name) :steps steps}))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; API & Impl
@@ -115,30 +100,33 @@
        "SET idle_in_transaction_session_timeout = 300000;"))
 
 (defn- create-datasource-config
-  [{:keys [::mtx/metrics ::uri] :as cfg}]
-  (let [config (HikariConfig.)]
+  [{:keys [metrics read-only] :or {read-only false} :as cfg}]
+  (let [dburi    (:uri cfg)
+        username (:username cfg)
+        password (:password cfg)
+        config   (HikariConfig.)]
     (doto config
-      (.setJdbcUrl           (str "jdbc:" uri))
-      (.setPoolName          (d/name (::name cfg)))
+      (.setJdbcUrl (str "jdbc:" dburi))
+      (.setPoolName (d/name (:name cfg)))
       (.setAutoCommit true)
-      (.setReadOnly          (::read-only? cfg))
-      (.setConnectionTimeout (::connection-timeout cfg))
-      (.setValidationTimeout (::validation-timeout cfg))
-      (.setIdleTimeout       (::idle-timeout cfg))
-      (.setMaxLifetime       (::max-lifetime cfg))
-      (.setMinimumIdle       (::min-size cfg))
-      (.setMaximumPoolSize   (::max-size cfg))
+      (.setReadOnly read-only)
+      (.setConnectionTimeout 10000)  ;; 10seg
+      (.setValidationTimeout 10000)  ;; 10seg
+      (.setIdleTimeout 120000)       ;; 2min
+      (.setMaxLifetime 1800000)      ;; 30min
+      (.setMinimumIdle (:min-pool-size cfg 0))
+      (.setMaximumPoolSize (:max-pool-size cfg 50))
       (.setConnectionInitSql initsql)
       (.setInitializationFailTimeout -1))
 
     ;; When metrics namespace is provided
     (when metrics
-      (->> (::mtx/registry metrics)
+      (->> (:registry metrics)
            (PrometheusMetricsTrackerFactory.)
            (.setMetricsTrackerFactory config)))
 
-    (some->> ^String (::username cfg) (.setUsername config))
-    (some->> ^String (::password cfg) (.setPassword config))
+    (when username (.setUsername config username))
+    (when password (.setPassword config password))
 
     config))
 
@@ -146,33 +134,12 @@
   [v]
   (instance? javax.sql.DataSource v))
 
-(defn connection?
-  [conn]
-  (instance? Connection conn))
-
-(s/def ::conn some?)
-(s/def ::nilable-pool (s/nilable ::pool))
 (s/def ::pool pool?)
-(s/def ::pool-or-conn some?)
 
-(defn closed?
+(defn pool-closed?
   [pool]
   (.isClosed ^HikariDataSource pool))
 
-(defn read-only?
-  [pool-or-conn]
-  (cond
-    (instance? HikariDataSource pool-or-conn)
-    (.isReadOnly ^HikariDataSource pool-or-conn)
-
-    (instance? Connection pool-or-conn)
-    (.isReadOnly ^Connection pool-or-conn)
-
-    :else
-    (ex/raise :type :internal
-              :code :invalid-connection
-              :hint "invalid connection provided")))
-
 (defn create-pool
   [cfg]
   (let [dsc (create-datasource-config cfg)]
@@ -223,220 +190,79 @@
 
 (defmacro with-atomic
   [& args]
-  (if (symbol? (first args))
-    (let [cfgs (first args)
-          body (rest args)]
-      `(jdbc/with-transaction [conn# (::pool ~cfgs)]
-         (let [~cfgs (assoc ~cfgs ::conn conn#)]
-           ~@body)))
-    `(jdbc/with-transaction ~@args)))
+  `(jdbc/with-transaction ~@args))
 
-(defn open
-  [system-or-pool]
-  (if (pool? system-or-pool)
-    (jdbc/get-connection system-or-pool)
-    (if (map? system-or-pool)
-      (open (::pool system-or-pool))
-      (throw (IllegalArgumentException. "unable to resolve connection pool")))))
-
-(defn get-update-count
-  [result]
-  (:next.jdbc/update-count result))
-
-(defn get-connection
-  [cfg-or-conn]
-  (if (connection? cfg-or-conn)
-    cfg-or-conn
-    (if (map? cfg-or-conn)
-      (get-connection (::conn cfg-or-conn))
-      (throw (IllegalArgumentException. "unable to resolve connection")))))
-
-(defn connection-map?
-  "Check if the provided value is a map like data structure that
-  contains a database connection."
-  [o]
-  (and (map? o) (connection? (::conn o))))
-
-(defn get-connectable
-  "Resolve to a connection or connection pool instance; if it is not
-  possible, raises an exception"
-  [o]
-  (cond
-    (connection? o) o
-    (pool? o)       o
-    (map? o)        (get-connectable (or (::conn o) (::pool o)))
-    :else           (throw (IllegalArgumentException. "unable to resolve connectable"))))
-
-(def ^:private params-mapping
-  {::return-keys? :return-keys
-   ::return-keys :return-keys})
-
-(defn rename-opts
-  [opts]
-  (set/rename-keys opts params-mapping))
-
-(def ^:private default-insert-opts
-  {:builder-fn sql/as-kebab-maps
-   :return-keys true})
-
-(def ^:private default-opts
-  {:builder-fn sql/as-kebab-maps})
+(defn ^Connection open
+  [pool]
+  (jdbc/get-connection pool))
 
 (defn exec!
-  ([ds sv] (exec! ds sv nil))
+  ([ds sv]
+   (exec! ds sv {}))
   ([ds sv opts]
-   (let [conn (get-connectable ds)
-         opts (if (empty? opts)
-                default-opts
-                (into default-opts (rename-opts opts)))]
-     (jdbc/execute! conn sv opts))))
+   (jdbc/execute! ds sv (assoc opts :builder-fn sql/as-kebab-maps))))
 
 (defn exec-one!
-  ([ds sv] (exec-one! ds sv nil))
+  ([ds sv] (exec-one! ds sv {}))
   ([ds sv opts]
-   (let [conn (get-connectable ds)
-         opts (if (empty? opts)
-                default-opts
-                (into default-opts (rename-opts opts)))]
-     (jdbc/execute-one! conn sv opts))))
+   (jdbc/execute-one! ds sv (assoc opts :builder-fn sql/as-kebab-maps))))
 
 (defn insert!
-  "A helper that builds an insert sql statement and executes it. By
-  default returns the inserted row with all the field; you can delimit
-  the returned columns with the `::columns` option."
-  [ds table params & {:as opts}]
-  (let [conn (get-connectable ds)
-        sql  (sql/insert table params opts)
-        opts (if (empty? opts)
-               default-insert-opts
-               (into default-insert-opts (rename-opts opts)))]
-    (jdbc/execute-one! conn sql opts)))
+  ([ds table params] (insert! ds table params nil))
+  ([ds table params opts]
+   (exec-one! ds
+              (sql/insert table params opts)
+              (assoc opts :return-keys true))))
 
-(defn insert-many!
-  "An optimized version of `insert!` that perform insertion of multiple
-  values at once.
-
-  This expands to a single SQL statement with placeholders for every
-  value being inserted. For large data sets, this may exceed the limit
-  of sql string size and/or number of parameters."
-  [ds table cols rows & {:as opts}]
-  (let [conn (get-connectable ds)
-        sql  (sql/insert-many table cols rows opts)
-        opts (if (empty? opts)
-               default-insert-opts
-               (into default-insert-opts (rename-opts opts)))
-        opts (update opts :return-keys boolean)]
-    (jdbc/execute! conn sql opts)))
+(defn insert-multi!
+  ([ds table cols rows] (insert-multi! ds table cols rows nil))
+  ([ds table cols rows opts]
+   (exec! ds
+          (sql/insert-multi table cols rows opts)
+          (assoc opts :return-keys true))))
 
 (defn update!
-  "A helper that build an UPDATE SQL statement and executes it.
-
-   Given a connectable object, a table name, a hash map of columns and
-  values to set, and either a hash map of columns and values to search
-  on or a vector of a SQL where clause and parameters, perform an
-  update on the table.
-
-  By default returns an object with the number of affected rows; a
-  complete row can be returned if you pass `::return-keys` with `true`
-  or with a vector of columns.
-
-  Also it can be combined with the `::many` option if you perform an
-  update to multiple rows and you want all the affected rows to be
-  returned."
-  [ds table params where & {:as opts}]
-  (let [conn (get-connectable ds)
-        sql  (sql/update table params where opts)
-        opts (if (empty? opts)
-               default-opts
-               (into default-opts (rename-opts opts)))
-        opts (update opts :return-keys boolean)]
-    (if (::many opts)
-      (jdbc/execute! conn sql opts)
-      (jdbc/execute-one! conn sql opts))))
+  ([ds table params where] (update! ds table params where nil))
+  ([ds table params where opts]
+   (exec-one! ds
+              (sql/update table params where opts)
+              (assoc opts :return-keys true))))
 
 (defn delete!
-  "A helper that builds an DELETE SQL statement and executes it.
+  ([ds table params] (delete! ds table params nil))
+  ([ds table params opts]
+   (exec-one! ds
+              (sql/delete table params opts)
+              (assoc opts :return-keys true))))
 
-  Given a connectable object, a table name, and either a hash map of columns
-  and values to search on or a vector of a SQL where clause and parameters,
-  perform a delete on the table.
-
-  By default returns an object with the number of affected rows; a
-  complete row can be returned if you pass `::return-keys` with `true`
-  or with a vector of columns.
-
-  Also it can be combined with the `::many` option if you perform an
-  update to multiple rows and you want all the affected rows to be
-  returned."
-  [ds table params & {:as opts}]
-  (let [conn (get-connectable ds)
-        sql  (sql/delete table params opts)
-        opts (if (empty? opts)
-               default-opts
-               (into default-opts (rename-opts opts)))]
-    (if (::many opts)
-      (jdbc/execute! conn sql opts)
-      (jdbc/execute-one! conn sql opts))))
-
-(defn query
-  [ds table params & {:as opts}]
-  (exec! ds (sql/select table params opts) opts))
-
-(defn is-row-deleted?
+(defn- is-deleted?
   [{:keys [deleted-at]}]
   (and (dt/instant? deleted-at)
        (< (inst-ms deleted-at)
           (inst-ms (dt/now)))))
 
-(defn get*
-  "Retrieve a single row from database that matches a simple filters. Do
-  not raises exceptions."
-  [ds table params & {:as opts}]
-  (let [rows (exec! ds (sql/select table params opts))
-        rows (cond->> rows
-               (::remove-deleted opts true)
-               (remove is-row-deleted?))]
-    (first rows)))
-
-(defn get
-  "Retrieve a single row from database that matches a simple
-  filters. Raises :not-found exception if no object is found."
-  [ds table params & {:as opts}]
-  (let [row (get* ds table params opts)]
-    (when (and (not row) (::check-deleted opts true))
-      (ex/raise :type :not-found
-                :code :object-not-found
-                :table table
-                :hint "database object not found"))
-    row))
-
-(defn plan
-  [ds sql]
-  (-> (get-connectable ds)
-      (jdbc/plan sql sql/default-opts)))
-
-(defn cursor
-  "Return a lazy seq of rows using server side cursors"
-  [conn query & {:keys [chunk-size] :or {chunk-size 25}}]
-  (let [cname  (str (gensym "cursor_"))
-        fquery [(str "FETCH " chunk-size " FROM " cname)]]
-
-    ;; declare cursor
-    (exec-one! conn
-               (if (vector? query)
-                 (into [(str "DECLARE " cname " CURSOR FOR " (nth query 0))]
-                       (rest query))
-                 [(str "DECLARE " cname " CURSOR FOR " query)]))
-
-    ;; return a lazy seq
-    ((fn fetch-more []
-       (lazy-seq
-        (when-let [chunk (seq (exec! conn fquery))]
-          (concat chunk (fetch-more))))))))
+(defn get-by-params
+  ([ds table params]
+   (get-by-params ds table params nil))
+  ([ds table params {:keys [check-not-found] :or {check-not-found true} :as opts}]
+   (let [res (exec-one! ds (sql/select table params opts))]
+     (when (and check-not-found (or (not res) (is-deleted? res)))
+       (ex/raise :type :not-found
+                 :table table
+                 :hint "database object not found"))
+     res)))
 
 (defn get-by-id
-  [ds table id & {:as opts}]
-  (get ds table {:id id} opts))
+  ([ds table id]
+   (get-by-params ds table {:id id} nil))
+  ([ds table id opts]
+   (get-by-params ds table {:id id} opts)))
+
+(defn query
+  ([ds table params]
+   (query ds table params nil))
+  ([ds table params opts]
+   (exec! ds (sql/select table params opts))))
 
 (defn pgobject?
   ([v]
@@ -463,13 +289,10 @@
   [v]
   (and (pgarray? v) (= "uuid" (.getBaseTypeName ^PgArray v))))
 
-;; TODO rename to decode-pgarray-into
 (defn decode-pgarray
-  ([v] (decode-pgarray v []))
-  ([v in]
-   (into in (some-> ^PgArray v .getArray)))
-  ([v in xf]
-   (into in xf (some-> ^PgArray v .getArray))))
+  ([v] (into [] (.getArray ^PgArray v)))
+  ([v in] (into in (.getArray ^PgArray v)))
+  ([v in xf] (into in xf (.getArray ^PgArray v))))
 
 (defn pgarray->set
   [v]
@@ -490,10 +313,6 @@
       (.createArrayOf conn ^String type (into-array Object objects))
       (.createArrayOf conn ^String type objects))))
 
-(defn encode-pgarray
-  [data conn type]
-  (create-array conn type data))
-
 (defn decode-pgpoint
   [^PGpoint v]
   (gpt/point (.-x v) (.-y v)))
@@ -508,163 +327,81 @@
   ([^Connection conn label]
    (.setSavepoint conn (name label))))
 
-(defn release!
-  [^Connection conn ^Savepoint sp]
-  (.releaseSavepoint conn sp))
-
 (defn rollback!
-  ([conn]
-   (if (and (map? conn) (::savepoint conn))
-     (rollback! conn (::savepoint conn))
-     (let [^Connection conn (get-connection conn)]
-       (l/trc :hint "explicit rollback requested")
-       (.rollback conn))))
-  ([conn ^Savepoint sp]
-   (let [^Connection conn (get-connection conn)]
-     (l/trc :hint "explicit rollback requested (savepoint)")
-     (.rollback conn sp))))
-
-(defn tx-run!
-  [system f & params]
-  (cond
-    (connection? system)
-    (tx-run! {::conn system} f)
-
-    (pool? system)
-    (tx-run! {::pool system} f)
-
-    (::conn system)
-    (let [conn (::conn system)
-          sp   (savepoint conn)]
-      (try
-        (let [system' (-> system
-                          (assoc ::savepoint sp)
-                          (dissoc ::rollback))
-              result  (apply f system' params)]
-          (if (::rollback system)
-            (rollback! conn sp)
-            (release! conn sp))
-          result)
-        (catch Throwable cause
-          (.rollback ^Connection conn ^Savepoint sp)
-          (throw cause))))
-
-    (::pool system)
-    (with-atomic [conn (::pool system)]
-      (let [system' (-> system
-                        (assoc ::conn conn)
-                        (dissoc ::rollback))
-            result  (apply f system' params)]
-        (when (::rollback system)
-          (rollback! conn))
-        result))
-
-    :else
-    (throw (IllegalArgumentException. "invalid system/cfg provided"))))
-
-(defn run!
-  [system f & params]
-  (cond
-    (connection? system)
-    (run! {::conn system} f)
-
-    (pool? system)
-    (run! {::pool system} f)
-
-    (::conn system)
-    (apply f system params)
-
-    (::pool system)
-    (with-open [^Connection conn (open (::pool system))]
-      (apply f (assoc system ::conn conn) params))
-
-    :else
-    (throw (IllegalArgumentException. "invalid arguments"))))
+  ([^Connection conn]
+   (.rollback conn))
+  ([^Connection conn ^Savepoint sp]
+   (.rollback conn sp)))
 
 (defn interval
-  [o]
+  [data]
   (cond
-    (or (integer? o)
-        (float? o))
-    (->> (/ o 1000.0)
+    (integer? data)
+    (->> (/ data 1000.0)
          (format "%s seconds")
          (pginterval))
 
-    (string? o)
-    (pginterval o)
+    (string? data)
+    (pginterval data)
 
-    (dt/duration? o)
-    (interval (inst-ms o))
+    (dt/duration? data)
+    (->> (/ (.toMillis ^java.time.Duration data) 1000.0)
+         (format "%s seconds")
+         (pginterval))
 
     :else
-    (ex/raise :type :not-implemented
-              :hint (format "no implementation found for value %s" (pr-str o)))))
+    (ex/raise :type :not-implemented)))
 
 (defn decode-json-pgobject
   [^PGobject o]
-  (when o
-    (let [typ (.getType o)
-          val (.getValue o)]
-      (if (or (= typ "json")
-              (= typ "jsonb"))
-        (json/decode val)
-        val))))
+  (let [typ (.getType o)
+        val (.getValue o)]
+    (if (or (= typ "json")
+            (= typ "jsonb"))
+      (json/read val)
+      val)))
 
 (defn decode-transit-pgobject
   [^PGobject o]
-  (when o
-    (let [typ (.getType o)
-          val (.getValue o)]
-      (if (or (= typ "json")
-              (= typ "jsonb"))
-        (t/decode-str val)
-        val))))
+  (let [typ (.getType o)
+        val (.getValue o)]
+    (if (or (= typ "json")
+            (= typ "jsonb"))
+      (t/decode-str val)
+      val)))
 
 (defn inet
   [ip-addr]
-  (when ip-addr
-    (doto (org.postgresql.util.PGobject.)
-      (.setType "inet")
-      (.setValue (str ip-addr)))))
+  (doto (org.postgresql.util.PGobject.)
+    (.setType "inet")
+    (.setValue (str ip-addr))))
 
 (defn decode-inet
   [^PGobject o]
-  (when o
-    (if (= "inet" (.getType o))
-      (.getValue o)
-      nil)))
+  (if (= "inet" (.getType o))
+    (.getValue o)
+    nil))
 
 (defn tjson
   "Encode as transit json."
   [data]
-  (when data
-    (doto (org.postgresql.util.PGobject.)
-      (.setType "jsonb")
-      (.setValue (t/encode-str data {:type :json-verbose})))))
+  (doto (org.postgresql.util.PGobject.)
+    (.setType "jsonb")
+    (.setValue (t/encode-str data {:type :json-verbose}))))
 
 (defn json
   "Encode as plain json."
   [data]
-  (when data
-    (doto (org.postgresql.util.PGobject.)
-      (.setType "jsonb")
-      (.setValue (json/encode-str data)))))
+  (doto (org.postgresql.util.PGobject.)
+    (.setType "jsonb")
+    (.setValue (json/write-str data))))
 
 ;; --- Locks
 
-(def ^:private siphash-state
-  (SipHasher/container
-   (uuid/get-bytes uuid/zero)))
-
-(defn uuid->hash-code
-  [o]
-  (.hash ^SipHasherContainer siphash-state
-         ^bytes (uuid/get-bytes o)))
-
 (defn- xact-check-param
   [n]
   (cond
-    (uuid? n) (uuid->hash-code n)
+    (uuid? n) (uuid/get-word-high n)
     (int? n)  n
     :else (throw (IllegalArgumentException. "uuid or number allowed"))))
 
@@ -679,18 +416,3 @@
   (let [n   (xact-check-param n)
         row (exec-one! conn ["select pg_try_advisory_xact_lock(?::bigint) as lock" n])]
     (:lock row)))
-
-(defn sql-exception?
-  [cause]
-  (instance? java.sql.SQLException cause))
-
-(defn connection-error?
-  [cause]
-  (and (sql-exception? cause)
-       (contains? #{"08003" "08006" "08001" "08004"}
-                  (.getSQLState ^java.sql.SQLException cause))))
-
-(defn serialization-error?
-  [cause]
-  (and (sql-exception? cause)
-       (= "40001" (.getSQLState ^java.sql.SQLException cause))))

backend/src/app/db/sql.clj

@@ -2,12 +2,11 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL
 
 (ns app.db.sql
   (:refer-clojure :exclude [update])
   (:require
-   [app.db :as-alias db]
    [clojure.string :as str]
    [next.jdbc.optional :as jdbc-opt]
    [next.jdbc.sql.builder :as sql]))
@@ -29,14 +28,11 @@
   ([table key-map opts]
    (let [opts (merge default-opts opts)
          opts (cond-> opts
-                (::db/on-conflict-do-nothing? opts)
-                (assoc :suffix "ON CONFLICT DO NOTHING")
-
-                (::on-conflict-do-nothing opts)
+                (:on-conflict-do-nothing opts)
                 (assoc :suffix "ON CONFLICT DO NOTHING"))]
      (sql/for-insert table key-map opts))))
 
-(defn insert-many
+(defn insert-multi
   [table cols rows opts]
   (let [opts (merge default-opts opts)]
     (sql/for-insert-multi table cols rows opts)))
@@ -47,30 +43,20 @@
   ([table where-params opts]
    (let [opts (merge default-opts opts)
          opts (cond-> opts
-                (::order-by opts)   (assoc :order-by (::order-by opts))
-                (::columns opts)    (assoc :columns (::columns opts))
-                (::for-update opts) (assoc :suffix "FOR UPDATE")
-                (::for-share opts)  (assoc :suffix "FOR SHARE"))]
+                (:for-update opts)    (assoc :suffix "FOR UPDATE")
+                (:for-key-share opts) (assoc :suffix "FOR KEY SHARE"))]
      (sql/for-query table where-params opts))))
 
 (defn update
   ([table key-map where-params]
    (update table key-map where-params nil))
   ([table key-map where-params opts]
-   (let [opts (into default-opts opts)
-         keys (::db/return-keys opts)
-         opts (if (vector? keys)
-                (assoc opts :suffix (str "RETURNING " (sql/as-cols keys opts)))
-                opts)]
+   (let [opts (merge default-opts opts)]
      (sql/for-update table key-map where-params opts))))
 
 (defn delete
   ([table where-params]
    (delete table where-params nil))
   ([table where-params opts]
-   (let [opts (merge default-opts opts)
-         keys (::db/return-keys opts)
-         opts (if (vector? keys)
-                (assoc opts :suffix (str "RETURNING " (sql/as-cols keys opts)))
-                opts)]
+   (let [opts (merge default-opts opts)]
      (sql/for-delete table where-params opts))))

backend/src/app/email.clj

@@ -1,450 +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.email
-  "Main api for send emails."
-  (:require
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.pprint :as pp]
-   [app.common.spec :as us]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.db.sql :as sql]
-   [app.email.invite-to-team :as-alias email.invite-to-team]
-   [app.metrics :as mtx]
-   [app.util.template :as tmpl]
-   [app.worker :as wrk]
-   [clojure.java.io :as io]
-   [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
-   [integrant.core :as ig])
-  (:import
-   jakarta.mail.Message$RecipientType
-   jakarta.mail.Session
-   jakarta.mail.Transport
-   jakarta.mail.internet.InternetAddress
-   jakarta.mail.internet.MimeBodyPart
-   jakarta.mail.internet.MimeMessage
-   jakarta.mail.internet.MimeMultipart
-   java.util.Properties))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; EMAIL IMPL
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- parse-address
-  ^"[Ljakarta.mail.internet.InternetAddress;"
-  [v]
-  (InternetAddress/parse ^String v))
-
-(defn- resolve-recipient-type
-  ^Message$RecipientType
-  [type]
-  (case type
-    :to  Message$RecipientType/TO
-    :cc  Message$RecipientType/CC
-    :bcc Message$RecipientType/BCC))
-
-(defn- assign-recipient
-  [^MimeMessage mmsg type address]
-  (if (sequential? address)
-    (reduce #(assign-recipient %1 type %2) mmsg address)
-    (let [address (parse-address address)
-          type    (resolve-recipient-type type)]
-      (.addRecipients mmsg type address)
-      mmsg)))
-(defn- assign-recipients
-  [mmsg {:keys [to cc bcc] :as params}]
-  (cond-> mmsg
-    (some? to)  (assign-recipient :to to)
-    (some? cc)  (assign-recipient :cc cc)
-    (some? bcc) (assign-recipient :bcc bcc)))
-
-(defn- assign-from
-  [mmsg {:keys [::default-from] :as cfg} {:keys [from] :as params}]
-  (let [from (or from default-from)]
-    (when from
-      (let [from (parse-address from)]
-        (.addFrom ^MimeMessage mmsg from)))))
-
-(defn- assign-reply-to
-  [mmsg {:keys [::default-reply-to] :as cfg} {:keys [reply-to] :as params}]
-  (let [reply-to (or reply-to default-reply-to)]
-    (when reply-to
-      (let [reply-to (parse-address reply-to)]
-        (.setReplyTo ^MimeMessage mmsg reply-to)))))
-
-(defn- assign-subject
-  [mmsg {:keys [subject charset] :or {charset "utf-8"} :as params}]
-  (assert (string? subject) "subject is mandatory")
-  (.setSubject ^MimeMessage mmsg
-               ^String subject
-               ^String charset))
-
-(defn- assign-extra-headers
-  [^MimeMessage mmsg {:keys [headers extra-data] :as params}]
-  (let [headers (assoc headers "X-Penpot-Data" extra-data)]
-    (reduce-kv (fn [^MimeMessage mmsg k v]
-                 (doto mmsg
-                   (.addHeader (name k) (str v))))
-               mmsg
-               headers)))
-
-(defn- assign-body
-  [^MimeMessage mmsg {:keys [body charset] :or {charset "utf-8"}}]
-  (let [mpart (MimeMultipart. "mixed")]
-    (cond
-      (string? body)
-      (let [bpart (MimeBodyPart.)]
-        (.setContent bpart ^String body (str "text/plain; charset=" charset))
-        (.addBodyPart mpart bpart))
-
-      (vector? body)
-      (let [mmp (MimeMultipart. "alternative")
-            mbp (MimeBodyPart.)]
-        (.addBodyPart mpart mbp)
-        (.setContent mbp mmp)
-        (doseq [item body]
-          (let [mbp (MimeBodyPart.)]
-            (.setContent mbp
-                         ^String (:content item)
-                         ^String (str (:type item "text/plain") "; charset=" charset))
-            (.addBodyPart mmp mbp))))
-
-      (map? body)
-      (let [bpart (MimeBodyPart.)]
-        (.setContent bpart
-                     ^String (:content body)
-                     ^String (str (:type body "text/plain") "; charset=" charset))
-        (.addBodyPart mpart bpart))
-
-      :else
-      (throw (ex-info "Unsupported type" {:body body})))
-    (.setContent mmsg mpart)
-    mmsg))
-
-(defn- opts->props
-  [{:keys [::username ::tls ::host ::port ::timeout ::default-from]
-    :or {timeout 30000}}]
-  (reduce-kv
-   (fn [^Properties props k v]
-     (if (nil? v)
-       props
-       (doto props (.put ^String k  ^String (str v)))))
-   (Properties.)
-   {"mail.user" username
-    "mail.host" host
-    "mail.debug" (contains? cf/flags :smtp-debug)
-    "mail.from" default-from
-    "mail.smtp.auth" (boolean username)
-    "mail.smtp.starttls.enable" tls
-    "mail.smtp.starttls.required" tls
-    "mail.smtp.host" host
-    "mail.smtp.port" port
-    "mail.smtp.user" username
-    "mail.smtp.timeout" timeout
-    "mail.smtp.connectiontimeout" timeout}))
-
-(defn- create-smtp-session
-  ^Session
-  [cfg]
-  (let [props (opts->props cfg)]
-    (Session/getInstance props)))
-
-(defn- create-smtp-message
-  ^MimeMessage
-  [cfg session params]
-  (let [mmsg (MimeMessage. ^Session session)]
-    (assign-recipients mmsg params)
-    (assign-from mmsg cfg params)
-    (assign-reply-to mmsg cfg params)
-    (assign-subject mmsg params)
-    (assign-extra-headers mmsg params)
-    (assign-body mmsg params)
-    (.saveChanges ^MimeMessage mmsg)
-    mmsg))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; TEMPLATE EMAIL IMPL
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:private email-path "app/email/%(id)s/%(lang)s.%(type)s")
-
-(defn- render-email-template-part
-  [type id context]
-  (let [lang (:lang context :en)
-        path (str/format email-path {:id (name id)
-                                     :lang (name lang)
-                                     :type (name type)})]
-    (some-> (io/resource path)
-            (tmpl/render context))))
-
-(defn- build-email-template
-  [id context]
-  (let [subj (render-email-template-part :subj id context)
-        text (render-email-template-part :txt id context)
-        html (render-email-template-part :html id context)]
-    (when (or (not subj)
-              (and (not text)
-                   (not html)))
-      (ex/raise :type :internal
-                :code :missing-email-templates))
-    {:subject subj
-     :body (into
-            [{:type "text/plain"
-              :content text}]
-            (when html
-              [{:type "text/html"
-                :content html}]))}))
-
-(s/def ::priority #{:high :low})
-(s/def ::to (s/or :single ::us/email
-                  :multi (s/coll-of ::us/email)))
-(s/def ::from ::us/email)
-(s/def ::reply-to ::us/email)
-(s/def ::lang string?)
-(s/def ::extra-data ::us/string)
-
-(s/def ::context
-  (s/keys :req-un [::to]
-          :opt-un [::reply-to ::from ::lang ::priority ::extra-data]))
-
-(defn template-factory
-  ([id] (template-factory id {}))
-  ([id extra-context]
-   (s/assert keyword? id)
-   (fn [context]
-     (us/verify ::context context)
-     (when-let [spec (s/get-spec id)]
-       (s/assert spec context))
-
-     (let [context (merge (if (fn? extra-context)
-                            (extra-context)
-                            extra-context)
-                          context)
-           email   (build-email-template id context)]
-       (when-not email
-         (ex/raise :type :internal
-                   :code :email-template-does-not-exists
-                   :hint "seems like the template is wrong or does not exists."
-                   :context {:id id}))
-       (cond-> (assoc email :id (name id))
-         (:extra-data context)
-         (assoc :extra-data (:extra-data context))
-
-         (:from context)
-         (assoc :from (:from context))
-
-         (:reply-to context)
-         (assoc :reply-to (:reply-to context))
-
-         (:to context)
-         (assoc :to (:to context)))))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; PUBLIC HIGH-LEVEL API
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn render
-  [email-factory context]
-  (email-factory context))
-
-(defn send!
-  "Schedule an already defined email to be sent using asynchronously
-  using worker task."
-  [{:keys [::conn ::factory] :as context}]
-  (us/verify some? conn)
-  (let [email (if factory
-                (factory context)
-                (dissoc context ::conn))]
-    (wrk/submit! {::wrk/task :sendmail
-                  ::wrk/delay 0
-                  ::wrk/max-retries 4
-                  ::wrk/priority 200
-                  ::db/conn conn
-                  ::wrk/params email})))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; SENDMAIL FN / TASK HANDLER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(s/def ::username ::cf/smtp-username)
-(s/def ::password ::cf/smtp-password)
-(s/def ::tls ::cf/smtp-tls)
-(s/def ::ssl ::cf/smtp-ssl)
-(s/def ::host ::cf/smtp-host)
-(s/def ::port ::cf/smtp-port)
-(s/def ::default-reply-to ::cf/smtp-default-reply-to)
-(s/def ::default-from ::cf/smtp-default-from)
-
-(s/def ::smtp-config
-  (s/keys :opt [::username
-                ::password
-                ::tls
-                ::ssl
-                ::host
-                ::port
-                ::default-from
-                ::default-reply-to]))
-
-(declare send-to-logger!)
-
-(s/def ::sendmail fn?)
-
-(defmethod ig/pre-init-spec ::sendmail [_]
-  (s/spec ::smtp-config))
-
-(defmethod ig/init-key ::sendmail
-  [_ cfg]
-  (fn [params]
-    (when (contains? cf/flags :smtp)
-      (let [session (create-smtp-session cfg)]
-        (with-open [transport (.getTransport session (if (::ssl cfg) "smtps" "smtp"))]
-          (.connect ^Transport transport
-                    ^String (::username cfg)
-                    ^String (::password cfg))
-
-          (let [^MimeMessage message (create-smtp-message cfg session params)]
-            (l/dbg :hint "sendmail"
-                   :id (:id params)
-                   :to (:to params)
-                   :subject (str/trim (:subject params))
-                   :body (str/join "," (map :type (:body params))))
-
-            (.sendMessage ^Transport transport
-                          ^MimeMessage message
-                          (.getAllRecipients message))))))
-
-    (when (or (contains? cf/flags :log-emails)
-              (not (contains? cf/flags :smtp)))
-      (send-to-logger! cfg params))))
-
-(defmethod ig/pre-init-spec ::handler [_]
-  (s/keys :req [::sendmail ::mtx/metrics]))
-
-(defmethod ig/init-key ::handler
-  [_ {:keys [::sendmail]}]
-  (fn [{:keys [props] :as task}]
-    (sendmail props)))
-
-(defn- send-to-logger!
-  [_ email]
-  (let [body (:body email)
-        out  (with-out-str
-               (println "email console dump:")
-               (println "******** start email" (:id email) "**********")
-               (pp/pprint (dissoc email :body))
-               (if (string? body)
-                 (println body)
-                 (println (->> body
-                               (filter #(= "text/plain" (:type %)))
-                               (map :content)
-                               first)))
-               (println "******** end email" (:id email) "**********"))]
-    (l/raw! :info out)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; EMAIL FACTORIES
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(s/def ::subject ::us/string)
-(s/def ::content ::us/string)
-
-(s/def ::feedback
-  (s/keys :req-un [::subject ::content]))
-
-(def feedback
-  "A profile feedback email."
-  (template-factory ::feedback))
-
-(s/def ::name ::us/string)
-(s/def ::register
-  (s/keys :req-un [::name]))
-
-(def register
-  "A new profile registration welcome email."
-  (template-factory ::register))
-
-(s/def ::token ::us/string)
-(s/def ::password-recovery
-  (s/keys :req-un [::name ::token]))
-
-(def password-recovery
-  "A password recovery notification email."
-  (template-factory ::password-recovery))
-
-(s/def ::pending-email ::us/email)
-(s/def ::change-email
-  (s/keys :req-un [::name ::pending-email ::token]))
-
-(def change-email
-  "Password change confirmation email"
-  (template-factory ::change-email))
-
-(s/def ::email.invite-to-team/invited-by ::us/string)
-(s/def ::email.invite-to-team/team ::us/string)
-(s/def ::email.invite-to-team/token ::us/string)
-
-(s/def ::invite-to-team
-  (s/keys :req-un [::email.invite-to-team/invited-by
-                   ::email.invite-to-team/token
-                   ::email.invite-to-team/team]))
-
-(def invite-to-team
-  "Teams member invitation email."
-  (template-factory ::invite-to-team))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; BOUNCE/COMPLAINS HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def sql:profile-complaint-report
-  "select (select count(*)
-             from profile_complaint_report
-            where type = 'complaint'
-              and profile_id = ?
-              and created_at > now() - ?::interval) as complaints,
-          (select count(*)
-             from profile_complaint_report
-            where type = 'bounce'
-              and profile_id = ?
-              and created_at > now() - ?::interval) as bounces;")
-
-(defn allow-send-emails?
-  [conn profile]
-  (when-not (:is-muted profile false)
-    (let [complaint-threshold (cf/get :profile-complaint-threshold)
-          complaint-max-age   (cf/get :profile-complaint-max-age)
-          bounce-threshold    (cf/get :profile-bounce-threshold)
-          bounce-max-age      (cf/get :profile-bounce-max-age)
-
-          {:keys [complaints bounces] :as result}
-          (db/exec-one! conn [sql:profile-complaint-report
-                              (:id profile)
-                              (db/interval complaint-max-age)
-                              (:id profile)
-                              (db/interval bounce-max-age)])]
-
-      (and (< (or complaints 0) complaint-threshold)
-           (< (or bounces 0) bounce-threshold)))))
-
-(defn has-complaint-reports?
-  ([conn email] (has-complaint-reports? conn email nil))
-  ([conn email {:keys [threshold] :or {threshold 1}}]
-   (let [reports (db/exec! conn (sql/select :global-complaint-report
-                                            {:email email :type "complaint"}
-                                            {:limit 10}))]
-     (>= (count reports) threshold))))
-
-(defn has-bounce-reports?
-  ([conn email] (has-bounce-reports? conn email nil))
-  ([conn email {:keys [threshold] :or {threshold 1}}]
-   (let [reports (db/exec! conn (sql/select :global-complaint-report
-                                            {:email email :type "bounce"}
-                                            {:limit 10}))]
-     (>= (count reports) threshold))))

backend/src/app/email/blacklist.clj

@@ -1,47 +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.email.blacklist
-  "Email blacklist provider"
-  (:refer-clojure :exclude [contains?])
-  (:require
-   [app.common.logging :as l]
-   [app.config :as cf]
-   [app.email :as-alias email]
-   [clojure.core :as c]
-   [clojure.java.io :as io]
-   [cuerdas.core :as str]
-   [integrant.core :as ig]))
-
-(defmethod ig/init-key ::email/blacklist
-  [_ _]
-  (when (c/contains? cf/flags :email-blacklist)
-    (try
-      (let [path   (cf/get :email-domain-blacklist)
-            result (with-open [reader (io/reader path)]
-                     (reduce (fn [result line]
-                               (if (str/starts-with? line "#")
-                                 result
-                                 (conj result (-> line str/trim str/lower))))
-                             #{}
-                             (line-seq reader)))]
-        (l/inf :hint "initializing email blacklist" :domains (count result))
-        (not-empty result))
-
-      (catch Throwable cause
-        (l/wrn :hint "unexpected exception on initializing email blacklist"
-               :cause cause)))))
-
-(defn contains?
-  "Check if email is in the blacklist."
-  [{:keys [::email/blacklist]} email]
-  (let [[_ domain] (str/split email "@" 2)]
-    (c/contains? blacklist (str/lower domain))))
-
-(defn enabled?
-  "Check if the blacklist is enabled"
-  [{:keys [::email/blacklist]}]
-  (some? blacklist))

backend/src/app/email/whitelist.clj

@@ -1,59 +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.email.whitelist
-  "Email whitelist provider"
-  (:refer-clojure :exclude [contains?])
-  (:require
-   [app.common.logging :as l]
-   [app.config :as cf]
-   [app.email :as-alias email]
-   [clojure.core :as c]
-   [clojure.java.io :as io]
-   [cuerdas.core :as str]
-   [datoteka.fs :as fs]
-   [integrant.core :as ig]))
-
-(defn- read-whitelist
-  [path]
-  (when (and path (fs/exists? path))
-    (try
-      (with-open [reader (io/reader path)]
-        (reduce (fn [result line]
-                  (if (str/starts-with? line "#")
-                    result
-                    (conj result (-> line str/trim str/lower))))
-                #{}
-                (line-seq reader)))
-
-      (catch Throwable cause
-        (l/wrn :hint "unexpected exception on reading email whitelist"
-               :cause cause)))))
-
-(defmethod ig/init-key ::email/whitelist
-  [_ _]
-  (let [whitelist (or (cf/get :registration-domain-whitelist) #{})
-        whitelist (if (c/contains? cf/flags :email-whitelist)
-                    (into whitelist (read-whitelist (cf/get :email-domain-whitelist)))
-                    whitelist)
-        whitelist (not-empty whitelist)]
-
-
-    (when whitelist
-      (l/inf :hint "initializing email whitelist" :domains (count whitelist)))
-
-    whitelist))
-
-(defn contains?
-  "Check if email is in the whitelist."
-  [{:keys [::email/whitelist]} email]
-  (let [[_ domain] (str/split email "@" 2)]
-    (c/contains? whitelist (str/lower domain))))
-
-(defn enabled?
-  "Check if the whitelist is enabled"
-  [{:keys [::email/whitelist]}]
-  (some? whitelist))

backend/src/app/emails.clj

@@ -0,0 +1,183 @@
+;; 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) UXBOX Labs SL
+
+(ns app.emails
+  "Main api for send emails."
+  (:require
+   [app.common.logging :as l]
+   [app.common.spec :as us]
+   [app.config :as cf]
+   [app.db :as db]
+   [app.db.sql :as sql]
+   [app.util.emails :as emails]
+   [app.worker :as wrk]
+   [clojure.spec.alpha :as s]
+   [integrant.core :as ig]))
+
+;; --- PUBLIC API
+
+(defn render
+  [email-factory context]
+  (email-factory context))
+
+(defn send!
+  "Schedule the email for sending."
+  [{:keys [::conn ::factory] :as context}]
+  (us/verify fn? factory)
+  (us/verify some? conn)
+  (let [email (factory context)]
+    (wrk/submit! (assoc email
+                        ::wrk/task :sendmail
+                        ::wrk/delay 0
+                        ::wrk/max-retries 1
+                        ::wrk/priority 200
+                        ::wrk/conn conn))))
+
+
+;; --- BOUNCE/COMPLAINS HANDLING
+
+(def sql:profile-complaint-report
+  "select (select count(*)
+             from profile_complaint_report
+            where type = 'complaint'
+              and profile_id = ?
+              and created_at > now() - ?::interval) as complaints,
+          (select count(*)
+             from profile_complaint_report
+            where type = 'bounce'
+              and profile_id = ?
+              and created_at > now() - ?::interval) as bounces;")
+
+(defn allow-send-emails?
+  [conn profile]
+  (when-not (:is-muted profile false)
+    (let [complaint-threshold (cf/get :profile-complaint-threshold)
+          complaint-max-age   (cf/get :profile-complaint-max-age)
+          bounce-threshold    (cf/get :profile-bounce-threshold)
+          bounce-max-age      (cf/get :profile-bounce-max-age)
+
+          {:keys [complaints bounces] :as result}
+          (db/exec-one! conn [sql:profile-complaint-report
+                              (:id profile)
+                              (db/interval complaint-max-age)
+                              (:id profile)
+                              (db/interval bounce-max-age)])]
+
+      (and (< (or complaints 0) complaint-threshold)
+           (< (or bounces 0) bounce-threshold)))))
+
+(defn has-complaint-reports?
+  ([conn email] (has-complaint-reports? conn email nil))
+  ([conn email {:keys [threshold] :or {threshold 1}}]
+   (let [reports (db/exec! conn (sql/select :global-complaint-report
+                                            {:email email :type "complaint"}
+                                            {:limit 10}))]
+     (>= (count reports) threshold))))
+
+(defn has-bounce-reports?
+  ([conn email] (has-bounce-reports? conn email nil))
+  ([conn email {:keys [threshold] :or {threshold 1}}]
+   (let [reports (db/exec! conn (sql/select :global-complaint-report
+                                            {:email email :type "bounce"}
+                                            {:limit 10}))]
+     (>= (count reports) threshold))))
+
+
+;; --- EMAIL FACTORIES
+
+(s/def ::subject ::us/string)
+(s/def ::content ::us/string)
+
+(s/def ::feedback
+  (s/keys :req-un [::subject ::content]))
+
+(def feedback
+  "A profile feedback email."
+  (emails/template-factory ::feedback))
+
+(s/def ::name ::us/string)
+(s/def ::register
+  (s/keys :req-un [::name]))
+
+(def register
+  "A new profile registration welcome email."
+  (emails/template-factory ::register))
+
+(s/def ::token ::us/string)
+(s/def ::password-recovery
+  (s/keys :req-un [::name ::token]))
+
+(def password-recovery
+  "A password recovery notification email."
+  (emails/template-factory ::password-recovery))
+
+(s/def ::pending-email ::us/email)
+(s/def ::change-email
+  (s/keys :req-un [::name ::pending-email ::token]))
+
+(def change-email
+  "Password change confirmation email"
+  (emails/template-factory ::change-email))
+
+(s/def :internal.emails.invite-to-team/invited-by ::us/string)
+(s/def :internal.emails.invite-to-team/team ::us/string)
+(s/def :internal.emails.invite-to-team/token ::us/string)
+
+(s/def ::invite-to-team
+  (s/keys :req-un [:internal.emails.invite-to-team/invited-by
+                   :internal.emails.invite-to-team/token
+                   :internal.emails.invite-to-team/team]))
+
+(def invite-to-team
+  "Teams member invitation email."
+  (emails/template-factory ::invite-to-team))
+
+
+;; --- SENDMAIL TASK
+
+(declare send-console!)
+
+(s/def ::username ::cf/smtp-username)
+(s/def ::password ::cf/smtp-password)
+(s/def ::tls ::cf/smtp-tls)
+(s/def ::ssl ::cf/smtp-ssl)
+(s/def ::host ::cf/smtp-host)
+(s/def ::port ::cf/smtp-port)
+(s/def ::default-reply-to ::cf/smtp-default-reply-to)
+(s/def ::default-from ::cf/smtp-default-from)
+
+(defmethod ig/pre-init-spec ::sendmail-handler [_]
+  (s/keys :opt-un [::username
+                   ::password
+                   ::tls
+                   ::ssl
+                   ::host
+                   ::port
+                   ::default-from
+                   ::default-reply-to]))
+
+(defmethod ig/init-key ::sendmail-handler
+  [_ cfg]
+  (fn [{:keys [props] :as task}]
+    (let [enabled? (or (contains? cf/flags :smtp)
+                       (cf/get :smtp-enabled)
+                       (:enabled task))]
+      (if enabled?
+        (emails/send! cfg props)
+        (send-console! cfg props)))))
+
+(defn- send-console!
+  [cfg email]
+  (let [baos (java.io.ByteArrayOutputStream.)
+        mesg (emails/smtp-message cfg email)]
+    (.writeTo mesg baos)
+    (let [out (with-out-str
+                (println "email console dump:")
+                (println "******** start email" (:id email) "**********")
+                (println (.toString baos))
+                (println "******** end email "(:id email) "**********"))]
+      (l/info :email out))))
+

backend/src/app/features/fdata.clj

@@ -1,122 +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.features.fdata
-  "A `fdata/*` related feature migration helpers"
-  (:require
-   [app.common.data :as d]
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.db :as db]
-   [app.db.sql :as-alias sql]
-   [app.util.blob :as blob]
-   [app.util.objects-map :as omap]
-   [app.util.pointer-map :as pmap]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; OBJECTS-MAP
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn enable-objects-map
-  [file]
-  (let [update-page
-        (fn [page]
-          (if (and (pmap/pointer-map? page)
-                   (not (pmap/loaded? page)))
-            page
-            (update page :objects omap/wrap)))
-
-        update-data
-        (fn [fdata]
-          (update fdata :pages-index d/update-vals update-page))]
-
-    (-> file
-        (update :data update-data)
-        (update :features conj "fdata/objects-map"))))
-
-(defn process-objects
-  "Apply a function to all objects-map on the file. Usualy used for convert
-  the objects-map instances to plain maps"
-  [fdata update-fn]
-  (if (contains? fdata :pages-index)
-    (update fdata :pages-index d/update-vals
-            (fn [page]
-              (update page :objects
-                      (fn [objects]
-                        (if (omap/objects-map? objects)
-                          (update-fn objects)
-                          objects)))))
-    fdata))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; POINTER-MAP
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn load-pointer
-  "A database loader pointer helper"
-  [system file-id id]
-  (let [{:keys [content]} (db/get system :file-data-fragment
-                                  {:id id :file-id file-id}
-                                  {::sql/columns [:content]
-                                   ::db/check-deleted false})]
-
-    (l/trc :hint "load pointer"
-           :file-id (str file-id)
-           :id (str id)
-           :found (some? content))
-
-    (when-not content
-      (ex/raise :type :internal
-                :code :fragment-not-found
-                :hint "fragment not found"
-                :file-id file-id
-                :fragment-id id))
-
-    (blob/decode content)))
-
-(defn persist-pointers!
-  "Given a database connection and the final file-id, persist all
-  pointers to the underlying storage (the database)."
-  [system file-id]
-  (let [conn (db/get-connection system)]
-    (doseq [[id item] @pmap/*tracked*]
-      (when (pmap/modified? item)
-        (l/trc :hint "persist pointer" :file-id (str file-id) :id (str id))
-        (let [content (-> item deref blob/encode)]
-          (db/insert! conn :file-data-fragment
-                      {:id id
-                       :file-id file-id
-                       :content content}))))))
-
-(defn process-pointers
-  "Apply a function to all pointers on the file. Usuly used for
-  dereference the pointer to a plain value before some processing."
-  [fdata update-fn]
-  (let [update-fn' (fn [val]
-                     (if (pmap/pointer-map? val)
-                       (update-fn val)
-                       val))]
-    (-> fdata
-        (d/update-vals update-fn')
-        (update :pages-index d/update-vals update-fn'))))
-
-(defn get-used-pointer-ids
-  "Given a file, return all pointer ids used in the data."
-  [fdata]
-  (->> (concat (vals fdata)
-               (vals (:pages-index fdata)))
-       (into #{} (comp (filter pmap/pointer-map?)
-                       (map pmap/get-id)))))
-
-(defn enable-pointer-map
-  "Enable the fdata/pointer-map feature on the file."
-  [file]
-  (-> file
-      (update :data (fn [fdata]
-                      (-> fdata
-                          (update :pages-index d/update-vals pmap/wrap)
-                          (d/update-when :components pmap/wrap))))
-      (update :features conj "fdata/pointer-map")))

backend/src/app/http.clj

@@ -2,170 +2,160 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL
 
 (ns app.http
   (:require
-   [app.auth.oidc :as-alias oidc]
    [app.common.data :as d]
+   [app.common.exceptions :as ex]
    [app.common.logging :as l]
-   [app.common.transit :as t]
-   [app.db :as-alias db]
-   [app.http.access-token :as actoken]
-   [app.http.assets :as-alias assets]
-   [app.http.awsns :as-alias awsns]
-   [app.http.debug :as-alias debug]
+   [app.common.spec :as us]
+   [app.http.doc :as doc]
    [app.http.errors :as errors]
-   [app.http.middleware :as mw]
-   [app.http.session :as session]
-   [app.http.websocket :as-alias ws]
-   [app.main :as-alias main]
+   [app.http.middleware :as middleware]
    [app.metrics :as mtx]
-   [app.rpc :as-alias rpc]
-   [app.rpc.doc :as-alias rpc.doc]
-   [app.setup :as-alias setup]
    [clojure.spec.alpha :as s]
    [integrant.core :as ig]
-   [promesa.exec :as px]
-   [reitit.core :as r]
-   [reitit.middleware :as rr]
-   [ring.request :as rreq]
-   [ring.response :as-alias rres]
-   [yetti.adapter :as yt]))
+   [reitit.ring :as rr]
+   [yetti.adapter :as yt])
+  (:import
+   org.eclipse.jetty.server.Server
+   org.eclipse.jetty.server.handler.StatisticsHandler))
 
-(declare router-handler)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HTTP SERVER
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(declare wrap-router)
 
 (s/def ::handler fn?)
 (s/def ::router some?)
-(s/def ::port integer?)
-(s/def ::host string?)
-(s/def ::name string?)
+(s/def ::port ::us/integer)
+(s/def ::host ::us/string)
+(s/def ::name ::us/string)
 
-(s/def ::max-body-size integer?)
-(s/def ::max-multipart-body-size integer?)
-(s/def ::io-threads integer?)
+(defmethod ig/pre-init-spec ::server [_]
+  (s/keys :req-un [::port]
+          :opt-un [::name ::mtx/metrics ::router ::handler ::host]))
 
 (defmethod ig/prep-key ::server
   [_ cfg]
-  (merge {::port 6060
-          ::host "0.0.0.0"
-          ::max-body-size (* 1024 1024 30)             ; default 30 MiB
-          ::max-multipart-body-size (* 1024 1024 120)} ; default 120 MiB
-         (d/without-nils cfg)))
+  (merge {:name "http"} (d/without-nils cfg)))
 
-(defmethod ig/pre-init-spec ::server [_]
-  (s/keys :req [::port ::host]
-          :opt [::max-body-size
-                ::max-multipart-body-size
-                ::router
-                ::handler
-                ::io-threads]))
+(defn- instrument-metrics
+  [^Server server metrics]
+  (let [stats (doto (StatisticsHandler.)
+                (.setHandler (.getHandler server)))]
+    (.setHandler server stats)
+    (mtx/instrument-jetty! (:registry metrics) stats)
+    server))
 
 (defmethod ig/init-key ::server
-  [_ {:keys [::handler ::router ::host ::port] :as cfg}]
-  (l/info :hint "starting http server" :port port :host host)
-  (let [options {:http/port port
-                 :http/host host
-                 :http/max-body-size (::max-body-size cfg)
-                 :http/max-multipart-body-size (::max-multipart-body-size cfg)
-                 :xnio/io-threads (or (::io-threads cfg)
-                                      (max 3 (px/get-available-processors)))
-                 :xnio/dispatch :virtual
-                 :ring/compat :ring2
-                 :socket/backlog 4069}
-
+  [_ {:keys [handler router port name metrics host] :as opts}]
+  (l/info :msg "starting http server" :port port :host host :name name)
+  (let [options {:http/port port :http/host host}
         handler (cond
-                  (some? router)
-                  (router-handler router)
-
-                  (some? handler)
-                  handler
-
-                  :else
-                  (throw (UnsupportedOperationException. "handler or router are required")))
-
-        options (d/without-nils options)
-        server  (yt/server handler options)]
-
-    (assoc cfg ::server (yt/start! server))))
+                  (fn? handler)  handler
+                  (some? router) (wrap-router router)
+                  :else (ex/raise :type :internal
+                                  :code :invalid-argument
+                                  :hint "Missing `handler` or `router` option."))
+        server  (-> (yt/server handler options)
+                    (cond-> metrics (instrument-metrics metrics)))]
+    (assoc opts :server (yt/start! server))))
 
 (defmethod ig/halt-key! ::server
-  [_ {:keys [::server ::port] :as cfg}]
-  (l/info :msg "stopping http server" :port port)
+  [_ {:keys [server name port] :as opts}]
+  (l/info :msg "stoping http server" :name name :port port)
   (yt/stop! server))
 
-(defn- not-found-handler
-  [_]
-  {::rres/status 404})
-
-(defn- router-handler
+(defn- wrap-router
   [router]
-  (letfn [(resolve-handler [request]
-            (if-let [match (r/match-by-path router (rreq/path request))]
-              (let [params  (:path-params match)
-                    result  (:result match)
-                    handler (or (:handler result) not-found-handler)
-                    request (assoc request :path-params params)]
-                (partial handler request))
-              (partial not-found-handler request)))
-
-          (on-error [cause request]
-            (let [{:keys [::rres/body] :as response} (errors/handle cause request)]
-              (cond-> response
-                (map? body)
-                (-> (update ::rres/headers assoc "content-type" "application/transit+json")
-                    (assoc ::rres/body (t/encode-str body {:type :json-verbose}))))))]
-
+  (let [default (rr/routes
+                 (rr/create-resource-handler {:path "/"})
+                 (rr/create-default-handler))
+        options {:middleware [middleware/server-timing]}
+        handler (rr/ring-handler router default options)]
     (fn [request]
-      (let [handler (resolve-handler request)]
-        (try
-          (handler)
-          (catch Throwable cause
-            (on-error cause request)))))))
+      (try
+        (handler request)
+        (catch Throwable e
+          (l/with-context (errors/get-error-context request e)
+            (l/error :hint (ex-message e) :cause e)
+            {:status 500 :body "internal server error"}))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HTTP ROUTER
+;; Http Router
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(s/def ::rpc map?)
+(s/def ::session map?)
+(s/def ::oauth map?)
+(s/def ::storage map?)
+(s/def ::assets map?)
+(s/def ::feedback fn?)
+(s/def ::ws fn?)
+(s/def ::audit-http-handler fn?)
+(s/def ::debug map?)
+
 (defmethod ig/pre-init-spec ::router [_]
-  (s/keys :req [::session/manager
-                ::ws/routes
-                ::rpc/routes
-                ::rpc.doc/routes
-                ::oidc/routes
-                ::setup/props
-                ::assets/routes
-                ::debug/routes
-                ::db/pool
-                ::mtx/routes
-                ::awsns/routes]))
+  (s/keys :req-un [::rpc ::session ::mtx/metrics ::ws
+                   ::oauth ::storage ::assets ::feedback
+                   ::debug ::audit-http-handler]))
 
 (defmethod ig/init-key ::router
-  [_ cfg]
+  [_ {:keys [ws session rpc oauth metrics assets feedback debug] :as cfg}]
   (rr/router
-   [["" {:middleware [[mw/server-timing]
-                      [mw/params]
-                      [mw/format-response]
-                      [mw/errors errors/handle]
-                      [mw/parse-request]
-                      [session/soft-auth cfg]
-                      [actoken/soft-auth cfg]
-                      [mw/restrict-methods]]}
+   [["/metrics" {:get (:handler metrics)}]
+    ["/assets" {:middleware [[middleware/format-response-body]
+                             [middleware/errors errors/handle]
+                             [middleware/cookies]
+                             (:middleware session)]}
+     ["/by-id/:id" {:get (:objects-handler assets)}]
+     ["/by-file-media-id/:id" {:get (:file-objects-handler assets)}]
+     ["/by-file-media-id/:id/thumbnail" {:get (:file-thumbnails-handler assets)}]]
 
-     (::mtx/routes cfg)
-     (::assets/routes cfg)
-     (::debug/routes cfg)
+    ["/dbg" {:middleware [[middleware/params]
+                          [middleware/keyword-params]
+                          [middleware/format-response-body]
+                          [middleware/errors errors/handle]
+                          [middleware/cookies]
+                          [(:middleware session)]]}
+     ["/error-by-id/:id" {:get (:retrieve-error debug)}]
+     ["/error/:id" {:get (:retrieve-error debug)}]
+     ["/error" {:get (:retrieve-error-list debug)}]
+     ["/file/data/:id" {:get (:retrieve-file-data debug)}]
+     ["/file/changes/:id" {:get (:retrieve-file-changes debug)}]]
 
-     ["/webhooks"
-      (::awsns/routes cfg)]
+    ["/webhooks"
+     ["/sns" {:post (:sns-webhook cfg)}]]
 
-     (::ws/routes cfg)
+    ["/ws/notifications"
+     {:middleware [[middleware/params]
+                   [middleware/keyword-params]
+                   [middleware/format-response-body]
+                   [middleware/errors errors/handle]
+                   [middleware/cookies]
+                   [(:middleware session)]]
+      :get ws}]
 
-     ["/api" {:middleware [[mw/cors]]}
-      (::oidc/routes cfg)
-      (::rpc.doc/routes cfg)
-      (::rpc/routes cfg)]]]))
+    ["/api" {:middleware [[middleware/cors]
+                          [middleware/etag]
+                          [middleware/params]
+                          [middleware/multipart-params]
+                          [middleware/keyword-params]
+                          [middleware/format-response-body]
+                          [middleware/parse-request-body]
+                          [middleware/errors errors/handle]
+                          [middleware/cookies]]}
+
+     ["/_doc" {:get (doc/handler rpc)}]
+
+     ["/feedback" {:middleware [(:middleware session)]
+                   :post feedback}]
+     ["/auth/oauth/:provider" {:post (:handler oauth)}]
+     ["/auth/oauth/:provider/callback" {:get (:callback-handler oauth)}]
+
+     ["/audit/events" {:middleware [(:middleware session)]
+                       :post (:audit-http-handler cfg)}]
+
+     ["/rpc" {:middleware [(:middleware session)]}
+      ["/query/:type" {:get (:query-handler rpc)
+                       :post (:query-handler rpc)}]
+      ["/mutation/:type" {:post (:mutation-handler rpc)}]]]]))

backend/src/app/http/access_token.clj

@@ -1,84 +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.http.access-token
-  (:require
-   [app.common.logging :as l]
-   [app.config :as cf]
-   [app.db :as db]
-   [app.main :as-alias main]
-   [app.setup :as-alias setup]
-   [app.tokens :as tokens]
-   [ring.request :as rreq]))
-
-(def header-re #"^Token\s+(.*)")
-
-(defn- get-token
-  [request]
-  (some->> (rreq/get-header request "authorization")
-           (re-matches header-re)
-           (second)))
-
-(defn- decode-token
-  [props token]
-  (when token
-    (tokens/verify props {:token token :iss "access-token"})))
-
-(def sql:get-token-data
-  "SELECT perms, profile_id, expires_at
-     FROM access_token
-    WHERE id = ?
-      AND (expires_at IS NULL
-           OR (expires_at > now()));")
-
-(defn- get-token-data
-  [pool token-id]
-  (when-not (db/read-only? pool)
-    (some-> (db/exec-one! pool [sql:get-token-data token-id])
-            (update :perms db/decode-pgarray #{}))))
-
-(defn- wrap-soft-auth
-  "Soft Authentication, will be executed synchronously on the undertow
-  worker thread."
-  [handler {:keys [::setup/props]}]
-  (letfn [(handle-request [request]
-            (try
-              (let [token  (get-token request)
-                    claims (decode-token props token)]
-                (cond-> request
-                  (map? claims)
-                  (assoc ::id (:tid claims))))
-              (catch Throwable cause
-                (l/trace :hint "exception on decoding malformed token" :cause cause)
-                request)))]
-
-    (fn [request]
-      (handler (handle-request request)))))
-
-(defn- wrap-authz
-  "Authorization middleware, will be executed synchronously on vthread."
-  [handler {:keys [::db/pool]}]
-  (fn [request]
-    (let [{:keys [perms profile-id expires-at]} (some->> (::id request) (get-token-data pool))]
-      (handler (cond-> request
-                 (some? perms)
-                 (assoc ::perms perms)
-                 (some? profile-id)
-                 (assoc ::profile-id profile-id)
-                 (some? expires-at)
-                 (assoc ::expires-at expires-at))))))
-
-(def soft-auth
-  {:name ::soft-auth
-   :compile (fn [& _]
-              (when (contains? cf/flags :access-tokens)
-                wrap-soft-auth))})
-
-(def authz
-  {:name ::authz
-   :compile (fn [& _]
-              (when (contains? cf/flags :access-tokens)
-                wrap-authz))})

backend/src/app/http/assets.clj

@@ -2,21 +2,20 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL
 
 (ns app.http.assets
   "Assets related handlers."
   (:require
-   [app.common.data :as d]
    [app.common.exceptions :as ex]
    [app.common.spec :as us]
    [app.common.uri :as u]
    [app.db :as db]
+   [app.metrics :as mtx]
    [app.storage :as sto]
    [app.util.time :as dt]
    [clojure.spec.alpha :as s]
-   [integrant.core :as ig]
-   [ring.response :as-alias rres]))
+   [integrant.core :as ig]))
 
 (def ^:private cache-max-age
   (dt/duration {:hours 24}))
@@ -24,87 +23,88 @@
 (def ^:private signature-max-age
   (dt/duration {:hours 24 :minutes 15}))
 
-(defn get-id
-  [{:keys [path-params]}]
-  (or (some-> path-params :id d/parse-uuid)
+(defn coerce-id
+  [id]
+  (let [res (us/uuid-conformer id)]
+    (when-not (uuid? res)
       (ex/raise :type :not-found
-                :hunt "object not found")))
+                :hint "object not found"))
+    res))
 
 (defn- get-file-media-object
-  [pool id]
-  (db/get pool :file-media-object {:id id}))
-
-(defn- serve-object-from-s3
-  [{:keys [::sto/storage] :as cfg} obj]
-  (let [{:keys [host port] :as url} (sto/get-object-url storage obj {:max-age signature-max-age})]
-    {::rres/status  307
-     ::rres/headers {"location" (str url)
-                     "x-host"   (cond-> host port (str ":" port))
-                     "x-mtype"  (-> obj meta :content-type)
-                     "cache-control" (str "max-age=" (inst-ms cache-max-age))}}))
-
-(defn- serve-object-from-fs
-  [{: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 cache-max-age))}]
-    {::rres/status 204
-     ::rres/headers headers}))
+  [{:keys [pool] :as storage} id]
+  (let [id   (coerce-id id)
+        mobj (db/exec-one! pool ["select * from file_media_object where id=?" id])]
+    (when-not mobj
+      (ex/raise :type :not-found
+                :hint "object does not found"))
+      mobj))
 
 (defn- serve-object
-  "Helper function that returns the appropriate response depending on
-  the storage object backend type."
-  [{:keys [::sto/storage] :as cfg} {:keys [backend] :as obj}]
-  (let [backend (sto/resolve-backend storage backend)]
-    (case (::sto/type backend)
-      :s3 (serve-object-from-s3 cfg obj)
-      :fs (serve-object-from-fs cfg obj))))
+  [{:keys [storage] :as cfg} obj]
+  (let [mdata   (meta obj)
+        backend (sto/resolve-backend storage (:backend obj))]
+    (case (:type backend)
+      :db
+      {:status 200
+       :headers {"content-type" (:content-type mdata)
+                 "cache-control" (str "max-age=" (inst-ms cache-max-age))}
+       :body (sto/get-object-bytes storage obj)}
 
-(defn objects-handler
-  "Handler that servers storage objects by id."
-  [{:keys [::sto/storage] :as cfg} request]
-  (let [id  (get-id request)
-        obj (sto/get-object storage id)]
-    (if obj
-      (serve-object cfg obj)
-      {::rres/status 404})))
+      :s3
+      (let [url (sto/get-object-url storage obj {:max-age signature-max-age})]
+        {:status 307
+         :headers {"location" (str url)
+                   "x-host"   (:host url)
+                   "cache-control" (str "max-age=" (inst-ms cache-max-age))}
+         :body ""})
+
+      :fs
+      (let [purl (u/uri (:assets-path cfg))
+            purl (u/join purl (sto/object->relative-path obj))]
+        {:status 204
+         :headers {"x-accel-redirect" (:path purl)
+                   "content-type" (:content-type mdata)
+                   "cache-control" (str "max-age=" (inst-ms cache-max-age))}
+         :body ""}))))
 
 (defn- generic-handler
-  "A generic handler helper/common code for file-media based handlers."
-  [{:keys [::sto/storage] :as cfg} request kf]
-  (let [pool (::db/pool storage)
-        id   (get-id request)
-        mobj (get-file-media-object pool id)
-        sobj (sto/get-object storage (kf mobj))]
-    (if sobj
-      (serve-object cfg sobj)
-      {::rres/status 404})))
+  [{:keys [storage] :as cfg} _request id]
+  (let [obj (sto/get-object storage id)]
+    (if obj
+      (serve-object cfg obj)
+      {:status 404 :body ""})))
+
+(defn objects-handler
+  [cfg request]
+  (let [id (get-in request [:path-params :id])]
+    (generic-handler cfg request (coerce-id id))))
 
 (defn file-objects-handler
-  "Handler that serves storage objects by file media id."
-  [cfg request]
-  (generic-handler cfg request :media-id))
+  [{:keys [storage] :as cfg} request]
+  (let [id   (get-in request [:path-params :id])
+        mobj (get-file-media-object storage id)]
+    (generic-handler cfg request (:media-id mobj))))
 
 (defn file-thumbnails-handler
-  "Handler that serves storage objects by thumbnail-id and quick
-  fallback to file-media-id if no thumbnail is available."
-  [cfg request]
-  (generic-handler cfg request #(or (:thumbnail-id %) (:media-id %))))
+  [{:keys [storage] :as cfg} request]
+  (let [id   (get-in request [:path-params :id])
+        mobj (get-file-media-object storage id)]
+    (generic-handler cfg request (or (:thumbnail-id mobj) (:media-id mobj)))))
+
 
 ;; --- Initialization
 
-(s/def ::path ::us/string)
-(s/def ::routes vector?)
+(s/def ::storage some?)
+(s/def ::assets-path ::us/string)
+(s/def ::cache-max-age ::dt/duration)
+(s/def ::signature-max-age ::dt/duration)
 
-(defmethod ig/pre-init-spec ::routes [_]
-  (s/keys :req [::sto/storage  ::path]))
+(defmethod ig/pre-init-spec ::handlers [_]
+  (s/keys :req-un [::storage ::mtx/metrics ::assets-path ::cache-max-age ::signature-max-age]))
 
-(defmethod ig/init-key ::routes
+(defmethod ig/init-key ::handlers
   [_ 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)}]])
+  {:objects-handler #(objects-handler cfg %)
+   :file-objects-handler #(file-objects-handler cfg %)
+   :file-thumbnails-handler #(file-thumbnails-handler cfg %)})

backend/src/app/http/awsns.clj

@@ -2,7 +2,7 @@
 ;; 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
+;; Copyright (c) UXBOX Labs SL
 
 (ns app.http.awsns
   "AWS SNS webhook handler for bounces."
@@ -11,49 +11,30 @@
    [app.common.logging :as l]
    [app.db :as db]
    [app.db.sql :as sql]
-   [app.http.client :as http]
-   [app.main :as-alias main]
-   [app.setup :as-alias setup]
-   [app.tokens :as tokens]
-   [app.worker :as-alias wrk]
+   [app.util.http :as http]
    [clojure.spec.alpha :as s]
    [cuerdas.core :as str]
    [integrant.core :as ig]
-   [jsonista.core :as j]
-   [promesa.exec :as px]
-   [ring.request :as rreq]
-   [ring.response :as-alias rres]))
+   [jsonista.core :as j]))
 
 (declare parse-json)
-(declare handle-request)
 (declare parse-notification)
 (declare process-report)
 
-(defmethod ig/pre-init-spec ::routes [_]
-  (s/keys :req [::http/client
-                ::setup/props
-                ::db/pool]))
+(defmethod ig/pre-init-spec ::handler [_]
+  (s/keys :req-un [::db/pool]))
 
-(defmethod ig/init-key ::routes
+(defmethod ig/init-key ::handler
   [_ cfg]
-  (letfn [(handler [request]
-            (let [data (-> request rreq/body slurp)]
-              (px/run! :vthread (partial handle-request cfg data)))
-            {::rres/status 200})]
-    ["/sns" {:handler handler
-             :allowed-methods #{:post}}]))
-
-(defn handle-request
-  [cfg data]
-  (try
-    (let [body  (parse-json data)
+  (fn [request]
+    (let [body  (parse-json (slurp (:body request)))
           mtype (get body "Type")]
       (cond
         (= mtype "SubscriptionConfirmation")
         (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/send! {:uri surl :method :post :timeout 10000}))
 
         (= mtype "Notification")
         (when-let [message (parse-json (get body "Message"))]
@@ -62,11 +43,8 @@
 
         :else
         (l/warn :hint "unexpected data received"
-                :report (pr-str body))))
-
-    (catch Throwable cause
-      (l/error :hint "unexpected exception on awsns"
-               :cause cause))))
+                :report (pr-str body)))
+      {:status 200 :body ""})))
 
 (defn- parse-bounce
   [data]
@@ -104,10 +82,10 @@
           (get mail "headers")))
 
 (defn- extract-identity
-  [cfg headers]
+  [{:keys [tokens] :as cfg} headers]
   (let [tdata (get headers "x-penpot-data")]
     (when-not (str/empty? tdata)
-      (let [result (tokens/verify (::setup/props cfg) {:token tdata :iss :profile-identity})]
+      (let [result (tokens :verify {:token tdata :iss :profile-identity})]
         (:profile-id result)))))
 
 (defn- parse-notification
@@ -140,7 +118,7 @@
    (j/read-value v)))
 
 (defn- register-bounce-for-profile
-  [{:keys [::db/pool]} {:keys [type kind profile-id] :as report}]
+  [{:keys [pool]} {:keys [type kind profile-id] :as report}]
   (when (= kind "permanent")
     (db/with-atomic [conn pool]
       (db/insert! conn :profile-complaint-report
@@ -169,7 +147,7 @@
                       {:id profile-id}))))))
 
 (defn- register-complaint-for-profile
-  [{:keys [::db/pool]} {:keys [type profile-id] :as report}]
+  [{:keys [pool]} {:keys [type profile-id] :as report}]
   (db/with-atomic [conn pool]
     (db/insert! conn :profile-complaint-report
                 {:profile-id profile-id

backend/src/app/http/client.clj

@@ -1,62 +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.http.client
-  "Http client abstraction layer."
-  (:require
-   [app.common.spec :as us]
-   [clojure.spec.alpha :as s]
-   [integrant.core :as ig]
-   [java-http-clj.core :as http]
-   [promesa.core :as p])
-  (:import
-   java.net.http.HttpClient))
-
-(s/def ::client #(instance? HttpClient %))
-(s/def ::client-holder
-  (s/keys :req [::client]))
-
-(defmethod ig/pre-init-spec ::client [_]
-  (s/keys :req []))
-
-(defmethod ig/init-key ::client
-  [_ _]
-  (http/build-client {:connect-timeout 30000 ;; 10s
-                      :follow-redirects :always}))
-
-(defn send!
-  ([client req] (send! client req {}))
-  ([client req {:keys [response-type sync?] :or {response-type :string sync? false}}]
-   (us/assert! ::client client)
-   (if sync?
-     (http/send req {:client client :as response-type})
-     (try
-       (http/send-async req {:client client :as response-type})
-       (catch Throwable cause
-         (p/rejected cause))))))
-
-(defn- resolve-client
-  [params]
-  (cond
-    (instance? HttpClient params)
-    params
-
-    (map? params)
-    (resolve-client (::client params))
-
-    :else
-    (throw (UnsupportedOperationException. "invalid arguments"))))
-
-(defn req!
-  "A convencience toplevel function for gradual migration to a new API
-  convention."
-  ([cfg-or-client request]
-   (let [client (resolve-client cfg-or-client)]
-     (send! client request {:sync? true})))
-  ([cfg-or-client request options]
-   (let [client (resolve-client cfg-or-client)]
-     (send! client request (merge {:sync? true} options)))))
-