fix font url

adjust retries
2026-08-07 07:14:43 +00:00 · 2024-08-12 13:55:36 +03:00 · 2024-08-12 13:54:13 +03:00
782 changed files with 7329 additions and 108738 deletions
@@ -1,58 +0,0 @@
---
-:position: before
-:position_in_additional_file_patterns: before
-:position_in_class: before
-:position_in_factory: before
-:position_in_fixture: before
-:position_in_routes: before
-:position_in_serializer: before
-:position_in_test: before
-:classified_sort: true
-:exclude_controllers: true
-:exclude_factories: true
-:exclude_fixtures: false
-:exclude_helpers: true
-:exclude_scaffolds: true
-:exclude_serializers: false
-:exclude_sti_subclasses: false
-:exclude_tests: false
-:force: false
-:format_markdown: false
-:format_rdoc: false
-:format_yard: false
-:frozen: false
-:ignore_model_sub_dir: false
-:ignore_unknown_models: false
-:include_version: false
-:show_check_constraints: false
-:show_complete_foreign_keys: false
-:show_foreign_keys: true
-:show_indexes: true
-:simple_indexes: false
-:sort: false
-:timestamp: false
-:trace: false
-:with_comment: true
-:with_column_comments: true
-:with_table_comments: true
-:active_admin: false
-:command:
-:debug: false
-:hide_default_column_types: ''
-:hide_limit_column_types: ''
-:ignore_columns:
-:ignore_routes:
-:models: true
-:routes: false
-:skip_on_db_migrate: false
-:target_action: :do_annotations
-:wrapper:
-:wrapper_close:
-:wrapper_open:
-:classes_default_to_s: []
-:additional_file_patterns: []
-:model_dir:
- app/models
-:require: []
-:root_dir:
- ''
@@ -6,15 +6,14 @@ jobs:
  rubocop:
    name: Rubocop
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
-          ruby-version: 4.0.1
+          ruby-version: 3.3.3
      - name: Cache gems
-        uses: actions/cache@v4
+        uses: actions/cache@v1
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -31,15 +30,14 @@ jobs:
  erblint:
    name: Erblint
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
-          ruby-version: 4.0.1
+          ruby-version: 3.3.3
      - name: Cache gems
-        uses: actions/cache@v4
+        uses: actions/cache@v1
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -51,22 +49,21 @@ jobs:
          bundle config path vendor/bundle
          bundle install --jobs 4 --retry 4
      - name: Run Erblint
-        run: bundle exec erb_lint ./app
+        run: bundle exec erblint ./app

  eslint:
    name: ESLint
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: Install Node.js
        uses: actions/setup-node@v1
        with:
-          node-version: 20.19.0
+          node-version: 20.9.0
      - name: Cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v4
+      - uses: actions/cache@v1
        id: yarn-cache
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -80,38 +77,9 @@ jobs:
        run: |
          ./node_modules/eslint/bin/eslint.js "app/javascript/**/*.js"

-  brakeman:
-    name: Brakeman
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 4.0.1
-      - name: Cache gems
-        uses: actions/cache@v4
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
-      - name: Install gems
-        run: |
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 4
-          yarn install
-          sudo apt-get update
-          sudo apt-get install libvips
-      - name: Run Brakeman
-        run: bundle exec brakeman -q --exit-on-warn
-
  rspec:
    name: RSpec
    runs-on: ubuntu-latest
-    timeout-minutes: 10

    services:
      postgres:
@@ -128,26 +96,24 @@ jobs:
          --health-retries 5

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
-          ruby-version: 4.0.1
+          ruby-version: 3.3.3
      - name: Set up Node
        uses: actions/setup-node@v1
        with:
-          node-version: 20.19.0
+          node-version: 20.9.0
      - name: Install Chrome
        uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: 125
      - name: Cache node_modules
-        uses: actions/cache@v4
+        uses: actions/cache@v1
        with:
          path: node_modules
          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
      - name: Cache gems
-        uses: actions/cache@v4
+        uses: actions/cache@v1
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -162,10 +128,7 @@ jobs:
          bundle install --jobs 4 --retry 4
          yarn install
          sudo apt-get update
-          sudo apt-get install -y libvips
-          wget -O pdfium-linux.tgz "https://github.com/docusealco/pdfium-binaries/releases/latest/download/pdfium-linux-$(uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/').tgz"
-          sudo tar -xzf pdfium-linux.tgz --strip-components=1 -C /usr/lib lib/libpdfium.so
-          rm -f pdfium-linux.tgz
+          sudo apt-get install libvips
      - name: Run
        env:
          RAILS_ENV: test
@@ -7,8 +7,7 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 30
+    runs-on: ubuntu-latest

    steps:
    - name: Checkout code
@@ -16,30 +15,32 @@ jobs:
      with:
        submodules: recursive

-    - name: Docker meta
+    -
+      name: Docker meta
      id: meta
      uses: docker/metadata-action@v4
      with:
-        images: docuseal/docuseal
-        tags: type=semver,pattern={{version}}
-
+        images: |
+          docuseal/docuseal
+        tags: |
+          type=semver,pattern={{version}}
    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v2

    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v2

    - name: Create .version file
      run: echo ${{ github.ref_name }} > .version

    - name: Login to Docker Hub
-      uses: docker/login-action@v3
+      uses: docker/login-action@v2
      with:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Build and push Docker image
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@v4
      with:
        context: .
        push: true
@@ -37,4 +37,3 @@ yarn-debug.log*
 /docuseal
 /ee
 dump.rdb
-*.onnx
@@ -1 +0,0 @@
--require rails_helper
@@ -1,4 +1,4 @@
-plugins:
+require:
  - rubocop-performance
  - rubocop-rails
  - rubocop-rspec
@@ -10,7 +10,7 @@ AllCops:
    - node_modules/**/*
    - bin/*
    - vendor/**/*
-  TargetRubyVersion: '4.0'
+  TargetRubyVersion: '3.3'
  SuggestExtensions: false

 Metrics/BlockLength:
@@ -34,7 +34,6 @@ Metrics/MethodLength:
  Max: 30
  Exclude:
    - 'db/migrate/**'
-    - 'spec/**/*'

 Metrics/CyclomaticComplexity:
  Max: 15
@@ -42,48 +41,28 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
  Max: 15

-Style/MultipleComparison:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Style/MinMaxComparison:
-  Enabled: false
-
-Naming/PredicateMethod:
-  Enabled: false
-
 Layout/LineLength:
  AllowedPatterns: ['\A\s*#']

 Metrics/AbcSize:
  Max: 45
-  Exclude:
-    - spec/**/*

 Metrics/ModuleLength:
-  Max: 1000
+  Max: 500

 Metrics/ClassLength:
-  Max: 1000
+  Max: 500

 RSpec/NestedGroups:
  Max: 6

 RSpec/MultipleExpectations:
-  Max: 25
+  Max: 20

 RSpec/ExampleLength:
-  Max: 500
+  Max: 40

 RSpec/MultipleMemoizedHelpers:
-  Max: 15
-
-RSpec/AnyInstance:
-  Enabled: false
-
-Metrics/BlockNesting:
  Max: 6

 Rails/I18nLocaleTexts:
@@ -100,16 +79,3 @@ Rails/ApplicationController:

 Rails/Output:
  Enabled: false
-
-Rails/StrongParametersExpect:
-  Enabled: false
-
-Rails/RedirectBackOrTo:
-  Enabled: false
-
-Rails/UnknownEnv:
-  Environments:
-    - development
-    - test
-    - production
-    - local
@@ -1,22 +1,12 @@
-FROM ruby:4.0.1-alpine AS download
+FROM ruby:3.3.3-alpine as fonts

 WORKDIR /fonts

-RUN apk --no-cache add fontforge wget && \
-    wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && \
-    wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && \
-    wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && \
-    wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && \
-    wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && \
-    wget https://github.com/impallari/DancingScript/raw/master/OFL.txt && \
-    wget -O /model.onnx "https://github.com/docusealco/fields-detection/releases/download/2.0.0/model_704_int8.onnx" && \
-    wget -O pdfium-linux.tgz "https://github.com/bblanchon/pdfium-binaries/releases/latest/download/pdfium-linux-musl-$(uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/').tgz" && \
-    mkdir -p /pdfium-linux && \
-    tar -xzf pdfium-linux.tgz -C /pdfium-linux
+RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt

 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'

-FROM ruby:4.0.1-alpine AS webpack
+FROM ruby:3.3.3-alpine as webpack

 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -36,24 +26,22 @@ COPY ./config/shakapacker.yml ./config/shakapacker.yml
 COPY ./postcss.config.js ./postcss.config.js
 COPY ./tailwind.config.js ./tailwind.config.js
 COPY ./tailwind.form.config.js ./tailwind.form.config.js
-COPY ./tailwind.dynamic.config.js ./tailwind.dynamic.config.js
 COPY ./tailwind.application.config.js ./tailwind.application.config.js
 COPY ./app/javascript ./app/javascript
 COPY ./app/views ./app/views

 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker

-FROM ruby:4.0.1-alpine AS app
+FROM ruby:3.3.3-alpine as app

 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"
-ENV OPENSSL_CONF=/etc/openssl_legacy.cnf
+ENV LD_PRELOAD=/lib/libgcompat.so.0
+ENV OPENSSL_CONF=/app/openssl_legacy.cnf

 WORKDIR /app

-RUN apk add --no-cache libpq vips redis vips-heif ttf-freefont onnxruntime && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
-
-RUN addgroup -g 2000 docuseal && adduser -u 2000 -G docuseal -s /bin/sh -D -h /home/docuseal docuseal
+RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils redis vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf

 RUN echo $'.include = /etc/ssl/openssl.cnf\n\
 \n\
@@ -65,38 +53,31 @@ legacy = legacy_sect\n\
 activate = 1\n\
 \n\
 [legacy_sect]\n\
-activate = 1' >> /etc/openssl_legacy.cnf
+activate = 1' >> /app/openssl_legacy.cnf

-COPY --chown=docuseal:docuseal ./Gemfile ./Gemfile.lock ./
+COPY ./Gemfile ./Gemfile.lock ./

