increase tokens length

.annotaterb.yml

@@ -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:
-- ''

.do/deploy.template.yaml

@@ -0,0 +1,18 @@
+spec:
+  name: docuseal
+  services:
+  - name: docuseal
+    dockerfile_path: Dockerfile
+    git:
+      repo_clone_url: https://github.com/docusealco/docuseal.git
+      branch: master
+    envs:
+    - key: SECRET_KEY_BASE
+      value: "- 64 characters string 64 characters string 64 characters string -"
+      type: SECRET
+      scope: RUN_TIME
+    - key: DATABASE_URL
+      scope: RUN_TIME
+      value: ${docuseal-db.DATABASE_URL}
+  databases:
+  - name: docuseal-db

.dockerignore

@@ -1,6 +1,5 @@
 /db/*.sqlite3
 
-**/node_modules
 /node_modules
 /coverage
 /doc
@@ -28,4 +27,3 @@
 /attachments
 /docuseal
 .DS_Store
-.env

.erb-lint.yml

@@ -30,5 +30,3 @@ linters:
         Enabled: false
       Style/ZeroLengthPredicate:
         Enabled: false
-      Style/RedundantConstantBase:
-        Enabled: false

.eslintrc

@@ -8,8 +8,7 @@
   },
   "rules": {
     "vue/no-deprecated-html-element-is": 0,
-    "vue/no-mutating-props": 0,
-    "vue/one-component-per-file": 0
+    "vue/no-mutating-props": 0
   },
   "parserOptions": {
     "ecmaVersion": 2022,

.github/workflows/ci.yml

@@ -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: 3.4.2
+          ruby-version: 3.2.2
       - 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: 3.4.2
+          ruby-version: 3.2.2
       - 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.9.0
+          node-version: 16.13.1
       - 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: 3.4.2
-      - 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: 3.4.2
+          ruby-version: 3.2.2
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
-          node-version: 20.9.0
+          node-version: 16.13.1
       - 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') }}
@@ -161,11 +127,7 @@ jobs:
           bundle config path vendor/bundle
           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
@@ -175,5 +137,4 @@ jobs:
         run: |
           bundle exec rake db:create
           bundle exec rake db:migrate
-          bundle exec rake assets:precompile
           bundle exec rspec

.github/workflows/docker.yml

@@ -7,8 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 20
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout code
@@ -26,22 +25,19 @@ jobs:
         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
-
-    - name: Create .version file
-      run: echo ${{ github.ref_name }} > .version
+      uses: docker/setup-buildx-action@v2
 
     - 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

.gitignore

@@ -35,5 +35,3 @@ yarn-debug.log*
 /coverage
 /attachments
 /docuseal
-/ee
-dump.rdb

.rspec

@@ -1 +0,0 @@
---require rails_helper

.rubocop.yml

@@ -10,8 +10,7 @@ AllCops:
     - node_modules/**/*
     - bin/*
     - vendor/**/*
-  TargetRubyVersion: '3.3'
-  SuggestExtensions: false
+  TargetRubyVersion: '3.2'
 
 Metrics/BlockLength:
   Exclude:
@@ -27,14 +26,10 @@ Style/Documentation:
 Lint/MissingSuper:
   Enabled: false
 
-Metrics/ParameterLists:
-  Max: 10
-
 Metrics/MethodLength:
-  Max: 30
+  Max: 20
   Exclude:
     - 'db/migrate/**'
-    - 'spec/**/*'
 
 Metrics/CyclomaticComplexity:
   Max: 15
@@ -46,42 +41,25 @@ Layout/LineLength:
   AllowedPatterns: ['\A\s*#']
 
 Metrics/AbcSize:
-  Max: 45
-  Exclude:
-    - spec/**/*
+  Max: 35
 
 Metrics/ModuleLength:
-  Max: 1000
+  Max: 500
 
 Metrics/ClassLength:
-  Max: 1000
+  Max: 500
 
 RSpec/NestedGroups:
   Max: 6
 
 RSpec/MultipleExpectations:
-  Max: 25
+  Max: 7
 
 RSpec/ExampleLength:
-  Max: 500
-
-RSpec/MultipleMemoizedHelpers:
   Max: 15
 
-Metrics/BlockNesting:
-  Max: 5
-
 Rails/I18nLocaleTexts:
   Enabled: false
 
-Rails/FindEach:
-  Enabled: false
-
-Rails/SkipsModelValidations:
-  Enabled: false
-
 Rails/ApplicationController:
   Enabled: false
-
-Rails/Output:
-  Enabled: false

Dockerfile

@@ -1,21 +1,4 @@
-FROM ruby:3.4.2-alpine AS download
-
-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 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" && \
-    mkdir -p /pdfium-linux && \
-    tar -xzf pdfium-linux.tgz -C /pdfium-linux
-
-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:3.4.2-alpine AS webpack
+FROM ruby:3.2.2-alpine as webpack
 
 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -32,64 +15,36 @@ RUN yarn install --network-timeout 1000000
 COPY ./bin/shakapacker ./bin/shakapacker
 COPY ./config/webpack ./config/webpack
 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.application.config.js ./tailwind.application.config.js
+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.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:3.4.2-alpine AS app
+FROM ruby:3.2.2-alpine as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"
-ENV LD_PRELOAD=/lib/libgcompat.so.0
-ENV OPENSSL_CONF=/app/openssl_legacy.cnf
 
 WORKDIR /app
 
-RUN echo '@edge https://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev@edge redis libheif@edge vips-heif@edge gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
-
-RUN echo $'.include = /etc/ssl/openssl.cnf\n\
-\n\
-[provider_sect]\n\
-default = default_sect\n\
-legacy = legacy_sect\n\
-\n\
-[default_sect]\n\
-activate = 1\n\
-\n\
-[legacy_sect]\n\
-activate = 1' >> /app/openssl_legacy.cnf
+RUN apk add --no-cache build-base sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler vips-heif libc6-compat ttf-freefont
 
 COPY ./Gemfile ./Gemfile.lock ./
 
-RUN apk add --no-cache build-base && bundle install && apk del --no-cache 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
+RUN bundle update --bundler && bundle install && rm -rf ~/.bundle
 
-COPY ./bin ./bin
-COPY ./app ./app
-COPY ./config ./config
-COPY ./db/migrate ./db/migrate
-COPY ./log ./log
-COPY ./lib ./lib
-COPY ./public ./public
-COPY ./tmp ./tmp
-COPY LICENSE README.md Rakefile config.ru .version ./
-COPY .version ./public/version
+COPY . ./
 
-COPY --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 --from=webpack /app/public/packs ./public/packs
 
-RUN ln -s /fonts /app/public/fonts
 RUN bundle exec bootsnap precompile --gemfile app/ lib/
 
 WORKDIR /data/docuseal
 ENV WORKDIR=/data/docuseal
 
 EXPOSE 3000
-CMD ["/app/bin/bundle", "exec", "puma", "-C", "/app/config/puma.rb", "--dir", "/app"]
+CMD ["/app/bin/rails", "server"]

Gemfile

@@ -2,51 +2,36 @@
 
 source 'https://rubygems.org'
 
-ruby '3.4.2'
+ruby '3.2.2'
 
-gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
 gem 'aws-sdk-s3', require: false
-gem 'aws-sdk-secretsmanager', require: false
 gem 'azure-storage-blob', require: false
 gem 'bootsnap', require: false
-gem 'cancancan'
-gem 'csv'
 gem 'devise'
-gem 'devise-two-factor'
 gem 'dotenv', require: false
-gem 'email_typo'
 gem 'faraday'
-gem 'faraday-follow_redirects'
 gem 'google-cloud-storage', require: false
 gem 'hexapdf'
 gem 'image_processing'
-gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
 gem 'oj'
 gem 'pagy'
 gem 'pg', require: false
 gem 'premailer-rails'
-gem 'pretender'
-gem 'puma', require: false
-gem 'rack'
+gem 'puma'
 gem 'rails'
-gem 'rails_autolink'
 gem 'rails-i18n'
-gem 'rotp'
-gem 'rouge', require: false
-gem 'rqrcode'
+gem 'rollbar', require: ENV.key?('ROLLBAR_ACCESS_TOKEN')
 gem 'ruby-vips'
-gem 'rubyXL'
 gem 'shakapacker'
-gem 'sidekiq'
 gem 'sqlite3', require: false
 gem 'strip_attributes'
 gem 'turbo-rails'
-gem 'twitter_cldr', require: false
 gem 'tzinfo-data'
 
 group :development, :test do
+  gem 'annotate'
   gem 'better_html'
   gem 'bullet'
   gem 'debug'
@@ -63,9 +48,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

Gemfile.lock

@@ -1,100 +1,92 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.1)
-      actionpack (= 8.0.1)
-      activesupport (= 8.0.1)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (8.0.1)
-      actionpack (= 8.0.1)
-      activejob (= 8.0.1)
-      activerecord (= 8.0.1)
-      activestorage (= 8.0.1)
-      activesupport (= 8.0.1)
-      mail (>= 2.8.0)
-    actionmailer (8.0.1)
-      actionpack (= 8.0.1)
-      actionview (= 8.0.1)
-      activejob (= 8.0.1)
-      activesupport (= 8.0.1)
-      mail (>= 2.8.0)
-      rails-dom-testing (~> 2.2)
-    actionpack (8.0.1)
-      actionview (= 8.0.1)
-      activesupport (= 8.0.1)
-      nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
+    actionmailbox (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.5)
+      actionpack (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activesupport (= 7.0.5)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.0.1)
-      actionpack (= 8.0.1)
-      activerecord (= 8.0.1)
-      activestorage (= 8.0.1)
-      activesupport (= 8.0.1)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.5)
+      actionpack (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.1)
-      activesupport (= 8.0.1)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (8.0.1)
-      activesupport (= 8.0.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.3.6)
-    activemodel (8.0.1)
-      activesupport (= 8.0.1)
-    activerecord (8.0.1)
-      activemodel (= 8.0.1)
-      activesupport (= 8.0.1)
-      timeout (>= 0.4.0)
-    activestorage (8.0.1)
-      actionpack (= 8.0.1)
-      activejob (= 8.0.1)
-      activerecord (= 8.0.1)
-      activesupport (= 8.0.1)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activestorage (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activesupport (= 7.0.5)
       marcel (~> 1.0)
-    activesupport (8.0.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    annotaterb (4.14.0)
-    arabic-letter-connector (0.1.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    annotate (3.2.0)
+      activerecord (>= 3.2, < 8.0)
+      rake (>= 10.4, < 14.0)
     ast (2.4.2)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1027.0)
-    aws-sdk-core (3.214.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.781.0)
+    aws-sdk-core (3.175.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.176.1)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.67.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.126.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-secretsmanager (1.110.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
       azure-storage-common (~> 2.0)
@@ -104,94 +96,74 @@ GEM
       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)
-    benchmark (0.4.0)
-    better_html (2.1.1)
+    bcrypt (3.1.19)
+    better_html (2.0.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.8)
     bindex (0.8.1)
-    bootsnap (1.18.4)
+    bootsnap (1.15.0)
       msgpack (~> 1.2)
-    brakeman (7.0.0)
-      racc
-    builder (3.3.0)
-    bullet (8.0.0)
+    builder (3.2.4)
+    bullet (7.0.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    camertron-eprun (1.1.1)
-    cancancan (3.6.1)
-    capybara (3.40.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.11)
+      nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    childprocess (5.1.0)
-      logger (~> 1.5)
-    chunky_png (1.4.0)
-    cldr-plurals-runtime-rb (1.1.0)
     cmdparse (3.0.7)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
-    crack (1.0.0)
-      bigdecimal
+    crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.21.0)
+    css_parser (1.14.0)
       addressable
-    csv (3.3.2)
-    cuprite (0.15.1)
+    cuprite (0.14.3)
       capybara (~> 3.0)
-      ferrum (~> 0.15.0)
-    date (3.4.1)
-    debug (1.10.0)
-      irb (~> 1.10)
-      reline (>= 0.3.8)
+      ferrum (~> 0.13.0)
+    date (3.3.3)
+    debug (1.8.0)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
     declarative (0.0.20)
-    devise (4.9.4)
+    devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (6.1.0)
-      activesupport (>= 7.0, < 8.1)
-      devise (~> 4.0)
-      railties (>= 7.0, < 8.1)
-      rotp (~> 6.0)
-    diff-lcs (1.5.1)
-    digest-crc (0.6.5)
+    diff-lcs (1.5.0)
+    digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
-    docile (1.4.1)
-    dotenv (3.1.7)
-    drb (2.2.1)
-    email_typo (0.2.3)
-    erb_lint (0.7.0)
+    docile (1.4.0)
+    dotenv (2.8.1)
+    erb_lint (0.4.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.0)
+    erubi (1.12.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
-      factory_bot (~> 6.5)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (3.5.1)
+    faker (3.2.0)
       i18n (>= 1.8.11, < 2)
-    faraday (1.10.4)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -206,107 +178,93 @@ GEM
     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-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
-      multipart-post (~> 2.0)
-    faraday-net_http (1.0.2)
+    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.1)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ferrum (0.15)
+    ferrum (0.13)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
-      websocket-driver (~> 0.7)
-    ffi (1.17.1)
-    ffi (1.17.1-aarch64-linux-gnu)
-    ffi (1.17.1-aarch64-linux-musl)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86_64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-musl)
-    foreman (0.88.1)
-    geom2d (0.4.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    google-apis-core (0.15.1)
+      websocket-driver (>= 0.6, < 0.8)
+    ffi (1.15.5)
+    geom2d (0.3.1)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
-      httpclient (>= 2.8.3, < 3.a)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
-      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-    google-apis-iamcredentials_v1 (0.22.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.49.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.7.1)
-      google-cloud-env (>= 1.0, < 3.a)
+      rexml
+      webrick
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.2.1)
-      faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.54.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-core (~> 0.13)
-      google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (~> 0.38)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
-      googleauth (~> 1.9)
+      googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    google-logging-utils (0.1.0)
-    googleauth (1.12.2)
-      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.2)
-      google-logging-utils (~> 0.1)
+    googleauth (1.6.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    hashdiff (1.1.2)
-    hexapdf (1.0.3)
+    hashdiff (1.0.1)
+    hexapdf (0.32.2)
       cmdparse (~> 3.0, >= 3.0.3)
-      geom2d (~> 0.4, >= 0.4.1)
+      geom2d (~> 0.3)
       openssl (>= 2.2.1)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    image_processing (1.13.0)
+    image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.0)
-    irb (1.14.3)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
+    io-console (0.6.0)
+    irb (1.7.0)
+      reline (>= 0.3.0)
     jmespath (1.6.2)
-    json (2.9.1)
-    jwt (2.9.3)
-      base64
+    json (2.6.3)
+    jwt (2.7.1)
     language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    launchy (2.5.2)
       addressable (~> 2.8)
-      childprocess (~> 5.0)
-    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 (1.8.1)
+      launchy (>= 2.2, < 3)
+    letter_opener_web (2.0.0)
+      actionmailer (>= 5.2)
+      letter_opener (~> 1.7)
+      railties (>= 5.2)
       rexml
-    logger (1.6.4)
-    lograge (0.14.0)
+    lograge (0.12.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.23.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -314,212 +272,167 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.0.2)
     matrix (0.4.2)
-    method_source (1.1.0)
-    mini_magick (4.13.2)
-    mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.4)
-    msgpack (1.7.5)
+    memoist (0.16.2)
+    method_source (1.0.0)
+    mini_magick (4.12.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.2)
+    minitest (5.18.1)
+    msgpack (1.7.1)
     multi_json (1.15.0)
-    multipart-post (2.4.1)
-    mutex_m (0.3.0)
-    mysql2 (0.5.6)
-    net-http-persistent (4.0.5)
+    multipart-post (2.3.0)
+    mysql2 (0.5.5)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.5.6)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.2)
+    net-protocol (0.2.1)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.3.3)
       net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.18.8)
-      mini_portile2 (~> 2.8.2)
+    nio4r (2.5.9)
+    nokogiri (1.15.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-musl)
-      racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-musl)
-      racc (~> 1.4)
-    oj (3.16.8)
-      bigdecimal (>= 3.0)
-      ostruct (>= 0.2)
-    openssl (3.3.0)
+    oj (3.15.0)
+    openssl (3.1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    ostruct (0.6.1)
-    package_json (0.1.0)
-    pagy (9.3.3)
-    parallel (1.26.3)
-    parser (3.3.6.0)
+    pagy (6.0.4)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
-    pg (1.5.9)
-    premailer (1.27.0)
+    pg (1.5.3)
+    premailer (1.21.0)
       addressable
-      css_parser (>= 1.19.0)
+      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.15.0)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-rails (0.3.11)
-      pry (>= 0.13.0)
-    psych (5.2.2)
-      date
-      stringio
-    public_suffix (6.0.1)
-    puma (6.5.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    public_suffix (5.0.1)
+    puma (6.3.0)
       nio4r (~> 2.0)
-    racc (1.8.1)
-    rack (3.1.16)
-    rack-proxy (0.7.7)
+    racc (1.7.1)
+    rack (2.2.7)
+    rack-proxy (0.7.6)
       rack
-    rack-session (2.0.0)
-      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (2.2.1)
-      rack (>= 3)
-    rails (8.0.1)
-      actioncable (= 8.0.1)
-      actionmailbox (= 8.0.1)
-      actionmailer (= 8.0.1)
-      actionpack (= 8.0.1)
-      actiontext (= 8.0.1)
-      actionview (= 8.0.1)
-      activejob (= 8.0.1)
-      activemodel (= 8.0.1)
-      activerecord (= 8.0.1)
-      activestorage (= 8.0.1)
-      activesupport (= 8.0.1)
+    rails (7.0.5)
+      actioncable (= 7.0.5)
+      actionmailbox (= 7.0.5)
+      actionmailer (= 7.0.5)
+      actionpack (= 7.0.5)
+      actiontext (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activemodel (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       bundler (>= 1.15.0)
-      railties (= 8.0.1)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
+      railties (= 7.0.5)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
+    rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
-      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.0.1)
+      nokogiri (~> 1.14)
+    rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
-      railties (>= 8.0.0, < 9)
-    rails_autolink (1.1.8)
-      actionview (> 3.1)
-      activesupport (> 3.1)
-      railties (> 3.1)
-    railties (8.0.1)
-      actionpack (= 8.0.1)
-      activesupport (= 8.0.1)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
+      railties (>= 6.0.0, < 8)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
+      method_source
       rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.2.1)
-    rdoc (6.10.0)
-      psych (>= 4.0.0)
-    redis-client (0.23.0)
-      connection_pool
-    regexp_parser (2.9.3)
-    reline (0.6.0)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    reline (0.3.5)
       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.5.1)
       rack (>= 1.4)
-    responders (3.1.1)
+    responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.4.0)
-    rotp (6.3.0)
-    rouge (4.5.2)
-    rqrcode (2.2.0)
-      chunky_png (~> 1.0)
-      rqrcode_core (~> 1.0)
-    rqrcode_core (1.2.0)
-    rspec-core (3.13.2)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rexml (3.2.5)
+    rollbar (3.4.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-rails (7.1.0)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
-    rspec-support (3.13.2)
-    rubocop (1.69.2)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.0.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.12.0)
+    rubocop (1.53.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.3.0.2)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
-      parser (>= 3.3.1.0)
-    rubocop-performance (1.23.0)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.27.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-performance (1.18.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.3.0)
-      rubocop (~> 1.61)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.2)
+    ruby-vips (2.1.4)
       ffi (~> 1.12)
-      logger
     ruby2_keywords (0.0.5)
-    rubyXL (3.4.33)
-      nokogiri (>= 1.10.8)
-      rubyzip (>= 1.3.0)
-    rubyzip (2.3.2)
-    securerandom (0.4.1)
-    semantic_range (3.1.0)
-    shakapacker (8.0.2)
+    semantic_range (3.0.0)
+    shakapacker (7.0.0)
       activesupport (>= 5.2)
-      package_json
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    sidekiq (7.3.7)
-      connection_pool (>= 2.3.0)
-      logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
-    signet (0.19.0)
+    signet (0.17.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -528,96 +441,68 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    sqlite3 (2.5.0)
+    sqlite3 (1.5.4)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (2.5.0-aarch64-linux-gnu)
-    sqlite3 (2.5.0-aarch64-linux-musl)
-    sqlite3 (2.5.0-arm64-darwin)
-    sqlite3 (2.5.0-x86_64-linux-gnu)
-    sqlite3 (2.5.0-x86_64-linux-musl)
-    stringio (3.1.2)
-    strip_attributes (1.14.1)
-      activemodel (>= 3.0, < 9.0)
-    thor (1.3.2)
-    timeout (0.4.3)
+    strip_attributes (1.13.0)
+      activemodel (>= 3.0, < 8.0)
+    thor (1.2.2)
+    timeout (0.4.0)
     trailblazer-option (0.1.2)
-    turbo-rails (2.0.11)
+    turbo-rails (1.4.0)
       actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
       railties (>= 6.0.0)
-    twitter_cldr (6.12.1)
-      camertron-eprun
-      cldr-plurals-runtime-rb (~> 1.1)
-      tzinfo
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.2)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    unicode-display_width (3.1.2)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
-    uri (1.0.3)
-    useragent (0.16.11)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.2.1)
+    web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
-    websocket-driver (0.7.6)
+    webrick (1.8.1)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.1)
+    zeitwerk (2.6.8)
 
 PLATFORMS
-  aarch64-linux
-  aarch64-linux-musl
-  arm64-darwin
-  ruby
-  x86_64-linux
-  x86_64-linux-musl
+  arm64-darwin-22
 
 DEPENDENCIES
-  annotaterb
-  arabic-letter-connector
+  annotate
   aws-sdk-s3
-  aws-sdk-secretsmanager
   azure-storage-blob
   better_html
   bootsnap
-  brakeman
   bullet
-  cancancan
   capybara
-  csv
   cuprite
   debug
   devise
-  devise-two-factor
   dotenv
-  email_typo
   erb_lint
   factory_bot_rails
   faker
   faraday
-  faraday-follow_redirects
-  foreman
   google-cloud-storage
   hexapdf
   image_processing
-  jwt
   letter_opener_web
   lograge
   mysql2
@@ -625,36 +510,28 @@ DEPENDENCIES
   pagy
   pg
   premailer-rails
-  pretender
   pry-rails
   puma
-  rack
   rails
   rails-i18n
-  rails_autolink
-  rotp
-  rouge
-  rqrcode
+  rollbar
   rspec-rails
   rubocop
   rubocop-performance
   rubocop-rails
   rubocop-rspec
   ruby-vips
-  rubyXL
   shakapacker
-  sidekiq
   simplecov
   sqlite3
   strip_attributes
   turbo-rails
-  twitter_cldr
   tzinfo-data
   web-console
   webmock
 
 RUBY VERSION
-   ruby 3.4.2p28
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.5.3
+   2.4.10

README.md

@@ -1,6 +1,6 @@
 <h1 align="center" style="border-bottom: none">
   <div>
-    <a href="https://www.docuseal.com">
+    <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>
@@ -14,7 +14,7 @@
   <a href="https://hub.docker.com/r/docuseal/docuseal">
     <img alt="Docker releases" src="https://img.shields.io/docker/v/docuseal/docuseal">
   </a>
-  <a href="https://discord.gg/qygYCDGck9">
+  <a href="https://discord.com/invite/B5wg5wKk">
     <img src="https://img.shields.io/discord/1125112641170448454?logo=discord"/>
   </a>
   <a href="https://twitter.com/intent/follow?screen_name=docusealco">
@@ -25,48 +25,29 @@
 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>
-  <span>|</span>
-  <a href="https://docuseal.com/sign_up">☁️ Try in Cloud</a>
+  <a href="https://demo.docuseal.co">✨ Live Demo</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)
-- 12 field types available (Signature, Date, File, Checkbox etc.)
-- Multiple submitters per document
-- Automated emails via SMTP
-- Files storage on disk or AWS S3, Google Storage, Azure Cloud
-- Automatic PDF eSignature
-- PDF signature verification
-- Users management
-- Mobile-optimized
-- 6 UI languages with signing available in 14 languages
-- API and Webhooks for integrations
-- Easy to deploy in minutes
-
-## Pro Features
-- Company logo and white-label
-- User roles
-- Automated reminders
-- Invitation and identify verification via SMS
-- 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)
+- [x] PDF form fields builder (WYSIWYG)
+- [x] 10 field types available (Signature, Date, File, Checkbox etc.)
+- [x] Multiple submitters per document
+- [x] Automated emails via SMTP
+- [x] Files storage on AWS S3, Google Storage, or Azure
+- [x] Automatic PDF eSignature
+- [x] PDF signature verification
+- [x] Users management
+- [x] Mobile-optimized
+- [x] Easy to deploy in minutes
 
 ## 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.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)
+| Heroku                                                                       | Railway                                                                      | DigitalOcean                                                                 |
+| ---------------------------------------------------------------------------- | --------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| [<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)             | [<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/tree/master&refcode=421d50f53990) |
+
 
 #### Docker
 
@@ -83,25 +64,11 @@ Download docker-compose.yml into your private server:
 curl https://raw.githubusercontent.com/docusealco/docuseal/master/docker-compose.yml > docker-compose.yml
 ```
 
-Run the app under a custom domain over https using docker compose (make sure your DNS points to the server to automatically issue ssl certs with Caddy):
+Run docker compose under a custom domain over https (make sure your DNS points to the server to automatically issue ssl certs with Caddy):
 ```sh