-RUN apk add --no-cache build-base git libpq-dev yaml-dev && bundle install && apk del --no-cache build-base git libpq-dev yaml-dev && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales,resources/unicode_data/properties}'] + Dir['/usr/local/bundle/gems/*/{test,tests,examples,sample,misc,doc,docs}'] + Dir['/usr/local/bundle/gems/*/ext/**/*.{c,h,o,S}']" | xargs rm -rf && ln -sf /usr/lib/libonnxruntime.so.1 $(ruby -e "print Dir[Gem::Specification.find_by_name('onnxruntime').gem_dir + '/vendor/*.so'].first")
+RUN apk add --no-cache build-base && bundle install && apk del build-base && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf

-COPY --chown=docuseal:docuseal ./bin ./bin
-COPY --chown=docuseal:docuseal ./app ./app
-COPY --chown=docuseal:docuseal ./config ./config
-COPY --chown=docuseal:docuseal ./db/migrate ./db/migrate
-COPY --chown=docuseal:docuseal ./log ./log
-COPY --chown=docuseal:docuseal ./lib ./lib
-COPY --chown=docuseal:docuseal ./public ./public
-COPY --chown=docuseal:docuseal ./tmp ./tmp
-COPY --chown=docuseal:docuseal LICENSE LICENSE_ADDITIONAL_TERMS README.md Rakefile config.ru .version ./
-COPY --chown=docuseal:docuseal .version ./public/version
+COPY ./bin ./bin
+COPY ./app ./app
+COPY ./config ./config
+COPY ./db ./db
+COPY ./log ./log
+COPY ./lib ./lib
+COPY ./public ./public
+COPY ./tmp ./tmp
+COPY LICENSE README.md Rakefile config.ru .version ./

-COPY --chown=docuseal:docuseal --from=download /fonts/GoNotoKurrent-Regular.ttf /fonts/GoNotoKurrent-Bold.ttf /fonts/DancingScript-Regular.otf /fonts/OFL.txt /fonts
-COPY --from=download /fonts/FreeSans.ttf /usr/share/fonts/freefont
-COPY --from=download /pdfium-linux/lib/libpdfium.so /usr/lib/libpdfium.so
-COPY --from=download /pdfium-linux/licenses/pdfium.txt /usr/lib/libpdfium-LICENSE.txt
-COPY --chown=docuseal:docuseal --from=download /model.onnx /app/tmp/model.onnx
-COPY --chown=docuseal:docuseal --from=webpack /app/public/packs ./public/packs
+COPY --from=fonts /fonts/GoNotoKurrent-Regular.ttf /fonts/GoNotoKurrent-Bold.ttf /fonts/DancingScript-Regular.otf /fonts/OFL.txt /fonts
+COPY --from=fonts /fonts/FreeSans.ttf /usr/share/fonts/freefont
+COPY --from=webpack /app/public/packs ./public/packs

-RUN ln -s /fonts /app/public/fonts && \
-    bundle exec bootsnap precompile -j 1 --gemfile app/ lib/ && \
-    chown -R docuseal:docuseal /app/tmp/cache
+RUN ln -s /fonts /app/public/fonts
+RUN bundle exec bootsnap precompile --gemfile app/ lib/

 WORKDIR /data/docuseal
-ENV HOME=/home/docuseal
 ENV WORKDIR=/data/docuseal
-ENV VIPS_MAX_COORD=17000

 EXPOSE 3000
 CMD ["/app/bin/bundle", "exec", "puma", "-C", "/app/config/puma.rb", "--dir", "/app"]
@@ -2,17 +2,15 @@

 source 'https://rubygems.org'

-ruby '4.0.1'
+ruby '3.3.3'

-gem 'addressable'
-gem 'arabic-letter-connector', require: false
+gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
 gem 'aws-sdk-s3', require: false
 gem 'aws-sdk-secretsmanager', require: false
-gem 'azure-blob', require: false
+gem 'azure-storage-blob', require: false
 gem 'bootsnap', require: false
 gem 'cancancan'
-gem 'csv', require: false
-gem 'csv-safe', require: false
+gem 'csv'
 gem 'devise'
 gem 'devise-two-factor'
 gem 'dotenv', require: false
@@ -22,33 +20,33 @@ gem 'faraday-follow_redirects'
 gem 'google-cloud-storage', require: false
 gem 'hexapdf'
 gem 'image_processing'
-gem 'jwt', require: false
+gem 'jwt'
 gem 'lograge'
-gem 'numo-narray-alt', require: false
+gem 'mysql2', require: false
 gem 'oj'
-gem 'onnxruntime', require: false
 gem 'pagy'
 gem 'pg', require: false
+gem 'premailer-rails'
 gem 'pretender'
 gem 'puma', require: false
 gem 'rack'
 gem 'rails'
+gem 'rails_autolink'
 gem 'rails-i18n'
 gem 'rotp'
-gem 'rouge', require: false
-gem 'rqrcode', require: false
+gem 'rqrcode'
 gem 'ruby-vips'
-gem 'rubyXL', require: false
+gem 'rubyXL'
 gem 'shakapacker'
 gem 'sidekiq'
-gem 'sqlite3', require: false
+gem 'sqlite3', require: false, force_ruby_platform: true
 gem 'strip_attributes'
-gem 'trilogy', require: false
 gem 'turbo-rails'
 gem 'twitter_cldr', require: false
 gem 'tzinfo-data'

 group :development, :test do
+  gem 'annotate'
  gem 'better_html'
  gem 'bullet'
  gem 'debug'
@@ -65,9 +63,6 @@ group :development, :test do
 end

 group :development do
-  gem 'annotaterb'
-  gem 'brakeman', require: false
-  gem 'foreman', require: false
  gem 'letter_opener_web'
  gem 'web-console'
 end
@@ -1,133 +1,133 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    action_text-trix (2.1.17)
-      railties
-    actioncable (8.1.3)
-      actionpack (= 8.1.3)
-      activesupport (= 8.1.3)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (8.1.3)
-      actionpack (= 8.1.3)
-      activejob (= 8.1.3)
-      activerecord (= 8.1.3)
-      activestorage (= 8.1.3)
-      activesupport (= 8.1.3)
-      mail (>= 2.8.0)
-    actionmailer (8.1.3)
-      actionpack (= 8.1.3)
-      actionview (= 8.1.3)
-      activejob (= 8.1.3)
-      activesupport (= 8.1.3)
-      mail (>= 2.8.0)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
      rails-dom-testing (~> 2.2)
-    actionpack (8.1.3)
-      actionview (= 8.1.3)
-      activesupport (= 8.1.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      nokogiri (>= 1.8.5)
+      racc
      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.1.3)
-      action_text-trix (~> 2.1.15)
-      actionpack (= 8.1.3)
-      activerecord (= 8.1.3)
-      activestorage (= 8.1.3)
-      activesupport (= 8.1.3)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (8.1.3)
-      activesupport (= 8.1.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    activejob (8.1.3)
-      activesupport (= 8.1.3)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
      globalid (>= 0.3.6)
-    activemodel (8.1.3)
-      activesupport (= 8.1.3)
-    activerecord (8.1.3)
-      activemodel (= 8.1.3)
-      activesupport (= 8.1.3)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      timeout (>= 0.4.0)
-    activestorage (8.1.3)
-      actionpack (= 8.1.3)
-      activejob (= 8.1.3)
-      activerecord (= 8.1.3)
-      activesupport (= 8.1.3)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      marcel (~> 1.0)
-    activesupport (8.1.3)
+    activesupport (7.1.3.4)
      base64
      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
-      json
-      logger (>= 1.4.2)
      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    addressable (2.8.8)
-      public_suffix (>= 2.0.2, < 8.0)
-    annotaterb (4.20.0)
-      activerecord (>= 6.0.0)
-      activesupport (>= 6.0.0)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    annotate (3.2.0)
+      activerecord (>= 3.2, < 8.0)
+      rake (>= 10.4, < 14.0)
    arabic-letter-connector (0.1.1)
-    ast (2.4.3)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1209.0)
-    aws-sdk-core (3.241.4)
+    ast (2.4.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.913.0)
+    aws-sdk-core (3.191.6)
      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
-      bigdecimal
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
      jmespath (~> 1, >= 1.6.1)
-      logger
-    aws-sdk-kms (1.121.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.212.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-kms (1.79.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.146.1)
+      aws-sdk-core (~> 3, >= 3.191.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-secretsmanager (1.128.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.1)
+      aws-sigv4 (~> 1.8)
+    aws-sdk-secretsmanager (1.91.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.8.0)
      aws-eventstream (~> 1, >= 1.0.2)
-    azure-blob (0.8.0)
-      cgi
-      rexml
-    base64 (0.3.0)
-    bcrypt (3.1.22)
-    better_html (2.2.0)
-      actionview (>= 7.0)
-      activesupport (>= 7.0)
+    azure-storage-blob (2.0.3)
+      azure-storage-common (~> 2.0)
+      nokogiri (~> 1, >= 1.10.8)
+    azure-storage-common (2.0.4)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0, >= 1.0.0.rc1)
+      net-http-persistent (~> 4.0)
+      nokogiri (~> 1, >= 1.10.8)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    better_html (2.1.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
      ast (~> 2.0)
      erubi (~> 1.4)
      parser (>= 2.4)
      smart_properties
-    bigdecimal (4.0.1)
+    bigdecimal (3.1.8)
    bindex (0.8.1)
-    bootsnap (1.21.1)
+    bootsnap (1.18.3)
      msgpack (~> 1.2)
-    brakeman (7.1.2)
-      racc
    builder (3.3.0)
-    bullet (8.1.0)
+    bullet (7.1.6)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    camertron-eprun (1.1.1)
-    cancancan (3.6.1)
+    cancancan (3.5.0)
    capybara (3.40.0)
      addressable
      matrix
@@ -137,436 +137,406 @@ GEM
      rack-test (>= 0.6.3)
      regexp_parser (>= 1.5, < 3.0)
      xpath (~> 3.2)
-    cgi (0.5.1)
-    childprocess (5.1.0)
-      logger (~> 1.5)
+    childprocess (5.0.0)
    chunky_png (1.4.0)
    cldr-plurals-runtime-rb (1.1.0)
    cmdparse (3.0.7)
    coderay (1.1.3)
-    concurrent-ruby (1.3.6)
-    connection_pool (3.0.2)
-    crack (1.0.1)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crack (1.0.0)
      bigdecimal
      rexml
    crass (1.0.6)
-    csv (3.3.5)
-    csv-safe (3.3.1)
-      csv (~> 3.0)
-    cuprite (0.17)
+    css_parser (1.17.1)
+      addressable
+    csv (3.3.0)
+    cuprite (0.15)
      capybara (~> 3.0)
-      ferrum (~> 0.17.0)
-    date (3.5.1)
-    debug (1.11.1)
+      ferrum (~> 0.14.0)
+    date (3.3.4)
+    debug (1.9.2)
      irb (~> 1.10)
      reline (>= 0.3.8)
    declarative (0.0.20)
-    devise (5.0.3)
+    devise (4.9.4)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 7.0)
+      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    devise-two-factor (6.4.0)
-      activesupport (>= 7.2, < 8.2)
-      devise (>= 4.0, < 6.0)
-      railties (>= 7.2, < 8.2)
+    devise-two-factor (5.0.0)
+      activesupport (~> 7.0)
+      devise (~> 4.0)
+      railties (~> 7.0)
      rotp (~> 6.0)
-    diff-lcs (1.6.2)
-    digest-crc (0.7.0)
+    diff-lcs (1.5.1)
+    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
-    docile (1.4.1)
-    dotenv (3.2.0)
-    drb (2.2.3)
+    docile (1.4.0)
+    dotenv (3.1.0)
+    drb (2.2.1)
    email_typo (0.2.3)
-    erb (6.0.2)
-    erb_lint (0.9.0)
+    erb_lint (0.5.0)
      activesupport
      better_html (>= 2.0.1)
      parser (>= 2.7.1.4)
      rainbow
-      rubocop (>= 1)
+      rubocop
      smart_properties
-    erubi (1.13.1)
-    factory_bot (6.5.6)
-      activesupport (>= 6.1.0)
-    factory_bot_rails (6.5.1)
-      factory_bot (~> 6.5)
-      railties (>= 6.1.0)
-    faker (3.6.0)
+    erubi (1.13.0)
+    factory_bot (6.4.6)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
+      railties (>= 5.0.0)
+    faker (3.3.1)
      i18n (>= 1.8.11, < 2)
-    faraday (2.14.1)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-follow_redirects (0.5.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-follow_redirects (0.3.0)
      faraday (>= 1, < 3)
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
-    ferrum (0.17.1)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    ferrum (0.14)
      addressable (~> 2.5)
-      base64 (~> 0.2)
      concurrent-ruby (~> 1.1)
      webrick (~> 1.7)
-      websocket-driver (~> 0.7)
-    ffi (1.17.3-aarch64-linux-gnu)
-    ffi (1.17.3-aarch64-linux-musl)
-    ffi (1.17.3-arm64-darwin)
-    ffi (1.17.3-x86_64-linux-gnu)
-    ffi (1.17.3-x86_64-linux-musl)
-    foreman (0.90.0)
-      thor (~> 1.4)
+      websocket-driver (>= 0.6, < 0.8)
+    ffi (1.16.3)
    geom2d (0.4.1)
-    globalid (1.3.0)
+    globalid (1.2.1)
      activesupport (>= 6.1)
-    google-apis-core (1.0.2)
-      addressable (~> 2.8, >= 2.8.7)
-      faraday (~> 2.13)
-      faraday-follow_redirects (~> 0.3)
-      googleauth (~> 1.14)
-      mini_mime (~> 1.1)
+    google-apis-core (0.14.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
      representable (~> 3.0)
-      retriable (~> 3.1)
-    google-apis-iamcredentials_v1 (0.26.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.59.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.8.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.20.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-apis-storage_v1 (0.37.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-cloud-core (1.7.0)
      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (2.3.1)
-      base64 (~> 0.2)
+    google-cloud-env (2.1.1)
      faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.5.0)
-    google-cloud-storage (1.58.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.49.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
-      google-apis-core (>= 0.18, < 2)
+      google-apis-core (~> 0.13)
      google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (>= 0.42)
+      google-apis-storage_v1 (~> 0.33)
      google-cloud-core (~> 1.6)
      googleauth (~> 1.9)
      mini_mime (~> 1.0)
-    google-logging-utils (0.2.0)
-    googleauth (1.16.1)
+    googleauth (1.11.0)
      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.2)
-      google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 4.0)
+      google-cloud-env (~> 2.1)
+      jwt (>= 1.4, < 3.0)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
-    hashdiff (1.2.1)
-    hexapdf (1.5.0)
+    hashdiff (1.1.0)
+    hexapdf (0.42.0)
      cmdparse (~> 3.0, >= 3.0.3)
      geom2d (~> 0.4, >= 0.4.1)
      openssl (>= 2.2.1)
-      strscan (>= 3.1.2)
-    i18n (1.14.8)
+    htmlentities (4.3.4)
+    httpclient (2.8.3)
+    i18n (1.14.5)
      concurrent-ruby (~> 1.0)
-    image_processing (1.14.0)
-      mini_magick (>= 4.9.5, < 6)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.2)
-    irb (1.17.0)
-      pp (>= 0.6.0)
-      prism (>= 1.3.0)
+    io-console (0.7.2)
+    irb (1.13.1)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jmespath (1.6.2)
-    json (2.19.2)
-    jwt (3.1.2)
+    json (2.7.2)
+    jwt (2.8.1)
      base64
-    language_server-protocol (3.17.0.5)
-    launchy (3.1.1)
+    language_server-protocol (3.17.0.3)
+    launchy (3.0.0)
      addressable (~> 2.8)
      childprocess (~> 5.0)
-      logger (~> 1.6)
    letter_opener (1.10.0)
      launchy (>= 2.2, < 4)
-    letter_opener_web (3.0.0)
-      actionmailer (>= 6.1)
-      letter_opener (~> 1.9)
-      railties (>= 6.1)
+    letter_opener_web (2.0.0)
+      actionmailer (>= 5.2)
+      letter_opener (~> 1.7)
+      railties (>= 5.2)
      rexml
-    lint_roller (1.1.0)
-    logger (1.7.0)
    lograge (0.14.0)
      actionpack (>= 4)
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.25.1)
+    loofah (2.22.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
-    mail (2.9.0)
-      logger
+    mail (2.8.1)
      mini_mime (>= 0.1.1)
      net-imap
      net-pop
      net-smtp
-    marcel (1.1.0)
-    matrix (0.4.3)
+    marcel (1.0.4)
+    matrix (0.4.2)
    method_source (1.1.0)
-    mini_magick (5.3.1)
-      logger
+    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    minitest (6.0.2)
-      drb (~> 2.0)
-      prism (~> 1.5)
-    msgpack (1.8.0)
-    multi_json (1.19.1)
-    net-http (0.9.1)
-      uri (>= 0.11.1)
-    net-imap (0.6.3)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
+    msgpack (1.7.2)
+    multi_json (1.15.0)
+    multipart-post (2.4.0)
+    mutex_m (0.2.0)
+    mysql2 (0.5.6)
+    net-http-persistent (4.0.2)
+      connection_pool (~> 2.2)
+    net-imap (0.4.14)
      date
      net-protocol
    net-pop (0.1.2)
-      net-protocol
    net-protocol (0.2.2)
      timeout
-    net-smtp (0.5.1)
+    net-smtp (0.5.0)
      net-protocol
-    nio4r (2.7.5)
-    nokogiri (1.19.2-aarch64-linux-gnu)
+    nio4r (2.7.1)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.19.2-aarch64-linux-musl)
+    nokogiri (1.16.7-aarch64-linux)
      racc (~> 1.4)
-    nokogiri (1.19.2-arm64-darwin)
+    nokogiri (1.16.7-x86_64-linux)
      racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-musl)
-      racc (~> 1.4)
-    numo-narray-alt (0.10.3)
-    oj (3.16.13)
+    oj (3.16.3)
      bigdecimal (>= 3.0)
-      ostruct (>= 0.2)
-    onnxruntime (0.10.1-aarch64-linux)
-      ffi
-    onnxruntime (0.10.1-arm64-darwin)
-      ffi
-    onnxruntime (0.10.1-x86_64-linux)
-      ffi
-    openssl (4.0.0)
+    openssl (3.2.0)
    orm_adapter (0.5.0)
    os (1.1.4)
-    ostruct (0.6.3)
-    package_json (0.2.0)
-    pagy (43.2.8)
-      json
-      yaml
-    parallel (1.27.0)
-    parser (3.3.10.1)
+    package_json (0.1.0)
+    pagy (8.1.2)
+    parallel (1.25.1)
+    parser (3.3.4.0)
      ast (~> 2.4.1)
      racc
-    pg (1.6.3-aarch64-linux)
-    pg (1.6.3-aarch64-linux-musl)
-    pg (1.6.3-arm64-darwin)
-    pg (1.6.3-x86_64-linux)
-    pg (1.6.3-x86_64-linux-musl)
-    pp (0.6.3)
-      prettyprint
-    pretender (0.6.0)
-      actionpack (>= 7.1)
-    prettyprint (0.2.0)
-    prism (1.9.0)
-    pry (0.16.0)
+    pg (1.5.6)
+    premailer (1.23.0)
+      addressable
+      css_parser (>= 1.12.0)
+      htmlentities (>= 4.0.0)
+    premailer-rails (1.12.0)
+      actionmailer (>= 3)
+      net-smtp
+      premailer (~> 1.7, >= 1.7.9)
+    pretender (0.5.0)
+      actionpack (>= 6.1)
+    pry (0.14.2)
      coderay (~> 1.1)
      method_source (~> 1.0)
-      reline (>= 0.6.0)
-    pry-rails (0.3.11)
-      pry (>= 0.13.0)
-    psych (5.3.1)
-      date
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    psych (5.1.2)
      stringio
-    public_suffix (7.0.2)
-    puma (7.2.0)
+    public_suffix (5.0.5)
+    puma (6.4.2)
      nio4r (~> 2.0)
    racc (1.8.1)
-    rack (3.2.5)
+    rack (3.1.7)
    rack-proxy (0.7.7)
      rack
-    rack-session (2.1.1)
-      base64 (>= 0.1.0)
+    rack-session (2.0.0)
      rack (>= 3.0.0)
-    rack-test (2.2.0)
+    rack-test (2.1.0)
      rack (>= 1.3)
-    rackup (2.3.1)
+    rackup (2.1.0)
      rack (>= 3)
-    rails (8.1.3)
-      actioncable (= 8.1.3)
-      actionmailbox (= 8.1.3)
-      actionmailer (= 8.1.3)
-      actionpack (= 8.1.3)
-      actiontext (= 8.1.3)
-      actionview (= 8.1.3)
-      activejob (= 8.1.3)
-      activemodel (= 8.1.3)
-      activerecord (= 8.1.3)
-      activestorage (= 8.1.3)
-      activesupport (= 8.1.3)
+      webrick (~> 1.8)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      bundler (>= 1.15.0)
-      railties (= 8.1.3)
-    rails-dom-testing (2.3.0)
+      railties (= 7.1.3.4)
+    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (8.1.0)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rails-i18n (7.0.9)
      i18n (>= 0.7, < 2)
-      railties (>= 8.0.0, < 9)
-    railties (8.1.3)
-      actionpack (= 8.1.3)
-      activesupport (= 8.1.3)
-      irb (~> 1.13)
+      railties (>= 6.0.0, < 8)
+    rails_autolink (1.1.8)
+      actionview (> 3.1)
+      activesupport (> 3.1)
+      railties (> 3.1)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
      thor (~> 1.0, >= 1.2.2)
-      tsort (>= 0.2)
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
-    rake (13.3.1)
-    rdoc (7.2.0)
-      erb
+    rake (13.2.1)
+    rdoc (6.6.3.1)
      psych (>= 4.0.0)
-      tsort
-    redis-client (0.26.4)
+    redis-client (0.22.2)
      connection_pool
-    regexp_parser (2.11.3)
-    reline (0.6.3)
+    regexp_parser (2.9.2)
+    reline (0.5.7)
      io-console (~> 0.5)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
-    request_store (1.7.0)
+    request_store (1.6.0)
      rack (>= 1.4)
-    responders (3.2.0)
-      actionpack (>= 7.0)
-      railties (>= 7.0)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
    retriable (3.1.2)
-    rexml (3.4.4)
+    rexml (3.3.3)
+      strscan
    rotp (6.3.0)
-    rouge (4.7.0)
-    rqrcode (3.2.0)
+    rqrcode (2.2.0)
      chunky_png (~> 1.0)
-      rqrcode_core (~> 2.0)
-    rqrcode_core (2.1.0)
-    rspec-core (3.13.6)
+      rqrcode_core (~> 1.0)
+    rqrcode_core (1.2.0)
+    rspec-core (3.13.0)
      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
+    rspec-expectations (3.13.0)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.0)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-rails (8.0.2)
-      actionpack (>= 7.2)
-      activesupport (>= 7.2)
-      railties (>= 7.2)
+    rspec-rails (6.1.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
      rspec-core (~> 3.13)
      rspec-expectations (~> 3.13)
      rspec-mocks (~> 3.13)
      rspec-support (~> 3.13)
-    rspec-support (3.13.6)
-    rubocop (1.82.1)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
+      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
-      parser (>= 3.3.7.2)
-      prism (~> 1.7)
-    rubocop-performance (1.26.1)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.34.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.24.1)
      activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
      rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.9.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.81)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
    ruby-progressbar (1.13.0)
-    ruby-vips (2.3.0)
+    ruby-vips (2.2.1)
      ffi (~> 1.12)
-      logger
-    rubyXL (3.4.35)
+    ruby2_keywords (0.0.5)
+    rubyXL (3.4.27)
      nokogiri (>= 1.10.8)
-      rubyzip (>= 3.2.2)
-    rubyzip (3.2.2)
-    securerandom (0.4.1)
-    semantic_range (3.1.0)
-    shakapacker (9.5.0)
+      rubyzip (>= 1.3.0)
+    rubyzip (2.3.2)
+    semantic_range (3.0.0)
+    shakapacker (8.0.0)
      activesupport (>= 5.2)
      package_json
      rack-proxy (>= 0.6.1)
      railties (>= 5.2)
      semantic_range (>= 2.3.0)
-    sidekiq (8.1.0)
-      connection_pool (>= 3.0.0)
-      json (>= 2.16.0)
-      logger (>= 1.7.0)
-      rack (>= 3.2.0)
-      redis-client (>= 0.26.0)
-    signet (0.21.0)
+    sidekiq (7.2.4)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.19.0)
+    signet (0.19.0)
      addressable (~> 2.8)
      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 4.0)
+      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simplecov (0.22.0)
      docile (~> 1.1)
      simplecov-html (~> 0.11)
      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.2)
+    simplecov-html (0.12.3)
    simplecov_json_formatter (0.1.4)
    smart_properties (1.17.0)
-    sqlite3 (2.9.0-aarch64-linux-gnu)
-    sqlite3 (2.9.0-aarch64-linux-musl)
-    sqlite3 (2.9.0-arm64-darwin)
-    sqlite3 (2.9.0-x86_64-linux-gnu)
-    sqlite3 (2.9.0-x86_64-linux-musl)
-    stringio (3.2.0)
-    strip_attributes (2.0.1)
-      activemodel (>= 3.0, < 9.0)
-    strscan (3.1.7)
-    thor (1.5.0)
-    timeout (0.6.1)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
+    stringio (3.1.0)
+    strip_attributes (1.13.0)
+      activemodel (>= 3.0, < 8.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
    trailblazer-option (0.1.2)
-    trilogy (2.10.0)
-      bigdecimal
-    tsort (0.2.0)
-    turbo-rails (2.0.21)
-      actionpack (>= 7.1.0)
-      railties (>= 7.1.0)
-    twitter_cldr (6.14.0)
-      base64
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
+    twitter_cldr (6.12.0)
      camertron-eprun
      cldr-plurals-runtime-rb (~> 1.1)
      tzinfo
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2025.3)
+    tzinfo-data (1.2024.1)
      tzinfo (>= 1.0.0)
    uber (0.1.0)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
-    uniform_notifier (1.18.0)
-    uri (1.1.1)
-    useragent (0.16.11)
+    unicode-display_width (2.5.0)
+    uniform_notifier (1.16.0)
    warden (1.2.9)
      rack (>= 2.0.9)
    web-console (4.2.1)
@@ -574,42 +544,35 @@ GEM
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
      railties (>= 6.0.0)
-    webmock (3.26.1)
+    webmock (3.23.0)
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.2)
-    websocket-driver (0.8.0)
-      base64
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    yaml (0.4.0)
-    zeitwerk (2.7.5)
+    zeitwerk (2.6.14)

 PLATFORMS
  aarch64-linux
-  aarch64-linux-musl
-  arm64-darwin
+  ruby
  x86_64-linux
-  x86_64-linux-musl

 DEPENDENCIES
-  addressable
-  annotaterb
+  annotate
  arabic-letter-connector
  aws-sdk-s3
  aws-sdk-secretsmanager
-  azure-blob
+  azure-storage-blob
  better_html
  bootsnap
-  brakeman
  bullet
  cancancan
  capybara
  csv
-  csv-safe
  cuprite
  debug
  devise
@@ -621,26 +584,25 @@ DEPENDENCIES
  faker
  faraday
  faraday-follow_redirects
-  foreman
  google-cloud-storage
  hexapdf
  image_processing
  jwt
  letter_opener_web
  lograge
-  numo-narray-alt
+  mysql2
  oj
-  onnxruntime
  pagy
  pg
+  premailer-rails
  pretender
  pry-rails
  puma
  rack
  rails
  rails-i18n
+  rails_autolink
  rotp
-  rouge
  rqrcode
  rspec-rails
  rubocop
@@ -654,7 +616,6 @@ DEPENDENCIES
  simplecov
  sqlite3
  strip_attributes
-  trilogy
  turbo-rails
  twitter_cldr
  tzinfo-data
@@ -662,7 +623,7 @@ DEPENDENCIES
  webmock

 RUBY VERSION
-  ruby 4.0.1
+   ruby 3.3.3p89

 BUNDLED WITH
-  4.0.3
+   2.5.3
@@ -1,5 +0,0 @@
-Additional Terms
-
-In accordance with Section 7(b) of the GNU Affero General Public License,
-a covered work must retain the original DocuSeal attribution in interactive
-user interfaces.
@@ -1,7 +1,7 @@
 <h1 align="center" style="border-bottom: none">
  <div>
-    <a href="https://www.docuseal.com">
-      <img  alt="DocuSeal" src="https://github.com/user-attachments/assets/38b45682-ffa4-4919-abde-d2d422325c44" width="80" />
+    <a href="https://www.docuseal.co">
+      <img  alt="DocuSeal" src="https://github.com/docusealco/docuseal/assets/5418788/c12cd051-81cd-4402-bc3a-92f2cfdc1b06" width="80" />
      <br>
    </a>
    DocuSeal
@@ -25,12 +25,12 @@
 DocuSeal is an open source platform that provides secure and efficient digital document signing and processing. Create PDF forms to have them filled and signed online on any device with an easy-to-use, mobile-optimized web tool.
 </p>
 <h2 align="center">
-  <a href="https://demo.docuseal.tech">✨ Live Demo</a>
+  <a href="https://demo.docuseal.co">✨ Live Demo</a>
  <span>|</span>
-  <a href="https://docuseal.com/sign_up">☁️ Try in Cloud</a>
+  <a href="https://docuseal.co/sign_up">☁️ Try in Cloud</a>
 </h2>

-[![Demo](https://github.com/docusealco/docuseal/assets/5418788/d8703ea3-361a-423f-8bfe-eff1bd9dbe14)](https://demo.docuseal.tech)
+[![Demo](https://github.com/docusealco/docuseal/assets/5418788/d8703ea3-361a-423f-8bfe-eff1bd9dbe14)](https://demo.docuseal.co)

 ## Features
 - PDF form fields builder (WYSIWYG)
@@ -42,7 +42,7 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - PDF signature verification
 - Users management
 - Mobile-optimized
- 7 UI languages with signing available in 14 languages
+- Signing available in 13 languages
 - API and Webhooks for integrations
 - Easy to deploy in minutes

@@ -54,17 +54,17 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - Conditional fields and formulas
 - Bulk send with CSV, XLSX spreadsheet import
 - SSO / SAML
- Template creation with HTML API ([Guide](https://www.docuseal.com/guides/create-pdf-document-fillable-form-with-html-api))
- Template creation with PDF or DOCX and field tags API ([Guide](https://www.docuseal.com/guides/use-embedded-text-field-tags-in-the-pdf-to-create-a-fillable-form))
- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.com/docs/embedded))
- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.com/docs/embedded))
- [Learn more](https://www.docuseal.com/pricing)
+- Template creation with HTML API ([Guide](https://www.docuseal.co/guides/create-pdf-document-fillable-form-with-html-api))
+- Template creation with PDF or DOCX and field tags API ([Guide](https://www.docuseal.co/guides/use-embedded-text-field-tags-in-the-pdf-to-create-a-fillable-form))
+- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
+- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
+- [Learn more](https://www.docuseal.co/pricing)

 ## Deploy

 |Heroku|Railway|
 |:--:|:---:|
-| [<img alt="Deploy on Heroku" src="https://www.herokucdn.com/deploy/button.svg" height="40">](https://heroku.com/deploy?template=https://github.com/docusealco/docuseal-heroku) | [<img alt="Deploy on Railway" src="https://railway.app/button.svg" height="40">](https://railway.com/deploy/IGoDnc?referralCode=ruU7JR)|
+| [<img alt="Deploy on Heroku" src="https://www.herokucdn.com/deploy/button.svg" height="40">](https://heroku.com/deploy?template=https://github.com/docusealco/docuseal-heroku) | [<img alt="Deploy on Railway" src="https://railway.app/button.svg" height="40">](https://railway.app/template/IGoDnc?referralCode=ruU7JR)|
 |**DigitalOcean**|**Render**|
 | [<img alt="Deploy on DigitalOcean" src="https://www.deploytodo.com/do-btn-blue.svg" height="40">](https://cloud.digitalocean.com/apps/new?repo=https://github.com/docusealco/docuseal-digitalocean/tree/master&refcode=421d50f53990) | [<img alt="Deploy to Render" src="https://render.com/images/deploy-to-render-button.svg" height="40">](https://render.com/deploy?repo=https://github.com/docusealco/docuseal-render)

@@ -93,15 +93,15 @@ sudo HOST=your-domain-name.com docker compose up

 At DocuSeal we have expertise and technologies to make documents creation, filling, signing and processing seamlessly integrated with your product. We specialize in working with various industries, including **Banking, Healthcare, Transport, Real Estate, eCommerce, KYC, CRM, and other software products** that require bulk document signing. By leveraging DocuSeal, we can assist in reducing the overall cost of developing and processing electronic documents while ensuring security and compliance with local electronic document laws.

-[Book a Meeting](https://www.docuseal.com/contact)
+[Book a Meeting](https://www.docuseal.co/contact)

 ## License

-Distributed under the AGPLv3 License with Section 7(b) Additional Terms. See [LICENSE](https://github.com/docusealco/docuseal/blob/master/LICENSE) and [LICENSE_ADDITIONAL_TERMS](https://github.com/docusealco/docuseal/blob/master/LICENSE_ADDITIONAL_TERMS) for more information.
-Unless otherwise noted, all files © 2023-2026 DocuSeal LLC.
+Distributed under the AGPLv3 License. See [LICENSE](https://github.com/docusealco/docuseal/blob/master/LICENSE) for more information.
+Unless otherwise noted, all files © 2023 DocuSeal LLC.

 ## Tools

- [Signature Maker](https://www.docuseal.com/online-signature)
- [Sign Document Online](https://www.docuseal.com/sign-documents-online)
- [Fill PDF Online](https://www.docuseal.com/fill-pdf)
+- [Signature Maker](https://www.docuseal.co/online-signature)
+- [Sign Document Online](https://www.docuseal.co/sign-documents-online)
+- [Fill PDF Online](https://www.docuseal.co/fill-pdf)
@@ -1,6 +1,6 @@
 # Reporting a Vulnerability

-If you come across any security concern or vulnarability, please report the information via email to security@docuseal.com instead of opening a GitHub issue. We will promptly respond and will collaborate with you to validate the issue, and resolve it ASAP.
+If you come across any security concern or vulnarability, please report the information via email to security@docuseal.co instead of opening a GitHub issue. We will promptly respond and will collaborate with you to validate the issue, and resolve it ASAP.

 **We have a bug bounty program to reward security researchers.**

@@ -1,31 +1,21 @@
 # frozen_string_literal: true

 class AccountConfigsController < ApplicationController
-  before_action :load_account_config, only: :create
-  authorize_resource :account_config, only: :create
-
-  load_and_authorize_resource :account_config, only: :destroy
+  before_action :load_account_config
+  authorize_resource :account_config

  ALLOWED_KEYS = [
    AccountConfig::ALLOW_TYPED_SIGNATURE,
    AccountConfig::FORCE_MFA,
    AccountConfig::ALLOW_TO_RESUBMIT,
-    AccountConfig::ALLOW_TO_DECLINE_KEY,
-    AccountConfig::ALLOW_TO_DELEGATE_KEY,
    AccountConfig::FORM_PREFILL_SIGNATURE_KEY,
    AccountConfig::ESIGNING_PREFERENCE_KEY,
    AccountConfig::FORM_WITH_CONFETTI_KEY,
    AccountConfig::DOWNLOAD_LINKS_AUTH_KEY,
-    AccountConfig::DOWNLOAD_LINKS_EXPIRE_KEY,
    AccountConfig::FORCE_SSO_AUTH_KEY,
    AccountConfig::FLATTEN_RESULT_PDF_KEY,
-    AccountConfig::ENFORCE_SIGNING_ORDER_KEY,
-    AccountConfig::WITH_FILE_LINKS_KEY,
    AccountConfig::WITH_SIGNATURE_ID,
-    AccountConfig::COMBINE_PDF_RESULT_KEY,
-    AccountConfig::REQUIRE_SIGNING_REASON_KEY,
-    AccountConfig::DOCUMENT_FILENAME_FORMAT_KEY,
-    AccountConfig::ENABLE_MCP_KEY
+    AccountConfig::REQUIRE_SIGNING_REASON_KEY
  ].freeze

  InvalidKey = Class.new(StandardError)
@@ -36,29 +26,17 @@ class AccountConfigsController < ApplicationController
    head :ok
  end

-  def destroy
-    raise InvalidKey unless allowed_keys.include?(@account_config.key)
-
-    @account_config.destroy!
-
-    redirect_back(fallback_location: root_path)
-  end
-
  private

-  def allowed_keys
-    ALLOWED_KEYS
-  end
-
  def load_account_config
-    raise InvalidKey unless allowed_keys.include?(account_config_params[:key])
+    raise InvalidKey unless ALLOWED_KEYS.include?(account_config_params[:key])

    @account_config =
      AccountConfig.find_or_initialize_by(account: current_account, key: account_config_params[:key])
  end

  def account_config_params
-    params.required(:account_config).permit(:key, :value, { value: {} }, { value: [] }).tap do |attrs|
+    params.required(:account_config).permit!.tap do |attrs|
      attrs[:value] = attrs[:value] == '1' if attrs[:value].in?(%w[1 0])
    end
  end
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class AccountCustomFieldsController < ApplicationController
-  before_action :load_account_config, only: :create
-
-  def create
-    authorize!(:create, Template)
-
-    @account_config.update!(account_config_params)
-
-    render json: @account_config.value
-  end
-
-  private
-
-  def load_account_config
-    @account_config =
-      AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::TEMPLATE_CUSTOM_FIELDS_KEY)
-  end
-
-  def account_config_params
-    params.permit(
-      value: [[:uuid, :name, :type,
-               :required, :readonly, :default_value,
-               :title, :description,
-               { preferences: {},
-                 default_value: [],
-                 options: [%i[value uuid]],
-                 validation: %i[message pattern min max step],
-                 areas: [%i[x y w h cell_w option_uuid]] }]]
-    )
-  end
-end
@@ -4,12 +4,11 @@ class AccountsController < ApplicationController
  LOCALE_OPTIONS = {
    'en-US' => 'English (United States)',
    'en-GB' => 'English (United Kingdom)',
-    'fr-FR' => 'Français',
-    'es-ES' => 'Español',
-    'pt-PT' => 'Português',
-    'de-DE' => 'Deutsch',
-    'it-IT' => 'Italiano',
-    'nl-NL' => 'Nederlands'
+    'fr-FR' => 'French (France)',
+    'es-ES' => 'Spanish (Spain)',
+    'pt-PT' => 'Portuguese (Portugal)',
+    'de-DE' => 'German (Germany)',
+    'it-IT' => 'Italian (Italy)'
  }.freeze

  before_action :load_account
@@ -20,42 +19,35 @@ class AccountsController < ApplicationController
  def update
    current_account.update!(account_params)

-    unless Docuseal.multitenant?
-      @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
-                                                                key: EncryptedConfig::APP_URL_KEY)
-      @encrypted_config.assign_attributes(app_url_params)
+    @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
+                                                              key: EncryptedConfig::APP_URL_KEY)
+    @encrypted_config.assign_attributes(app_url_params)

-      unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
-        @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
+    unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
+      @encrypted_config.errors.add(:value, 'should be a valid URL')

-        return render :show, status: :unprocessable_content
-      end
-
-      @encrypted_config.save!
-
-      Docuseal.refresh_default_url_options!
+      return render :show, status: :unprocessable_entity
    end

-    with_locale do
-      redirect_to settings_account_path, notice: I18n.t('account_information_has_been_updated')
-    end
+    @encrypted_config.save!
+
+    Docuseal.refresh_default_url_options!
+
+    redirect_to settings_account_path, notice: 'Account information has been updated'
  rescue ActiveRecord::RecordInvalid
-    render :show, status: :unprocessable_content
+    render :show, status: :unprocessable_entity
  end

  def destroy
    authorize!(:manage, current_account)

-    true_user.skip_reconfirmation!
-    true_user.update!(locked_at: Time.current, email: true_user.email.sub('@', '+removed@'))
-    true_user.account.update!(archived_at: Time.current)
+    true_user.update!(locked_at: Time.current)

-    # rubocop:disable Layout/LineLength
    render turbo_stream: turbo_stream.replace(
      :account_delete_button,
-      html: helpers.tag.p(I18n.t('your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account'))
+      html: helpers.tag.p('Your account removal request will be processed within 2 weeks. ' \
+                          'Please contact us if you want to keep your account.')
    )
-    # rubocop:enable Layout/LineLength
  end

  private
@@ -13,7 +13,7 @@ module Api
    def show
      blob_uuid, purp, exp = ApplicationRecord.signed_id_verifier.verified(params[:signed_uuid])

-      if blob_uuid.blank? || purp != 'blob'
+      if blob_uuid.blank? || (purp.present? && purp != 'blob') || (exp && exp < Time.current.to_i)
        Rollbar.error('Blob not found') if defined?(Rollbar)

        return head :not_found
@@ -21,12 +21,7 @@ module Api

      blob = ActiveStorage::Blob.find_by!(uuid: blob_uuid)

-      attachment = blob.attachments.take
-
-      @record = attachment.record
-      @record = @record.record if @record.is_a?(ActiveStorage::Attachment)
-
-      authorization_check!(attachment, @record, exp)
+      authorization_check!(blob) if exp.blank?

      if request.headers['Range'].present?
        send_blob_byte_range_data blob, request.headers['Range']
@@ -42,22 +37,17 @@ module Api

    private

-    def authorization_check!(attachment, record, exp)
-      return if attachment.name == 'logo'
-      return if exp.to_i >= Time.current.to_i
-      return if current_user && current_ability.can?(:read, record)
+    def authorization_check!(blob)
+      is_authorized =
+        blob.attachments.all? do |a|
+          a.name.in?(%w[logo preview_images]) ||
+            (current_user && a.record.account.id == current_user.account_id) ||
+            !a.record.account.account_configs.find_or_initialize_by(key: AccountConfig::DOWNLOAD_LINKS_AUTH_KEY).value
+        end

-      if exp.blank?
-        configs = record.account.account_configs.where(key: [AccountConfig::DOWNLOAD_LINKS_AUTH_KEY,
-                                                             AccountConfig::DOWNLOAD_LINKS_EXPIRE_KEY])
+      return if is_authorized

-        require_auth = configs.any? { |c| c.key == AccountConfig::DOWNLOAD_LINKS_AUTH_KEY && c.value }
-        require_ttl = configs.none? { |c| c.key == AccountConfig::DOWNLOAD_LINKS_EXPIRE_KEY && c.value == false }
-
-        return if !require_ttl && !require_auth
-      end
-
-      Rollbar.error('Blob unauthorized') if defined?(Rollbar)
+      Rollbar.error('Blob aunauthorized') if defined?(Rollbar)

      raise CanCan::AccessDenied
    end
@@ -3,7 +3,7 @@
 module Api
  class ApiBaseController < ActionController::API
    include ActiveStorage::SetCurrent
-    include Pagy::Method
+    include Pagy::Backend

    DEFAULT_LIMIT = 10
    MAX_LIMIT = 100
@@ -16,7 +16,7 @@ module Api
    check_authorization

    rescue_from Params::BaseValidator::InvalidParameterError do |e|
-      render json: { error: e.message }, status: :unprocessable_content
+      render json: { error: e.message }, status: :unprocessable_entity
    end

    rescue_from RateLimit::LimitApproached do |e|
@@ -25,47 +25,20 @@ module Api
      render json: { error: 'Too many requests' }, status: :too_many_requests
    end

-    unless Rails.env.development?
+    if Rails.env.production?
      rescue_from CanCan::AccessDenied do |e|
-        render json: { error: access_denied_error_message(e) }, status: :forbidden
+        render json: { error: e.message }, status: :forbidden
      end

      rescue_from JSON::ParserError do |e|
        Rollbar.warning(e) if defined?(Rollbar)

-        render json: { error: "JSON parse error: #{e.message}" }, status: :unprocessable_content
+        render json: { error: "JSON parse error: #{e.message}" }, status: :unprocessable_entity
      end
    end

    private

-    def access_denied_error_message(error)
-      return 'Not authorized' if request.headers['X-Auth-Token'].blank?
-      return 'Not authorized' unless error.subject.is_a?(ActiveRecord::Base)
-      return 'Not authorized' unless error.subject.respond_to?(:account_id)
-
-      linked_account_record_exists =
-        if current_user.account.testing?
-          current_user.account.linked_account_accounts.where(account_type: 'testing')
-                      .exists?(account_id: error.subject.account_id)
-        else
-          current_user.account.testing_accounts.exists?(id: error.subject.account_id)
-        end
-
-      return 'Not authorized' unless linked_account_record_exists
-
-      object_name = error.subject.model_name.human
-      id = error.subject.id
-
-      if current_user.account.testing?
-        "#{object_name} #{id} not found using testing API key; Use production API key to " \
-          "access production #{object_name.downcase.pluralize}."
-      else
-        "#{object_name} #{id} not found using production API key; Use testing API key to " \
-          "access testing #{object_name.downcase.pluralize}."
-      end
-    end
-
    def paginate(relation, field: :id)
      result = relation.order(field => :desc)
                       .limit([params.fetch(:limit, DEFAULT_LIMIT).to_i, MAX_LIMIT].min)
@@ -10,23 +10,6 @@ module Api
    def create
      submitter = Submitter.find_by!(slug: params[:submitter_slug])

-      if params[:type].in?(%w[initials signature])
-        image = Vips::Image.new_from_file(params[:file].path)
-
-        if ImageUtils.blank?(image)
-          Rollbar.error("Empty signature: #{submitter.id}") if defined?(Rollbar)
-
-          return render json: { error: "#{params[:type]} is empty" }, status: :unprocessable_content
-        end
-
-        if ImageUtils.error?(image)
-          Rollbar.error("Error signature: #{submitter.id}") if defined?(Rollbar)
-
-          return render json: { error: "#{params[:type]} error, try to sign on another device" },
-                        status: :unprocessable_content
-        end
-      end
-
      attachment = Submitters.create_attachment!(submitter, params)

      if params[:remember_signature] == 'true' && submitter.email.present?
@@ -34,10 +17,6 @@ module Api
      end

      render json: attachment.as_json(only: %i[uuid created_at], methods: %i[url filename content_type])
-    rescue Submitters::MaliciousFileExtension => e
-      Rollbar.error(e) if defined?(Rollbar)
-
-      render json: { error: e.message }, status: :unprocessable_content
    end

    def build_new_cookie_signatures_json(submitter, attachment)
@@ -11,21 +11,17 @@ module Api
      params[:before] = Time.zone.at(params[:before].to_i) if params[:before].present?

      submitters = paginate(
-        submitters.preload(template: { folder: :parent_folder },
-                           submission: [:submitters, { audit_trail_attachment: :blob,
-                                                       combined_document_attachment: :blob }],
+        submitters.preload(template: :folder, submission: [:submitters, { audit_trail_attachment: :blob }],
                           documents_attachments: :blob, attachments_attachments: :blob),
        field: :completed_at
      )

-      expires_at = Accounts.link_expires_at(current_account)
-
      render json: {
        data: submitters.map do |s|
                {
                  event_type: 'form.completed',
                  timestamp: s.completed_at,
-                  data: Submitters::SerializeForWebhook.call(s, expires_at:)
+                  data: Submitters::SerializeForWebhook.call(s)
                }
              end,
        pagination: {
@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmissionDocumentsController < ApiBaseController
-    load_and_authorize_resource :submission
-
-    def index
-      is_merge = params[:merge] == 'true' &&
-                 (@submission.schema_documents || @submission.template.schema_documents).size > 1
-
-      documents =
-        if @submission.submitters.all?(&:completed_at?)
-          build_completed_documents(@submission, merge: is_merge)
-        else
-          build_preview_documents(@submission, merge: is_merge)
-        end
-
-      ActiveRecord::Associations::Preloader.new(records: documents, associations: [:blob]).call
-
-      expires_at = Accounts.link_expires_at(current_account)
-
-      render json: {
-        id: @submission.id,
-        documents: documents.map do |attachment|
-          { name: attachment.filename.base, url: ActiveStorage::Blob.proxy_url(attachment.blob, expires_at:) }
-        end
-      }
-    end
-
-    private
-
-    def build_completed_documents(submission, merge: false)
-      last_submitter = submission.submitters.max_by(&:completed_at)
-
-      if merge
-        if submission.merged_document_attachment.blank?
-          submission.merged_document_attachment =
-            Submissions::GenerateCombinedAttachment.call(last_submitter, with_audit: false)
-        end
-
-        [submission.merged_document_attachment]
-      else
-        if last_submitter.documents_attachments.blank?
-          last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(last_submitter)
-        end
-
-        last_submitter.documents_attachments
-      end
-    end
-
-    def build_preview_documents(submission, merge: false)
-      values_hash = Submissions::GeneratePreviewAttachments.build_values_hash(submission)
-
-      if merge
-        if submission.preview_merged_document_attachment.present? &&
-           submission.preview_merged_document_attachment.metadata['values_hash'] == values_hash
-          [submission.preview_merged_document_attachment]
-        else
-          ApplicationRecord.no_touching { submission.preview_merged_document_attachment&.destroy }
-
-          Submissions::GeneratePreviewAttachments.call(submission, values_hash:, merge: true)
-        end
-      elsif submission.preview_documents.present? &&
-            submission.preview_documents.all? { |s| s.metadata['values_hash'] == values_hash }
-        submission.preview_documents
-      else
-        ApplicationRecord.no_touching do
-          submission.preview_documents.each(&:destroy)
-        end
-
-        Submissions::GeneratePreviewAttachments.call(submission, values_hash:)
-      end
-    end
-  end
-end
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmissionEventsController < ApiBaseController
-    load_and_authorize_resource :submission, parent: false
-
-    def index
-      submissions = build_completed_query(@submissions)
-
-      params[:after] = Time.zone.at(params[:after].to_i) if params[:after].present?
-      params[:before] = Time.zone.at(params[:before].to_i) if params[:before].present?
-
-      submissions = paginate(submissions.preload(
-                               :created_by_user, :submission_events,
-                               template: :folder,
-                               submitters: { documents_attachments: :blob, attachments_attachments: :blob },
-                               audit_trail_attachment: :blob,
-                               combined_document_attachment: :blob
-                             ),
-                             field: :completed_at)
-
-      expires_at = Accounts.link_expires_at(current_account)
-
-      render json: {
-        data: submissions.map do |s|
-                {
-                  event_type: 'submission.completed',
-                  timestamp: s.completed_at,
-                  data: Submissions::SerializeForApi.call(s, s.submitters, expires_at:)
-                }
-              end,
-        pagination: {
-          count: submissions.size,
-          next: submissions.last&.completed_at&.to_i,
-          prev: submissions.first&.completed_at&.to_i
-        }
-      }
-    end
-
-    private
-
-    def build_completed_query(submissions)
-      submissions = submissions.where(
-        Submitter.where(completed_at: nil).where(
-          Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])
-        ).select(1).arel.exists.not
-      )
-
-      submissions.joins(:submitters)
-                 .group(:id)
-                 .select(Submission.arel_table[Arel.star],
-                         Submitter.arel_table[:completed_at].maximum.as('completed_at'))
-    end
-  end
-end
@@ -10,21 +10,19 @@ module Api
    end

    def index
-      submissions = Submissions.search(current_user, @submissions, params[:q])
-      submissions = filter_submissions(submissions, params)
+      submissions = Submissions.search(@submissions, params[:q])
+      submissions = submissions.where(template_id: params[:template_id]) if params[:template_id].present?
+
+      if params[:template_folder].present?
+        submissions = submissions.joins(template: :folder).where(folder: { name: params[:template_folder] })
+      end

      submissions = paginate(submissions.preload(:created_by_user, :submitters,
-                                                 template: { folder: :parent_folder },
-                                                 combined_document_attachment: :blob,
+                                                 template: :folder,
                                                 audit_trail_attachment: :blob))

-      expires_at = Accounts.link_expires_at(current_account)
-
      render json: {
-        data: submissions.map do |s|
-          Submissions::SerializeForApi.call(s, s.submitters, params,
-                                            with_events: false, with_documents: false, with_values: false, expires_at:)
-        end,
+        data: submissions.as_json(Submissions::SerializeForApi::SERIALIZE_PARAMS),
        pagination: {
          count: submissions.size,
          next: submissions.last&.id,
@@ -43,7 +41,7 @@ module Api
      end

      if @submission.audit_trail_attachment.blank? && submitters.all?(&:completed_at?)
-        @submission.audit_trail_attachment = Submissions::EnsureAuditGenerated.call(@submission)
+        @submission.audit_trail_attachment = Submissions::GenerateAuditTrail.call(@submission)
      end

      render json: Submissions::SerializeForApi.call(@submission, submitters, params)
@@ -52,12 +50,12 @@ module Api
    def create
      Params::SubmissionCreateValidator.call(params)

-      return render json: { error: 'Template not found' }, status: :unprocessable_content if @template.nil?
+      return render json: { error: 'Template not found' }, status: :unprocessable_entity if @template.nil?

      if @template.fields.blank?
        Rollbar.warning("Template does not contain fields: #{@template.id}") if defined?(Rollbar)

-        return render json: { error: 'Template does not contain fields' }, status: :unprocessable_content
+        return render json: { error: 'Template does not contain fields' }, status: :unprocessable_entity
      end

      params[:send_email] = true unless params.key?(:send_email)
@@ -65,35 +63,32 @@ module Api

      submissions = create_submissions(@template, params)

-      WebhookUrls.enqueue_events(submissions, 'submission.created')
+      submissions.each do |submission|
+        SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
+      end

      Submissions.send_signature_requests(submissions)

      submissions.each do |submission|
-        submission.submitters.each do |submitter|
-          next unless submitter.completed_at?
-
-          ProcessSubmitterCompletionJob.perform_async('submitter_id' => submitter.id, 'send_invitation_email' => false)
+        if submission.submitters.all?(&:completed_at?) && submission.submitters.last
+          ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => submission.submitters.last.id })
        end
      end

-      SearchEntries.enqueue_reindex(submissions)
-
      render json: build_create_json(submissions)
-    rescue Submitters::NormalizeValues::BaseError, Submissions::CreateFromSubmitters::BaseError,
-           DownloadUtils::UnableToDownload => e
+    rescue Submitters::NormalizeValues::BaseError => e
      Rollbar.warning(e) if defined?(Rollbar)

-      render json: { error: e.message }, status: :unprocessable_content
+      render json: { error: e.message }, status: :unprocessable_entity
    end

    def destroy
-      if params[:permanently].in?(['true', true])
+      if params[:permanently] == 'true'
        @submission.destroy!
      else
        @submission.update!(archived_at: Time.current)

-        WebhookUrls.enqueue_events(@submission, 'submission.archived')
+        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
      end

      render json: @submission.as_json(only: %i[id archived_at])
@@ -101,24 +96,6 @@ module Api

    private

-    def filter_submissions(submissions, params)
-      submissions = submissions.where(template_id: params[:template_id]) if params[:template_id].present?
-      submissions = submissions.where(slug: params[:slug]) if params[:slug].present?
-
-      if params[:template_folder].present?
-        folders =
-          TemplateFolders.filter_by_full_name(TemplateFolder.accessible_by(current_ability), params[:template_folder])
-
-        submissions = submissions.joins(:template).where(template: { folder_id: folders.pluck(:id) })
-      end
-
-      if params.key?(:archived)
-        submissions = params[:archived].in?(['true', true]) ? submissions.archived : submissions.active
-      end
-
-      Submissions::Filter.call(submissions, current_user, params)
-    end
-
    def build_create_json(submissions)
      json = submissions.flat_map do |submission|
        submission.submitters.map do |s|
@@ -126,19 +103,7 @@ module Api
        end
      end

-      if request.path.ends_with?('/init')
-        json =
-          if submissions.size == 1
-            {
-              id: submissions.first.id,
-              submitters: json,
-              expire_at: submissions.first.expire_at,
-              created_at: submissions.first.created_at
-            }
-          else
-            { submitters: json }
-          end
-      end
+      json = { submitters: json } if request.path.ends_with?('/init')

      json
    end
@@ -147,7 +112,7 @@ module Api
      is_send_email = !params[:send_email].in?(['false', false])

      if (emails = (params[:emails] || params[:email]).presence) &&
-         params[:submission].blank? && params[:submitters].blank?
+         (params[:submission].blank? && params[:submitters].blank?)
        Submissions.create_from_emails(template:,
                                       user: current_user,
                                       source: :api,
@@ -172,10 +137,7 @@ module Api
        Submissions::NormalizeParamUtils.save_default_value_attachments!(attachments, submitters)

        submitters.each do |submitter|
-          if submitter.completed_at?
-            Submitters::SubmitValues.maybe_invite_via_field(submitter, request)
-            SubmissionEvents.create_with_tracking_data(submitter, 'api_complete_form', request)
-          end
+          SubmissionEvents.create_with_tracking_data(submitter, 'api_complete_form', request) if submitter.completed_at?
        end

        submissions
@@ -185,17 +147,15 @@ module Api
    def submissions_params
      permitted_attrs = [
        :send_email, :send_sms, :bcc_completed, :completed_redirect_url, :reply_to, :go_to_last,
-        :require_phone_2fa, :require_email_2fa, :expire_at, :name,
+        :expire_at,
        {
-          variables: {},
          message: %i[subject body],
          submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
                        :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last,
-                        :require_phone_2fa, :require_email_2fa, :order, :index, :invite_by,
-                        { metadata: {}, values: {}, roles: [], readonly_fields: [], message: %i[subject body],
+                        { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
                          fields: [:name, :uuid, :default_value, :value, :title, :description,
-                                   :readonly, :required, :validation_pattern, :invalid_message,
-                                   { default_value: [], value: [], preferences: {}, validation: {} }] }]]
+                                   :readonly, :redacted, :validation_pattern, :invalid_message,
+                                   { default_value: [], value: [], preferences: {} }] }]]
        }
      ]

@@ -205,7 +165,7 @@ module Api
        key = params.key?(:submission) ? :submission : :submissions

        params.permit(
-          { key => [permitted_attrs] }, { key => permitted_attrs }
+          key => [permitted_attrs]
        ).fetch(key, [])
      end
    end
@@ -6,10 +6,10 @@ module Api
    skip_authorization_check

    def create
-      @submitter = Submitter.find_by!(slug: params[:submitter_slug])
+      submitter = Submitter.find_by!(slug: params[:submitter_slug])

-      if params[:t] == SubmissionEvents.build_tracking_param(@submitter, 'click_email')
-        SubmissionEvents.create_with_tracking_data(@submitter, 'click_email', request)
+      if params[:t] == SubmissionEvents.build_tracking_param(submitter, 'click_email')
+        SubmissionEvents.create_with_tracking_data(submitter, 'click_email', request)
      end

      render json: {}
@@ -6,14 +6,14 @@ module Api
    skip_authorization_check

    def create
-      @submitter = Submitter.find_by!(slug: params[:submitter_slug])
+      submitter = Submitter.find_by!(slug: params[:submitter_slug])

-      @submitter.opened_at = Time.current
-      @submitter.save
+      submitter.opened_at = Time.current
+      submitter.save

-      SubmissionEvents.create_with_tracking_data(@submitter, 'view_form', request)
+      SubmissionEvents.create_with_tracking_data(submitter, 'view_form', request)

-      WebhookUrls.enqueue_events(@submitter, 'form.viewed')
+      SendFormViewedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })

      render json: {}
    end
@@ -5,20 +5,26 @@ module Api
    load_and_authorize_resource :submitter

    def index
-      submitters = Submitters.search(current_user, @submitters, params[:q])
+      submitters = Submitters.search(@submitters, params[:q])

-      submitters = filter_submitters(submitters, params)
+      submitters = submitters.where(external_id: params[:application_key]) if params[:application_key].present?
+      submitters = submitters.where(external_id: params[:external_id]) if params[:external_id].present?
+      submitters = submitters.where(submission_id: params[:submission_id]) if params[:submission_id].present?
+
+      if params[:template_id].present?
+        submitters = submitters.joins(:submission).where(submission: { template_id: params[:template_id] })
+      end
+
+      submitters = maybe_filder_by_completed_at(submitters, params)

      submitters = paginate(
        submitters.preload(:template, :submission, :submission_events,
                           documents_attachments: :blob, attachments_attachments: :blob)
      )

-      expires_at = Accounts.link_expires_at(current_account)
-
      render json: {
        data: submitters.map do |s|
-                Submitters::SerializeForApi.call(s, with_template: true, with_events: true, params:, expires_at:)
+                Submitters::SerializeForApi.call(s, with_template: true, with_events: true, params:)
              end,
        pagination: {
          count: submitters.size,
@@ -34,26 +40,19 @@ module Api
      render json: Submitters::SerializeForApi.call(@submitter, with_template: true, with_events: true, params:)
    end

-    # rubocop:disable Metrics/MethodLength
    def update
      if @submitter.completed_at?
-        return render json: { error: 'Submitter has already completed the submission.' }, status: :unprocessable_content
+        return render json: { error: 'Submitter has already completed the submission.' }, status: :unprocessable_entity
      end

-      if @submitter.declined_at?
-        return render json: { error: 'Submitter has already declined the submission.' }, status: :unprocessable_content
-      end
+      role = @submitter.submission.template_submitters.find { |e| e['uuid'] == @submitter.uuid }['name']

-      submission = @submitter.submission
-      role = submission.template_submitters.find { |e| e['uuid'] == @submitter.uuid }['name']
+      normalized_params, new_attachments =
+        Submissions::NormalizeParamUtils.normalize_submitter_params!(submitter_params.merge(role:), @submitter.template,
+                                                                     for_submitter: @submitter)

-      normalized_params, new_attachments = Submissions::NormalizeParamUtils.normalize_submitter_params!(
-        submitter_params.merge(role:),
-        @submitter.template || Template.new(submitters: submission.template_submitters, account: @submitter.account),
-        for_submitter: @submitter
-      )
-
-      Submissions::CreateFromSubmitters.maybe_set_template_fields(submission, [normalized_params],
+      Submissions::CreateFromSubmitters.maybe_set_template_fields(@submitter.submission,
+                                                                  [normalized_params],
                                                                  default_submitter_uuid: @submitter.uuid)

      assign_submitter_attrs(@submitter, normalized_params)
@@ -65,38 +64,30 @@ module Api

        @submitter.submission.save!

-        if @submitter.completed_at?
-          Submitters::SubmitValues.maybe_invite_via_field(@submitter, request)
-          SubmissionEvents.create_with_tracking_data(@submitter, 'api_complete_form', request)
-        end
+        SubmissionEvents.create_with_tracking_data(@submitter, 'api_complete_form', request) if @submitter.completed_at?
      end

      if @submitter.completed_at?
-        ProcessSubmitterCompletionJob.perform_async('submitter_id' => @submitter.id)
+        ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => @submitter.id })
      elsif normalized_params[:send_email] || normalized_params[:send_sms]
        Submitters.send_signature_requests([@submitter])
      end

-      SearchEntries.enqueue_reindex(@submitter)
-
-      render json: Submitters::SerializeForApi.call(@submitter, with_template: false, with_urls: true,
-                                                                with_events: false, params:)
-    rescue Submitters::NormalizeValues::BaseError, DownloadUtils::UnableToDownload => e
-      Rollbar.warning(e) if defined?(Rollbar)
-
-      render json: { error: e.message }, status: :unprocessable_content
+      render json: Submitters::SerializeForApi.call(@submitter, with_template: false,
+                                                                with_urls: true,
+                                                                with_events: false,
+                                                                params:)
    end
-    # rubocop:enable Metrics/MethodLength

    def submitter_params
      submitter_params = params.key?(:submitter) ? params.require(:submitter) : params

      submitter_params.permit(
        :send_email, :send_sms, :reply_to, :completed_redirect_url, :uuid, :name, :email, :role,
-        :completed, :phone, :application_key, :external_id, :go_to_last, :require_phone_2fa, :require_email_2fa,
+        :completed, :phone, :application_key, :external_id, :go_to_last,
        { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
-          fields: [[:name, :uuid, :default_value, :value, :required,
-                    :readonly, :validation_pattern, :invalid_message,
+          fields: [[:name, :uuid, :default_value, :value,
+                    :readonly, :redacted, :validation_pattern, :invalid_message,
                    { default_value: [], value: [], preferences: {} }]] }
      )
    end
@@ -125,7 +116,6 @@ module Api
      end&.dig('uuid')

      submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
-      submitter.name = attrs[:name] if attrs.key?(:name)

      if attrs.key?(:phone)
        submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '')
@@ -151,15 +141,9 @@ module Api

      if attrs[:completed]
        submitter.values = Submitters::SubmitValues.merge_default_values(submitter)
+        submitter.values = Submitters::SubmitValues.merge_formula_values(submitter)
        submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter)

-        formula_values = Submitters::SubmitValues.build_formula_values(submitter)
-
-        if formula_values.present?
-          submitter.values = submitter.values.merge(formula_values)
-          submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter)
-        end
-
        submitter.values = submitter.values.transform_values do |v|
          v == '{{date}}' ? Time.current.in_time_zone(submitter.account.timezone).to_date.to_s : v
        end
@@ -168,19 +152,6 @@ module Api
      submitter
    end

-    def filter_submitters(submitters, params)
-      submitters = submitters.where(external_id: params[:application_key]) if params[:application_key].present?
-      submitters = submitters.where(external_id: params[:external_id]) if params[:external_id].present?
-      submitters = submitters.where(slug: params[:slug]) if params[:slug].present?
-      submitters = submitters.where(submission_id: params[:submission_id]) if params[:submission_id].present?
-
-      if params[:template_id].present?
-        submitters = submitters.joins(:submission).where(submissions: { template_id: params[:template_id] })
-      end
-
-      maybe_filder_by_completed_at(submitters, params)
-    end
-
    def assign_external_id(submitter, attrs)
      submitter.external_id = attrs[:application_key] if attrs.key?(:application_key)
      submitter.external_id = attrs[:external_id] if attrs.key?(:external_id)
@@ -204,10 +175,6 @@ module Api

      submitter.preferences['send_sms'] = submitter_preferences['send_sms'] if submitter_preferences.key?('send_sms')
      submitter.preferences['reply_to'] = submitter_preferences['reply_to'] if submitter_preferences.key?('reply_to')
-      if submitter_preferences.key?('require_phone_2fa')
-        submitter.preferences['require_phone_2fa'] = submitter_preferences['require_phone_2fa']
-      end
-
      if submitter_preferences.key?('go_to_last')
        submitter.preferences['go_to_last'] = submitter_preferences['go_to_last']
      end
@@ -5,7 +5,7 @@ module Api
    load_and_authorize_resource :template

    def create
-      authorize!(:create, @template)
+      authorize!(:manage, @template)

      ActiveRecord::Associations::Preloader.new(
        records: [@template],
@@ -21,20 +21,13 @@ module Api
      )

      cloned_template.source = :api
-
-      schema_documents = Templates::CloneAttachments.call(template: cloned_template,
-                                                          original_template: @template,
-                                                          documents: params[:documents])
-
-      Templates.maybe_assign_access(cloned_template)
-
      cloned_template.save!

-      WebhookUrls.enqueue_events(cloned_template, 'template.created')
+      schema_documents = Templates::CloneAttachments.call(template: cloned_template, original_template: @template)

-      SearchEntries.enqueue_reindex(cloned_template)
+      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => cloned_template.id)

-      render json: Templates::SerializeForApi.call(cloned_template, schema_documents:)
+      render json: Templates::SerializeForApi.call(cloned_template, schema_documents)
    end
  end
 end
@@ -7,7 +7,7 @@ module Api
    def index
      templates = filter_templates(@templates, params)

-      templates = paginate(templates.preload(:author, folder: :parent_folder))
+      templates = paginate(templates.preload(:author, :folder))

      schema_documents =
        ActiveStorage::Attachment.where(record_id: templates.map(&:id),
@@ -18,20 +18,19 @@ module Api

      preview_image_attachments =
        ActiveStorage::Attachment.joins(:blob)
-                                 .where(blob: { filename: ['0.png', '0.jpg'] })
+                                 .where(blob: { filename: '0.jpg' })
                                 .where(record_id: schema_documents.map(&:id),
                                        record_type: 'ActiveStorage::Attachment',
                                        name: :preview_images)
                                 .preload(:blob)

-      expires_at = Accounts.link_expires_at(current_account)
-
      render json: {
        data: templates.map do |t|
-          Templates::SerializeForApi.call(t,
-                                          schema_documents: schema_documents.select { |e| e.record_id == t.id },
-                                          preview_image_attachments:,
-                                          expires_at:)
+          Templates::SerializeForApi.call(
+            t,
+            schema_documents.select { |e| e.record_id == t.id },
+            preview_image_attachments
+          )
        end,
        pagination: {
          count: templates.size,
@@ -66,21 +65,16 @@ module Api

      @template.update!(template_params)

-      SearchEntries.enqueue_reindex(@template)
-
-      WebhookUrls.enqueue_events(@template, 'template.updated')
-      WebhookUrls.enqueue_events(@template, 'template.archived') if archived == true
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)

      render json: @template.as_json(only: %i[id updated_at])
    end

    def destroy
-      if params[:permanently].in?(['true', true])
+      if params[:permanently] == 'true'
        @template.destroy!
      else
        @template.update!(archived_at: Time.current)
-
-        WebhookUrls.enqueue_events(@template, 'template.archived')
      end

      render json: @template.as_json(only: %i[id archived_at])
@@ -89,17 +83,11 @@ module Api
    private

    def filter_templates(templates, params)
-      templates = Templates.search(current_user, templates, params[:q])
-      templates = params[:archived].in?(['true', true]) ? templates.archived : templates.active
+      templates = Templates.search(templates, params[:q])
+      templates = params[:archived] ? templates.archived : templates.active
      templates = templates.where(external_id: params[:application_key]) if params[:application_key].present?
      templates = templates.where(external_id: params[:external_id]) if params[:external_id].present?
-      templates = templates.where(slug: params[:slug]) if params[:slug].present?
-
-      if params[:folder].present?
-        folders = TemplateFolders.filter_by_full_name(TemplateFolder.accessible_by(current_ability), params[:folder])
-
-        templates = templates.where(folder_id: folders.pluck(:id))
-      end
+      templates = templates.joins(:folder).where(folder: { name: params[:folder] }) if params[:folder].present?

      templates
    end
@@ -107,20 +95,16 @@ module Api
    def template_params
      permitted_params = [
        :name,
-        :external_id,
-        :shared_link,
        {
-          submitters: [%i[name uuid is_requester invite_by_uuid invite_via_field_uuid
-                          optional_invite_by_uuid linked_to_uuid email order]],
+          submitters: [%i[name uuid]],
          fields: [[:uuid, :submitter_uuid, :name, :type,
                    :required, :readonly, :default_value,
-                    :title, :description, :prefillable,
+                    :title, :description,
                    { preferences: {},
-                      default_value: [],
-                      conditions: [%i[field_uuid value action operation]],
+                      conditions: [%i[field_uuid value action]],
                      options: [%i[value uuid]],
-                      validation: %i[message pattern min max step],
-                      areas: [%i[uuid x y w h cell_w attachment_uuid option_uuid page]] }]]
+                      validation: %i[message pattern],
+                      areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]]
        }
      ]

@@ -7,8 +7,8 @@ module Api
    def merge
      files = params[:files] || []

-      return render json: { error: 'Files are required' }, status: :unprocessable_content if files.blank?
-      return render json: { error: 'At least 2 files are required' }, status: :unprocessable_content if files.size < 2
+      return render json: { error: 'Files are required' }, status: :unprocessable_entity if files.blank?
+      return render json: { error: 'At least 2 files are required' }, status: :unprocessable_entity if files.size < 2

      render json: {
        data: Base64.encode64(PdfUtils.merge(files.map { |base64| StringIO.new(Base64.decode64(base64)) }).string)
@@ -20,7 +20,10 @@ module Api
      pdf = HexaPDF::Document.new(io: StringIO.new(file))

      trusted_certs = Accounts.load_trusted_certs(current_account)
-      is_checksum_found = CompletedDocument.exists?(sha256: Base64.urlsafe_encode64(Digest::SHA256.digest(file)))
+
+      is_checksum_found = ActiveStorage::Attachment.joins(:blob)
+                                                   .where(name: 'documents', record_type: 'Submitter')
+                                                   .exists?(blob: { checksum: Digest::MD5.base64digest(file) })

      render json: {
        checksum_status: is_checksum_found ? 'verified' : 'not_found',
@@ -34,8 +37,6 @@ module Api
          }
        end
      }
-    rescue HexaPDF::MalformedPDFError
-      render json: { error: 'Malformed PDF' }, status: :unprocessable_content
    end
  end
 end
@@ -12,6 +12,6 @@ class ApiSettingsController < ApplicationController

    current_user.access_token.save!

-    redirect_back(fallback_location: settings_api_index_path, notice: I18n.t('api_token_has_been_updated'))
+    redirect_back(fallback_location: settings_api_index_path, notice: 'API token as been updated.')
  end
 end
@@ -4,26 +4,21 @@ class ApplicationController < ActionController::Base
  BROWSER_LOCALE_REGEXP = /\A\w{2}(?:-\w{2})?/

  include ActiveStorage::SetCurrent
-  include Pagy::Method
+  include Pagy::Backend

  check_authorization unless: :devise_controller?

-  around_action :with_locale
  before_action :sign_in_for_demo, if: -> { Docuseal.demo? }
  before_action :maybe_redirect_to_setup, unless: :signed_in?
  before_action :authenticate_user!, unless: :devise_controller?

-  before_action :set_csp, if: -> { request.get? && !request.headers['HTTP_X_TURBO'] }
-
  helper_method :button_title,
                :current_account,
-                :true_ability,
-                :form_link_host,
                :svg_icon

  impersonates :user, with: ->(uuid) { User.find_by(uuid:) }

-  rescue_from Pagy::RangeError do
+  rescue_from Pagy::OverflowError do
    redirect_to request.path
  end

@@ -33,7 +28,7 @@ class ApplicationController < ActionController::Base
    redirect_to request.referer, alert: 'Too many requests', status: :too_many_requests
  end

-  if Rails.env.production? || Rails.env.test?
+  if Rails.env.production?
    rescue_from CanCan::AccessDenied do |e|
      Rollbar.warning(e) if defined?(Rollbar)

@@ -54,28 +49,9 @@ class ApplicationController < ActionController::Base
    request.session[:impersonated_user_id] = user.uuid
  end

-  def pagy_auto(collection, **keyword_args)
-    if current_ability.can?(:manage, :countless)
-      pagy(:countless, collection, **keyword_args)
-    else
-      pagy(collection, **keyword_args)
-    end
-  end
-
  private

-  def with_locale(&)
-    return yield unless current_account
-
-    locale   = params[:lang].presence if Rails.env.development?
-    locale ||= current_account.locale
-
-    I18n.with_locale(locale, &)
-  end
-
  def with_browser_locale(&)
-    return yield if I18n.locale != :'en-US' && I18n.locale != :en
-
    locale   = params[:lang].presence
    locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s

@@ -99,16 +75,11 @@ class ApplicationController < ActionController::Base
    current_user&.account
  end

-  def true_ability
-    @true_ability ||= Ability.new(true_user)
-  end
-
  def maybe_redirect_to_setup
    redirect_to setup_index_path unless User.exists?
  end

-  def button_title(title: I18n.t('submit'), disabled_with: I18n.t('submitting'), title_class: '', icon: nil,
-                   icon_disabled: nil)
+  def button_title(title: 'Submit', disabled_with: 'Submitting', title_class: '', icon: nil, icon_disabled: nil)
    render_to_string(partial: 'shared/button_title',
                     locals: { title:, disabled_with:, title_class:, icon:, icon_disabled: })
  end
@@ -116,31 +87,4 @@ class ApplicationController < ActionController::Base
  def svg_icon(icon_name, class: '')
    render_to_string(partial: "icons/#{icon_name}", locals: { class: })
  end
-
-  def form_link_host
-    Docuseal.default_url_options[:host]
-  end
-
-  def maybe_redirect_com
-    return if request.domain != 'docuseal.co'
-
-    redirect_to request.url.gsub('.co/', '.com/'), allow_other_host: true, status: :moved_permanently
-  end
-
-  def set_csp
-    request.content_security_policy = current_content_security_policy.tap do |policy|
-      policy.default_src :self
-      policy.script_src :self
-      policy.style_src :self, :unsafe_inline
-      policy.img_src :self, :https, :http, :blob, :data
-      policy.font_src :self, :https, :http, :blob, :data
-      policy.manifest_src :self
-      policy.media_src :self
-      policy.frame_src :self
-      policy.worker_src :self, :blob
-      policy.connect_src :self
-
-      policy.directives['connect-src'] << 'ws:' if Rails.env.development?
-    end
-  end
 end
@@ -6,7 +6,7 @@ class ConsoleRedirectController < ApplicationController

  def index
    if request.path == '/upgrade'
-      params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premises"
+      params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premise"
    end

    params[:redir] = "#{Docuseal::CONSOLE_URL}/manage" if request.path == '/manage'
@@ -17,10 +17,8 @@ class ConsoleRedirectController < ApplicationController
                               scope: :console,
                               exp: 1.minute.from_now.to_i)

-    redir_uri = Addressable::URI.parse(params[:redir])
-    path = redir_uri.path if params[:redir].to_s.starts_with?(Docuseal::CONSOLE_URL)
+    path = Addressable::URI.parse(params[:redir]).path if params[:redir].to_s.starts_with?(Docuseal::CONSOLE_URL)

-    redirect_to "#{Docuseal::CONSOLE_URL}#{path}?#{{ **redir_uri&.query_values, 'auth' => auth }.to_query}",
-                allow_other_host: true
+    redirect_to("#{Docuseal::CONSOLE_URL}#{path}?#{{ auth: }.to_query}", allow_other_host: true)
  end
 end
@@ -33,7 +33,7 @@ class DashboardController < ApplicationController
                                                                             account_id: current_user.account_id,
                                                                             key: AccountConfig::FORCE_MFA)

-    redirect_to mfa_setup_path, notice: I18n.t('setup_2fa_to_continue')
+    redirect_to mfa_setup_path, notice: 'Setup 2FA to continue'
  end

  def maybe_render_landing
@@ -9,18 +9,16 @@ class EmailSmtpSettingsController < ApplicationController

  def create
    if @encrypted_config.update(email_configs)
-      unless Docuseal.multitenant?
-        SettingsMailer.smtp_successful_setup(@encrypted_config.value['from_email'] || current_user.email).deliver_now!
-      end
+      SettingsMailer.smtp_successful_setup(@encrypted_config.value['from_email']).deliver_now!

-      redirect_to settings_email_index_path, notice: I18n.t('changes_have_been_saved')
+      redirect_to settings_email_index_path, notice: 'Changes have been saved'
    else
-      render :index, status: :unprocessable_content
+      render :index, status: :unprocessable_entity
    end
  rescue StandardError => e
    flash[:alert] = e.message

-    render :index, status: :unprocessable_content
+    render :index, status: :unprocessable_entity
  end

  private
@@ -9,7 +9,7 @@ class EmbedScriptsController < ActionController::Metal
            <h2>Upgrade to Pro</h2>
            <p>Unlock embedded components by upgrading to Pro</p>
            <div style="margin-top: 40px;">
-              <a href="#{Docuseal::CONSOLE_URL}/on_premises" target="_blank" style="padding: 15px 25px; background-color: #222; color: white; text-decoration: none; border-radius: 5px; font-size: 16px; cursor: pointer;">
+              <a href="#{Docuseal::CONSOLE_URL}/on_premise" target="_blank" style="padding: 15px 25px; background-color: #222; color: white; text-decoration: none; border-radius: 5px; font-size: 16px; cursor: pointer;">
                Learn More
              </a>
            </div>
@@ -2,15 +2,11 @@

 class ErrorsController < ActionController::Base
  ENTERPRISE_FEATURE_MESSAGE =
-    'This feature is available in Pro Edition: https://www.docuseal.com/pricing'
+    'This feature is available in Pro Edition: https://www.docuseal.co/pricing'

  ENTERPRISE_PATHS = [
-    '/submissions/html',
-    '/api/submissions/html',
    '/templates/html',
    '/api/templates/html',
-    '/submissions/pdf',
-    '/api/submissions/pdf',
    '/templates/pdf',
    '/api/templates/pdf',
    '/templates/doc',
@@ -40,7 +36,7 @@ class ErrorsController < ActionController::Base
        render json: { status: error_status_code, error: }.compact, status: error_status_code
      end

-      f.any { render error_status_code.to_s, status: error_status_code }
+      f.html { render error_status_code.to_s, status: error_status_code }
    end
  end

@@ -51,7 +47,7 @@ class ErrorsController < ActionController::Base
    headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, PATCH, DELETE, OPTIONS'
    headers['Access-Control-Allow-Headers'] = '*'
    headers['Access-Control-Max-Age'] = '1728000'
-    headers['Access-Control-Allow-Credentials'] = 'true'
+    headers['Access-Control-Allow-Credentials'] = true
  end

  def error_status_code
@@ -11,8 +11,6 @@ class EsignSettingsController < ApplicationController
    end
  end

-  prepend_before_action :maybe_redirect_com, only: %i[show]
-
  before_action :load_encrypted_config
  authorize_resource :encrypted_config, parent: false, only: %i[new create]
  authorize_resource :encrypted_config, only: %i[update destroy show]
@@ -23,9 +21,9 @@ class EsignSettingsController < ApplicationController
    default_pkcs = GenerateCertificate.load_pkcs(cert_data) if cert_data['cert'].present?

    custom_pkcs_list = (cert_data['custom'] || []).map do |e|
-      pkcs = e['data'].present? ? OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s) : nil
-
-      { 'pkcs' => pkcs, 'name' => e['name'], 'status' => e['status'] }
+      { 'pkcs' => OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s),
+        'name' => e['name'],
+        'status' => e['status'] }
    end

    @pkcs_list = [
@@ -50,38 +48,32 @@ class EsignSettingsController < ApplicationController
    if (@encrypted_config.value && @encrypted_config.value['custom']&.any? { |e| e['name'] == @cert_record.name }) ||
       @cert_record.name == DEFAULT_CERT_NAME

-      @cert_record.errors.add(:name, I18n.t('already_exists'))
+      @cert_record.errors.add(:name, 'already exists')

      return render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'),
-                    status: :unprocessable_content
+                    status: :unprocessable_entity
    end

    save_new_cert!(@encrypted_config, @cert_record)

-    redirect_to settings_esign_path, notice: I18n.t('certificate_has_been_successfully_added')
+    redirect_to settings_esign_path, notice: 'Certificate has been successfully added!'
  rescue OpenSSL::PKCS12::PKCS12Error => e
    Rollbar.error(e) if defined?(Rollbar)

    @cert_record.errors.add(:password, e.message)

-    render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'), status: :unprocessable_content
+    render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'), status: :unprocessable_entity
  end

  def update
-    @encrypted_config.value['custom'].to_a.each { |e| e['status'] = 'validate' }
+    @encrypted_config.value['custom'].each { |e| e['status'] = 'validate' }

-    custom_cert_data = @encrypted_config.value['custom'].to_a.find { |e| e['name'] == params[:name] }
-
-    if custom_cert_data
-      custom_cert_data['status'] = 'default'
-    elsif params[:name] == Docuseal::AATL_CERT_NAME
-      @encrypted_config.value['custom'] ||= []
-      @encrypted_config.value['custom'] << { 'name' => params[:name], 'status' => 'default' }
-    end
+    custom_cert_data = @encrypted_config.value['custom'].find { |e| e['name'] == params[:name] }
+    custom_cert_data['status'] = 'default' if custom_cert_data

    @encrypted_config.save!

-    redirect_to settings_esign_path, notice: I18n.t('default_certificate_has_been_selected')
+    redirect_to settings_esign_path, notice: 'Default certificate has been selected'
  end

  def destroy
@@ -89,7 +81,7 @@ class EsignSettingsController < ApplicationController

    @encrypted_config.save!

-    redirect_to settings_esign_path, notice: I18n.t('certificate_has_been_removed')
+    redirect_to settings_esign_path, notice: 'Certificate has been removed'
  end

  private
@@ -1,11 +1,4 @@
 # frozen_string_literal: true

 class InvitationsController < Devise::PasswordsController
-  def update
-    super do |resource|
-      resource.confirmed_at ||= Time.current if resource.errors.empty?
-
-      PasswordsController::Current.user = resource
-    end
-  end
 end
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-class McpController < ActionController::API
-  before_action :authenticate_user!
-  before_action :verify_mcp_enabled!
-
-  before_action do
-    authorize!(:manage, :mcp)
-  end
-
-  def call
-    return head :ok if request.raw_post.blank?
-
-    body = JSON.parse(request.raw_post)
-
-    result = Mcp::HandleRequest.call(body, current_user, current_ability)
-
-    if result
-      render json: result
-    else
-      head :accepted
-    end
-  rescue CanCan::AccessDenied
-    render json: { jsonrpc: '2.0', id: nil, error: { code: -32_603, message: 'Forbidden' } }, status: :forbidden
-  rescue JSON::ParserError
-    render json: { jsonrpc: '2.0', id: nil, error: { code: -32_700, message: 'Parse error' } }, status: :bad_request
-  end
-
-  private
-
-  def authenticate_user!
-    render json: { error: 'Not authenticated' }, status: :unauthorized unless current_user
-  end
-
-  def verify_mcp_enabled!
-    return if Docuseal.multitenant?
-
-    return if AccountConfig.exists?(account_id: current_user.account_id,
-                                    key: AccountConfig::ENABLE_MCP_KEY,
-                                    value: true)
-
-    render json: { error: 'MCP is disabled' }, status: :forbidden
-  end
-
-  def current_user
-    @current_user ||= user_from_api_key
-  end
-
-  def user_from_api_key
-    token = request.headers['Authorization'].to_s[/\ABearer\s+(.+)\z/, 1]
-
-    return if token.blank?
-
-    sha256 = Digest::SHA256.hexdigest(token)
-
-    User.joins(:mcp_tokens).active.find_by(mcp_tokens: { sha256:, archived_at: nil })
-  end
-end
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-class McpSettingsController < ApplicationController
-  load_and_authorize_resource :mcp_token, parent: false
-
-  before_action do
-    authorize!(:manage, :mcp)
-  end
-
-  def index
-    @mcp_tokens = @mcp_tokens.active.order(id: :desc)
-  end
-
-  def create
-    @mcp_token = current_user.mcp_tokens.new(mcp_token_params)
-
-    if @mcp_token.save
-      @mcp_tokens = [@mcp_token]
-
-      render :index, status: :created
-    else
-      render turbo_stream: turbo_stream.replace(:modal, template: 'mcp_settings/new'), status: :unprocessable_content
-    end
-  end
-
-  def destroy
-    @mcp_token.update!(archived_at: Time.current)
-
-    redirect_back fallback_location: settings_mcp_index_path, notice: I18n.t('mcp_token_has_been_removed')
-  end
-
-  private
-
-  def mcp_token_params
-    params.require(:mcp_token).permit(:name)
-  end
-end
@@ -18,13 +18,13 @@ class MfaSetupController < ApplicationController
      current_user.otp_required_for_login = true
      current_user.save!

-      redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_configured')
+      redirect_to settings_profile_index_path, notice: '2FA has been configured'
    else
      @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Docuseal.product_name)

-      @error_message = I18n.t('code_is_invalid')
+      @error_message = 'Code is invalid'

-      render turbo_stream: turbo_stream.replace(:mfa_form, partial: 'mfa_setup/form'), status: :unprocessable_content
+      render turbo_stream: turbo_stream.replace(:mfa_form, partial: 'mfa_setup/form'), status: :unprocessable_entity
    end
  end

@@ -32,18 +32,18 @@ class MfaSetupController < ApplicationController
    if current_user.validate_and_consume_otp!(params[:otp_attempt])
      current_user.update!(otp_required_for_login: false, otp_secret: nil)

-      redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_removed')
+      redirect_to settings_profile_index_path, notice: '2FA has been removed'
    else
-      @error_message = I18n.t('code_is_invalid')
+      @error_message = 'Code is invalid'

-      render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_content
+      render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_entity
    end
  end

  private

  def set_provision_url
-    return redirect_to root_path, alert: I18n.t('2fa_has_been_set_up_already') if current_user.otp_required_for_login
+    return redirect_to root_path, alert: '2FA has been set up already' if current_user.otp_required_for_login

    current_user.otp_secret ||= User.generate_otp_secret

@@ -13,9 +13,9 @@ class NotificationsSettingsController < ApplicationController

  def create
    if @account_config.value.present? ? @account_config.save : @account_config.delete
-      redirect_back fallback_location: settings_notifications_path, notice: I18n.t('changes_have_been_saved')
+      redirect_back fallback_location: settings_notifications_path, notice: 'Changes have been saved'
    else
-      redirect_back fallback_location: settings_notifications_path, alert: I18n.t('unable_to_save')
+      redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
    end
  end

@@ -39,7 +39,7 @@ class NotificationsSettingsController < ApplicationController
  end

  def email_config_params
-    params.require(:account_config).permit(:key, :value, { value: {} }, { value: [] }).tap do |attrs|
+    params.require(:account_config).permit!.tap do |attrs|
      attrs[:key] = nil unless attrs[:key].in?([AccountConfig::BCC_EMAILS, AccountConfig::SUBMITTER_REMINDERS])
    end
  end
@@ -1,12 +1,6 @@
 # frozen_string_literal: true

 class PasswordsController < Devise::PasswordsController
-  # rubocop:disable Rails/LexicallyScopedActionFilter
-  skip_before_action :require_no_authentication, only: %i[edit update]
-  # rubocop:enable Rails/LexicallyScopedActionFilter
-
-  around_action :with_browser_locale
-
  class Current < ActiveSupport::CurrentAttributes
    attribute :user
  end
@@ -22,10 +16,4 @@ class PasswordsController < Devise::PasswordsController
      Current.user = resource
    end
  end
-
-  private
-
-  def after_resetting_password_path_for(_)
-    new_session_path(resource_name)
-  end
 end
@@ -4,11 +4,9 @@ class PersonalizationSettingsController < ApplicationController
  ALLOWED_KEYS = [
    AccountConfig::FORM_COMPLETED_BUTTON_KEY,
    AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY,
-    AccountConfig::SUBMITTER_INVITATION_REMINDER_EMAIL_KEY,
    AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY,
    AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY,
-    AccountConfig::FORM_COMPLETED_MESSAGE_KEY,
-    *(Docuseal.multitenant? ? [] : [AccountConfig::POLICY_LINKS_KEY])
+    AccountConfig::FORM_COMPLETED_MESSAGE_KEY
  ].freeze

  InvalidKey = Class.new(StandardError)
@@ -32,7 +30,7 @@ class PersonalizationSettingsController < ApplicationController
      @account_config.save!
    end

-    redirect_back(fallback_location: settings_personalization_path, notice: I18n.t('settings_have_been_saved'))
+    redirect_back(fallback_location: settings_personalization_path, notice: 'Settings have been saved.')
  end

  private
@@ -51,7 +49,7 @@ class PersonalizationSettingsController < ApplicationController
  end

  def account_config_params
-    attrs = params.require(:account_config).permit(:key, :value, { value: {} }, { value: [] })
+    attrs = params.require(:account_config).permit!

    return attrs if attrs[:value].is_a?(String)

@@ -6,24 +6,13 @@ class PreviewDocumentPageController < ActionController::API
  FORMAT = Templates::ProcessDocument::FORMAT

  def show
-    result_data =
-      ApplicationRecord.signed_id_verifier.verified(params[:signed_key], purpose: :attachment)
+    attachment_uuid = ApplicationRecord.signed_id_verifier.verified(params[:signed_uuid], purpose: :attachment)

-    attachment =
-      if result_data.is_a?(Array) && result_data.compact_blank.size == 2
-        attachment_id, attachment_uuid = result_data
-
-        ActiveStorage::Attachment.find_by(id: attachment_id, uuid: attachment_uuid)
-      elsif result_data
-        ActiveStorage::Attachment.find_by(uuid: result_data)
-      end
+    attachment = ActiveStorage::Attachment.find_by(uuid: attachment_uuid) if attachment_uuid

    return head :not_found unless attachment

-    @template = attachment.record
-
-    preview_image = attachment.preview_images.joins(:blob)
-                              .find_by(blob: { filename: ["#{params[:id]}.png", "#{params[:id]}.jpg"] })
+    preview_image = attachment.preview_images.joins(:blob).find_by(blob: { filename: "#{params[:id]}#{FORMAT}" })

    return redirect_to preview_image.url, allow_other_host: true if preview_image

@@ -9,25 +9,18 @@ class ProfileController < ApplicationController

  def update_contact
    if current_user.update(contact_params)
-      if current_user.try(:pending_reconfirmation?) && current_user.previous_changes.key?(:unconfirmed_email)
-        SendConfirmationInstructionsJob.perform_async('user_id' => current_user.id)
-
-        redirect_to settings_profile_index_path,
-                    notice: I18n.t('a_confirmation_email_has_been_sent_to_the_new_email_address')
-      else
-        redirect_to settings_profile_index_path, notice: I18n.t('contact_information_has_been_update')
-      end
+      redirect_to settings_profile_index_path, notice: 'Contact information has been updated'
    else
-      render :index, status: :unprocessable_content
+      render :index, status: :unprocessable_entity
    end
  end

  def update_password
-    if current_user.update_with_password(password_params)
+    if current_user.update(password_params)
      bypass_sign_in(current_user)
-      redirect_to settings_profile_index_path, notice: I18n.t('password_has_been_changed')
+      redirect_to settings_profile_index_path, notice: 'Password has been changed'
    else
-      render :index, status: :unprocessable_content
+      render :index, status: :unprocessable_entity
    end
  end

@@ -38,6 +31,6 @@ class ProfileController < ApplicationController
  end

  def password_params
-    params.require(:user).permit(:password, :password_confirmation, :current_password)
+    params.require(:user).permit(:password, :password_confirmation)
  end
 end
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class PwaController < ActionController::Base
-end
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class RevealAccessTokenController < ApplicationController
-  def show
-    authorize!(:manage, current_user.access_token)
-  end
-
-  def create
-    authorize!(:manage, current_user.access_token)
-
-    if current_user.valid_password?(params[:password])
-      render turbo_stream: turbo_stream.replace(:access_token_container,
-                                                partial: 'reveal_access_token/access_token',
-                                                locals: { token: current_user.access_token.token })
-    else
-      render turbo_stream: turbo_stream.replace(:modal, template: 'reveal_access_token/show',
-                                                        locals: { error_message: I18n.t('wrong_password') }),
-             status: :unprocessable_content
-    end
-  end
-end
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class SearchEntriesReindexController < ApplicationController
-  def create
-    authorize!(:manage, EncryptedConfig)
-
-    ReindexAllSearchEntriesJob.perform_async
-
-    AccountConfig.find_or_initialize_by(account_id: Account.minimum(:id), key: :fulltext_search)
-                 .update!(value: true)
-
-    Docuseal.instance_variable_set(:@fulltext_search, nil)
-
-    redirect_back(fallback_location: settings_account_path,
-                  notice: "Started building search index. Visit #{root_url}jobs/busy to check progress.")
-  end
-end
@@ -7,43 +7,27 @@ class SendSubmissionEmailController < ApplicationController
  skip_before_action :verify_authenticity_token
  skip_authorization_check

-  SEND_DURATION = 30.minutes
+  def success; end

  def create
-    if params[:template_slug]
-      template = Template.find_by!(slug: params[:template_slug])
-
-      @submitter =
-        Submitter.completed.where(submission: template.submissions).find_by!(email: params[:email].to_s.downcase)
-    elsif params[:submission_slug]
-      submission = Submission.find_by(slug: params[:submission_slug])
-
-      if submission
-        @submitter = Submitter.completed.find_by(submission: submission, email: params[:email].to_s.downcase)
+    @submitter =
+      if params[:template_slug]
+        Submitter.joins(submission: :template).find_by!(email: params[:email].to_s.downcase,
+                                                        template: { slug: params[:template_slug] })
+      elsif params[:submission_slug]
+        Submitter.joins(:submission).find_by!(email: params[:email].to_s.downcase,
+                                              submission: { slug: params[:submission_slug] })
+      else
+        Submitter.find_by!(slug: params[:submitter_slug])
      end

-      return redirect_to submissions_preview_completed_path(params[:submission_slug], status: :error) unless @submitter
-    else
-      @submitter = Submitter.completed.find_by!(slug: params[:submitter_slug])
-    end
-
    RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)

-    SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later! if can_send?(@submitter)
+    SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!

    respond_to do |f|
-      f.html { render :success }
+      f.html { redirect_to success_send_submission_email_index_path }
      f.json { head :ok }
    end
  end
-
-  private
-
-  def can_send?(submitter)
-    return false if submitter.account.archived_at?
-    return false if EmailEvent.exists?(tag: :submitter_documents_copy, email: submitter.email, emailable: submitter,
-                                       event_type: :send, created_at: SEND_DURATION.ago..Time.current)
-
-    true
-  end
 end
@@ -12,11 +12,11 @@ class SessionsController < Devise::SessionsController
      Rollbar.warning('Sign in new user') if defined?(Rollbar)

      return redirect_to new_registration_path(sign_up: true, user: sign_in_params.slice(:email)),
-                         notice: I18n.t('create_a_new_account')
+                         notice: 'Create a new account'
    end

    if User.exists?(email:, otp_required_for_login: true) && sign_in_params[:otp_attempt].blank?
-      return render :otp, locals: { resource: User.new(sign_in_params) }, status: :unprocessable_content
+      return render :otp, locals: { resource: User.new(sign_in_params) }, status: :unprocessable_entity
    end

    super
@@ -21,12 +21,12 @@ class SetupController < ApplicationController
    @encrypted_config = EncryptedConfig.new(encrypted_config_params)

    unless URI.parse(encrypted_config_params[:value].to_s).class.in?([URI::HTTP, URI::HTTPS])
-      @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
+      @encrypted_config.errors.add(:value, 'should be a valid URL')

-      return render :index, status: :unprocessable_content
+      return render :index, status: :unprocessable_entity
    end

-    return render :index, status: :unprocessable_content unless @account.valid?
+    return render :index, status: :unprocessable_entity unless @account.valid?

    if @user.save
      encrypted_configs = [
@@ -34,7 +34,6 @@ class SetupController < ApplicationController
        { key: EncryptedConfig::ESIGN_CERTS_KEY, value: GenerateCertificate.call.transform_values(&:to_pem) }
      ]
      @account.encrypted_configs.create!(encrypted_configs)
-      @account.account_configs.create!(key: :fulltext_search, value: true) if SearchEntry.table_exists?

      Docuseal.refresh_default_url_options!

@@ -42,7 +41,7 @@ class SetupController < ApplicationController

      redirect_to newsletter_path
    else
-      render :index, status: :unprocessable_content
+      render :index, status: :unprocessable_entity
    end
  end

@@ -57,7 +56,7 @@ class SetupController < ApplicationController
  def account_params
    return {} unless params[:account]

-    params.require(:account).permit(:name, :timezone, :locale)
+    params.require(:account).permit(:name, :timezone)
  end

  def encrypted_config_params
@@ -67,10 +66,10 @@ class SetupController < ApplicationController
  end

  def redirect_to_root_if_signed
-    redirect_to root_path, notice: I18n.t('you_are_already_signed_in')
+    redirect_to root_path, notice: 'You are already signed in'
  end

  def ensure_first_user_not_created!
-    redirect_to new_user_session_path, notice: I18n.t('please_sign_in') if User.exists?
+    redirect_to new_user_session_path, notice: 'Please sign in.' if User.exists?
  end
 end
@@ -6,161 +6,73 @@ class StartFormController < ApplicationController
  skip_before_action :authenticate_user!
  skip_authorization_check

-  around_action :with_browser_locale, only: %i[show update completed]
-  before_action :maybe_redirect_com, only: %i[show completed]
-  before_action :load_resubmit_submitter, only: :update
+  around_action :with_browser_locale, only: %i[show completed]
  before_action :load_template
-  before_action :authorize_start!, only: :update
-
-  COOKIES_TTL = 12.hours
-  COOKIES_DEFAULTS = { httponly: true, secure: Rails.env.production? }.freeze

  def show
-    if @template.preferences['require_phone_2fa'] || @template.preferences['require_email_2fa']
-      raise ActionController::RoutingError, I18n.t('not_found')
-    end
-
-    if @template.shared_link?
-      @submitter = @template.submissions.new(account_id: @template.account_id)
-                            .submitters.new(account_id: @template.account_id,
-                                            uuid: (filter_undefined_submitters(@template).first ||
-                                                  @template.submitters.first)['uuid'])
-      render :email_verification if params[:email_verification]
-    else
-      Rollbar.warning("Not shared template: #{@template.id}") if defined?(Rollbar)
-
-      return render :private if current_user && current_ability.can?(:read, @template)
-
-      raise ActionController::RoutingError, I18n.t('not_found')
-    end
+    @submitter = @template.submissions.new(account_id: @template.account_id)
+                          .submitters.new(uuid: @template.submitters.first['uuid'])
  end

  def update
-    @submitter = find_or_initialize_submitter(@template, submitter_params)
+    return redirect_to start_form_path(@template.slug) if @template.archived_at?
+
+    @submitter = Submitter.where(submission: @template.submissions.where(expire_at: Time.current..)
+                                             .or(@template.submissions.where(expire_at: nil)).where(archived_at: nil))
+                          .order(id: :desc)
+                          .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
+                          .find_or_initialize_by(**submitter_params.compact_blank)

    if @submitter.completed_at?
-      redirect_to start_form_completed_path(@template.slug, submitter_params.compact_blank)
+      redirect_to start_form_completed_path(@template.slug, email: submitter_params[:email])
    else
-      if filter_undefined_submitters(@template).size > 1 && @submitter.new_record?
-        @error_message = multiple_submitters_error_message
+      if @template.submitters.to_a.size > 1 && @submitter.new_record?
+        @error_message = 'Not found'

-        return render :show, status: :unprocessable_content
+        return render :show
      end

-      if (is_new_record = @submitter.new_record?)
-        assign_submission_attributes(@submitter, @template)
+      assign_submission_attributes(@submitter, @template) if @submitter.new_record?

-        Submissions::AssignDefinedSubmitters.call(@submitter.submission)
-      else
-        @submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
-      end
+      is_new_record = @submitter.new_record?

-      if @template.preferences['shared_link_2fa'] == true
-        handle_require_2fa(@submitter, is_new_record:)
-      elsif @submitter.errors.blank? && @submitter.save
-        enqueue_new_submitter_jobs(@submitter) if is_new_record
+      if @submitter.save
+        if is_new_record
+          SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => @submitter.submission.id })
+        end

        redirect_to submit_form_path(@submitter.slug)
      else
-        render :show, status: :unprocessable_content
+        render :show
      end
    end
  end

  def completed
-    return redirect_to start_form_path(@template.slug) if !@template.shared_link? || @template.archived_at?
-
-    submitter_params = params.permit(:name, :email, :phone).tap do |attrs|
-      attrs[:email] = Submissions.normalize_email(attrs[:email])
-    end
-
-    required_fields = @template.preferences.fetch('link_form_fields', ['email'])
-
-    required_params = required_fields.index_with { |key| submitter_params[key] }
-
-    raise ActionController::RoutingError, I18n.t('not_found') if required_params.any? { |_, v| v.blank? } ||
-                                                                 required_params.except('name').compact_blank.blank?
-
    @submitter = Submitter.where(submission: @template.submissions)
                          .where.not(completed_at: nil)
-                          .find_by!(required_params.except('name'))
+                          .find_by!(email: params[:email])
  end

  private

-  def enqueue_new_submitter_jobs(submitter)
-    WebhookUrls.enqueue_events(submitter.submission, 'submission.created')
-
-    SearchEntries.enqueue_reindex(submitter)
-
-    return unless submitter.submission.expire_at?
-
-    ProcessSubmissionExpiredJob.perform_at(submitter.submission.expire_at, 'submission_id' => submitter.submission_id)
-  end
-
-  def load_resubmit_submitter
-    @resubmit_submitter =
-      if params[:resubmit].present? && !params[:resubmit].in?([true, 'true'])
-        Submitter.find_by(slug: params[:resubmit])
-      end
-  end
-
-  def authorize_start!
-    return redirect_to start_form_path(@template.slug) if @template.archived_at?
-
-    return if @resubmit_submitter
-    return if @template.shared_link? || (current_user && current_ability.can?(:read, @template))
-
-    Rollbar.warning("Not shared template: #{@template.id}") if defined?(Rollbar)
-
-    redirect_to start_form_path(@template.slug)
-  end
-
-  def find_or_initialize_submitter(template, submitter_params)
-    required_fields = template.preferences.fetch('link_form_fields', ['email'])
-
-    required_params = required_fields.index_with { |key| submitter_params[key] }
-
-    find_params = required_params.except('name')
-
-    submitter = Submitter.new if find_params.compact_blank.blank?
-
-    submitter ||=
-      Submitter
-      .where(submission: template.submissions.where(expire_at: Time.current..)
-                                 .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
-      .order(id: :desc)
-      .where(declined_at: nil)
-      .where(external_id: nil)
-      .where(template.preferences['shared_link_2fa'] == true ? {} : { ip: [nil, request.remote_ip] })
-      .then { |rel| params[:resubmit].present? || params[:selfsign].present? ? rel.where(completed_at: nil) : rel }
-      .find_or_initialize_by(find_params)
-
-    submitter.name = required_params['name'] if submitter.new_record?
-
-    unless @resubmit_submitter
-      required_params.each do |key, value|
-        submitter.errors.add(key.to_sym, :blank) if value.blank?
-      end
-    end
-
-    submitter
-  end
-
  def assign_submission_attributes(submitter, template)
+    resubmit_submitter =
+      if params[:resubmit].present?
+        Submitter.where(submission: @template.submissions).find_by(slug: params[:resubmit])
+      end
+
    submitter.assign_attributes(
-      uuid: (filter_undefined_submitters(template).first || @template.submitters.first)['uuid'],
+      uuid: template.submitters.first['uuid'],
      ip: request.remote_ip,
      ua: request.user_agent,
-      values: @resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
-      preferences: @resubmit_submitter&.preferences.presence || { 'send_email' => true },
-      metadata: @resubmit_submitter&.metadata.presence || {}
+      values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
+      preferences: resubmit_submitter&.preferences.presence || { 'send_email' => true },
+      metadata: resubmit_submitter&.metadata.presence || {}
    )

-    submitter.assign_attributes(@resubmit_submitter.slice(:name, :email, :phone)) if @resubmit_submitter
-
    if submitter.values.present?
-      @resubmit_submitter.attachments.each do |attachment|
+      resubmit_submitter.attachments.each do |attachment|
        submitter.attachments << attachment.dup if submitter.values.value?(attachment.uuid)
      end
    end
@@ -168,79 +80,20 @@ class StartFormController < ApplicationController
    submitter.submission ||= Submission.new(template:,
                                            account_id: template.account_id,
                                            template_submitters: template.submitters,
-                                            expire_at: Templates.build_default_expire_at(template),
-                                            submitters: [submitter],
                                            source: :link)

-    Submissions::CreateFromSubmitters.maybe_set_dynamic_documents(submitter.submission)
-
-    submitter.account_id = submitter.submission.account_id
-
    submitter
  end

-  def filter_undefined_submitters(template)
-    Templates.filter_undefined_submitters(template.submitters)
-  end
-
  def submitter_params
-    return { 'email' => current_user.email, 'name' => current_user.full_name } if params[:selfsign]
-    return @resubmit_submitter.slice(:name, :phone, :email) if @resubmit_submitter.present?
-
    params.require(:submitter).permit(:email, :phone, :name).tap do |attrs|
      attrs[:email] = Submissions.normalize_email(attrs[:email])
    end
  end

  def load_template
-    @template =
-      if @resubmit_submitter
-        @resubmit_submitter.template
-      else
-        Template.find_by!(slug: params[:slug] || params[:start_form_slug])
-      end
-  end
+    slug = params[:slug] || params[:start_form_slug]

-  def multiple_submitters_error_message
-    if current_user&.account_id == @template.account_id
-      helpers.t('this_submission_has_multiple_signers_which_prevents_the_use_of_a_sharing_link_html')
-    else
-      I18n.t('not_found')
-    end
-  end
-
-  def handle_require_2fa(submitter, is_new_record:)
-    return render :show, status: :unprocessable_content if submitter.errors.present?
-
-    is_otp_verified = Submitters.verify_link_otp!(params[:one_time_code], submitter)
-
-    if cookies.encrypted[:email_2fa_slug] == submitter.slug || is_otp_verified
-      if submitter.save
-        enqueue_new_submitter_jobs(submitter) if is_new_record
-
-        if is_otp_verified
-          SubmissionEvents.create_with_tracking_data(submitter, 'email_verified', request)
-
-          cookies.encrypted[:email_2fa_slug] =
-            { value: submitter.slug, expires: COOKIES_TTL.from_now, **COOKIES_DEFAULTS }
-        end
-
-        redirect_to submit_form_path(submitter.slug)
-      else
-        render :show, status: :unprocessable_content
-      end
-    else
-      Submitters.send_shared_link_email_verification_code(submitter, request:)
-
-      render :email_verification
-    end
-  rescue Submitters::UnableToSendCode, Submitters::InvalidOtp => e
-    redirect_to start_form_path(submitter.submission.template.slug,
-                                params: submitter_params.merge(email_verification: true)),
-                alert: e.message
-  rescue RateLimit::LimitApproached
-    redirect_to start_form_path(submitter.submission.template.slug,
-                                params: submitter_params.merge(email_verification: true)),
-                alert: I18n.t(:too_many_attempts)
+    @template = Template.find_by!(slug:)
  end
 end
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class StartFormEmail2faSendController < ApplicationController
-  around_action :with_browser_locale
-
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def create
-    @template = Template.find_by!(slug: params[:slug])
-
-    @submitter = @template.submissions.new(account_id: @template.account_id)
-                          .submitters.new(**submitter_params, account_id: @template.account_id)
-
-    Submitters.send_shared_link_email_verification_code(@submitter, request:)
-
-    redir_params = { notice: I18n.t(:code_has_been_resent) } if params[:resend]
-
-    redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)),
-                **redir_params
-  rescue Submitters::UnableToSendCode => e
-    redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)),
-                alert: e.message
-  end
-
-  private
-
-  def submitter_params
-    params.require(:submitter).permit(:name, :email, :phone)
-  end
-end
@@ -11,9 +11,9 @@ class StorageSettingsController < ApplicationController
    if @encrypted_config.update(storage_configs)
      LoadActiveStorageConfigs.reload

-      redirect_to settings_storage_index_path, notice: I18n.t('changes_have_been_saved')
+      redirect_to settings_storage_index_path, notice: 'Changes have been saved'
    else
-      render :index, status: :unprocessable_content
+      render :index, status: :unprocessable_entity
    end
  end

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class SubmissionEventsController < ApplicationController
-  SUBMISSION_EVENT_ICONS = {
-    'view_form' => 'eye',
-    'start_form' => 'player_play',
-    'complete_form' => 'check',
-    'send_email' => 'mail_forward',
-    'click_email' => 'hand_click',
-    'api_complete_form' => 'check',
-    'send_reminder_email' => 'mail_forward',
-    'send_2fa_sms' => '2fa',
-    'send_2fa_email' => '2fa',
-    'send_sms' => 'send',
-    'phone_verified' => 'phone_check',
-    'email_verified' => 'email_check',
-    'click_sms' => 'hand_click',
-    'decline_form' => 'x',
-    'delegate_form' => 'user_share',
-    'start_verification' => 'player_play',
-    'complete_verification' => 'check',
-    'invite_party' => 'user_plus'
-  }.freeze
-
-  load_and_authorize_resource :submission
-
-  def index; end
-end
@@ -4,20 +4,12 @@ class SubmissionsArchivedController < ApplicationController
  load_and_authorize_resource :submission, parent: false

  def index
-    @submissions = @submissions.left_joins(:template)
+    @submissions = @submissions.joins(:template)
    @submissions = @submissions.where.not(archived_at: nil)
                               .or(@submissions.where.not(templates: { archived_at: nil }))
-                               .preload(:template_accesses, :created_by_user, template: :author)
+                               .preload(:created_by_user, template: :author)
+    @submissions = Submissions.search(@submissions, params[:q], search_template: true)

-    @submissions = Submissions.search(current_user, @submissions, params[:q], search_template: true)
-    @submissions = Submissions::Filter.call(@submissions, current_user, params)
-
-    @submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
-                     @submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
-                   else
-                     @submissions.order(id: :desc)
-                   end
-
-    @pagy, @submissions = pagy_auto(@submissions.preload(submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
  end
 end
@@ -6,30 +6,9 @@ class SubmissionsController < ApplicationController

  load_and_authorize_resource :submission, only: %i[show destroy]

-  prepend_before_action :maybe_redirect_com, only: %i[show]
-
-  before_action only: :create do
-    authorize!(:create, Submission)
-  end
-
-  FIELD_ICONS = {
-    'text' => 'text_size', 'signature' => 'writing_sign', 'date' => 'calendar_event',
-    'number' => 'square_number_1', 'image' => 'photo', 'initials' => 'letter_case_upper',
-    'file' => 'paperclip', 'select' => 'select', 'checkbox' => 'checkbox', 'radio' => 'circle_dot',
-    'stamp' => 'rubber_stamp', 'cells' => 'columns_3', 'multiple' => 'checks', 'phone' => 'phone_check',
-    'payment' => 'credit_card', 'verification' => 'id', 'kba' => 'user_scan'
-  }.freeze
-
  def show
    @submission = Submissions.preload_with_pages(@submission)

-    unless @submission.submitters.all?(&:completed_at?)
-      ActiveRecord::Associations::Preloader.new(
-        records: [@submission],
-        associations: [submitters: :start_form_submission_events]
-      ).call
-    end
-
    render :show, layout: 'plain'
  end

@@ -38,9 +17,14 @@ class SubmissionsController < ApplicationController
  end

  def create
+    authorize!(:create, Submission)
+
    save_template_message(@template, params) if params[:save_message] == '1'

-    [params.delete(:subject), params.delete(:body)] if params[:is_custom_message] != '1'
+    if params[:is_custom_message] != '1'
+      params.delete(:subject)
+      params.delete(:body)
+    end

    submissions =
      if params[:emails].present?
@@ -51,56 +35,42 @@ class SubmissionsController < ApplicationController
                                       emails: params[:emails],
                                       params: params.merge('send_completed_email' => true))
      else
-        create_submissions(@template, submissions_params, params)
+        Submissions.create_from_submitters(template: @template,
+                                           user: current_user,
+                                           source: :invite,
+                                           submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
+                                           submissions_attrs: submissions_params[:submission].to_h.values,
+                                           params: params.merge('send_completed_email' => true))
      end

-    WebhookUrls.enqueue_events(submissions, 'submission.created')
+    submissions.each do |submission|
+      SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
+    end

    Submissions.send_signature_requests(submissions)

-    SearchEntries.enqueue_reindex(submissions)
-
-    redirect_to template_path(@template), notice: I18n.t('new_recipients_have_been_added')
-  rescue Submissions::CreateFromSubmitters::BaseError => e
-    render turbo_stream: turbo_stream.replace(:submitters_error, partial: 'submissions/error',
-                                                                 locals: { error: e.message }),
-           status: :unprocessable_content
+    redirect_to template_path(@template), notice: 'New recipients have been added'
  end

  def destroy
    notice =
-      if params[:permanently].in?(['true', true])
+      if params[:permanently].present?
        @submission.destroy!

-        I18n.t('submission_has_been_removed')
+        'Submission has been removed'
      else
        @submission.update!(archived_at: Time.current)

-        WebhookUrls.enqueue_events(@submission, 'submission.archived')
+        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)

-        I18n.t('submission_has_been_archived')
+        'Submission has been archived'
      end

-    redirect_back(fallback_location: @submission.template_id ? template_path(@submission.template) : root_path, notice:)
+    redirect_back(fallback_location: template_path(@submission.template), notice:)
  end

  private

-  def create_submissions(template, submissions_params, params)
-    submissions_attrs = submissions_params[:submission].to_h.values
-
-    submissions_attrs, _, new_fields =
-      Submissions::NormalizeParamUtils.normalize_submissions_params!(submissions_attrs, template, add_fields: true)
-
-    Submissions.create_from_submitters(template: template,
-                                       user: current_user,
-                                       source: :invite,
-                                       submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
-                                       submissions_attrs:,
-                                       new_fields:,
-                                       params: params.merge('send_completed_email' => true))
-  end
-
  def save_template_message(template, params)
    template.preferences['request_email_subject'] = params[:subject] if params[:subject].present?
    template.preferences['request_email_body'] = params[:body] if params[:body].present?
@@ -109,7 +79,7 @@ class SubmissionsController < ApplicationController
  end

  def submissions_params
-    params.permit(submission: { submitters: [:uuid, :email, :phone, :name, { values: {} }] })
+    params.permit(submission: { submitters: [%i[uuid email phone name]] })
  end

  def load_template
@@ -4,21 +4,17 @@ class SubmissionsDashboardController < ApplicationController
  load_and_authorize_resource :submission, parent: false

  def index
-    @submissions = @submissions.left_joins(:template)
+    @submissions = @submissions.joins(:template)

    @submissions = @submissions.where(archived_at: nil)
                               .where(templates: { archived_at: nil })
-                               .preload(:template_accesses, :created_by_user, template: :author)
+                               .preload(:created_by_user, template: :author)

-    @submissions = Submissions.search(current_user, @submissions, params[:q], search_template: true)
-    @submissions = Submissions::Filter.call(@submissions, current_user, params)
+    @submissions = Submissions.search(@submissions, params[:q], search_template: true)

-    @submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
-                     @submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
-                   else
-                     @submissions.order(id: :desc)
-                   end
+    @submissions = @submissions.pending if params[:status] == 'pending'
+    @submissions = @submissions.completed if params[:status] == 'completed'

-    @pagy, @submissions = pagy_auto(@submissions.preload(submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
  end
 end
@@ -8,37 +8,39 @@ class SubmissionsDownloadController < ApplicationController
  FILES_TTL = 5.minutes

  def index
-    @submitter = Submitter.find_signed(params[:sig], purpose: :download_completed) if params[:sig].present?
+    submitter = Submitter.find_signed(params[:sig], purpose: :download_completed) if params[:sig].present?

    signature_valid =
-      if @submitter&.slug == params[:submitter_slug]
+      if submitter&.slug == params[:submitter_slug]
        true
      else
-        @submitter = nil
+        submitter = nil
      end

-    @submitter ||= Submitter.find_by!(slug: params[:submitter_slug])
+    submitter ||= Submitter.find_by!(slug: params[:submitter_slug])

-    Submissions::EnsureResultGenerated.call(@submitter)
+    Submissions::EnsureResultGenerated.call(submitter)

-    last_submitter = @submitter.submission.submitters.where.not(completed_at: nil).order(:completed_at).last
-
-    return head :not_found unless last_submitter
+    last_submitter = submitter.submission.submitters.where.not(completed_at: nil).order(:completed_at).last

    Submissions::EnsureResultGenerated.call(last_submitter)

-    if !signature_valid && !current_user_submitter?(last_submitter)
-      return head :not_found unless Submitters::AuthorizedForForm.call(@submitter, current_user, request)
+    return head :not_found unless last_submitter.completed_at?

-      if last_submitter.completed_at < TTL.ago
-        Rollbar.info("TTL: #{last_submitter.id}") if defined?(Rollbar)
+    if last_submitter.completed_at < TTL.ago && !signature_valid && !current_user_submitter?(last_submitter)
+      Rollbar.info("TTL: #{last_submitter.id}") if defined?(Rollbar)

-        return head :not_found
-      end
+      return head :not_found
    end

-    if params[:combined] == 'true'
-      respond_with_combined(last_submitter)
+    if params[:combined]
+      url = build_combined_url(submitter)
+
+      if url
+        render json: [url]
+      else
+        head :not_found
+      end
    else
      render json: build_urls(last_submitter)
    end
@@ -46,30 +48,13 @@ class SubmissionsDownloadController < ApplicationController

  private

-  def respond_with_combined(submitter)
-    url = build_combined_url(submitter)
-
-    if url
-      render json: [url]
-    else
-      head :not_found
-    end
-  end
-
  def current_user_submitter?(submitter)
-    current_user && current_ability.can?(:read, submitter)
+    current_user && current_user.account.submitters.exists?(id: submitter.id)
  end

  def build_urls(submitter)
-    filename_format = AccountConfig.find_or_initialize_by(account_id: submitter.account_id,
-                                                          key: AccountConfig::DOCUMENT_FILENAME_FORMAT_KEY)&.value
-
    Submitters.select_attachments_for_download(submitter).map do |attachment|
-      ActiveStorage::Blob.proxy_path(
-        attachment.blob,
-        expires_at: FILES_TTL.from_now.to_i,
-        filename: Submitters.build_document_filename(submitter, attachment.blob, filename_format)
-      )
+      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
    end
  end

@@ -78,15 +63,8 @@ class SubmissionsDownloadController < ApplicationController
    return if submitter.submission.submitters.order(:completed_at).last != submitter

    attachment = submitter.submission.combined_document_attachment
-    attachment ||= Submissions::EnsureCombinedGenerated.call(submitter)
+    attachment ||= Submissions::GenerateCombinedAttachment.call(submitter)

-    filename_format = AccountConfig.find_or_initialize_by(account_id: submitter.account_id,
-                                                          key: AccountConfig::DOCUMENT_FILENAME_FORMAT_KEY)&.value
-
-    ActiveStorage::Blob.proxy_path(
-      attachment.blob,
-      expires_at: FILES_TTL.from_now.to_i,
-      filename: Submitters.build_document_filename(submitter, attachment.blob, filename_format)
-    )
+    ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
  end
 end
@@ -5,22 +5,16 @@ class SubmissionsExportController < ApplicationController
  load_and_authorize_resource :submission, through: :template, parent: false, only: :index

  def index
-    submissions = params[:archived] == 'true' ? @submissions.archived : @submissions.active
-
-    submissions = submissions.preload(submitters: { documents_attachments: :blob,
-                                                    attachments_attachments: :blob })
-                             .order(id: :asc)
-
-    submissions = Submissions.search(current_user, submissions, params[:q], search_values: true)
-    submissions = Submissions::Filter.call(submissions, current_user, params)
-
-    expires_at = Accounts.link_expires_at(current_account)
+    submissions = @submissions.active
+                              .preload(submitters: { documents_attachments: :blob,
+                                                     attachments_attachments: :blob })
+                              .order(id: :asc)

    if params[:format] == 'csv'
-      send_data Submissions::GenerateExportFiles.call(submissions, format: params[:format], expires_at:),
+      send_data Submissions::GenerateExportFiles.call(submissions, format: params[:format]),
                filename: "#{@template.name}.csv"
    elsif params[:format] == 'xlsx'
-      send_data Submissions::GenerateExportFiles.call(submissions, format: params[:format], expires_at:),
+      send_data Submissions::GenerateExportFiles.call(submissions, format: params[:format]),
                filename: "#{@template.name}.xlsx"
    end
  end
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class SubmissionsFiltersController < ApplicationController
-  ALLOWED_NAMES = %w[
-    author
-    folder
-    completed_at
-    status
-    created_at
-  ].freeze
-
-  skip_authorization_check
-
-  def show
-    return head :not_found unless ALLOWED_NAMES.include?(params[:name])
-
-    render params[:name]
-  end
-end
@@ -1,12 +1,9 @@
 # frozen_string_literal: true

 class SubmissionsPreviewController < ApplicationController
-  around_action :with_browser_locale
  skip_before_action :authenticate_user!
  skip_authorization_check

-  prepend_before_action :maybe_redirect_com, only: %i[show completed]
-
  TTL = 40.minutes

  def show
@@ -21,14 +18,11 @@ class SubmissionsPreviewController < ApplicationController

    @submission ||= Submission.find_by!(slug: params[:slug])

-    raise ActionController::RoutingError, I18n.t('not_found') if @submission.account.archived_at?
-
-    if !@submission.submitters.all?(&:completed_at?) && !signature_valid &&
-       (!current_user || !current_ability.can?(:read, @submission))
-      raise ActionController::RoutingError, I18n.t('not_found')
+    if !@submission.submitters.all?(&:completed_at?) && current_user.blank?
+      raise ActionController::RoutingError, 'Not Found'
    end

-    if use_signature?(@submission) && !signature_valid
+    if !submission_valid_ttl?(@submission) && !signature_valid
      Rollbar.info("TTL: #{@submission.id}") if defined?(Rollbar)

      return redirect_to submissions_preview_completed_path(@submission.slug)
@@ -42,27 +36,14 @@ class SubmissionsPreviewController < ApplicationController
  def completed
    @submission = Submission.find_by!(slug: params[:submissions_preview_slug])

-    raise ActionController::RoutingError, I18n.t('not_found') if @submission.account.archived_at?
-
-    @template = @submission.template
-
    render :completed, layout: 'form'
  end

  private

-  def use_signature?(submission)
-    return false if current_user && can?(:read, submission)
-    return true if submission.submitters.any? do |e|
-      e.preferences['require_phone_2fa'] || e.preferences['require_email_2fa']
-    end
-    return true if submission.template&.preferences&.dig('require_phone_2fa')
-    return true if submission.template&.preferences&.dig('require_email_2fa')
-
-    !submission_valid_ttl?(submission)
-  end
-
  def submission_valid_ttl?(submission)
+    return true if current_user && current_user.account.submissions.exists?(id: submission.id)
+
    last_submitter = submission.submitters.select(&:completed_at?).max_by(&:completed_at)

    last_submitter && last_submitter.completed_at > TTL.ago
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class SubmissionsUnarchiveController < ApplicationController
-  load_and_authorize_resource :submission
-
-  def create
-    @submission.update!(archived_at: nil)
-
-    redirect_to submission_path(@submission), notice: I18n.t('submission_has_been_unarchived')
-  end
-end
@@ -3,34 +3,27 @@
 class SubmitFormController < ApplicationController
  layout 'form'

-  around_action :with_browser_locale, only: %i[show completed success delegated]
+  around_action :with_browser_locale, only: %i[show completed success]
  skip_before_action :authenticate_user!
  skip_authorization_check

-  before_action :load_submitter, only: %i[show update completed]
-  before_action :maybe_redirect_delegated, only: %i[show completed]
-  before_action :maybe_render_locked_page, only: :show
-  before_action :maybe_require_link_2fa, only: %i[show]
-
  CONFIG_KEYS = [].freeze

  def show
-    submission = @submitter.submission
+    @submitter = Submitter.find_by!(slug: params[:slug])

-    return render :email_2fa unless Submitters::AuthorizedForForm.pass_email_2fa?(@submitter, request)
    return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
+    return render :archived if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
+    return render :expired if @submitter.submission.expired?

-    @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS)
-
-    return render :awaiting if (@form_configs[:enforce_signing_order] ||
-                                submission.template&.preferences&.dig('submitters_order') == 'preserved') &&
-                               !Submitters.current_submitter_order?(@submitter)
-
-    Submissions.preload_with_pages(submission)
+    Submitters.preload_with_pages(@submitter)

    Submitters::MaybeUpdateDefaultValues.call(@submitter, current_user)

-    @attachments_index = build_attachments_index(submission)
+    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
+                                                  .preload(:blob).index_by(&:uuid)
+
+    @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS)

    return unless @form_configs[:prefill_signature]

@@ -49,88 +42,30 @@ class SubmitFormController < ApplicationController
  end

  def update
-    unless Submitters::AuthorizedForForm.call(@submitter, current_user, request)
-      return render json: { error: I18n.t('verification_required_refresh_the_page_and_pass_2fa') },
-                    status: :unprocessable_content
+    submitter = Submitter.find_by!(slug: params[:slug])
+
+    if submitter.completed_at?
+      return render json: { error: 'Form has been completed already.' }, status: :unprocessable_entity
    end

-    if @submitter.completed_at?
-      return render json: { error: I18n.t('form_has_been_completed_already') }, status: :unprocessable_content
+    if submitter.template.archived_at? || submitter.submission.archived_at?
+      return render json: { error: 'Form has been archived.' }, status: :unprocessable_entity
    end

-    if @submitter.submission.template&.archived_at? || @submitter.submission.archived_at?
-      return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_content
+    if submitter.submission.expired?
+      return render json: { error: 'Form has been expired.' }, status: :unprocessable_entity
    end

-    if @submitter.submission.expired?
-      return render json: { error: I18n.t('form_has_been_expired') }, status: :unprocessable_content
-    end
-
-    if @submitter.declined_at?
-      return render json: { error: I18n.t('form_has_been_declined') },
-                    status: :unprocessable_content
-    end
-
-    Submitters::SubmitValues.call(@submitter, params, request)
+    Submitters::SubmitValues.call(submitter, params, request)

    head :ok
-  rescue Submitters::SubmitValues::RequiredFieldError => e
-    Rollbar.warning("Required field #{@submitter.id}: #{e.message}") if defined?(Rollbar)
-
-    render json: { field_uuid: e.message }, status: :unprocessable_content
  rescue Submitters::SubmitValues::ValidationError => e
-    render json: { error: e.message }, status: :unprocessable_content
+    render json: { error: e.message }, status: :unprocessable_entity
  end

  def completed
-    raise ActionController::RoutingError, I18n.t('not_found') if @submitter.account.archived_at?
-
-    return if Submitters::AuthorizedForForm.call(@submitter, current_user, request)
-
-    redirect_to submit_form_path(params[:submit_form_slug])
+    @submitter = Submitter.completed.find_by!(slug: params[:submit_form_slug])
  end

  def success; end
-
-  def delegated
-    submitter_version = SubmitterVersion.find_by!(slug: params[:slug] || params[:submit_form_slug])
-
-    @submitter = submitter_version.submitter
-  end
-
-  private
-
-  def maybe_require_link_2fa
-    return if Submitters::AuthorizedForForm.pass_link_2fa?(@submitter, current_user, request)
-
-    redirect_to start_form_path(@submitter.submission.template.slug)
-  end
-
-  def maybe_render_locked_page
-    return render :archived if @submitter.submission.template&.archived_at? ||
-                               @submitter.submission.archived_at? ||
-                               @submitter.account.archived_at?
-    return render :expired if @submitter.submission.expired?
-
-    render :declined if @submitter.declined_at?
-  end
-
-  def maybe_redirect_delegated
-    return if @submitter
-
-    submitter_version = SubmitterVersion.find_by!(slug: params[:slug] || params[:submit_form_slug])
-
-    submitter_version.submitter.submission_events.find_by!(event_type: :delegate_form)
-
-    redirect_to submit_form_delegated_path(submitter_version.slug)
-  end
-
-  def load_submitter
-    @submitter = Submitter.find_by(slug: params[:slug] || params[:submit_form_slug])
-  end
-
-  def build_attachments_index(submission)
-    ActiveStorage::Attachment.where(record: submission.submitters, name: :attachments)
-                             .preload(:blob).index_by(&:uuid)
-  end
 end
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormDeclineController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  before_action :load_submitter
-
-  def create
-    return redirect_to submit_form_path(@submitter.slug) if @submitter.declined_at? ||
-                                                            @submitter.completed_at? ||
-                                                            @submitter.submission.archived_at? ||
-                                                            @submitter.submission.expired? ||
-                                                            @submitter.submission.template&.archived_at? ||
-                                                            !Submitters::AuthorizedForForm.call(@submitter,
-                                                                                                current_user,
-                                                                                                request)
-
-    ApplicationRecord.transaction do
-      @submitter.update!(declined_at: Time.current)
-
-      SubmissionEvents.create_with_tracking_data(@submitter, 'decline_form', request, { reason: params[:reason] })
-    end
-
-    user = @submitter.submission.created_by_user || @submitter.template.author
-
-    if user.user_configs.find_by(key: UserConfig::RECEIVE_DECLINED_EMAIL)&.value != false
-      SubmitterMailer.declined_email(@submitter, user).deliver_later!
-    end
-
-    WebhookUrls.enqueue_events(@submitter, 'form.declined')
-
-    redirect_to submit_form_path(@submitter.slug)
-  end
-
-  private
-
-  def load_submitter
-    @submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-  end
-end
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormDelegateController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  before_action :load_submitter
-
-  def create
-    return redirect_to submit_form_path(@submitter.slug) if @submitter.declined_at? ||
-                                                            @submitter.completed_at? ||
-                                                            @submitter.submission.archived_at? ||
-                                                            @submitter.submission.expired? ||
-                                                            @submitter.submission.template&.archived_at? ||
-                                                            !Submitters::AuthorizedForForm.call(@submitter,
-                                                                                                current_user,
-                                                                                                request)
-
-    @submitter.account.account_configs.find_by!(key: AccountConfig::ALLOW_TO_DELEGATE_KEY, value: true)
-
-    email = Submissions.normalize_email(params[:email])
-
-    return redirect_to submit_form_path(@submitter.slug) if email.blank?
-
-    old_slug = @submitter.slug
-
-    ApplicationRecord.transaction do
-      @submitter.submitter_versions.create!(slug: old_slug, email: @submitter.email,
-                                            name: @submitter.name, phone: @submitter.phone)
-
-      SubmissionEvents.create_with_tracking_data(@submitter, 'delegate_form', request,
-                                                 { old_email: @submitter.email, email: })
-
-      @submitter.update!(email:, phone: nil, name: nil, slug: SecureRandom.base58(14))
-    end
-
-    SendSubmitterInvitationEmailJob.perform_async('submitter_id' => @submitter.id)
-
-    redirect_to submit_form_delegated_path(old_slug)
-  end
-
-  private
-
-  def load_submitter
-    @submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-  end
-end
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormDownloadController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  FILES_TTL = 5.minutes
-
-  def index
-    @submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-
-    return redirect_to submitter_download_index_path(@submitter.slug) if @submitter.completed_at?
-
-    return head :unprocessable_content if @submitter.declined_at? ||
-                                          @submitter.submission.archived_at? ||
-                                          @submitter.submission.expired? ||
-                                          @submitter.submission.template&.archived_at? ||
-                                          AccountConfig.exists?(account_id: @submitter.account_id,
-                                                                key: AccountConfig::ALLOW_TO_PARTIAL_DOWNLOAD_KEY,
-                                                                value: false) ||
-                                          !Submitters::AuthorizedForForm.call(@submitter, current_user, request)
-
-    last_completed_submitter = @submitter.submission.submitters
-                                         .where.not(id: @submitter.id)
-                                         .where.not(completed_at: nil)
-                                         .max_by(&:completed_at)
-
-    attachments =
-      if last_completed_submitter
-        Submitters.select_attachments_for_download(last_completed_submitter)
-      else
-        @submitter.submission.schema_documents.preload(:blob)
-      end
-
-    urls = attachments.map do |attachment|
-      ActiveStorage::Blob.proxy_path(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
-    end
-
-    render json: urls
-  end
-end
@@ -12,8 +12,7 @@ class SubmitFormDrawSignatureController < ApplicationController

    return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?

-    if @submitter.submission.template&.archived_at? || @submitter.submission.archived_at? ||
-       !Submitters::AuthorizedForForm.call(@submitter, current_user, request)
+    if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
      return redirect_to submit_form_path(@submitter.slug)
    end

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormEmail2fasController < ApplicationController
-  around_action :with_browser_locale
-
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  before_action :load_submitter
-
-  COOKIES_TTL = 12.hours
-  COOKIES_DEFAULTS = { httponly: true, secure: Rails.env.production? }.freeze
-
-  def create
-    RateLimit.call("verify-2fa-code-#{@submitter.id}", limit: 2, ttl: 45.seconds, enabled: true)
-
-    value = [@submitter.email.downcase.strip, @submitter.slug].join(':')
-
-    if EmailVerificationCodes.verify(params[:one_time_code].to_s.gsub(/\D/, ''), value)
-      SubmissionEvents.create_with_tracking_data(@submitter, 'email_verified', request, { email: @submitter.email })
-
-      cookies.encrypted[:email_2fa_slug] =
-        { value: @submitter.slug, expires: COOKIES_TTL.from_now, **COOKIES_DEFAULTS }
-
-      redirect_to submit_form_path(@submitter.slug)
-    else
-      redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:invalid_code)
-    end
-  rescue RateLimit::LimitApproached
-    redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:too_many_attempts)
-  end
-
-  def update
-    if @submitter.submission_events.where(event_type: 'send_2fa_email').exists?(created_at: 15.seconds.ago..)
-      return redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:rate_limit_exceeded)
-    end
-
-    RateLimit.call("send-email-code-#{@submitter.id}", limit: 2, ttl: 45.seconds, enabled: true)
-
-    SendSubmitterVerificationEmailJob.perform_async('submitter_id' => @submitter.id, 'locale' => I18n.locale.to_s)
-
-    redir_params = params[:resend] ? { alert: I18n.t(:code_has_been_resent) } : {}
-
-    redirect_to submit_form_path(@submitter.slug, status: :sent), **redir_params
-  rescue RateLimit::LimitApproached
-    redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:too_many_attempts)
-  end
-
-  def load_submitter
-    @submitter = Submitter.find_by!(slug: params[:submitter_slug])
-  end
-end
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormInviteController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def create
-    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-
-    return head :unprocessable_content unless can_invite?(submitter)
-
-    invite_submitters = filter_invite_submitters(submitter, 'invite_by_uuid')
-    optional_invite_submitters = filter_invite_submitters(submitter, 'optional_invite_by_uuid')
-
-    ApplicationRecord.transaction do
-      (invite_submitters + optional_invite_submitters).each do |item|
-        attrs = submitters_attributes.find { |e| e[:uuid] == item['uuid'] }
-
-        next unless attrs
-        next if attrs[:email].blank?
-
-        email = Submissions.normalize_email(attrs[:email])
-
-        submitter.submission.submitters.create!(uuid: attrs[:uuid], email:, account_id: submitter.account_id)
-
-        SubmissionEvents.create_with_tracking_data(submitter, 'invite_party', request, { uuid: submitter.uuid })
-      end
-
-      submitter.submission.update!(submitters_order: :preserved)
-    end
-
-    submitter.submission.submitters.reload
-
-    if invite_submitters.all? { |s| submitter.submission.submitters.any? { |e| e.uuid == s['uuid'] } }
-      Submitters::SubmitValues.call(submitter, ActionController::Parameters.new(completed: 'true'), request)
-
-      head :ok
-    else
-      head :unprocessable_content
-    end
-  end
-
-  private
-
-  def can_invite?(submitter)
-    !submitter.declined_at? &&
-      !submitter.completed_at? &&
-      !submitter.submission.archived_at? &&
-      !submitter.submission.expired? &&
-      !submitter.submission.template&.archived_at? &&
-      Submitters::AuthorizedForForm.call(submitter, current_user, request)
-  end
-
-  def filter_invite_submitters(submitter, key = 'invite_by_uuid')
-    (submitter.submission.template_submitters || submitter.submission.template.submitters).select do |s|
-      s[key] == submitter.uuid && submitter.submission.submitters.none? { |e| e.uuid == s['uuid'] }
-    end
-  end
-
-  def submitters_attributes
-    params.require(:submission).permit(submitters: [%i[uuid email]]).fetch(:submitters, [])
-  end
-end
@@ -7,12 +7,8 @@ class SubmitFormValuesController < ApplicationController
  def index
    submitter = Submitter.find_by!(slug: params[:submit_form_slug])

-    return render json: {} if submitter.completed_at? ||
-                              submitter.declined_at? ||
-                              submitter.submission.template&.archived_at? ||
-                              submitter.submission.archived_at? ||
-                              submitter.submission.expired? ||
-                              !Submitters::AuthorizedForForm.call(submitter, current_user, request)
+    return render json: {} if submitter.completed_at?
+    return render json: {} if submitter.submission.template.archived_at? || submitter.submission.archived_at?

    value = submitter.values[params['field_uuid']]
    attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?
@@ -7,41 +7,27 @@ class SubmittersAutocompleteController < ApplicationController
  LIMIT = 100

  def index
-    field = SELECT_COLUMNS.find { |c| c == params[:field] }
+    submitters = search_submitters(@submitters)

-    submitters = search_submitters(@submitters, field)
-
-    arel_columns = SELECT_COLUMNS.map { |col| Submitter.arel_table[col] }
-
-    values =
-      if field
-        max_ids = submitters.group(field).limit(LIMIT).select(Submitter.arel_table[:id].maximum)
-
-        submitters.where(id: max_ids).order(id: :desc).pluck(arel_columns)
-      else
-        submitters.limit(LIMIT).group(arel_columns).pluck(arel_columns)
-      end
+    values = submitters.limit(LIMIT).group(SELECT_COLUMNS.join(', ')).pluck(SELECT_COLUMNS.join(', '))

    attrs = values.map { |row| SELECT_COLUMNS.zip(row).to_h }
+    attrs = attrs.uniq { |e| e[params[:field]] } if params[:field].present?

    render json: attrs
  end

  private

-  def search_submitters(submitters, field)
-    if field
-      if Docuseal.fulltext_search?
-        Submitters.fulltext_search_field(current_user, submitters, params[:q], field)
-      else
-        column = Submitter.arel_table[field.to_sym]
+  def search_submitters(submitters)
+    if SELECT_COLUMNS.include?(params[:field])
+      column = Submitter.arel_table[params[:field].to_sym]

-        term = "#{params[:q].downcase}%"
+      term = "#{params[:q].downcase}%"

-        submitters.where(column.matches(term))
-      end
+      submitters.where(column.matches(term))
    else
-      Submitters.search(current_user, submitters, params[:q])
+      Submitters.search(submitters, params[:q])
    end
  end
 end
@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-class SubmittersController < ApplicationController
-  load_and_authorize_resource :submitter, only: %i[edit update]
-
-  def edit
-    @submitter_email_message =
-      if @submitter.preferences['email_message_uuid'].present?
-        @submitter.account.email_messages.find_by(uuid: @submitter.preferences['email_message_uuid'])
-      end
-  end
-
-  def update
-    submission = @submitter.submission
-
-    if @submitter.submission_events.exists?(event_type: 'start_form') || submission.archived_at? || submission.expired?
-      return redirect_back fallback_location: submission_path(submission), alert: I18n.t('submitter_cannot_be_updated')
-    end
-
-    if submitter_params.values.all?(&:blank?)
-      return redirect_back fallback_location: submission_path(submission),
-                           alert: I18n.t('at_least_one_field_must_be_filled')
-    end
-
-    if params[:is_custom_message] != '1'
-      params.delete(:subject)
-      params.delete(:body)
-    end
-
-    submitter_preferences = Submitters.normalize_preferences(@submitter.account, current_user, params)
-
-    if submitter_preferences.key?('email_message_uuid')
-      @submitter.preferences['email_message_uuid'] = submitter_preferences['email_message_uuid']
-    end
-
-    assign_submitter_attrs(@submitter, submitter_params)
-
-    if @submitter.save
-      maybe_resend_email_sms(@submitter, params)
-
-      SearchEntries.enqueue_reindex(@submitter)
-
-      redirect_back fallback_location: submission_path(submission), notice: I18n.t('changes_have_been_saved')
-    else
-      redirect_back fallback_location: submission_path(submission), alert: I18n.t('unable_to_save')
-    end
-  end
-
-  private
-
-  def maybe_resend_email_sms(submitter, params)
-    if params[:send_email] == '1' && submitter.email.present?
-      is_sent_recently = Docuseal.multitenant? &&
-                         EmailEvent.exists?(email: submitter.email,
-                                            tag: 'submitter_invitation',
-                                            emailable: submitter,
-                                            event_type: 'send',
-                                            created_at: 4.hours.ago..Time.current)
-
-      SendSubmitterInvitationEmailJob.perform_async('submitter_id' => submitter.id) unless is_sent_recently
-    end
-
-    return if submitter.phone.blank?
-    return unless params[:send_sms] == '1'
-
-    SendSubmitterInvitationSmsJob.perform_async('submitter_id' => submitter.id)
-  end
-
-  def assign_submitter_attrs(submitter, attrs)
-    submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '') if attrs.key?(:phone)
-
-    submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
-
-    submitter.name = attrs[:name] if attrs.key?(:name)
-
-    submitter
-  end
-
-  def submitter_params
-    params.require(:submitter).permit(:email, :name, :phone).transform_values(&:strip)
-  end
-end
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-class SubmittersResubmitController < ApplicationController
-  load_and_authorize_resource :submitter, parent: false
-
-  def update
-    return redirect_to submit_form_path(slug: @submitter.slug) if @submitter.email != current_user.email
-
-    submission = @submitter.account.submissions.new(created_by_user: current_user,
-                                                    submitters_order: :preserved,
-                                                    **@submitter.submission.slice(:template_fields,
-                                                                                  :account_id,
-                                                                                  :name,
-                                                                                  :template_id,
-                                                                                  :template_schema,
-                                                                                  :template_submitters,
-                                                                                  :preferences))
-
-    @submitter.submission.submitters.each do |submitter|
-      new_submitter = submission.submitters.new(submitter.slice(:uuid, :email, :phone, :name,
-                                                                :preferences, :metadata, :account_id))
-
-      next unless submitter.uuid == @submitter.uuid
-
-      assign_submitter_values(new_submitter, submitter)
-
-      @new_submitter ||= new_submitter
-    end
-
-    submission.save!
-
-    @submitter.submission.documents_attachments.each do |attachment|
-      submission.documents_attachments.create!(uuid: attachment.uuid, blob_id: attachment.blob_id)
-    end
-
-    redirect_to submit_form_path(slug: @new_submitter.slug)
-  end
-
-  private
-
-  def assign_submitter_values(new_submitter, submitter)
-    attachments_index = submitter.attachments.index_by(&:uuid)
-
-    submitter.submission.template_fields.each do |field|
-      next if field['submitter_uuid'] != submitter.uuid
-      next if field['default_value'] == '{{date}}'
-      next if field['type'] == 'stamp'
-      next if field['type'] == 'signature'
-      next if field.dig('preferences', 'formula').present?
-
-      value = submitter.values[field['uuid']]
-
-      next if value.blank?
-
-      if field['type'].in?(%w[image file initials])
-        Array.wrap(value).each do |attachment_uuid|
-          new_submitter.attachments << attachments_index[attachment_uuid].dup
-        end
-      end
-
-      new_submitter.values[field['uuid']] = value
-    end
-  end
-end
@@ -6,11 +6,11 @@ class SubmittersSendEmailController < ApplicationController
  def create
    if Docuseal.multitenant? && SubmissionEvent.exists?(submitter: @submitter,
                                                        event_type: 'send_email',
-                                                        created_at: 10.hours.ago..Time.current)
+                                                        created_at: 24.hours.ago..Time.current)
      Rollbar.warning("Already sent: #{@submitter.id}") if defined?(Rollbar)

      return redirect_back(fallback_location: submission_path(@submitter.submission),
-                           alert: I18n.t('email_has_been_sent_already'))
+                           alert: 'Email has been sent already.')
    end

    SendSubmitterInvitationEmailJob.perform_async('submitter_id' => @submitter.id)
@@ -18,6 +18,6 @@ class SubmittersSendEmailController < ApplicationController
    @submitter.sent_at ||= Time.current
    @submitter.save!

-    redirect_back(fallback_location: submission_path(@submitter.submission), notice: I18n.t('email_has_been_sent'))
+    redirect_back(fallback_location: submission_path(@submitter.submission), notice: 'Email has been sent')
  end
 end
@@ -3,20 +3,14 @@
 class TemplateDocumentsController < ApplicationController
  load_and_authorize_resource :template

-  FILES_TTL = 5.minutes
-
-  def index
-    render json: @template.schema_documents.map { |d| ActiveStorage::Blob.proxy_path(d.blob, expires_at: FILES_TTL.from_now.to_i) }
-  end
-
  def create
    if params[:blobs].blank? && params[:files].blank?
-      return render json: { error: I18n.t('file_is_missing') }, status: :unprocessable_content
+      return render json: { error: 'File is missing' }, status: :unprocessable_entity
    end

    old_fields_hash = @template.fields.hash

-    documents, = Templates::CreateAttachments.call(@template, params, extract_fields: true)
+    documents = Templates::CreateAttachments.call(@template, params, extract_fields: true)

    schema = documents.map do |doc|
      { attachment_uuid: doc.uuid, name: doc.filename.base }
@@ -27,13 +21,13 @@ class TemplateDocumentsController < ApplicationController
      fields: old_fields_hash == @template.fields.hash ? nil : @template.fields,
      submitters: old_fields_hash == @template.fields.hash ? nil : @template.submitters,
      documents: documents.as_json(
-        methods: %i[metadata signed_key],
+        methods: %i[metadata signed_uuid],
        include: {
          preview_images: { methods: %i[url metadata filename] }
        }
      )
    }
  rescue Templates::CreateAttachments::PdfEncrypted
-    render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_content
+    render json: { error: 'PDF encrypted' }, status: :unprocessable_entity
  end
 end
@@ -3,31 +3,12 @@
 class TemplateFoldersAutocompleteController < ApplicationController
  load_and_authorize_resource :template_folder, parent: false

-  LIMIT = 30
+  LIMIT = 100

  def index
-    parent_name, name =
-      if params[:parent_name].present?
-        [params[:parent_name], params[:q]]
-      else
-        params[:q].to_s.split(' /', 2).map(&:squish)
-      end
+    template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
+    template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)

-    if name
-      parent_folder = @template_folders.find_by(name: parent_name, parent_folder_id: nil)
-    else
-      name = parent_name
-    end
-
-    template_folders = TemplateFolders.filter_active_folders(@template_folders.where(parent_folder:),
-                                                             Template.accessible_by(current_ability))
-
-    name = name.to_s.downcase
-
-    template_folders = TemplateFolders.search(template_folders, name).order(id: :desc).limit(LIMIT)
-
-    render json: template_folders.preload(:parent_folder)
-                                 .sort_by { |e| e.name.downcase.index(name) || Float::MAX }
-                                 .as_json(only: %i[name archived_at], methods: %i[full_name])
+    render json: template_folders.as_json(only: %i[name archived_at])
  end
 end
@@ -3,41 +3,11 @@
 class TemplateFoldersController < ApplicationController
  load_and_authorize_resource :template_folder

-  helper_method :selected_order
-
-  TEMPLATES_PER_PAGE = 12
-  FOLDERS_PER_PAGE = 18
-
  def show
-    @templates = Template.active.accessible_by(current_ability)
-                         .where(folder: [@template_folder, *(params[:q].present? ? @template_folder.subfolders : [])])
-                         .preload(:author, :template_accesses)
+    @templates = @template_folder.templates.active.preload(:author).order(id: :desc)
+    @templates = Templates.search(@templates, params[:q])

-    @template_folders =
-      @template_folder.subfolders.where(id: Template.accessible_by(current_ability).active.select(:folder_id))
-
-    @template_folders = TemplateFolders.search(@template_folders, params[:q])
-    @template_folders = TemplateFolders.sort(@template_folders, current_user, selected_order)
-
-    if @templates.exists?
-      @templates = Templates.search(current_user, @templates, params[:q])
-      @templates = Templates::Order.call(@templates, current_user, selected_order)
-
-      limit =
-        if @template_folders.size < 4
-          TEMPLATES_PER_PAGE
-        else
-          (@template_folders.size < 7 ? 9 : 6)
-        end
-
-      @pagy, @templates = pagy_auto(@templates, limit:)
-
-      load_related_submissions if params[:q].present? && @templates.blank?
-    else
-      @pagy, @template_folders = pagy(@template_folders, limit: FOLDERS_PER_PAGE)
-
-      @templates = @templates.none
-    end
+    @pagy, @templates = pagy(@templates, items: 12)
  end

  def edit; end
@@ -45,42 +15,15 @@ class TemplateFoldersController < ApplicationController
  def update
    if @template_folder != current_account.default_template_folder &&
       @template_folder.update(template_folder_params)
-      redirect_to folder_path(@template_folder), notice: I18n.t('folder_name_has_been_updated')
+      redirect_to folder_path(@template_folder), notice: 'Folder name has been updated'
    else
-      redirect_to folder_path(@template_folder), alert: I18n.t('unable_to_rename_folder')
+      redirect_to folder_path(@template_folder), alert: 'Unable to rename folder'
    end
  end

  private

-  def selected_order
-    @selected_order ||=
-      if cookies.permanent[:dashboard_templates_order].blank? ||
-         (cookies.permanent[:dashboard_templates_order] == 'used_at' && can?(:manage, :countless))
-        'created_at'
-      else
-        cookies.permanent[:dashboard_templates_order]
-      end
-  end
-
  def template_folder_params
    params.require(:template_folder).permit(:name)
  end
-
-  def load_related_submissions
-    @related_submissions =
-      Submission.accessible_by(current_ability)
-                .where(archived_at: nil)
-                .where(template_id: current_account.templates.active
-                                                   .where(folder: [@template_folder, *@template_folder.subfolders])
-                                                   .select(:id))
-                .preload(:template_accesses, :created_by_user,
-                         template: :author,
-                         submitters: :start_form_submission_events)
-
-    @related_submissions = Submissions.search(current_user, @related_submissions, params[:q])
-                                      .order(id: :desc)
-
-    @related_submissions_pagy, @related_submissions = pagy_auto(@related_submissions, limit: 5)
-  end
 end
@@ -4,27 +4,9 @@ class TemplatesArchivedController < ApplicationController
  load_and_authorize_resource :template, parent: false

  def index
-    @templates = @templates.where.not(archived_at: nil)
-                           .preload(:author, :template_accesses, folder: :parent_folder)
-                           .order(id: :desc)
+    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder).order(id: :desc)
+    @templates = Templates.search(@templates, params[:q])

-    @templates = Templates.search(current_user, @templates, params[:q])
-
-    @pagy, @templates = pagy_auto(@templates, limit: 12)
-
-    return unless params[:q].present? && @templates.blank?
-
-    @related_submissions =
-      Submission.accessible_by(current_ability)
-                .joins(:template)
-                .where.not(templates: { archived_at: nil })
-                .preload(:template_accesses, :created_by_user,
-                         template: :author,
-                         submitters: :start_form_submission_events)
-
-    @related_submissions = Submissions.search(current_user, @related_submissions, params[:q])
-                                      .order(id: :desc)
-
-    @related_submissions_pagy, @related_submissions = pagy_auto(@related_submissions, limit: 5)
+    @pagy, @templates = pagy(@templates, items: 12)
  end
 end
@@ -6,16 +6,9 @@ class TemplatesArchivedSubmissionsController < ApplicationController

  def index
    @submissions = @submissions.where.not(archived_at: nil)
-    @submissions = Submissions.search(current_user, @submissions, params[:q], search_values: true)
-    @submissions = Submissions::Filter.call(@submissions, current_user, params)
+    @submissions = Submissions.search(@submissions, params[:q], search_values: true)

-    @submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
-                     @submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
-                   else
-                     @submissions.order(id: :desc)
-                   end
-
-    @pagy, @submissions = pagy_auto(@submissions.preload(submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
  rescue ActiveRecord::RecordNotFound
    redirect_to root_path
  end
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesCloneAndReplaceController < ApplicationController
-  load_and_authorize_resource :template
-
-  def create
-    return head :unprocessable_content if params[:files].blank?
-
-    ActiveRecord::Associations::Preloader.new(
-      records: [@template],
-      associations: [schema_documents: :preview_images_attachments]
-    ).call
-
-    cloned_template = Templates::Clone.call(@template, author: current_user)
-    cloned_template.name = File.basename(params[:files].first.original_filename, '.*')
-    cloned_template.save!
-
-    documents = Templates::ReplaceAttachments.call(cloned_template, params, extract_fields: true)
-
-    Templates.maybe_assign_access(cloned_template)
-
-    cloned_template.save!
-
-    Templates::CloneAttachments.call(template: cloned_template, original_template: @template,
-                                     excluded_attachment_uuids: documents.map(&:uuid))
-
-    SearchEntries.enqueue_reindex(cloned_template)
-
-    respond_to do |f|
-      f.html { redirect_to edit_template_path(cloned_template) }
-      f.json { render json: { id: cloned_template.id } }
-    end
-  rescue Templates::CreateAttachments::PdfEncrypted
-    respond_to do |f|
-      f.html { render turbo_stream: turbo_stream.append(params[:form_id], html: helpers.tag.prompt_password) }
-      f.json { render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_content }
-    end
-  end
-end
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesCloneController < ApplicationController
-  load_and_authorize_resource :template, instance_name: :base_template
-
-  def new
-    authorize!(:create, Template)
-
-    @template = Template.new(name: "#{@base_template.name} (#{I18n.t('clone')})")
-  end
-
-  def create
-    ActiveRecord::Associations::Preloader.new(
-      records: [@base_template],
-      associations: [schema_documents: :preview_images_attachments]
-    ).call
-
-    @template = Templates::Clone.call(@base_template, author: current_user,
-                                                      name: params.dig(:template, :name),
-                                                      folder_name: params[:folder_name])
-
-    authorize!(:create, @template)
-
-    if params[:account_id].present? && true_ability.can?(:manage, Account.find(params[:account_id]))
-      @template.account_id = params[:account_id]
-      @template.author = true_user if true_user.account_id == @template.account_id
-      @template.folder = @template.account.default_template_folder if @template.account_id != current_account.id
-    else
-      @template.account = current_account
-    end
-
-    Templates.maybe_assign_access(@template)
-
-    if @template.save
-      Templates::CloneAttachments.call(template: @template, original_template: @base_template)
-
-      SearchEntries.enqueue_reindex(@template)
-
-      WebhookUrls.enqueue_events(@template, 'template.created')
-
-      maybe_redirect_to_template(@template)
-    else
-      render turbo_stream: turbo_stream.replace(:modal, partial: 'templates_clone/form'), status: :unprocessable_content
-    end
-  end
-
-  private
-
-  def maybe_redirect_to_template(template)
-    if template.account == current_account
-      redirect_to(edit_template_path(template))
-    else
-      redirect_back(fallback_location: root_path, notice: I18n.t('template_has_been_cloned'))
-    end
-  end
-end
@@ -3,28 +3,26 @@
 class TemplatesController < ApplicationController
  load_and_authorize_resource :template

+  before_action :load_base_template, only: %i[new create]
+
  def show
    submissions = @template.submissions.accessible_by(current_ability)
    submissions = submissions.active if @template.archived_at.blank?
-    submissions = Submissions.search(current_user, submissions, params[:q], search_values: true)
-    submissions = Submissions::Filter.call(submissions, current_user, params.except(:status))
+    submissions = Submissions.search(submissions, params[:q], search_values: true)

    @base_submissions = submissions

-    submissions = Submissions::Filter.filter_by_status(submissions, params)
+    submissions = submissions.pending if params[:status] == 'pending'
+    submissions = submissions.completed if params[:status] == 'completed'

-    submissions = if params[:completed_at_from].present? || params[:completed_at_to].present?
-                    submissions.order(Submitter.arel_table[:completed_at].maximum.desc)
-                  else
-                    submissions.order(id: :desc)
-                  end
-
-    @pagy, @submissions = pagy_auto(submissions.preload(:template_accesses, submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy(submissions.preload(:submitters).order(id: :desc))
  rescue ActiveRecord::RecordNotFound
    redirect_to root_path
  end

-  def new; end
+  def new
+    @template.name = "#{@base_template.name} (Clone)" if @base_template
+  end

  def edit
    ActiveRecord::Associations::Preloader.new(
@@ -35,7 +33,7 @@ class TemplatesController < ApplicationController
    @template_data =
      @template.as_json.merge(
        documents: @template.schema_documents.as_json(
-          methods: %i[metadata signed_key],
+          methods: %i[metadata signed_uuid],
          include: { preview_images: { methods: %i[url metadata filename] } }
        )
      ).to_json
@@ -44,49 +42,56 @@ class TemplatesController < ApplicationController
  end

  def create
-    @template.author = current_user
-    @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:folder_name])
-    @template.account = current_account
+    if @base_template
+      ActiveRecord::Associations::Preloader.new(
+        records: [@base_template],
+        associations: [schema_documents: :preview_images_attachments]
+      ).call

-    Templates.maybe_assign_access(@template)
+      @template = Templates::Clone.call(@base_template, author: current_user,
+                                                        name: params.dig(:template, :name),
+                                                        folder_name: params[:folder_name])
+    else
+      @template.author = current_user
+      @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:folder_name])
+    end
+
+    if params[:account_id].present? && authorized_clone_account_id?(params[:account_id])
+      @template.account_id = params[:account_id]
+      @template.folder = @template.account.default_template_folder if @template.account_id != current_account.id
+    else
+      @template.account = current_account
+    end

    if @template.save
-      SearchEntries.enqueue_reindex(@template)
+      Templates::CloneAttachments.call(template: @template, original_template: @base_template) if @base_template

-      WebhookUrls.enqueue_events(@template, 'template.created')
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)

-      redirect_to(edit_template_path(@template))
+      maybe_redirect_to_template(@template)
    else
-      render turbo_stream: turbo_stream.replace(:modal, template: 'templates/new'), status: :unprocessable_content
+      render turbo_stream: turbo_stream.replace(:modal, template: 'templates/new'), status: :unprocessable_entity
    end
  end

  def update
-    @template.assign_attributes(template_params)
+    @template.update!(template_params)

-    is_name_changed = @template.name_changed?
-
-    @template.save!
-
-    SearchEntries.enqueue_reindex(@template) if is_name_changed
-
-    WebhookUrls.enqueue_events(@template, 'template.updated')
+    SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)

    head :ok
  end

  def destroy
    notice =
-      if params[:permanently].in?(['true', true])
+      if params[:permanently].present?
        @template.destroy!

-        I18n.t('template_has_been_removed')
+        'Template has been removed.'
      else
        @template.update!(archived_at: Time.current)

-        WebhookUrls.enqueue_events(@template, 'template.archived')
-
-        I18n.t('template_has_been_archived')
+        'Template has been archived.'
      end

    redirect_back(fallback_location: root_path, notice:)
@@ -97,20 +102,34 @@ class TemplatesController < ApplicationController
  def template_params
    params.require(:template).permit(
      :name,
-      { schema: [[:attachment_uuid, :google_drive_file_id, :name, :dynamic,
-                  { conditions: [%i[field_uuid value action operation]] }]],
-        submitters: [%i[name uuid is_requester linked_to_uuid invite_via_field_uuid
-                        invite_by_uuid optional_invite_by_uuid email order]],
-        variables_schema: {},
+      { schema: [%i[attachment_uuid name]],
+        submitters: [%i[name uuid]],
        fields: [[:uuid, :submitter_uuid, :name, :type,
                  :required, :readonly, :default_value,
-                  :title, :description, :prefillable,
+                  :title, :description,
                  { preferences: {},
-                    default_value: [],
-                    conditions: [%i[field_uuid value action operation]],
+                    conditions: [%i[field_uuid value action]],
                    options: [%i[value uuid]],
-                    validation: %i[message pattern min max step],
-                    areas: [%i[uuid x y w h cell_w attachment_uuid option_uuid page]] }]] }
+                    validation: %i[message pattern],
+                    areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]] }
    )
  end
+
+  def authorized_clone_account_id?(account_id)
+    true_user.account_id.to_s == account_id.to_s || true_user.account.linked_accounts.exists?(id: account_id)
+  end
+
+  def maybe_redirect_to_template(template)
+    if template.account == current_account
+      redirect_to(edit_template_path(@template))
+    else
+      redirect_back(fallback_location: root_path, notice: 'Template has been clonned')
+    end
+  end
+
+  def load_base_template
+    return if params[:base_template_id].blank?
+
+    @base_template = Template.accessible_by(current_ability).find_by(id: params[:base_template_id])
+  end
 end
@@ -8,18 +8,12 @@ class TemplatesDashboardController < ApplicationController
  TEMPLATES_PER_PAGE = 12
  FOLDERS_PER_PAGE = 18

-  helper_method :selected_order
-
  def index
-    @template_folders =
-      TemplateFolders.filter_active_folders(@template_folders.where(parent_folder_id: nil), @templates)
-
-    @template_folders = TemplateFolders.search(@template_folders, params[:q])
-    @template_folders = TemplateFolders.sort(@template_folders, current_user, selected_order)
+    @template_folders = filter_template_folders(@template_folders)

    @pagy, @template_folders = pagy(
      @template_folders,
-      limit: FOLDERS_PER_PAGE,
+      items: FOLDERS_PER_PAGE,
      page: @template_folders.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD ? params[:page] : 1
    )

@@ -27,70 +21,43 @@ class TemplatesDashboardController < ApplicationController
      @templates = @templates.none
    else
      @template_folders = @template_folders.reject { |e| e.name == TemplateFolder::DEFAULT_NAME }
-      @templates = filter_templates(@templates).preload(:author, :template_accesses)
-      @templates = Templates::Order.call(@templates, current_user, selected_order)
+      @templates = filter_templates(@templates)

-      limit =
+      items =
        if @template_folders.size < 4
          TEMPLATES_PER_PAGE
        else
          (@template_folders.size < 7 ? 9 : 6)
        end

-      @pagy, @templates = pagy_auto(@templates, limit:)
-
-      load_related_submissions if params[:q].present? && @templates.blank?
+      @pagy, @templates = pagy(@templates, items:)
    end
  end

  private

+  def filter_template_folders(template_folders)
+    rel = template_folders.joins(:active_templates)
+                          .order(id: :desc)
+                          .distinct
+
+    TemplateFolders.search(rel, params[:q])
+  end
+
  def filter_templates(templates)
-    rel = templates.active
+    rel = templates.active.preload(:author).order(id: :desc)

    if params[:q].blank?
-      if Docuseal.multitenant? ? current_account.testing? : current_account.linked_account_account
-        shared_account_ids = [current_user.account_id]
-        shared_account_ids << TemplateSharing::ALL_ID if !Docuseal.multitenant? && !current_account.testing?
-
-        shared_template_ids = TemplateSharing.where(account_id: shared_account_ids).select(:template_id)
-
-        rel = Template.where(
-          Template.arel_table[:id].in(
-            rel.where(folder_id: current_account.default_template_folder.id).select(:id).arel
-               .union(:all, shared_template_ids.arel)
-          )
-        )
-      else
+      if Docuseal.multitenant? && !current_account.testing?
        rel = rel.where(folder_id: current_account.default_template_folder.id)
+      else
+        shared_template_ids =
+          TemplateSharing.where(account_id: [current_account.id, TemplateSharing::ALL_ID]).select(:template_id)
+
+        rel = rel.where(folder_id: current_account.default_template_folder.id).or(rel.where(id: shared_template_ids))
      end
    end

-    Templates.search(current_user, rel, params[:q])
-  end
-
-  def selected_order
-    @selected_order ||=
-      if cookies.permanent[:dashboard_templates_order].blank? ||
-         (cookies.permanent[:dashboard_templates_order] == 'used_at' && can?(:manage, :countless))
-        'created_at'
-      else
-        cookies.permanent[:dashboard_templates_order]
-      end
-  end
-
-  def load_related_submissions
-    @related_submissions = Submission.accessible_by(current_ability)
-                                     .left_joins(:template)
-                                     .where(archived_at: nil)
-                                     .where(templates: { archived_at: nil })
-                                     .preload(:template_accesses, :created_by_user,
-                                              template: :author,
-                                              submitters: :start_form_submission_events)
-
-    @related_submissions = Submissions.search(current_user, @related_submissions, params[:q])
-                                      .order(id: :desc)
-
-    @related_submissions_pagy, @related_submissions = pagy_auto(@related_submissions, limit: 5)
+    Templates.search(rel, params[:q])
  end
 end
@@ -3,30 +3,17 @@
 class TemplatesDebugController < ApplicationController
  load_and_authorize_resource :template

-  DEBUG_FILE = ''
-
  def show
-    schema_uuids = @template.schema.index_by { |e| e['attachment_uuid'] }
-    attachment = @template.documents.find { |a| schema_uuids[a.uuid] }
+    attachment = @template.documents.first

-    if attachment
-      data = attachment.download
+    pdf = HexaPDF::Document.new(io: StringIO.new(attachment.download))

-      unless attachment.image?
-        pdf = HexaPDF::Document.new(io: StringIO.new(data))
+    fields = Templates::FindAcroFields.call(pdf, attachment)

-        fields = Templates::FindAcroFields.call(pdf, attachment, data)
-      end
+    attachment.metadata['pdf'] ||= {}
+    attachment.metadata['pdf']['fields'] = fields

-      # fields, = Templates::DetectFields.call(StringIO.new(data), attachment:) if fields.blank?
-
-      attachment.metadata['pdf'] ||= {}
-      attachment.metadata['pdf']['fields'] = fields
-
-      @template.update!(fields: Templates::ProcessDocument.normalize_attachment_fields(@template, [attachment]))
-    end
-
-    debug_file if DEBUG_FILE.present?
+    @template.update!(fields: Templates::ProcessDocument.normalize_attachment_fields(@template, [attachment]))

    ActiveRecord::Associations::Preloader.new(
      records: [@template],
@@ -36,41 +23,11 @@ class TemplatesDebugController < ApplicationController
    @template_data =
      @template.as_json.merge(
        documents: @template.schema_documents.as_json(
-          methods: %i[metadata signed_key],
+          methods: %i[metadata signed_uuid],
          include: { preview_images: { methods: %i[url metadata filename] } }
        )
      ).to_json

    render 'templates/edit', layout: 'plain'
  end
-
-  def debug_file
-    tempfile = Tempfile.new
-    tempfile.binmode
-    tempfile.write(File.read(DEBUG_FILE))
-    tempfile.rewind
-
-    filename = File.basename(DEBUG_FILE)
-
-    file = ActionDispatch::Http::UploadedFile.new(
-      tempfile:,
-      filename:,
-      type: Marcel::MimeType.for(tempfile)
-    )
-
-    params = { files: [file] }
-
-    documents, dynamic_documents = Templates::CreateAttachments.call(@template, params,
-                                                                     dynamic: DEBUG_FILE.ends_with?('.docx'))
-
-    schema = documents.map do |doc|
-      {
-        attachment_uuid: doc.uuid,
-        name: doc.filename.base,
-        dynamic: dynamic_documents.find { |e| e.uuid == doc.uuid }.present?
-      }
-    end
-
-    @template.update!(schema:)
-  end
 end
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesDetectFieldsController < ApplicationController
-  include ActionController::Live
-
-  load_and_authorize_resource :template
-
-  def create
-    response.headers['Content-Type'] = 'text/event-stream'
-
-    sse = SSE.new(response.stream)
-
-    documents = @template.schema_documents.preload(:blob)
-    documents = documents.where(uuid: params[:attachment_uuid]) if params[:attachment_uuid].present?
-
-    page_number = params[:page].presence&.to_i
-
-    documents.each do |document|
-      io = StringIO.new(document.download)
-
-      Templates::DetectFields.call(io, attachment: document, page_number:) do |(attachment_uuid, page, fields)|
-        sse.write({ attachment_uuid:, page:, fields: })
-      end
-    end
-
-    sse.write({ completed: true })
-  ensure
-    response.stream.close
-  end
-end
@@ -6,14 +6,12 @@ class TemplatesFoldersController < ApplicationController
  def edit; end

  def update
-    name = [params[:parent_name], params[:name]].compact_blank.join(' / ')
-
-    @template.folder = TemplateFolders.find_or_create_by_name(current_user, name)
+    @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:name])

    if @template.save
-      redirect_back(fallback_location: template_path(@template), notice: I18n.t('document_template_has_been_moved'))
+      redirect_back(fallback_location: template_path(@template), notice: 'Document template has been moved')
    else
-      redirect_back(fallback_location: template_path(@template), notice: I18n.t('unable_to_move_template_into_folder'))
+      redirect_back(fallback_location: template_path(@template), notice: 'Unable to move template into folder')
    end
  end

@@ -13,7 +13,7 @@ class TemplatesFormPreviewController < ApplicationController

    @submitter.submission.submitters = @template.submitters.map { |item| Submitter.new(uuid: item['uuid']) }

-    Submissions.preload_with_pages(@submitter.submission)
+    Submitters.preload_with_pages(@submitter)

    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
                                                  .preload(:blob).index_by(&:uuid)
@@ -3,76 +3,32 @@
 class TemplatesPreferencesController < ApplicationController
  load_and_authorize_resource :template

-  RESETTABLE_PREFERENCE_KEYS = {
-    AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY => %w[request_email_subject request_email_body submitters],
-    AccountConfig::SUBMITTER_INVITATION_REMINDER_EMAIL_KEY => %w[invitation_reminder_email_subject
-                                                                 invitation_reminder_email_body],
-    AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY => %w[documents_copy_email_subject documents_copy_email_body],
-    AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY => %w[completed_notification_email_subject
-                                                       completed_notification_email_body]
-  }.freeze
-
  def show; end

  def create
    authorize!(:update, @template)

    @template.preferences = @template.preferences.merge(template_params[:preferences])
-    @template.preferences = @template.preferences.reject { |_, v| (v.is_a?(String) || v.is_a?(Hash)) && v.blank? }
+    @template.preferences = @template.preferences.reject { |_, v| v.is_a?(String) && v.blank? }
    @template.save!

    head :ok
  end

-  def destroy
-    authorize!(:update, @template)
-
-    config_key = params[:config_key]
-    preferences_to_delete = RESETTABLE_PREFERENCE_KEYS[config_key]
-
-    return head :ok if preferences_to_delete.blank?
-
-    preferences_to_delete.each do |key|
-      @template.preferences.delete(key)
-    end
-
-    @template.save!
-
-    render turbo_stream: turbo_stream.replace("#{config_key}_form",
-                                              partial: "templates_preferences/#{config_key}_form"),
-           status: :ok
-  end
-
  private

  def template_params
    params.require(:template).permit(
      preferences: %i[bcc_completed request_email_subject request_email_body
-                      invitation_reminder_email_subject invitation_reminder_email_body
                      documents_copy_email_subject documents_copy_email_body
                      documents_copy_email_enabled documents_copy_email_attach_audit
-                      documents_copy_email_attach_documents documents_copy_email_reply_to
                      completed_notification_email_attach_documents
-                      completed_redirect_url validate_unique_submitters
-                      require_all_submitters submitters_order require_phone_2fa require_email_2fa
-                      default_expire_at_duration shared_link_2fa default_expire_at request_email_enabled
                      completed_notification_email_subject completed_notification_email_body
-                      completed_notification_email_enabled completed_notification_email_attach_audit] +
-                      [completed_message: %i[title body],
-                       submitters: [%i[uuid request_email_subject request_email_body]], link_form_fields: []]
+                      completed_notification_email_enabled completed_notification_email_attach_audit]
    ).tap do |attrs|
-      attrs[:preferences].delete(:submitters) if params[:request_email_per_submitter] != '1'
-
-      if (default_expire_at = attrs.dig(:preferences, :default_expire_at).presence)
-        attrs[:preferences][:default_expire_at] =
-          (ActiveSupport::TimeZone[current_account.timezone] || Time.zone).parse(default_expire_at).utc
-      end
-
      attrs[:preferences] = attrs[:preferences].transform_values do |value|
        if %w[true false].include?(value)
          value == 'true'
-        elsif value.respond_to?(:compact_blank)
-          value.compact_blank
        else
          value
        end
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesPrefillableFieldsController < ApplicationController
-  PREFILLABLE_FIELD_TYPES = %w[text number cells date checkbox select radio phone].freeze
-
-  load_and_authorize_resource :template
-
-  def create
-    authorize!(:update, @template)
-
-    field = @template.fields.find { |f| f['uuid'] == params[:field_uuid] }
-
-    if params[:prefillable] == 'false'
-      field.delete('prefillable')
-      field.delete('readonly')
-    elsif params[:prefillable] == 'true'
-      field['prefillable'] = true
-      field['readonly'] = true
-    end
-
-    @template.save!
-
-    render turbo_stream: turbo_stream.replace(:prefillable_fields_list, partial: 'list',
-                                                                        locals: { template: @template })
-  end
-end
@@ -12,7 +12,7 @@ class TemplatesPreviewController < ApplicationController
    @template_data =
      @template.as_json.merge(
        documents: @template.schema_documents.as_json(
-          methods: %i[metadata signed_key],
+          methods: %i[metadata signed_uuid],
          include: { preview_images: { methods: %i[url metadata filename] } }
        )
      ).to_json
@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesRecipientsController < ApplicationController
-  load_and_authorize_resource :template
-
-  def create
-    authorize!(:update, @template)
-
-    @template.submitters =
-      submitters_params.map { |s| s.reject { |_, v| v.is_a?(String) && v.blank? } }
-
-    if @template.submitters.each_with_index.all? { |s, index| s['order'] == index }
-      @template.submitters.each { |s| s.delete('order') }
-    end
-
-    @template.save!
-
-    render json: { submitters: @template.submitters }
-  end
-
-  private
-
-  def submitters_params
-    permit_params = { submitters: [%i[name uuid is_requester optional_invite_by_uuid
-                                      invite_by_uuid invite_via_field_uuid linked_to_uuid email option order]] }
-
-    params.require(:template).permit(permit_params).fetch(:submitters, {}).values.filter_map do |s|
-      next if s[:uuid].blank?
-
-      if s[:is_requester] == '1' && s[:invite_by_uuid].blank? && s[:optional_invite_by_uuid].blank?
-        s[:is_requester] = true
-      else
-        s.delete(:is_requester)
-      end
-
-      s[:order] = s[:order].to_i if s[:order].present?
-      s.delete(:invite_by_uuid) if s[:invite_by_uuid].blank?
-      s.delete(:optional_invite_by_uuid) if s[:optional_invite_by_uuid].blank?
-      s.delete(:invite_via_field_uuid) if s[:invite_via_field_uuid].blank?
-
-      normalize_option_value(s)
-    end
-  end
-
-  def normalize_option_value(attrs)
-    option = attrs.delete(:option)
-
-    if option.present?
-      case option
-      when 'is_requester'
-        attrs[:is_requester] = true
-      when 'not_set'
-        attrs.delete(:is_requester)
-        attrs.delete(:email)
-        attrs.delete(:linked_to_uuid)
-        attrs.delete(:invite_by_uuid)
-        attrs.delete(:invite_via_field_uuid)
-        attrs.delete(:optional_invite_by_uuid)
-      when /\Alinked_to_(.*)\z/
-        attrs[:linked_to_uuid] = ::Regexp.last_match(-1)
-      when /\Aoptional_invite_by_(.*)\z/
-        attrs[:optional_invite_by_uuid] = ::Regexp.last_match(-1)
-      when /\Ainvite_by_(.*)\z/
-        attrs[:invite_by_uuid] = ::Regexp.last_match(-1)
-      end
-    end
-
-    attrs
-  end
-end
@@ -6,8 +6,6 @@ class TemplatesRestoreController < ApplicationController
  def create
    @template.update!(archived_at: nil)

-    WebhookUrls.enqueue_events(@template, 'template.updated')
-
-    redirect_to template_path(@template), notice: I18n.t('template_has_been_unarchived')
+    redirect_to template_path(@template), notice: 'Template has been unarchived'
  end
 end
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesShareLinkController < ApplicationController
-  load_and_authorize_resource :template
-
-  def show; end
-
-  def create
-    authorize!(:update, @template)
-
-    @template.update!(template_params)
-
-    if params[:redir].present?
-      redirect_to params[:redir]
-    else
-      head :ok
-    end
-  end
-
-  private
-
-  def template_params
-    params.require(:template).permit(:shared_link)
-  end
-end
@@ -12,7 +12,7 @@ class TemplatesUploadsController < ApplicationController

    save_template!(@template, url_params)

-    documents, = Templates::CreateAttachments.call(@template, url_params || params, extract_fields: true)
+    documents = Templates::CreateAttachments.call(@template, url_params || params, extract_fields: true)
    schema = documents.map { |doc| { attachment_uuid: doc.uuid, name: doc.filename.base } }

    if @template.fields.blank?
@@ -23,9 +23,7 @@ class TemplatesUploadsController < ApplicationController

    @template.update!(schema:)

-    WebhookUrls.enqueue_events(@template, 'template.created')
-
-    SearchEntries.enqueue_reindex(@template)
+    SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => @template.id)

    redirect_to edit_template_path(@template)
  rescue Templates::CreateAttachments::PdfEncrypted
@@ -35,7 +33,7 @@ class TemplatesUploadsController < ApplicationController

    raise if Rails.env.local?

-    redirect_to root_path, alert: I18n.t('unable_to_update_file')
+    redirect_to root_path, alert: 'Unable to upload file'
  end

  private
@@ -46,8 +44,6 @@ class TemplatesUploadsController < ApplicationController
    template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:folder_name])
    template.name = File.basename((url_params || params)[:files].first.original_filename, '.*')

-    Templates.maybe_assign_access(template)
-
    template.save!

    template
@@ -56,18 +52,23 @@ class TemplatesUploadsController < ApplicationController
  def create_file_params_from_url
    tempfile = Tempfile.new
    tempfile.binmode
-    tempfile.write(DownloadUtils.call(params[:url], validate: true).body)
+    tempfile.write(conn.get(Addressable::URI.parse(params[:url]).display_uri.to_s).body)
    tempfile.rewind

-    filename = URI.decode_www_form_component(params[:filename]) if params[:filename].present?
-    filename ||= File.basename(URI.decode_www_form_component(params[:url]))
-
    file = ActionDispatch::Http::UploadedFile.new(
      tempfile:,
-      filename:,
+      filename: File.basename(
+        URI.decode_www_form_component(params[:filename].presence || params[:url]), '.*'
+      ),
      type: Marcel::MimeType.for(tempfile)
    )

    { files: [file] }
  end
+
+  def conn
+    Faraday.new do |faraday|
+      faraday.response :follow_redirects
+    end
+  end
 end
@@ -4,8 +4,9 @@ class TestingApiSettingsController < ApplicationController
  def index
    authorize!(:manage, current_user.access_token)

-    @webhook_url = current_account.webhook_urls.first_or_initialize
+    @webhook_config =
+      current_account.encrypted_configs.find_or_initialize_by(key: EncryptedConfig::WEBHOOK_URL_KEY)

-    authorize!(:manage, @webhook_url)
+    authorize!(:manage, @webhook_config)
  end
 end
@@ -14,12 +14,12 @@ class TimestampServerController < ApplicationController
    test_timeserver_url(@encrypted_config.value) if @encrypted_config.value.present?

    if @encrypted_config.value.present? ? @encrypted_config.save : @encrypted_config.delete
-      redirect_back fallback_location: settings_notifications_path, notice: I18n.t('changes_have_been_saved')
+      redirect_back fallback_location: settings_notifications_path, notice: 'Changes have been saved'
    else
-      redirect_back fallback_location: settings_notifications_path, alert: I18n.t('unable_to_save')
+      redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
    end
  rescue SocketError, TimestampError, OpenSSL::Timestamp::TimestampError
-    redirect_back fallback_location: settings_notifications_path, alert: t('invalid_timeserver')
+    redirect_back fallback_location: settings_notifications_path, alert: 'Invalid Timeserver'
  end

  private
@@ -32,7 +32,7 @@ class TimestampServerController < ApplicationController
    uri = Addressable::URI.parse(url)

    conn = Faraday.new(uri.origin) do |c|
-      c.request :authorization, :basic, uri.user, uri.password if uri.password.present?
+      c.basic_auth(uri.user, uri.password) if uri.password.present?
    end

    response = conn.post(uri.path, req.to_der,
@@ -5,8 +5,7 @@ class UserConfigsController < ApplicationController
  authorize_resource :user_config

  ALLOWED_KEYS = [
-    UserConfig::RECEIVE_COMPLETED_EMAIL,
-    UserConfig::SHOW_APP_TOUR
+    UserConfig::RECEIVE_COMPLETED_EMAIL
  ].freeze

  InvalidKey = Class.new(StandardError)
@@ -27,9 +26,8 @@ class UserConfigsController < ApplicationController
  end

  def user_config_params
-    params.required(:user_config).permit(:key, :value, { value: {} }, { value: [] }).tap do |attrs|
+    params.required(:user_config).permit!.tap do |attrs|
      attrs[:value] = attrs[:value] == '1' if attrs[:value].in?(%w[1 0])
-      attrs[:value] = attrs[:value] == 'true' if attrs[:value].in?(%w[true false])
    end
  end
 end
@@ -9,7 +9,7 @@ class UserInitialsController < ApplicationController
  def update
    file = params[:file]

-    return redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_initials') if file.blank?
+    return redirect_to settings_profile_index_path, notice: 'Unable to save initials' if file.blank?

    blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
                                                  filename: file.original_filename,
@@ -22,16 +22,16 @@ class UserInitialsController < ApplicationController
    )

    if @user_config.update(value: attachment.uuid)
-      redirect_to settings_profile_index_path, notice: I18n.t('initials_has_been_saved')
+      redirect_to settings_profile_index_path, notice: 'Initials has been saved'
    else
-      redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_initials')
+      redirect_to settings_profile_index_path, notice: 'Unable to save initials'
    end
  end

  def destroy
    @user_config.destroy

-    redirect_to settings_profile_index_path, notice: I18n.t('initials_has_been_removed')
+    redirect_to settings_profile_index_path, notice: 'Initials has been removed'
  end

  private
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pete Matsyburka	e64f187f85	fix font url	2024-08-12 13:55:36 +03:00
Pete Matsyburka	416685334a	adjust retries	2024-08-12 13:54:13 +03:00