-sudo HOST=your-domain-name.com docker compose up
+HOST=your-domain-name.com docker-compose up
 ```
 
-## For Businesses
-### Integrate seamless document signing into your web or mobile apps with DocuSeal
-
-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)
-
 ## License
 
-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)
+DocuSeal is released under the GNU Affero General Public License v3.0.

SECURITY.md

@@ -1,14 +0,0 @@
-# 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.
-
-**We have a bug bounty program to reward security researchers.**
-
-Out of scope vulnerabilities:
-
-- CSRF
-- DNSSEC, CAA, CSP headers
-- DNS or email security related
-- Rate Limiting
-
-Note: We reserve the right to classify any reported vulnerability as out of scope for the bug bounty program.

app/controllers/account_configs_controller.rb

@@ -1,57 +0,0 @@
-# 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
-
-  ALLOWED_KEYS = [
-    AccountConfig::ALLOW_TYPED_SIGNATURE,
-    AccountConfig::FORCE_MFA,
-    AccountConfig::ALLOW_TO_RESUBMIT,
-    AccountConfig::ALLOW_TO_DECLINE_KEY,
-    AccountConfig::FORM_PREFILL_SIGNATURE_KEY,
-    AccountConfig::ESIGNING_PREFERENCE_KEY,
-    AccountConfig::FORM_WITH_CONFETTI_KEY,
-    AccountConfig::DOWNLOAD_LINKS_AUTH_KEY,
-    AccountConfig::FORCE_SSO_AUTH_KEY,
-    AccountConfig::FLATTEN_RESULT_PDF_KEY,
-    AccountConfig::ENFORCE_SIGNING_ORDER_KEY,
-    AccountConfig::WITH_SIGNATURE_ID,
-    AccountConfig::COMBINE_PDF_RESULT_KEY,
-    AccountConfig::REQUIRE_SIGNING_REASON_KEY,
-    AccountConfig::DOCUMENT_FILENAME_FORMAT_KEY
-  ].freeze
-
-  InvalidKey = Class.new(StandardError)
-
-  def create
-    @account_config.update!(account_config_params)
-
-    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 load_account_config
-    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|
-      attrs[:value] = attrs[:value] == '1' if attrs[:value].in?(%w[1 0])
-    end
-  end
-end

app/controllers/accounts_controller.rb

@@ -4,70 +4,42 @@ 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'
+    'es-ES' => 'Spanish (Spain)',
+    'pt-PT' => 'Portuguese (Portugal)',
+    'de-DE' => 'German (Germany)'
   }.freeze
 
-  before_action :load_account
-  authorize_resource :account
-
   def show; end
 
   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_entity
-      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_entity
   end
 
-  def destroy
-    authorize!(:manage, current_account)
-
-    true_user.update!(locked_at: Time.current, email: true_user.email.sub('@', '+removed@'))
-
-    # 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'))
-    )
-    # rubocop:enable Layout/LineLength
-  end
-
   private
 
-  def load_account
-    @account = current_account
-  end
-
   def account_params
     params.require(:account).permit(:name, :timezone, :locale)
   end
 
   def app_url_params
-    return {} if params[:encrypted_config].blank?
-
     params.require(:encrypted_config).permit(:value)
   end
 end

app/controllers/api/active_storage_blobs_proxy_controller.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class ActiveStorageBlobsProxyController < ApiBaseController
-    include ActiveStorage::Streaming
-
-    skip_before_action :authenticate_user!
-    skip_authorization_check
-
-    before_action :set_cors_headers
-    before_action :set_noindex_headers
-
-    def show
-      blob_uuid, purp, exp = ApplicationRecord.signed_id_verifier.verified(params[:signed_uuid])
-
-      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
-      end
-
-      blob = ActiveStorage::Blob.find_by!(uuid: blob_uuid)
-
-      attachment = blob.attachments.take
-
-      @record = attachment.record
-
-      authorization_check!(attachment) if exp.blank?
-
-      if request.headers['Range'].present?
-        send_blob_byte_range_data blob, request.headers['Range']
-      else
-        http_cache_forever public: true do
-          response.headers['Accept-Ranges'] = 'bytes'
-          response.headers['Content-Length'] = blob.byte_size.to_s
-
-          send_blob_stream blob, disposition: params[:disposition]
-        end
-      end
-    end
-
-    private
-
-    def authorization_check!(attachment)
-      is_authorized = attachment.name.in?(%w[logo preview_images]) ||
-                      (current_user && attachment.record.account.id == current_user.account_id) ||
-                      (current_user && !Docuseal.multitenant? && current_user.role == 'superadmin') ||
-                      !attachment.record.account.account_configs
-                                 .find_or_initialize_by(key: AccountConfig::DOWNLOAD_LINKS_AUTH_KEY).value
-
-      return if is_authorized
-
-      Rollbar.error('Blob aunauthorized') if defined?(Rollbar)
-
-      raise CanCan::AccessDenied
-    end
-  end
-end

app/controllers/api/active_storage_blobs_proxy_legacy_controller.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class ActiveStorageBlobsProxyLegacyController < ApiBaseController
-    include ActiveStorage::Streaming
-
-    skip_before_action :authenticate_user!
-    skip_authorization_check
-
-    before_action :set_cors_headers
-    before_action :set_noindex_headers
-
-    # rubocop:disable Metrics
-    def show
-      Rollbar.info('Blob legacy') if defined?(Rollbar)
-
-      blob = ActiveStorage::Blob.find_signed(params[:signed_blob_id] || params[:signed_id])
-
-      return head :not_found unless blob
-
-      is_permitted = blob.attachments.any? do |a|
-        (current_user && a.record.account.id == current_user.account_id) ||
-          a.record.account.account_configs.any? { |e| e.key == 'legacy_blob_proxy' } ||
-          a.name == 'logo'
-      end
-
-      unless is_permitted
-        Rollbar.error("Blob account not found: #{blob.id}") if defined?(Rollbar)
-
-        return render json: { error: 'Not authenticated' }, status: :unauthorized
-      end
-
-      if request.headers['Range'].present?
-        send_blob_byte_range_data blob, request.headers['Range']
-      else
-        http_cache_forever public: true do
-          response.headers['Accept-Ranges'] = 'bytes'
-          response.headers['Content-Length'] = blob.byte_size.to_s
-
-          send_blob_stream blob, disposition: params[:disposition]
-        end
-      end
-    end
-    # rubocop:enable Metrics
-  end
-end

app/controllers/api/api_base_controller.rb

@@ -3,111 +3,13 @@
 module Api
   class ApiBaseController < ActionController::API
     include ActiveStorage::SetCurrent
-    include Pagy::Backend
-
-    DEFAULT_LIMIT = 10
-    MAX_LIMIT = 100
-
-    impersonates :user, with: ->(uuid) { User.find_by(uuid:) }
-
-    wrap_parameters false
 
     before_action :authenticate_user!
-    check_authorization
-
-    rescue_from Params::BaseValidator::InvalidParameterError do |e|
-      render json: { error: e.message }, status: :unprocessable_entity
-    end
-
-    rescue_from RateLimit::LimitApproached do |e|
-      Rollbar.error(e) if defined?(Rollbar)
-
-      render json: { error: 'Too many requests' }, status: :too_many_requests
-    end
-
-    unless Rails.env.development?
-      rescue_from CanCan::AccessDenied do |e|
-        render json: { error: access_denied_error_message(e) }, 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_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)
-
-      if field == :id
-        result = result.where(id: ...params[:after].to_i) if params[:after].present?
-        result = result.where(id: (params[:before].to_i + 1)...) if params[:before].present?
-      else
-        result = result.where(field => ...params[:after]) if params[:after].present?
-        result = result.where(field => (params[:before] + 1)...) if params[:before].present?
-      end
-
-      result
-    end
-
-    def authenticate_user!
-      render json: { error: 'Not authenticated' }, status: :unauthorized unless current_user
-    end
-
-    def current_user
-      super || @current_user ||=
-                 if request.headers['X-Auth-Token'].present?
-                   sha256 = Digest::SHA256.hexdigest(request.headers['X-Auth-Token'])
-
-                   User.joins(:access_token).active.find_by(access_token: { sha256: })
-                 end
-    end
-
     def current_account
       current_user&.account
     end
-
-    def set_noindex_headers
-      headers['X-Robots-Tag'] = 'noindex'
-    end
-
-    def set_cors_headers
-      headers['Access-Control-Allow-Origin'] = '*'
-      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
-    end
   end
 end

app/controllers/api/attachments_controller.rb

@@ -1,43 +1,28 @@
 # frozen_string_literal: true
 
 module Api
-  class AttachmentsController < ActionController::API
-    include ActionController::Cookies
-    include ActiveStorage::SetCurrent
-
-    COOKIE_STORE_LIMIT = 10
+  class AttachmentsController < ApiBaseController
+    skip_before_action :authenticate_user!
 
     def create
       submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
-      if params[:type].in?(%w[initials signature]) && ImageUtils.blank?(Vips::Image.new_from_file(params[:file].path))
-        Rollbar.error("Empty signature: #{submitter.id}") if defined?(Rollbar)
-
-        return render json: { error: "#{params[:type]} is empty" }, status: :unprocessable_entity
-      end
-
-      attachment = Submitters.create_attachment!(submitter, params)
-
-      if params[:remember_signature] == 'true' && submitter.email.present?
-        cookies.encrypted[:signature_uuids] = build_new_cookie_signatures_json(submitter, attachment)
-      end
-
-      render json: attachment.as_json(only: %i[uuid created_at], methods: %i[url filename content_type])
-    end
-
-    def build_new_cookie_signatures_json(submitter, attachment)
-      values =
-        begin
-          JSON.parse(cookies.encrypted[:signature_uuids].presence || '{}')
-        rescue JSON::ParserError
-          {}
+      blob =
+        if (file = params[:file])
+          ActiveStorage::Blob.create_and_upload!(io: file.open,
+                                                 filename: file.original_filename,
+                                                 content_type: file.content_type)
+        else
+          ActiveStorage::Blob.find_signed(params[:blob_signed_id])
         end
 
-      values[submitter.email] = attachment.uuid
+      attachment = ActiveStorage::Attachment.create!(
+        blob:,
+        name: params[:name],
+        record: submitter
+      )
 
-      values = values.to_a.last(COOKIE_STORE_LIMIT).to_h if values.size > COOKIE_STORE_LIMIT
-
-      values.to_json
+      render json: attachment.as_json(only: %i[uuid], methods: %i[url filename content_type])
     end
   end
 end

app/controllers/api/form_events_controller.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class FormEventsController < ApiBaseController
-    load_and_authorize_resource :submitter, parent: false
-
-    def index
-      submitters = @submitters.where.not(completed_at: nil)
-
-      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?
-
-      submitters = paginate(
-        submitters.preload(template: { folder: :parent_folder },
-                           submission: [:submitters, { audit_trail_attachment: :blob,
-                                                       combined_document_attachment: :blob }],
-                           documents_attachments: :blob, attachments_attachments: :blob),
-        field: :completed_at
-      )
-
-      render json: {
-        data: submitters.map do |s|
-                {
-                  event_type: 'form.completed',
-                  timestamp: s.completed_at,
-                  data: Submitters::SerializeForWebhook.call(s)
-                }
-              end,
-        pagination: {
-          count: submitters.size,
-          next: submitters.last&.completed_at&.to_i,
-          prev: submitters.first&.completed_at&.to_i
-        }
-      }
-    end
-  end
-end

app/controllers/api/submission_documents_controller.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmissionDocumentsController < ApiBaseController
-    load_and_authorize_resource :submission
-
-    def index
-      documents =
-        if @submission.submitters.all?(&:completed_at?)
-          last_submitter = @submission.submitters.max_by(&:completed_at)
-
-          if last_submitter.documents_attachments.blank?
-            last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(last_submitter)
-          end
-
-          last_submitter.documents_attachments
-        else
-          values_hash = Submissions::GeneratePreviewAttachments.build_values_hash(@submission)
-
-          if @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
-
-      ActiveRecord::Associations::Preloader.new(
-        records: documents,
-        associations: [:blob]
-      ).call
-
-      render json: {
-        id: @submission.id,
-        documents: documents.map do |attachment|
-          { name: attachment.filename.base, url: ActiveStorage::Blob.proxy_url(attachment.blob) }
-        end
-      }
-    end
-  end
-end

app/controllers/api/submission_events_controller.rb

@@ -1,52 +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
-                             ),
-                             field: :completed_at)
-
-      render json: {
-        data: submissions.map do |s|
-                {
-                  event_type: 'submission.completed',
-                  timestamp: s.completed_at,
-                  data: Submissions::SerializeForApi.call(s, s.submitters)
-                }
-              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

app/controllers/api/submissions_controller.rb

@@ -1,207 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmissionsController < ApiBaseController
-    load_and_authorize_resource :template, only: :create
-    load_and_authorize_resource :submission, only: %i[show index destroy]
-
-    before_action only: :create do
-      authorize!(:create, Submission)
-    end
-
-    def index
-      submissions = Submissions.search(current_user, @submissions, params[:q])
-      submissions = filter_submissions(submissions, params)
-
-      submissions = paginate(submissions.preload(:created_by_user, :submitters,
-                                                 template: { folder: :parent_folder },
-                                                 combined_document_attachment: :blob,
-                                                 audit_trail_attachment: :blob))
-
-      render json: {
-        data: submissions.map do |s|
-          Submissions::SerializeForApi.call(s, s.submitters, params,
-                                            with_events: false, with_documents: false, with_values: false)
-        end,
-        pagination: {
-          count: submissions.size,
-          next: submissions.last&.id,
-          prev: submissions.first&.id
-        }
-      }
-    end
-
-    def show
-      submitters = @submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob)
-
-      submitters.each do |submitter|
-        if submitter.completed_at? && submitter.documents_attachments.blank?
-          submitter.documents_attachments = Submissions::EnsureResultGenerated.call(submitter)
-        end
-      end
-
-      if @submission.audit_trail_attachment.blank? && submitters.all?(&:completed_at?)
-        @submission.audit_trail_attachment = Submissions::GenerateAuditTrail.call(@submission)
-      end
-
-      render json: Submissions::SerializeForApi.call(@submission, submitters, params)
-    end
-
-    def create
-      Params::SubmissionCreateValidator.call(params)
-
-      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_entity
-      end
-
-      params[:send_email] = true unless params.key?(:send_email)
-      params[:send_sms] = false unless params.key?(:send_sms)
-
-      submissions = create_submissions(@template, params)
-
-      WebhookUrls.enqueue_events(submissions, 'submission.created')
-
-      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)
-        end
-      end
-
-      SearchEntries.enqueue_reindex(submissions)
-
-      render json: build_create_json(submissions)
-    rescue Submitters::NormalizeValues::BaseError, Submissions::CreateFromSubmitters::BaseError,
-           DownloadUtils::UnableToDownload => e
-      Rollbar.warning(e) if defined?(Rollbar)
-
-      render json: { error: e.message }, status: :unprocessable_entity
-    end
-
-    def destroy
-      if params[:permanently].in?(['true', true])
-        @submission.destroy!
-      else
-        @submission.update!(archived_at: Time.current)
-
-        WebhookUrls.enqueue_events(@submission, 'submission.archived')
-      end
-
-      render json: @submission.as_json(only: %i[id archived_at])
-    end
-
-    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|
-          Submitters::SerializeForApi.call(s, with_documents: false, with_urls: true, params:)
-        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
-    end
-
-    def create_submissions(template, params)
-      is_send_email = !params[:send_email].in?(['false', false])
-
-      if (emails = (params[:emails] || params[:email]).presence) &&
-         (params[:submission].blank? && params[:submitters].blank?)
-        Submissions.create_from_emails(template:,
-                                       user: current_user,
-                                       source: :api,
-                                       mark_as_sent: is_send_email,
-                                       emails:,
-                                       params:)
-      else
-        submissions_attrs, attachments =
-          Submissions::NormalizeParamUtils.normalize_submissions_params!(submissions_params, template)
-
-        submissions = Submissions.create_from_submitters(
-          template:,
-          user: current_user,
-          source: :api,
-          submitters_order: params[:submitters_order] || params[:order] || 'preserved',
-          submissions_attrs:,
-          params:
-        )
-
-        submitters = submissions.flat_map(&:submitters)
-
-        Submissions::NormalizeParamUtils.save_default_value_attachments!(attachments, submitters)
-
-        submitters.each do |submitter|
-          SubmissionEvents.create_with_tracking_data(submitter, 'api_complete_form', request) if submitter.completed_at?
-        end
-
-        submissions
-      end
-    end
-
-    def submissions_params
-      permitted_attrs = [
-        :send_email, :send_sms, :bcc_completed, :completed_redirect_url, :reply_to, :go_to_last,
-        :require_phone_2fa, :expire_at, :name,
-        {
-          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,
-                        { metadata: {}, values: {}, roles: [], readonly_fields: [], message: %i[subject body],
-                          fields: [:name, :uuid, :default_value, :value, :title, :description,
-                                   :readonly, :required, :validation_pattern, :invalid_message,
-                                   { default_value: [], value: [], preferences: {} }] }]]
-        }
-      ]
-
-      if params.key?(:submitters)
-        params.permit(*permitted_attrs)
-      else
-        key = params.key?(:submission) ? :submission : :submissions
-
-        params.permit(
-          { key => [permitted_attrs] }, { key => permitted_attrs }
-        ).fetch(key, [])
-      end
-    end
-  end
-end

app/controllers/api/submitter_email_clicks_controller.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmitterEmailClicksController < ApiBaseController
-    skip_before_action :authenticate_user!
-    skip_authorization_check
-
-    def create
-      @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)
-      end
-
-      render json: {}
-    end
-  end
-end

app/controllers/api/submitter_form_views_controller.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmitterFormViewsController < ApiBaseController
-    skip_before_action :authenticate_user!
-    skip_authorization_check
-
-    def create
-      @submitter = Submitter.find_by!(slug: params[:submitter_slug])
-
-      @submitter.opened_at = Time.current
-      @submitter.save
-
-      SubmissionEvents.create_with_tracking_data(@submitter, 'view_form', request)
-
-      WebhookUrls.enqueue_events(@submitter, 'form.viewed')
-
-      render json: {}
-    end
-  end
-end

app/controllers/api/submitters_controller.rb

@@ -1,215 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmittersController < ApiBaseController
-    load_and_authorize_resource :submitter
-
-    def index
-      submitters = Submitters.search(current_user, @submitters, params[:q])
-
-      submitters = filter_submitters(submitters, params)
-
-      submitters = paginate(
-        submitters.preload(:template, :submission, :submission_events,
-                           documents_attachments: :blob, attachments_attachments: :blob)
-      )
-
-      render json: {
-        data: submitters.map do |s|
-                Submitters::SerializeForApi.call(s, with_template: true, with_events: true, params:)
-              end,
-        pagination: {
-          count: submitters.size,
-          next: submitters.last&.id,
-          prev: submitters.first&.id
-        }
-      }
-    end
-
-    def show
-      Submissions::EnsureResultGenerated.call(@submitter) if @submitter.completed_at?
-
-      render json: Submitters::SerializeForApi.call(@submitter, with_template: true, with_events: true, params:)
-    end
-
-    def update
-      if @submitter.completed_at?
-        return render json: { error: 'Submitter has already completed the submission.' }, status: :unprocessable_entity
-      end
-
-      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 || Template.new(submitters: submission.template_submitters, account: @submitter.account),
-        for_submitter: @submitter
-      )
-
-      Submissions::CreateFromSubmitters.maybe_set_template_fields(submission, [normalized_params],
-                                                                  default_submitter_uuid: @submitter.uuid)
-
-      assign_submitter_attrs(@submitter, normalized_params)
-
-      ApplicationRecord.transaction do
-        Submissions::NormalizeParamUtils.save_default_value_attachments!(new_attachments, [@submitter])
-
-        @submitter.save!
-
-        @submitter.submission.save!
-
-        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)
-      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_entity
-    end
-
-    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,
-        { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
-          fields: [[:name, :uuid, :default_value, :value, :required,
-                    :readonly, :validation_pattern, :invalid_message,
-                    { default_value: [], value: [], preferences: {} }]] }
-      )
-    end
-
-    private
-
-    def maybe_filder_by_completed_at(submitters, params)
-      if params[:completed_after].present?
-        submitters = submitters.where(completed_at: Time.zone.parse(params[:completed_after])..)
-      end
-
-      if params[:completed_before].present?
-        submitters = submitters.where(completed_at: ..Time.zone.parse(params[:completed_before]))
-      end
-
-      submitters
-    end
-
-    def assign_submitter_attrs(submitter, attrs)
-      values = attrs[:values]&.to_unsafe_h || {}
-
-      assign_submission_fields(submitter.submission)
-
-      phone_field_uuid = submitter.submission.template_fields.find do |f|
-        values[f['uuid']].present? && f['type'] == 'phone'
-      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+]/, '')
-      elsif values[phone_field_uuid].present?
-        submitter.phone = values[phone_field_uuid].to_s.gsub(/[^0-9+]/, '')
-      end
-
-      values = values.except(phone_field_uuid)
-
-      submitter.values = submitter.values.merge(values) if values.present?
-      submitter.metadata = attrs[:metadata] if attrs.key?(:metadata)
-
-      maybe_assign_completed_attributes(submitter, attrs)
-
-      assign_external_id(submitter, attrs)
-      assign_preferences(submitter, attrs)
-
-      submitter
-    end
-
-    def maybe_assign_completed_attributes(submitter, attrs)
-      submitter.completed_at = attrs[:completed] ? Time.current : submitter.completed_at
-
-      if attrs[:completed]
-        submitter.values = Submitters::SubmitValues.merge_default_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
-      end
-
-      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)
-
-      submitter
-    end
-
-    def assign_submission_fields(submission)
-      submission.template_fields ||= submission.template.fields
-      submission.template_schema ||= submission.template.schema
-    end
-
-    def assign_preferences(submitter, attrs)
-      submitter_preferences = Submitters.normalize_preferences(submitter.account, current_user, attrs)
-
-      submitter.preferences['default_values'] = attrs[:values].to_unsafe_h if attrs[:values].present?
-
-      if submitter_preferences.key?('send_email')
-        submitter.preferences['send_email'] = submitter_preferences['send_email']
-      end
-
-      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
-
-      if submitter_preferences.key?('completed_redirect_url')
-        submitter.preferences['completed_redirect_url'] = submitter_preferences['completed_redirect_url']
-      end
-
-      return unless submitter_preferences.key?('email_message_uuid')
-
-      submitter.preferences['email_message_uuid'] = submitter_preferences['email_message_uuid']
-
-      submitter
-    end
-  end
-end

app/controllers/api/templates_clone_controller.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class TemplatesCloneController < ApiBaseController
-    load_and_authorize_resource :template
-
-    def create
-      authorize!(:create, @template)
-
-      ActiveRecord::Associations::Preloader.new(
-        records: [@template],
-        associations: [schema_documents: :preview_images_attachments]
-      ).call
-
-      cloned_template = Templates::Clone.call(
-        @template,
-        author: current_user,
-        name: params[:name],
-        external_id: params[:external_id].presence || params[:application_key],
-        folder_name: params[:folder_name]
-      )
-
-      cloned_template.source = :api
-
-      schema_documents = Templates::CloneAttachments.call(template: cloned_template,
-                                                          original_template: @template,
-                                                          documents: params[:documents])
-
-      cloned_template.save!
-
-      WebhookUrls.enqueue_events(cloned_template, 'template.created')
-
-      SearchEntries.enqueue_reindex(cloned_template)
-
-      render json: Templates::SerializeForApi.call(cloned_template, schema_documents)
-    end
-  end
-end

app/controllers/api/templates_controller.rb

@@ -2,127 +2,22 @@
 
 module Api
   class TemplatesController < ApiBaseController
-    load_and_authorize_resource :template
-
-    def index
-      templates = filter_templates(@templates, params)
-
-      templates = paginate(templates.preload(:author, folder: :parent_folder))
-
-      schema_documents =
-        ActiveStorage::Attachment.where(record_id: templates.map(&:id),
-                                        record_type: 'Template',
-                                        name: :documents,
-                                        uuid: templates.flat_map { |t| t.schema.pluck('attachment_uuid') })
-                                 .preload(:blob)
-
-      preview_image_attachments =
-        ActiveStorage::Attachment.joins(:blob)
-                                 .where(blob: { filename: ['0.png', '0.jpg'] })
-                                 .where(record_id: schema_documents.map(&:id),
-                                        record_type: 'ActiveStorage::Attachment',
-                                        name: :preview_images)
-                                 .preload(:blob)
-
-      render json: {
-        data: templates.map do |t|
-          Templates::SerializeForApi.call(
-            t,
-            schema_documents.select { |e| e.record_id == t.id },
-            preview_image_attachments
-          )
-        end,
-        pagination: {
-          count: templates.size,
-          next: templates.last&.id,
-          prev: templates.first&.id
-        }
-      }
-    end
-
-    def show
-      render json: Templates::SerializeForApi.call(@template)
-    end
-
     def update
-      if (folder_name = params[:folder_name] || params.dig(:template, :folder_name))
-        @template.folder = TemplateFolders.find_or_create_by_name(current_user, folder_name)
-      end
-
-      Array.wrap(params[:roles].presence || params.dig(:template, :roles).presence).each_with_index do |role, index|
-        if (item = @template.submitters[index])
-          item['name'] = role
-        else
-          @template.submitters << { 'name' => role, 'uuid' => SecureRandom.uuid }
-        end
-      end
-
-      archived = params.key?(:archived) ? params[:archived] : params.dig(:template, :archived)
-
-      if archived.in?([true, false])
-        @template.archived_at = archived == true ? Time.current : nil
-      end
+      @template = current_account.templates.find(params[:id])
 
       @template.update!(template_params)
 
-      SearchEntries.enqueue_reindex(@template)
-
-      WebhookUrls.enqueue_events(@template, 'template.updated')
-
-      render json: @template.as_json(only: %i[id updated_at])
-    end
-
-    def destroy
-      if params[:permanently].in?(['true', true])
-        @template.destroy!
-      else
-        @template.update!(archived_at: Time.current)
-      end
-
-      render json: @template.as_json(only: %i[id archived_at])
+      render :ok
     end
 
     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.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
-    end
-
     def template_params
-      permitted_params = [
-        :name,
-        :external_id,
-        :shared_link,
-        {
-          submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email]],
-          fields: [[:uuid, :submitter_uuid, :name, :type,
-                    :required, :readonly, :default_value,
-                    :title, :description,
-                    { preferences: {},
-                      conditions: [%i[field_uuid value action operation]],
-                      options: [%i[value uuid]],
-                      validation: %i[message pattern],
-                      areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]]
-        }
-      ]
-
-      if params.key?(:template)
-        params.require(:template).permit(permitted_params)
-      else
-        params.permit(permitted_params)
-      end
+      params.require(:template).permit(:name,
+                                       schema: [%i[attachment_uuid name]],
+                                       submitters: [%i[name uuid]],
+                                       fields: [[:uuid, :submitter_uuid, :name, :type, :required,
+                                                 { options: [], areas: [%i[x y w h cell_w attachment_uuid page]] }]])
     end
   end
 end

app/controllers/api/templates_documents_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Api
+  class TemplatesDocumentsController < ApiBaseController
+    def create
+      @template = current_account.templates.find(params[:template_id])
+
+      documents =
+        find_or_create_blobs.map do |blob|
+          document = @template.documents.create!(blob:)
+
+          Templates::ProcessDocument.call(document)
+        end
+
+      schema = documents.map do |doc|
+        { attachment_uuid: doc.uuid, name: doc.filename.base }
+      end
+
+      render json: {
+        schema:,
+        documents: documents.as_json(
+          include: {
+            preview_images: { methods: %i[url metadata filename] }
+          }
+        )
+      }
+    end
+
+    private
+
+    def find_or_create_blobs
+      blobs = params[:blobs]&.map do |attrs|
+        ActiveStorage::Blob.find_signed(attrs[:signed_id])
+      end
+
+      blobs || params[:files].map do |file|
+        ActiveStorage::Blob.create_and_upload!(io: file.open,
+                                               filename: file.original_filename,
+                                               content_type: file.content_type)
+      end
+    end
+  end
+end

app/controllers/api/tools_controller.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class ToolsController < ApiBaseController
-    skip_authorization_check
-
-    def merge
-      files = params[:files] || []
-
-      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)
-      }
-    end
-
-    def verify
-      file = Base64.decode64(params[:file])
-      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)))
-
-      render json: {
-        checksum_status: is_checksum_found ? 'verified' : 'not_found',
-        signatures: pdf.signatures.map do |sig|
-          {
-            verification_result: sig.verify(trusted_certs:).messages,
-            signer_name: sig.signer_name,
-            signing_reason: sig.signing_reason,
-            signing_time: sig.signing_time,
-            signature_type: sig.signature_type
-          }
-        end
-      }
-    rescue HexaPDF::MalformedPDFError
-      render json: { error: 'Malformed PDF' }, status: :unprocessable_entity
-    end
-  end
-end

app/controllers/api/users_controller.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class UsersController < ApiBaseController
-    authorize_resource :current_user
-
-    def show
-      render json: current_user.as_json(only: %i[id first_name last_name email])
-    end
-  end
-end

app/controllers/api_settings_controller.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class ApiSettingsController < ApplicationController
-  def index
-    authorize!(:read, current_user.access_token)
-  end
-
-  def create
-    authorize!(:manage, current_user.access_token)
-
-    current_user.access_token.token = SecureRandom.base58(AccessToken::TOKEN_LENGTH)
-
-    current_user.access_token.save!
-
-    redirect_back(fallback_location: settings_api_index_path, notice: I18n.t('api_token_has_been_updated'))
-  end
-end

app/controllers/application_controller.rb

@@ -1,99 +1,29 @@
 # frozen_string_literal: true
 
 class ApplicationController < ActionController::Base
-  BROWSER_LOCALE_REGEXP = /\A\w{2}(?:-\w{2})?/
-
   include ActiveStorage::SetCurrent
   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?
 
   helper_method :button_title,
                 :current_account,
-                :form_link_host,
                 :svg_icon
 
-  impersonates :user, with: ->(uuid) { User.find_by(uuid:) }
-
   rescue_from Pagy::OverflowError do
     redirect_to request.path
   end
 
-  rescue_from RateLimit::LimitApproached do |e|
-    Rollbar.error(e) if defined?(Rollbar)
-
-    redirect_to request.referer, alert: 'Too many requests', status: :too_many_requests
-  end
-
-  if Rails.env.production? || Rails.env.test?
-    rescue_from CanCan::AccessDenied do |e|
-      Rollbar.warning(e) if defined?(Rollbar)
-
-      redirect_to root_path, alert: e.message
-    end
-  end
-
   def default_url_options
-    if request.domain == 'docuseal.com'
-      return { host: 'docuseal.com', protocol: ENV['FORCE_SSL'].present? ? 'https' : 'http' }
-    end
-
     Docuseal.default_url_options
   end
 
-  def impersonate_user(user)
-    raise ArgumentError unless user
-    raise Pretender::Error unless true_user
-
-    @impersonated_user = user
-
-    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
-
-    locale =
-      if locale.starts_with?('en-') && locale != 'en-US'
-        'en-GB'
-      else
-        locale.split('-').first.presence || 'en-GB'
-      end
-
-    locale = 'en-GB' unless I18n.locale_available?(locale)
-
-    I18n.with_locale(locale, &)
-  end
-
   def sign_in_for_demo
-    sign_in(User.active.order('random()').take) unless signed_in?
+    sign_in(User.first) unless signed_in?
   end
 
   def current_account
@@ -104,23 +34,11 @@ class ApplicationController < ActionController::Base
     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)
-    render_to_string(partial: 'shared/button_title',
-                     locals: { title:, disabled_with:, title_class:, icon:, icon_disabled: })
+  def button_title(title: 'Submit', disabled_with: 'Submitting', icon: nil)
+    render_to_string(partial: 'shared/button_title', locals: { title:, disabled_with:, icon: })
   end
 
   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
 end

app/controllers/console_redirect_controller.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class ConsoleRedirectController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def index
-    if request.path == '/upgrade'
-      params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premises"
-    end
-
-    params[:redir] = "#{Docuseal::CONSOLE_URL}/manage" if request.path == '/manage'
-
-    return redirect_to(new_user_session_path({ redir: params[:redir] }.compact)) if true_user.blank?
-
-    auth = JsonWebToken.encode(uuid: true_user.uuid,
-                               scope: :console,
-                               exp: 1.minute.from_now.to_i)
-
-    path = Addressable::URI.parse(params[:redir]).path if params[:redir].to_s.starts_with?(Docuseal::CONSOLE_URL)
-
-    redirect_to("#{Docuseal::CONSOLE_URL}#{path}?#{{ auth: }.to_query}", allow_other_host: true)
-  end
-end

app/controllers/dashboard_controller.rb

@@ -3,42 +3,11 @@
 class DashboardController < ApplicationController
   skip_before_action :authenticate_user!, only: %i[index]
 
-  before_action :maybe_redirect_product_url
-  before_action :maybe_render_landing
-  before_action :maybe_redirect_mfa_setup
-
-  skip_authorization_check
-
   def index
-    if cookies.permanent[:dashboard_view] == 'submissions'
-      SubmissionsDashboardController.dispatch(:index, request, response)
-    else
-      TemplatesDashboardController.dispatch(:index, request, response)
-    end
-  end
+    return render 'pages/landing' unless signed_in?
 
-  private
+    templates = current_account.templates.active.preload(:author).order(id: :desc)
 
-  def maybe_redirect_product_url
-    return if !Docuseal.multitenant? || signed_in?
-
-    redirect_to Docuseal::PRODUCT_URL, allow_other_host: true
-  end
-
-  def maybe_redirect_mfa_setup
-    return unless signed_in?
-    return if current_user.otp_required_for_login
-
-    return if !current_user.otp_required_for_login && !AccountConfig.exists?(value: true,
-                                                                             account_id: current_user.account_id,
-                                                                             key: AccountConfig::FORCE_MFA)
-
-    redirect_to mfa_setup_path, notice: I18n.t('setup_2fa_to_continue')
-  end
-
-  def maybe_render_landing
-    return if signed_in?
-
-    render 'pages/landing'
+    @pagy, @templates = pagy(templates, items: 12)
   end
 end

app/controllers/email_settings_controller.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class EmailSettingsController < ApplicationController
+  before_action :load_encrypted_config
+
+  def index; end
+
+  def create
+    if @encrypted_config.update(storage_configs)
+      redirect_to settings_email_index_path, notice: 'Changes have been saved'
+    else
+      render :index, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def load_encrypted_config
+    @encrypted_config =
+      EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::EMAIL_SMTP_KEY)
+  end
+
+  def storage_configs
+    params.require(:encrypted_config).permit(value: {}).tap do |e|
+      e[:value].compact_blank!
+    end
+  end
+end

app/controllers/email_smtp_settings_controller.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-class EmailSmtpSettingsController < ApplicationController
-  before_action :load_encrypted_config
-  authorize_resource :encrypted_config, only: :index
-  authorize_resource :encrypted_config, parent: false, only: :create
-
-  def index; end
-
-  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
-
-      redirect_to settings_email_index_path, notice: I18n.t('changes_have_been_saved')
-    else
-      render :index, status: :unprocessable_entity
-    end
-  rescue StandardError => e
-    flash[:alert] = e.message
-
-    render :index, status: :unprocessable_entity
-  end
-
-  private
-
-  def load_encrypted_config
-    @encrypted_config =
-      EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::EMAIL_SMTP_KEY)
-  end
-
-  def email_configs
-    params.require(:encrypted_config).permit(value: {}).tap do |e|
-      e[:value].compact_blank!
-    end
-  end
-end

app/controllers/embed_scripts_controller.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class EmbedScriptsController < ActionController::Metal
-  DUMMY_SCRIPT = <<~JAVASCRIPT.freeze
-    const DummyBuilder = class extends HTMLElement {
-      connectedCallback() {
-        this.innerHTML = `
-          <div style="text-align: center; padding: 20px; font-family: Arial, sans-serif;">
-            <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;">
-                Learn More
-              </a>
-            </div>
-          </div>
-        `;
-      }
-    };
-
-    const DummyForm = class extends DummyBuilder {};
-
-    if (!window.customElements.get('docuseal-builder')) {
-      window.customElements.define('docuseal-builder', DummyBuilder);
-    }
-
-    if (!window.customElements.get('docuseal-form')) {
-      window.customElements.define('docuseal-form', DummyForm);
-    }
-  JAVASCRIPT
-
-  def show
-    headers['Content-Type'] = 'application/javascript'
-
-    self.response_body = DUMMY_SCRIPT
-
-    self.status = 200
-  end
-end

app/controllers/encrypted_user_configs_controller.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class EncryptedUserConfigsController < ApplicationController
-  load_and_authorize_resource :encrypted_user_config
-
-  def destroy
-    @encrypted_user_config.destroy!
-
-    redirect_back(fallback_location: root_path)
-  end
-end

app/controllers/enquiries_controller.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class EnquiriesController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def create
-    if params[:talk_to_sales] == 'on'
-      Faraday.post(Docuseal::ENQUIRIES_URL,
-                   enquiry_params.merge(type: :talk_to_sales).to_json,
-                   'Content-Type' => 'application/json')
-    end
-
-    head :ok
-  end
-
-  private
-
-  def enquiry_params
-    params.require(:user).permit(:email)
-  end
-end

app/controllers/errors_controller.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-class ErrorsController < ActionController::Base
-  ENTERPRISE_FEATURE_MESSAGE =
-    'This feature is available in Pro Edition: https://www.docuseal.com/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',
-    '/api/templates/doc',
-    '/templates/docx',
-    '/api/templates/docx'
-  ].freeze
-
-  SAFE_ERROR_MESSAGE_CLASSES = [
-    ActionDispatch::Http::Parameters::ParseError,
-    JSON::ParserError
-  ].freeze
-
-  def show
-    if request.original_fullpath.in?(ENTERPRISE_PATHS) && error_status_code == 404
-      return render json: { status: 404, message: ENTERPRISE_FEATURE_MESSAGE }, status: :not_found
-    end
-
-    respond_to do |f|
-      f.json do
-        set_cors_headers
-
-        exception = request.env['action_dispatch.exception']
-
-        error = exception.message if exception.class.in?(SAFE_ERROR_MESSAGE_CLASSES)
-
-        render json: { status: error_status_code, error: }.compact, status: error_status_code
-      end
-
-      f.html { render error_status_code.to_s, status: error_status_code }
-    end
-  end
-
-  private
-
-  def set_cors_headers
-    headers['Access-Control-Allow-Origin'] = '*'
-    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
-  end
-
-  def error_status_code
-    @error_status_code ||=
-      ActionDispatch::ExceptionWrapper.new(request.env,
-                                           request.env['action_dispatch.exception']).status_code
-  end
-end

app/controllers/esign_settings_controller.rb

@@ -1,123 +1,19 @@
 # frozen_string_literal: true
 
 class EsignSettingsController < ApplicationController
-  DEFAULT_CERT_NAME = 'DocuSeal Self-Host Autogenerated'
-
-  CertFormRecord = Struct.new(:name, :file, :password, keyword_init: true) do
-    include ActiveModel::Validations
-
-    def to_key
-      []
-    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]
-
-  def show
-    cert_data = @encrypted_config.value || {}
-
-    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'] }
-    end
-
-    @pkcs_list = [
-      if default_pkcs
-        {
-          'pkcs' => default_pkcs,
-          'name' => DEFAULT_CERT_NAME,
-          'status' => custom_pkcs_list.any? { |e| e['status'] == 'default' } ? 'validate' : 'default'
-        }
-      end,
-      *custom_pkcs_list
-    ].compact.reverse
-  end
-
-  def new
-    @cert_record = CertFormRecord.new
-  end
-
   def create
-    @cert_record = CertFormRecord.new(**cert_params)
+    pdfs =
+      params[:files].map do |file|
+        HexaPDF::Document.new(io: file.open)
+      end
 
-    if (@encrypted_config.value && @encrypted_config.value['custom']&.any? { |e| e['name'] == @cert_record.name }) ||
-       @cert_record.name == DEFAULT_CERT_NAME
+    certs = Accounts.load_signing_certs(current_account)
 
-      @cert_record.errors.add(:name, I18n.t('already_exists'))
+    trusted_certs = [certs[:cert], certs[:sub_ca], certs[:root_ca]]
 
-      return render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'),
-                    status: :unprocessable_entity
-    end
-
-    save_new_cert!(@encrypted_config, @cert_record)
-
-    redirect_to settings_esign_path, notice: I18n.t('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_entity
-  end
-
-  def update
-    @encrypted_config.value['custom'].to_a.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
-
-    @encrypted_config.save!
-
-    redirect_to settings_esign_path, notice: I18n.t('default_certificate_has_been_selected')
-  end
-
-  def destroy
-    @encrypted_config.value['custom'].reject! { |e| e['name'] == params[:name] }
-
-    @encrypted_config.save!
-
-    redirect_to settings_esign_path, notice: I18n.t('certificate_has_been_removed')
-  end
-
-  private
-
-  def load_encrypted_config
-    @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
-                                                              key: EncryptedConfig::ESIGN_CERTS_KEY)
-  end
-
-  def save_new_cert!(cert_configs, cert_record)
-    pkcs = OpenSSL::PKCS12.new(cert_record.file.read, cert_record.password)
-
-    cert_configs.value ||= {}
-    cert_configs.value['custom'] ||= []
-    cert_configs.value['custom'].each { |e| e['status'] = 'validate' }
-    cert_configs.value['custom'] << {
-      data: Base64.urlsafe_encode64(pkcs.to_der),
-      password: cert_record.password,
-      name: cert_record.name,
-      status: 'default'
-    }
-
-    cert_configs.save!
-  end
-
-  def cert_params
-    return {} if params[:esign_settings_controller_cert_form_record].blank?
-
-    params.require(:esign_settings_controller_cert_form_record).permit(:name, :file, :password)
+    render turbo_stream: turbo_stream.replace('result', partial: 'result',
+                                                        locals: { pdfs:, files: params[:files], trusted_certs: })
+  rescue HexaPDF::MalformedPDFError
+    render turbo_stream: turbo_stream.replace('result', html: helpers.tag.div('Invalid PDF', id: 'result'))
   end
 end

app/controllers/mfa_setup_controller.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-class MfaSetupController < ApplicationController
-  before_action do
-    authorize!(:update, current_user)
-  end
-
-  before_action :set_provision_url, only: %i[show new]
-
-  def show; end
-
-  def new; end
-
-  def edit; end
-
-  def create
-    if current_user.validate_and_consume_otp!(params[:otp_attempt])
-      current_user.otp_required_for_login = true
-      current_user.save!
-
-      redirect_to settings_profile_index_path, notice: I18n.t('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')
-
-      render turbo_stream: turbo_stream.replace(:mfa_form, partial: 'mfa_setup/form'), status: :unprocessable_entity
-    end
-  end
-
-  def destroy
-    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')
-    else
-      @error_message = I18n.t('code_is_invalid')
-
-      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
-
-    current_user.otp_secret ||= User.generate_otp_secret
-
-    current_user.save!
-
-    @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Docuseal.product_name)
-  end
-end

app/controllers/newsletters_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class NewslettersController < ApplicationController
-  skip_authorization_check
-
   def show; end
 
   def update

app/controllers/notifications_settings_controller.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-class NotificationsSettingsController < ApplicationController
-  before_action :load_bcc_config, only: :index
-  before_action :load_reminder_config, only: :index
-  authorize_resource :bcc_config, only: :index
-  authorize_resource :reminder_config, only: :index
-
-  before_action :build_account_config, only: :create
-  authorize_resource :account_config, only: :create
-
-  def index; end
-
-  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')
-    else
-      redirect_back fallback_location: settings_notifications_path, alert: I18n.t('unable_to_save')
-    end
-  end
-
-  private
-
-  def build_account_config
-    @account_config =
-      AccountConfig.find_or_initialize_by(account: current_account, key: email_config_params[:key])
-
-    @account_config.assign_attributes(email_config_params)
-  end
-
-  def load_bcc_config
-    @bcc_config =
-      AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::BCC_EMAILS)
-  end
-
-  def load_reminder_config
-    @reminder_config =
-      AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::SUBMITTER_REMINDERS)
-  end
-
-  def email_config_params
-    params.require(:account_config).permit(:key, :value, { value: {} }, { value: [] }).tap do |attrs|
-      attrs[:key] = nil unless attrs[:key].in?([AccountConfig::BCC_EMAILS, AccountConfig::SUBMITTER_REMINDERS])
-    end
-  end
-end

app/controllers/passwords_controller.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class PasswordsController < Devise::PasswordsController
-  class Current < ActiveSupport::CurrentAttributes
-    attribute :user
-  end
-
-  def create
-    super do |resource|
-      resource.errors.clear unless Docuseal.multitenant?
-    end
-  end
-
-  def update
-    super do |resource|
-      Current.user = resource
-    end
-  end
-end

app/controllers/personalization_settings_controller.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-class PersonalizationSettingsController < ApplicationController
-  ALLOWED_KEYS = [
-    AccountConfig::FORM_COMPLETED_BUTTON_KEY,
-    AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY,
-    AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY,
-    AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY,
-    AccountConfig::FORM_COMPLETED_MESSAGE_KEY,
-    *(Docuseal.multitenant? ? [] : [AccountConfig::POLICY_LINKS_KEY])
-  ].freeze
-
-  InvalidKey = Class.new(StandardError)
-
-  before_action :load_and_authorize_account_config, only: :create
-
-  def show
-    authorize!(:read, AccountConfig)
-  end
-
-  def create
-    if @account_config.value.is_a?(Hash)
-      @account_config.value = @account_config.value.reject do |_, v|
-        v.blank? && v != false
-      end
-    end
-
-    if @account_config.value != false && @account_config.value.blank?
-      @account_config.destroy!
-    else
-      @account_config.save!
-    end
-
-    redirect_back(fallback_location: settings_personalization_path, notice: I18n.t('settings_have_been_saved'))
-  end
-
-  private
-
-  def load_and_authorize_account_config
-    @account_config =
-      current_account.account_configs.find_or_initialize_by(key: account_config_params[:key])
-
-    @account_config.assign_attributes(account_config_params)
-
-    authorize!(:create, @account_config)
-
-    raise InvalidKey unless ALLOWED_KEYS.include?(@account_config.key)
-
-    @account_config
-  end
-
-  def account_config_params
-    attrs = params.require(:account_config).permit(:key, :value, { value: {} }, { value: [] })
-
-    return attrs if attrs[:value].is_a?(String)
-
-    attrs[:value]&.transform_values! do |value|
-      if value.in?(%w[true false])
-        value == 'true'
-      else
-        value
-      end
-    end
-
-    attrs
-  end
-end

app/controllers/preview_document_page_controller.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-class PreviewDocumentPageController < ActionController::API
-  include ActiveStorage::SetCurrent
-
-  FORMAT = Templates::ProcessDocument::FORMAT
-
-  def show
-    attachment_uuid = ApplicationRecord.signed_id_verifier.verified(params[:signed_uuid], purpose: :attachment)
-
-    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"] })
-
-    return redirect_to preview_image.url, allow_other_host: true if preview_image
-
-    file_path =
-      if attachment.service.name == :disk
-        ActiveStorage::Blob.service.path_for(attachment.key)
-      else
-        find_or_create_document_tempfile_path(attachment)
-      end
-
-    preview_image =
-      Templates::ProcessDocument.generate_pdf_preview_from_file(attachment, file_path, params[:id].to_i)
-
-    redirect_to preview_image.url, allow_other_host: true
-  end
-
-  def find_or_create_document_tempfile_path(attachment)
-    file_path = "#{Dir.tmpdir}/#{attachment.uuid}"
-
-    File.open(file_path, File::RDWR | File::CREAT, 0o644) do |f|
-      f.flock(File::LOCK_EX)
-
-      # rubocop:disable Style/ZeroLengthPredicate
-      if f.size.zero?
-        f.binmode
-
-        f.write(attachment.download)
-      end
-      # rubocop:enable Style/ZeroLengthPredicate
-    end
-
-    file_path
-  end
-end

app/controllers/profile_controller.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 class ProfileController < ApplicationController
-  before_action do
-    authorize!(:manage, current_user)
-  end
-
   def index; end
 
   def update_contact
     if current_user.update(contact_params)
-      redirect_to settings_profile_index_path, notice: I18n.t('contact_information_has_been_update')
+      redirect_to settings_profile_index_path, notice: 'Contact information has been updated'
     else
       render :index, status: :unprocessable_entity
     end
@@ -18,7 +14,7 @@ class ProfileController < ApplicationController
   def update_password
     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_entity
     end

app/controllers/pwa_controller.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class PwaController < ActionController::Base
-end

app/controllers/registrations_controller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class RegistrationsController < Devise::RegistrationsController
+  private
+
+  def build_resource(_hash = {})
+    account = Account.new(account_params)
+    account.timezone = Accounts.normalize_timezone(account.timezone)
+
+    self.resource = account.users.new(user_params)
+  end
+
+  def user_params
+    return {} if params[:user].blank?
+
+    params.require(:user).permit(:first_name, :last_name, :email, :password)
+  end
+
+  def account_params
+    return {} if params[:account].blank?
+
+    params.require(:account).permit(:name, :timezone)
+  end
+end

app/controllers/search_entries_reindex_controller.rb

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

app/controllers/send_submission_email_controller.rb

@@ -5,42 +5,23 @@ class SendSubmissionEmailController < ApplicationController
 
   skip_before_action :authenticate_user!
   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],
+                                                        template: { slug: params[:template_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! unless already_sent?(@submitter)
+    SubmitterMailer.documents_copy_email(@submitter).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 already_sent?(submitter)
-    EmailEvent.exists?(tag: :submitter_documents_copy, email: submitter.email, emailable: submitter,
-                       event_type: :send, created_at: SEND_DURATION.ago..Time.current)
-  end
 end

app/controllers/sessions_controller.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-class SessionsController < Devise::SessionsController
-  before_action :configure_permitted_parameters
-
-  around_action :with_browser_locale
-
-  def create
-    email = sign_in_params[:email].to_s.downcase
-
-    if Docuseal.multitenant? && !User.exists?(email:)
-      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')
-    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_entity
-    end
-
-    super
-  end
-
-  private
-
-  def after_sign_in_path_for(...)
-    if params[:redir].present?
-      return console_redirect_index_path(redir: params[:redir]) if params[:redir].starts_with?(Docuseal::CONSOLE_URL)
-
-      return params[:redir]
-    end
-
-    super
-  end
-
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_in, keys: [:otp_attempt])
-  end
-
-  def set_flash_message(key, kind, options = {})
-    return if key == :alert && kind == 'already_authenticated'
-
-    super
-  end
-end

app/controllers/setup_controller.rb

@@ -3,7 +3,6 @@
 class SetupController < ApplicationController
   skip_before_action :maybe_redirect_to_setup
   skip_before_action :authenticate_user!
-  skip_authorization_check
 
   before_action :redirect_to_root_if_signed, if: :signed_in?
   before_action :ensure_first_user_not_created!
@@ -17,24 +16,22 @@ class SetupController < ApplicationController
   def create
     @account = Account.new(account_params)
     @account.timezone = Accounts.normalize_timezone(@account.timezone)
+
     @user = @account.users.new(user_params)
-    @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 = EncryptedConfig.new(encrypted_config_params)
+      @encrypted_config.errors.add(:value, 'should be a valid URL')
 
       return render :index, status: :unprocessable_entity
     end
 
-    return render :index, status: :unprocessable_entity unless @account.valid?
-
     if @user.save
       encrypted_configs = [
         { key: EncryptedConfig::APP_URL_KEY, value: encrypted_config_params[:value] },
         { 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!
 
@@ -57,7 +54,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 +64,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

app/controllers/sms_settings_controller.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class SmsSettingsController < ApplicationController
-  before_action :load_encrypted_config
-  authorize_resource :encrypted_config, only: :index
-  authorize_resource :encrypted_config, parent: false, except: :index
-
-  def index; end
-
-  private
-
-  def load_encrypted_config
-    @encrypted_config =
-      EncryptedConfig.find_or_initialize_by(account: current_account, key: 'sms_configs')
-  end
-end

app/controllers/sso_settings_controller.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class SsoSettingsController < ApplicationController
-  before_action :load_encrypted_config
-  authorize_resource :encrypted_config, only: :index
-
-  def index; end
-
-  private
-
-  def load_encrypted_config
-    @encrypted_config =
-      EncryptedConfig.find_or_initialize_by(account: current_account, key: 'saml_configs')
-  end
-end

app/controllers/start_form_controller.rb

@@ -4,239 +4,50 @@ class StartFormController < ApplicationController
   layout 'form'
 
   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
   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
-    raise ActionController::RoutingError, I18n.t('not_found') if @template.preferences['require_phone_2fa']
-
-    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.submitters.new(uuid: @template.submitters.first['uuid'])
   end
 
   def update
-    @submitter = find_or_initialize_submitter(@template, submitter_params)
+    @submitter = Submitter.where(submission: @template.submissions.where(deleted_at: nil))
+                          .find_or_initialize_by(email: submitter_params[:email])
 
     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
+      @submitter.assign_attributes(
+        uuid: @template.submitters.first['uuid'],
+        opened_at: Time.current,
+        ip: request.remote_ip,
+        ua: request.user_agent
+      )
 
-        return render :show, status: :unprocessable_entity
-      end
-
-      if (is_new_record = @submitter.new_record?)
-        assign_submission_attributes(@submitter, @template)
-
-        Submissions::AssignDefinedSubmitters.call(@submitter.submission)
-      else
-        @submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
-      end
-
-      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
+      @submitter.submission ||= Submission.new(template: @template)
 
+      if @submitter.save
         redirect_to submit_form_path(@submitter.slug)
       else
-        render :show, status: :unprocessable_entity
+        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)
+    @submitter = Submitter.where(submission: @template.submissions).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)
-    submitter.assign_attributes(
-      uuid: (filter_undefined_submitters(template).first || @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 || {}
-    )
-
-    submitter.assign_attributes(@resubmit_submitter.slice(:name, :email, :phone)) if @resubmit_submitter
-
-    if submitter.values.present?
-      @resubmit_submitter.attachments.each do |attachment|
-        submitter.attachments << attachment.dup if submitter.values.value?(attachment.uuid)
-      end
-    end
-
-    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)
-
-    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
+    params.require(:submitter).permit(:email)
   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_entity 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_entity
-      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

app/controllers/start_form_email_2fa_send_controller.rb

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

app/controllers/storage_settings_controller.rb

@@ -2,8 +2,6 @@
 
 class StorageSettingsController < ApplicationController
   before_action :load_encrypted_config
-  authorize_resource :encrypted_config, only: :index
-  authorize_resource :encrypted_config, parent: false, only: :create
 
   def index; end
 
@@ -11,7 +9,7 @@ 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_entity
     end

app/controllers/submission_events_controller.rb

@@ -1,26 +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_sms' => 'send',
-    'phone_verified' => 'phone_check',
-    'email_verified' => 'email_check',
-    'click_sms' => 'hand_click',
-    'decline_form' => 'x',
-    'start_verification' => 'player_play',
-    'complete_verification' => 'check',
-    'invite_party' => 'user_plus'
-  }.freeze
-
-  load_and_authorize_resource :submission
-
-  def index; end
-end

app/controllers/submissions_archived_controller.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class SubmissionsArchivedController < ApplicationController
-  load_and_authorize_resource :submission, parent: false
-
-  def index
-    @submissions = @submissions.left_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)
-
-    @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))
-  end
-end

app/controllers/submissions_controller.rb

@@ -2,103 +2,76 @@
 
 class SubmissionsController < ApplicationController
   before_action :load_template, only: %i[new create]
-  authorize_resource :template, only: %i[new create]
-
-  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
 
   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
+    @submission =
+      Submission.joins(:template).where(template: { account_id: current_account.id })
+                .preload(template: { documents_attachments: { preview_images_attachments: :blob } })
+                .find(params[:id])
 
     render :show, layout: 'plain'
   end
 
-  def new
-    authorize!(:new, Submission)
-  end
+  def new; end
 
   def create
-    save_template_message(@template, params) if params[:save_message] == '1'
-
-    if params[:is_custom_message] != '1'
-      params.delete(:subject)
-      params.delete(:body)
-    end
-
     submissions =
       if params[:emails].present?
-        Submissions.create_from_emails(template: @template,
-                                       user: current_user,
-                                       source: :invite,
-                                       mark_as_sent: params[:send_email] == '1',
-                                       emails: params[:emails],
-                                       params: params.merge('send_completed_email' => true))
+        create_submissions_from_emails
       else
-        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))
+        create_submissions_from_submitters
       end
 
-    WebhookUrls.enqueue_events(submissions, 'submission.created')
+    if params[:send_email] == '1'
+      submissions.flat_map(&:submitters).each do |submitter|
+        SubmitterMailer.invitation_email(submitter, message: params[:message]).deliver_later!
+      end
+    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_entity
+    redirect_to template_path(@template),
+                notice: "#{submissions.size} #{'recipient'.pluralize(submissions.size)} added"
   end
 
   def destroy
-    notice =
-      if params[:permanently].in?(['true', true])
-        @submission.destroy!
+    submission = Submission.joins(:template).where(template: { account_id: current_account.id })
+                           .find(params[:id])
 
-        I18n.t('submission_has_been_removed')
-      else
-        @submission.update!(archived_at: Time.current)
+    submission.update!(deleted_at: Time.current)
 
-        WebhookUrls.enqueue_events(@submission, 'submission.archived')
-
-        I18n.t('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: 'Submission has been archived')
   end
 
   private
 
-  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?
+  def create_submissions_from_emails
+    emails = params[:emails].to_s.scan(User::EMAIL_REGEXP)
 
-    template.save!
+    emails.map do |email|
+      submission = @template.submissions.new(created_by_user: current_user)
+      submission.submitters.new(email:, uuid: @template.submitters.first['uuid'],
+                                sent_at: params[:send_email] == '1' ? Time.current : nil)
+
+      submission.tap(&:save!)
+    end
+  end
+
+  def create_submissions_from_submitters
+    submissions_params[:submission].to_h.map do |_, attrs|
+      submission = @template.submissions.new(created_by_user: current_user)
+
+      attrs[:submitters].each do |submitter_attrs|
+        submission.submitters.new(**submitter_attrs, sent_at: params[:send_email] == '1' ? Time.current : nil)
+      end
+
+      submission.tap(&:save!)
+    end
   end
 
   def submissions_params
-    params.permit(submission: { submitters: [%i[uuid email phone name]] })
+    params.permit(submission: { submitters: [%i[uuid email]] })
   end
 
   def load_template
-    @template = Template.accessible_by(current_ability).find(params[:template_id])
+    @template = current_account.templates.find(params[:template_id])
   end
 end

app/controllers/submissions_dashboard_controller.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class SubmissionsDashboardController < ApplicationController
-  load_and_authorize_resource :submission, parent: false
-
-  def index
-    @submissions = @submissions.left_joins(:template)
-
-    @submissions = @submissions.where(archived_at: nil)
-                               .where(templates: { archived_at: nil })
-                               .preload(:template_accesses, :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 = 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))
-  end
-end

app/controllers/submissions_debug_controller.rb

@@ -4,7 +4,6 @@ class SubmissionsDebugController < ApplicationController
   layout 'plain'
 
   skip_before_action :authenticate_user!
-  skip_authorization_check
 
   def index
     @submitter = Submitter.preload({ attachments_attachments: :blob },
@@ -16,16 +15,9 @@ class SubmissionsDebugController < ApplicationController
         render 'submit_form/show'
       end
       f.pdf do
-        result =
-          if params[:audit]
-            Submissions::GenerateAuditTrail.call(@submitter.submission)
-          elsif params[:combined]
-            Submissions::GenerateCombinedAttachment.call(@submitter)
-          else
-            Submissions::GenerateResultAttachments.call(@submitter)
-          end
+        Submissions::GenerateResultAttachments.call(@submitter)
 
-        send_data Array.wrap(result).first.download,
+        send_data ActiveStorage::Attachment.where(name: :documents).last.download,
                   filename: 'debug.pdf',
                   disposition: 'inline',
                   type: 'application/pdf'

app/controllers/submissions_download_controller.rb

@@ -2,83 +2,17 @@
 
 class SubmissionsDownloadController < ApplicationController
   skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  TTL = 40.minutes
-  FILES_TTL = 5.minutes
 
   def index
-    @submitter = Submitter.find_signed(params[:sig], purpose: :download_completed) if params[:sig].present?
+    submitter = Submitter.find_by(slug: params[:submitter_slug])
 
-    signature_valid =
-      if @submitter&.slug == params[:submitter_slug]
-        true
-      else
-        @submitter = nil
+    Submissions::EnsureResultGenerated.call(submitter)
+
+    urls =
+      Submitters.select_attachments_for_download(submitter).map do |attachment|
+        helpers.rails_blob_url(attachment)
       end
 
-    @submitter ||= Submitter.find_by!(slug: params[:submitter_slug])
-
-    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
-
-    Submissions::EnsureResultGenerated.call(last_submitter)
-
-    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
-
-    if params[:combined] == 'true'
-      url = build_combined_url(@submitter)
-
-      if url
-        render json: [url]
-      else
-        head :not_found
-      end
-    else
-      render json: build_urls(last_submitter)
-    end
-  end
-
-  private
-
-  def current_user_submitter?(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_url(
-        attachment.blob,
-        expires_at: FILES_TTL.from_now.to_i,
-        filename: Submitters.build_document_filename(submitter, attachment.blob, filename_format)
-      )
-    end
-  end
-
-  def build_combined_url(submitter)
-    return if submitter.submission.submitters.exists?(completed_at: nil)
-    return if submitter.submission.submitters.order(:completed_at).last != submitter
-
-    attachment = submitter.submission.combined_document_attachment
-    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_url(
-      attachment.blob,
-      expires_at: FILES_TTL.from_now.to_i,
-      filename: Submitters.build_document_filename(submitter, attachment.blob, filename_format)
-    )
+    render json: urls
   end
 end

app/controllers/submissions_export_controller.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class SubmissionsExportController < ApplicationController
-  load_and_authorize_resource :template
-  load_and_authorize_resource :submission, through: :template, parent: false, only: :index
-
-  def index
-    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]),
-                filename: "#{@template.name}.csv"
-    elsif params[:format] == 'xlsx'
-      send_data Submissions::GenerateExportFiles.call(submissions, format: params[:format]),
-                filename: "#{@template.name}.xlsx"
-    end
-  end
-
-  def new; end
-end

app/controllers/submissions_filters_controller.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class SubmissionsFiltersController < ApplicationController
-  ALLOWED_NAMES = %w[
-    author
-    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

app/controllers/submissions_preview_controller.rb

@@ -1,64 +0,0 @@
-# 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
-    submitter = Submitter.find_signed(params[:sig], purpose: :download_completed) if params[:sig].present?
-
-    signature_valid =
-      if submitter && submitter.submission.slug == params[:slug]
-        @submission = submitter.submission
-
-        true
-      end
-
-    @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')
-    end
-
-    if use_signature?(@submission) && !signature_valid
-      Rollbar.info("TTL: #{@submission.id}") if defined?(Rollbar)
-
-      return redirect_to submissions_preview_completed_path(@submission.slug)
-    end
-
-    @submission = Submissions.preload_with_pages(@submission)
-
-    render 'submissions/show', layout: 'plain'
-  end
-
-  def completed
-    @submission = Submission.find_by!(slug: params[:submissions_preview_slug])
-    @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? { |e| e.preferences['require_phone_2fa'] }
-    return true if submission.template&.preferences&.dig('require_phone_2fa')
-
-    !submission_valid_ttl?(submission)
-  end
-
-  def submission_valid_ttl?(submission)
-    last_submitter = submission.submitters.select(&:completed_at?).max_by(&:completed_at)
-
-    last_submitter && last_submitter.completed_at > TTL.ago
-  end
-end

app/controllers/submissions_unarchive_controller.rb

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

app/controllers/submit_form_controller.rb

@@ -3,108 +3,50 @@
 class SubmitFormController < ApplicationController
   layout 'form'
 
-  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_render_locked_page, only: :show
-  before_action :maybe_require_link_2fa, only: %i[show update]
-
-  CONFIG_KEYS = [].freeze
 
   def show
-    submission = @submitter.submission
+    @submitter =
+      Submitter.preload(submission: { template: { documents_attachments: { preview_images_attachments: :blob } } })
+               .find_by!(slug: params[:slug])
 
     return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
 
-    @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::MaybeUpdateDefaultValues.call(@submitter, current_user)
-
-    @attachments_index = build_attachments_index(submission)
-
-    return unless @form_configs[:prefill_signature]
-
-    if (user_signature = UserConfigs.load_signature(current_user))
-      @signature_attachment = ActiveStorage::Attachment.find_or_create_by!(
-        blob_id: user_signature.blob_id,
-        name: 'attachments',
-        record: @submitter
-      )
-    end
-
-    @signature_attachment ||=
-      Submitters::MaybeAssignDefaultBrowserSignature.call(@submitter, params, cookies, @attachments_index.values)
-
-    @attachments_index[@signature_attachment.uuid] = @signature_attachment if @signature_attachment
+    cookies[:submitter_sid] = @submitter.signed_id
   end
 
   def update
-    if @submitter.completed_at?
-      return render json: { error: I18n.t('form_has_been_completed_already') }, status: :unprocessable_entity
-    end
+    submitter = Submitter.find_by!(slug: params[:slug])
+    submitter.values.merge!(normalized_values)
+    submitter.completed_at = Time.current if params[:completed] == 'true'
+    submitter.opened_at ||= Time.current
 
-    if @submitter.submission.template&.archived_at? || @submitter.submission.archived_at?
-      return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_entity
-    end
+    submitter.save!
 
-    if @submitter.submission.expired?
-      return render json: { error: I18n.t('form_has_been_expired') }, status: :unprocessable_entity
-    end
+    if submitter.completed_at?
+      GenerateSubmitterResultAttachmentsJob.perform_later(submitter)
 
-    if @submitter.declined_at?
-      return render json: { error: I18n.t('form_has_been_declined') },
-                    status: :unprocessable_entity
+      submitter.submission.template.account.users.active.each do |user|
+        SubmitterMailer.completed_email(submitter, user).deliver_later!
+      end
     end
 
-    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_entity
-  rescue Submitters::SubmitValues::ValidationError => e
-    render json: { error: e.message }, status: :unprocessable_entity
   end
 
-  def completed; end
-
-  def success; end
+  def completed
+    @submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+  end
 
   private
 
-  def maybe_require_link_2fa
-    return if @submitter.submission.source != 'link'
-    return unless @submitter.submission.template&.preferences&.dig('shared_link_2fa') == true
-    return if cookies.encrypted[:email_2fa_slug] == @submitter.slug
-    return if @submitter.email == current_user&.email && current_user&.account_id == @submitter.account_id
-
-    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 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)
+  def normalized_values
+    params.fetch(:values, {}).to_unsafe_h.transform_values do |v|
+      if params[:cast_boolean] == 'true'
+        v == 'true'
+      else
+        v.is_a?(Array) ? v.compact_blank : v
+      end
+    end
   end
 end

app/controllers/submit_form_decline_controller.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormDeclineController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def create
-    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-
-    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?
-
-    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
-end

app/controllers/submit_form_download_controller.rb

@@ -1,40 +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_entity 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)
-
-    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_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
-    end
-
-    render json: urls
-  end
-end

app/controllers/submit_form_draw_signature_controller.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormDrawSignatureController < ApplicationController
-  layout false
-
-  around_action :with_browser_locale, only: %i[show]
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def show
-    @submitter = Submitter.find_by!(slug: params[:slug])
-
-    return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
-
-    if @submitter.submission.template&.archived_at? || @submitter.submission.archived_at?
-      return redirect_to submit_form_path(@submitter.slug)
-    end
-
-    render :show
-  end
-end

app/controllers/submit_form_invite_controller.rb

@@ -1,60 +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_entity 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?
-
-        submitter.submission.submitters.create!(**attrs, 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_entity
-    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?
-  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

app/controllers/submit_form_values_controller.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormValuesController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def index
-    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-
-    return render json: {} if submitter.completed_at? || submitter.declined_at?
-    return render json: {} if submitter.submission.template&.archived_at? ||
-                              submitter.submission.archived_at? ||
-                              submitter.submission.expired?
-
-    value = submitter.values[params['field_uuid']]
-    attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?
-
-    render json: {
-      value:,
-      attachment: attachment&.as_json(only: %i[uuid created_at], methods: %i[url filename content_type])
-    }, head: :ok
-  end
-end

app/controllers/submitters_autocomplete_controller.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-class SubmittersAutocompleteController < ApplicationController
-  load_and_authorize_resource :submitter, parent: false
-
-  SELECT_COLUMNS = %w[email phone name].freeze
-  LIMIT = 100
-
-  def index
-    submitters = search_submitters(@submitters)
-
-    arel_columns = SELECT_COLUMNS.map { |col| Submitter.arel_table[col] }
-    values = submitters.limit(LIMIT).group(arel_columns).pluck(arel_columns)
-
-    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)
-    if SELECT_COLUMNS.include?(params[:field])
-      if Docuseal.fulltext_search?
-        Submitters.fulltext_search_field(current_user, submitters, params[:q], params[:field])
-      else
-        column = Submitter.arel_table[params[:field].to_sym]
-
-        term = "#{params[:q].downcase}%"
-
-        submitters.where(column.matches(term))
-      end
-    else
-      Submitters.search(current_user, submitters, params[:q])
-    end
-  end
-end

app/controllers/submitters_controller.rb

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

app/controllers/submitters_resubmit_controller.rb

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

app/controllers/submitters_send_email_controller.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class SubmittersSendEmailController < ApplicationController
-  load_and_authorize_resource :submitter, id_param: :submitter_slug, find_by: :slug
-
-  def create
-    if Docuseal.multitenant? && SubmissionEvent.exists?(submitter: @submitter,
-                                                        event_type: 'send_email',
-                                                        created_at: 10.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'))
-    end
-
-    SendSubmitterInvitationEmailJob.perform_async('submitter_id' => @submitter.id)
-
-    @submitter.sent_at ||= Time.current
-    @submitter.save!
-
-    redirect_back(fallback_location: submission_path(@submitter.submission), notice: I18n.t('email_has_been_sent'))
-  end
-end

app/controllers/template_documents_controller.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class TemplateDocumentsController < ApplicationController
-  load_and_authorize_resource :template
-
-  def create
-    if params[:blobs].blank? && params[:files].blank?
-      return render json: { error: I18n.t('file_is_missing') }, status: :unprocessable_entity
-    end
-
-    old_fields_hash = @template.fields.hash
-
-    documents = Templates::CreateAttachments.call(@template, params, extract_fields: true)
-
-    schema = documents.map do |doc|
-      { attachment_uuid: doc.uuid, name: doc.filename.base }
-    end
-
-    render json: {
-      schema:,
-      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_uuid],
-        include: {
-          preview_images: { methods: %i[url metadata filename] }
-        }
-      )
-    }
-  rescue Templates::CreateAttachments::PdfEncrypted
-    render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity
-  end
-end

app/controllers/template_folders_autocomplete_controller.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class TemplateFoldersAutocompleteController < ApplicationController
-  load_and_authorize_resource :template_folder, parent: false
-
-  LIMIT = 30
-
-  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
-
-    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])
-  end
-end

app/controllers/template_folders_controller.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-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)
-
-    @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
-  end
-
-  def edit; end
-
-  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')
-    else
-      redirect_to folder_path(@template_folder), alert: I18n.t('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

app/controllers/template_sharings_testing_controller.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class TemplateSharingsTestingController < ApplicationController
-  load_and_authorize_resource :template, parent: true
-
-  before_action do
-    authorize!(:manage, TemplateSharing.new(template: @template))
-  end
-
-  def create
-    testing_account = Accounts.find_or_create_testing_user(true_user.account).account
-
-    if params[:value] == '1'
-      TemplateSharing.create!(ability: :manage, account: testing_account, template: @template)
-    else
-      TemplateSharing.find_by(template: @template, account: testing_account)&.destroy!
-    end
-
-    head :ok
-  end
-end

app/controllers/templates_archived_controller.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-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.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)
-  end
-end

app/controllers/templates_archived_submissions_controller.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesArchivedSubmissionsController < ApplicationController
-  load_and_authorize_resource :template
-  load_and_authorize_resource :submission, through: :template, parent: false
-
-  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 = 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))
-  rescue ActiveRecord::RecordNotFound
-    redirect_to root_path
-  end
-end

app/controllers/templates_clone_and_replace_controller.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesCloneAndReplaceController < ApplicationController
-  load_and_authorize_resource :template
-
-  def create
-    return head :unprocessable_entity 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)
-
-    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_entity }
-    end
-  end
-end

app/controllers/templates_code_modal_controller.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesCodeModalController < ApplicationController
-  load_and_authorize_resource :template
-
-  def show; end
-end

app/controllers/templates_controller.rb

@@ -1,150 +1,60 @@
 # frozen_string_literal: true
 
 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))
+    @template = current_account.templates.active.find(params[:id])
 
-    @base_submissions = submissions
-
-    submissions = Submissions::Filter.filter_by_status(submissions, 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(:template_accesses, submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy(@template.submissions.active.preload(:submitters).order(id: :desc))
   rescue ActiveRecord::RecordNotFound
     redirect_to root_path
   end
 
   def new
-    @template.name = "#{@base_template.name} (#{I18n.t('clone')})" if @base_template
+    @template = current_account.templates.new
+    @template.name = "#{@base_template.name} (Clone)" if @base_template
   end
 
   def edit
-    ActiveRecord::Associations::Preloader.new(
-      records: [@template],
-      associations: [schema_documents: [:blob, { preview_images_attachments: :blob }]]
-    ).call
-
-    @template_data =
-      @template.as_json.merge(
-        documents: @template.schema_documents.as_json(
-          methods: %i[metadata signed_uuid],
-          include: { preview_images: { methods: %i[url metadata filename] } }
-        )
-      ).to_json
+    @template = current_account.templates.preload(documents_attachments: { preview_images_attachments: :blob })
+                               .find(params[:id])
 
     render :edit, layout: 'plain'
   end
 
   def create
-    if @base_template
-      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])
-    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
+    @template = current_account.templates.new(template_params)
+    @template.author = current_user
+    @template.assign_attributes(@base_template.slice(:fields, :schema, :submitters)) if @base_template
 
     if @template.save
       Templates::CloneAttachments.call(template: @template, original_template: @base_template) if @base_template
 
-      SearchEntries.enqueue_reindex(@template)
-
-      WebhookUrls.enqueue_events(@template, 'template.created')
-
-      maybe_redirect_to_template(@template)
+      redirect_to edit_template_path(@template)
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'templates/new'), status: :unprocessable_entity
     end
   end
 
-  def update
-    @template.assign_attributes(template_params)
-
-    is_name_changed = @template.name_changed?
-
-    @template.save!
-
-    SearchEntries.enqueue_reindex(@template) if is_name_changed
-
-    WebhookUrls.enqueue_events(@template, 'template.updated')
-
-    head :ok
-  end
-
   def destroy
-    notice =
-      if params[:permanently].in?(['true', true])
-        @template.destroy!
+    @template = current_account.templates.find(params[:id])
+    @template.update!(deleted_at: Time.current)
 
-        I18n.t('template_has_been_removed')
-      else
-        @template.update!(archived_at: Time.current)
-
-        I18n.t('template_has_been_archived')
-      end
-
-    redirect_back(fallback_location: root_path, notice:)
+    redirect_back(fallback_location: root_path, notice: 'Template has been archived.')
   end
 
   private
 
   def template_params
-    params.require(:template).permit(
-      :name,
-      { schema: [[:attachment_uuid, :name, { conditions: [%i[field_uuid value action operation]] }]],
-        submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid optional_invite_by_uuid email]],
-        fields: [[:uuid, :submitter_uuid, :name, :type,
-                  :required, :readonly, :default_value,
-                  :title, :description,
-                  { preferences: {},
-                    conditions: [%i[field_uuid value action operation]],
-                    options: [%i[value uuid]],
-                    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.accessible_by(current_ability).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: I18n.t('template_has_been_cloned'))
-    end
+    params.require(:template).permit(:name)
   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])
+    @base_template = current_account.templates
+                                    .preload(documents_attachments: :preview_images_attachments)
+                                    .find_by(id: params[:base_template_id])
   end
 end

app/controllers/templates_dashboard_controller.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesDashboardController < ApplicationController
-  load_and_authorize_resource :template_folder, parent: false
-  load_and_authorize_resource :template, parent: false
-
-  SHOW_TEMPLATES_FOLDERS_THRESHOLD = 9
-  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)
-
-    @pagy, @template_folders = pagy(
-      @template_folders,
-      limit: FOLDERS_PER_PAGE,
-      page: @template_folders.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD ? params[:page] : 1
-    )
-
-    if @pagy.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD
-      @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)
-
-      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?
-    end
-  end
-
-  private
-
-  def filter_templates(templates)
-    rel = templates.active
-
-    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
-        rel = rel.where(folder_id: current_account.default_template_folder.id)
-      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)
-  end
-end

app/controllers/templates_debug_controller.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesDebugController < ApplicationController
-  load_and_authorize_resource :template
-
-  def show
-    attachment = @template.documents.first
-
-    data = attachment.download
-    pdf = HexaPDF::Document.new(io: StringIO.new(data))
-
-    fields = Templates::FindAcroFields.call(pdf, attachment, data)
-
-    attachment.metadata['pdf'] ||= {}
-    attachment.metadata['pdf']['fields'] = fields
-
-    @template.update!(fields: Templates::ProcessDocument.normalize_attachment_fields(@template, [attachment]))
-
-    ActiveRecord::Associations::Preloader.new(
-      records: [@template],
-      associations: [schema_documents: { preview_images_attachments: :blob }]
-    ).call
-
-    @template_data =
-      @template.as_json.merge(
-        documents: @template.schema_documents.as_json(
-          methods: %i[metadata signed_uuid],
-          include: { preview_images: { methods: %i[url metadata filename] } }
-        )
-      ).to_json
-
-    render 'templates/edit', layout: 'plain'
-  end
-end

app/controllers/templates_folders_controller.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesFoldersController < ApplicationController
-  load_and_authorize_resource :template
-
-  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)
-
-    if @template.save
-      redirect_back(fallback_location: template_path(@template), notice: I18n.t('document_template_has_been_moved'))
-    else
-      redirect_back(fallback_location: template_path(@template), notice: I18n.t('unable_to_move_template_into_folder'))
-    end
-  end
-
-  private
-
-  def template_folder_params
-    params.require(:template_folder).permit(:name)
-  end
-end

app/controllers/templates_form_preview_controller.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesFormPreviewController < ApplicationController
-  layout 'form'
-
-  load_and_authorize_resource :template
-
-  def show
-    @submitter = Submitter.new(uuid: params[:uuid] || @template.submitters.first['uuid'],
-                               account: current_account,
-                               submission: @template.submissions.new(template_submitters: @template.submitters,
-                                                                     account: current_account))
-
-    @submitter.submission.submitters = @template.submitters.map { |item| Submitter.new(uuid: item['uuid']) }
-
-    Submissions.preload_with_pages(@submitter.submission)
-
-    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
-                                                  .preload(:blob).index_by(&:uuid)
-
-    @form_configs = Submitters::FormConfigs.call(@submitter)
-  end
-end

app/controllers/templates_preferences_controller.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesPreferencesController < ApplicationController
-  load_and_authorize_resource :template
-
-  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.save!
-
-    head :ok
-  end
-
-  private
-
-  def template_params
-    params.require(:template).permit(
-      preferences: %i[bcc_completed request_email_subject request_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
-                      default_expire_at_duration shared_link_2fa
-                      default_expire_at
-                      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: []]
-    ).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
-      end
-    end
-  end
-end

app/controllers/templates_preview_controller.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesPreviewController < ApplicationController
-  load_and_authorize_resource :template
-
-  def show
-    ActiveRecord::Associations::Preloader.new(
-      records: [@template],
-      associations: [schema_documents: { preview_images_attachments: :blob }]
-    ).call
-
-    @template_data =
-      @template.as_json.merge(
-        documents: @template.schema_documents.as_json(
-          methods: %i[metadata signed_uuid],
-          include: { preview_images: { methods: %i[url metadata filename] } }
-        )
-      ).to_json
-
-    render :show, layout: 'plain'
-  end
-end

app/controllers/templates_recipients_controller.rb

@@ -1,63 +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? } }
-
-    @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 linked_to_uuid email option]] }
-
-    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.delete(:invite_by_uuid) if s[:invite_by_uuid].blank?
-      s.delete(:optional_invite_by_uuid) if s[:optional_invite_by_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(: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

app/controllers/templates_restore_controller.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class TemplatesRestoreController < ApplicationController
-  load_and_authorize_resource :template
-
-  def create
-    @template.update!(archived_at: nil)
-
-    redirect_to template_path(@template), notice: I18n.t('template_has_been_unarchived')
-  end
-end