Delete unused files

.circleci/config.yml

@@ -7,20 +7,16 @@ defaults: &defaults
   working_directory: ~/build
   docker:
     # specify the version you desire here
-    - image: cimg/ruby:3.0.4-browsers
+    - image: cimg/ruby:3.0.2-node
 
     # Specify service dependencies here if necessary
     # CircleCI maintains a library of pre-built images
     # documented at https://circleci.com/docs/2.0/circleci-images/
-    - image: cimg/postgres:14.1
-    - image: cimg/redis:6.2.6
+    - image: circleci/postgres:alpine
+    - image: circleci/redis:alpine
   environment:
+      - CC_TEST_REPORTER_ID: b1b5c4447bf93f6f0b06a64756e35afd0810ea83649f03971cbf303b4449456f
       - RAILS_LOG_TO_STDOUT: false
-      - COVERAGE: true
-      - LOG_LEVEL: warn
-  parallelism: 4
-  resource_class: large
-
 jobs:
   build:
     <<: *defaults
@@ -44,13 +40,14 @@ jobs:
 
       - restore_cache:
           keys:
-            - chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}
+            - chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-{{ checksum "Gemfile.lock" }}
+            - chatwoot-bundle
 
       - run: bundle install --frozen --path ~/.bundle
       - save_cache:
           paths:
             - ~/.bundle
-          key: chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}
+          key: chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-{{ checksum "Gemfile.lock" }}
 
 
       # Only necessary if app uses webpacker or yarn in some other way
@@ -80,19 +77,6 @@ jobs:
           paths:
             - cc-test-reporter
 
-      # verify swagger specification
-      - run:
-          name: Verify swagger API specification
-          command: |
-            bundle exec rake swagger:build
-            if [[ `git status swagger/swagger.json --porcelain` ]]
-            then
-              echo "ERROR: The swagger.json file is not in sync with the yaml specification. Run 'rake swagger:build' and commit 'swagger/swagger.json'."
-              exit 1
-            fi
-            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.3.0/openapi-generator-cli-5.3.0.jar > ~/tmp/openapi-generator-cli-5.3.0.jar
-            java -jar ~/tmp/openapi-generator-cli-5.3.0.jar validate -i swagger/swagger.json
-            
       # Database setup
       - run: yarn install --check-files
       - run: bundle exec rake db:create
@@ -105,10 +89,6 @@ jobs:
       - run:
           name: Rubocop
           command: bundle exec rubocop
-      
-      # - run:
-      #     name: Brakeman
-      #     command: bundle exec brakeman
 
       - run:
           name: eslint
@@ -118,79 +98,34 @@ jobs:
       - run:
           name: Run backend tests
           command: |
-            mkdir -p ~/tmp/test-results/rspec
-            mkdir -p ~/tmp/test-artifacts
-            mkdir -p coverage
-            ~/tmp/cc-test-reporter before-build
-            TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            bundle exec rspec --format progress \
-                              --format RspecJunitFormatter \
-                              --out ~/tmp/test-results/rspec.xml \
-                              -- ${TESTFILES}
-          no_output_timeout: 30m
-      - run:
-          name: Code Climate Test Coverage
-          command: |
-            ~/tmp/cc-test-reporter format-coverage -t simplecov -o "coverage/codeclimate.$CIRCLE_NODE_INDEX.json"
+            bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings) --profile=10
+            ~/tmp/cc-test-reporter format-coverage -t simplecov -o ~/tmp/codeclimate.backend.json coverage/backend/.resultset.json
+      - persist_to_workspace:
+          root: ~/tmp
+          paths:
+            - codeclimate.backend.json
 
       - run:
           name: Run frontend tests
           command: |
-            mkdir -p ~/tmp/test-results/frontend_specs
-            ~/tmp/cc-test-reporter before-build
-            TESTFILES=$(circleci tests glob **/specs/*.spec.js | circleci tests split --split-by=timings)
-            yarn test:coverage --profile 10 \
-                               --out ~/tmp/test-results/yarn.xml \
-                               -- ${TESTFILES}
-      - run:
-          name: Code Climate Test Coverage
-          command: |
-            ~/tmp/cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json buildreports/lcov.info    
-            
+            yarn test:coverage
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o ~/tmp/codeclimate.frontend.json buildreports/lcov.info
       - persist_to_workspace:
-          root: coverage
+          root: ~/tmp
           paths:
-            - codeclimate.*.json
+            - codeclimate.frontend.json
+
       # collect reports
       - store_test_results:
           path: ~/tmp/test-results
       - store_artifacts:
-          path: ~/tmp/test-artifacts
+          path: ~/tmp/test-results
+          destination: test-results
       - store_artifacts:
           path: log
 
-  upload-coverage:
-    working_directory: ~/build
-    docker:
-      # specify the version you desire here
-      - image: circleci/ruby:3.0.2-node-browsers
-    environment:
-      - CC_TEST_REPORTER_ID: caf26a895e937974a90860cfadfded20891cfd1373a5aaafb3f67406ab9d433f
-    steps:
-      - attach_workspace:
-          at: ~/build
-      - run:
-          name:  Download cc-test-reporter
-          command: |
-            mkdir -p ~/tmp
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
-            chmod +x ~/tmp/cc-test-reporter
-      - persist_to_workspace:
-          root: ~/tmp
-          paths:
-            - cc-test-reporter
       - run:
           name: Upload coverage results to Code Climate
           command: |
-            ~/tmp/cc-test-reporter sum-coverage --output - codeclimate.*.json |  ~/tmp/cc-test-reporter upload-coverage --debug --input -
-
-workflows:
-  version: 2
-
-  commit:
-    jobs:
-      - build
-      - upload-coverage:
-          requires:
-             - build
-
+            ~/tmp/cc-test-reporter sum-coverage ~/tmp/codeclimate.*.json -p 2 -o ~/tmp/codeclimate.total.json
+            ~/tmp/cc-test-reporter upload-coverage -i ~/tmp/codeclimate.total.json

.codeclimate.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 plugins:
   rubocop:
     enabled: false
@@ -17,42 +17,26 @@ checks:
   method-count:
     enabled: true
     config:
-      threshold: 32
+      threshold: 30
   file-lines:
     enabled: true
     config:
       threshold: 300
-  method-lines:
-    config:
-      threshold: 50
 exclude_patterns:
-  - 'spec/'
-  - '**/specs/'
-  - 'db/*'
-  - 'bin/**/*'
-  - 'db/**/*'
-  - 'config/**/*'
-  - 'public/**/*'
-  - 'vendor/**/*'
-  - 'node_modules/**/*'
-  - 'lib/tasks/auto_annotate_models.rake'
-  - 'app/test-matchers.js'
-  - 'docs/*'
-  - '**/*.md'
-  - '**/*.yml'
-  - 'app/javascript/dashboard/i18n/locale'
-  - '**/*.stories.js'
-  - 'stories/'
-  - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js'
-  - 'app/javascript/shared/constants/countries.js'
-  - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js'
-  - 'app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js'
-  - 'app/javascript/dashboard/routes/dashboard/settings/automation/constants.js'
-  - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
-  - 'app/javascript/dashboard/routes/dashboard/settings/reports/constants.js'
-  - 'app/javascript/dashboard/i18n/index.js'
-  - 'app/javascript/widget/i18n/index.js'
-  - 'app/javascript/survey/i18n/index.js'
-  - 'app/javascript/shared/constants/locales.js'
-  - 'app/javascript/dashboard/helper/specs/macrosFixtures.js'
-  - 'app/javascript/dashboard/routes/dashboard/settings/macros/constants.js'
+  - "spec/"
+  - "**/specs/"
+  - "db/*"
+  - "bin/**/*"
+  - "db/**/*"
+  - "config/**/*"
+  - "public/**/*"
+  - "vendor/**/*"
+  - "node_modules/**/*"
+  - "lib/tasks/auto_annotate_models.rake"
+  - "app/test-matchers.js"
+  - "docs/*"
+  - "**/*.md"
+  - "**/*.yml"
+  - "app/javascript/dashboard/i18n/locale"
+  - "**/*.stories.js"
+  - "stories/"

.devcontainer/Dockerfile

@@ -5,4 +5,4 @@ FROM ghcr.io/chatwoot/chatwoot_codespace:latest
 # Do the set up required for chatwoot app 
 WORKDIR /workspace
 COPY . /workspace
-RUN yarn && gem install bundler && bundle install
+RUN yarn && gem install bundler && bundle install 

.devcontainer/Dockerfile.base

@@ -1,6 +1,6 @@
-
-ARG VARIANT=ubuntu-20.04
-FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
+# pre-build stage
+ARG VARIANT=3
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
 
 # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
 ARG USER_UID=1000
@@ -11,36 +11,23 @@ RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
         && chmod -R $USER_UID:$USER_GID /home/vscode; \
     fi
 
+# [Option] Install Node.js
+ARG INSTALL_NODE="true"
+ARG NODE_VERSION="lts/*"
+RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
   && apt-get -y install --no-install-recommends \
-    build-essential \
     libssl-dev \
-    zlib1g-dev \
-    gnupg2 \
     tar \
     tzdata \
     postgresql-client \
-    libpq-dev \
     yarn \
     git \
     imagemagick \
     tmux \
-    zsh \
-    git-flow \
-    npm
+    zsh
 
-# Install rbenv and ruby
-ARG RUBY_VERSION="3.0.4"
-RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
-    &&  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \
-    &&  echo 'eval "$(rbenv init -)"' >> ~/.bashrc
-ENV PATH "/root/.rbenv/bin/:/root/.rbenv/shims/:$PATH"
-RUN git clone https://github.com/rbenv/ruby-build.git && \
-    PREFIX=/usr/local ./ruby-build/install.sh
-
-RUN rbenv install $RUBY_VERSION && \
-    rbenv global $RUBY_VERSION && \
-    rbenv versions
 
 # Install overmind
 RUN curl -L https://github.com/DarthSim/overmind/releases/download/v2.1.0/overmind-v2.1.0-linux-amd64.gz > overmind.gz \
@@ -48,25 +35,11 @@ RUN curl -L https://github.com/DarthSim/overmind/releases/download/v2.1.0/overmi
   && sudo mv overmind /usr/local/bin \
   && chmod +x /usr/local/bin/overmind 
 
-
-# Install gh
-RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
-   && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
-   && sudo apt update \
-   && sudo apt install gh
-
-
 # Do the set up required for chatwoot app 
 WORKDIR /workspace
 COPY . /workspace
+RUN yarn
 
-# set up ruby
 COPY Gemfile Gemfile.lock ./
 RUN gem install bundler && bundle install
 
-# set up node js
-RUN npm install npm@latest -g && \
-    npm install n -g && \
-    n latest
-RUN npm install --global yarn
-RUN yarn

.devcontainer/devcontainer.json

@@ -23,18 +23,17 @@
   // 5432 postgres
   // 6379 redis
   // 1025,8025 mailhog
-  "forwardPorts": [8025, 3000, 3035],
+  "forwardPorts": [8025],
+  //your application may need to listen on all interfaces (0.0.0.0) not just localhost for it to be available externally. Defaults to []
+  "appPort": [3000, 3035],
 
   "postCreateCommand": ".devcontainer/scripts/setup.sh && bundle exec rake db:chatwoot_prepare && yarn",
   "portsAttributes": {
     "3000": {
       "label": "Rails Server"
     },
-    "3035": {
-      "label": "Webpack Dev Server"
-    },
     "8025": {
       "label": "Mailhog UI"
     }
-  }
+  },
 }

.devcontainer/scripts/setup.sh

@@ -6,8 +6,3 @@ sed -i -e "/FRONTEND_URL/ s/=.*/=https:\/\/$CODESPACE_NAME-3000.githubpreview.de
 sed -i -e "/WEBPACKER_DEV_SERVER_PUBLIC/ s/=.*/=https:\/\/$CODESPACE_NAME-3035.githubpreview.dev/" .env
 # uncomment the webpacker env variable
 sed -i -e '/WEBPACKER_DEV_SERVER_PUBLIC/s/^# //' .env
-# fix the error with webpacker
-echo 'export NODE_OPTIONS=--openssl-legacy-provider' >> ~/.zshrc
-
-# codespaces make the ports public
-gh codespace ports visibility 3000:public 3035:public 8025:public -c $CODESPACE_NAME

.editorconfig

@@ -7,8 +7,8 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
+indent_style = spaces
 tab_width = 2
 
-[*.{rb,erb,js,coffee,json,yml,css,scss,sh,markdown,md,html}]
+[{*.{rb,erb,js,coffee,json,yml,css,scss,sh,markdown,md,html}]
 indent_size = 2

.env.example

@@ -3,8 +3,6 @@ SECRET_KEY_BASE=replace_with_lengthy_secure_hex
 
 # Replace with the URL you are planning to use for your app
 FRONTEND_URL=http://0.0.0.0:3000
-# To use a dedicated URL for help center pages
-# HELPCENTER_URL=http://0.0.0.0:3000
 
 # If the variable is set, all non-authenticated pages would fallback to the default locale.
 # Whenever a new account is created, the default language will be DEFAULT_LOCALE instead of en
@@ -34,20 +32,7 @@ REDIS_SENTINELS=
 # You can find list of master using "SENTINEL masters" command
 REDIS_SENTINEL_MASTER_NAME=
 
-# By default Chatwoot will pass REDIS_PASSWORD as the password value for sentinels
-# Use the following environment variable to customize passwords for sentinels. 
-# Use empty string if sentinels are configured with out passwords
-# REDIS_SENTINEL_PASSWORD=
-
-# Redis premium breakage in heroku fix
-# enable the following configuration
-# ref: https://github.com/chatwoot/chatwoot/issues/2420
-# REDIS_OPENSSL_VERIFY_MODE=none
-
 # Postgres Database config variables
-# You can leave POSTGRES_DATABASE blank. The default name of 
-# the database in the production environment is chatwoot_production
-# POSTGRES_DATABASE=
 POSTGRES_HOST=postgres
 POSTGRES_USERNAME=postgres
 POSTGRES_PASSWORD=
@@ -56,14 +41,14 @@ RAILS_MAX_THREADS=5
 
 # The email from which all outgoing emails are sent
 # could user either  `email@yourdomain.com` or `BrandName <email@yourdomain.com>`
-MAILER_SENDER_EMAIL=Chatwoot <accounts@chatwoot.com>
+MAILER_SENDER_EMAIL="Chatwoot <accounts@chatwoot.com>"
+
 
 #SMTP domain key is set up for HELO checking
 SMTP_DOMAIN=chatwoot.com
-# Set the value to "mailhog" if using docker-compose for development environments,
+# the default value is set "mailhog" and is used by docker-compose for development environments,
 # Set the value as "localhost" or your SMTP address in other environments
-# If SMTP_ADDRESS is empty, Chatwoot would try to use sendmail(postfix)
-SMTP_ADDRESS=
+SMTP_ADDRESS=mailhog
 SMTP_PORT=1025
 SMTP_USERNAME=
 SMTP_PASSWORD=
@@ -72,9 +57,6 @@ SMTP_AUTHENTICATION=
 SMTP_ENABLE_STARTTLS_AUTO=true
 # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert', see http://api.rubyonrails.org/classes/ActionMailer/Base.html
 SMTP_OPENSSL_VERIFY_MODE=peer
-# Comment out the following environment variables if required by your SMTP server
-# SMTP_TLS=
-# SMTP_SSL=
 
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
@@ -103,6 +85,7 @@ AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
 
+
 # Log settings
 # Disable if you want to write logs to a file
 RAILS_LOG_TO_STDOUT=true
@@ -139,6 +122,7 @@ ANDROID_BUNDLE_ID=com.chatwoot.app
 # https://developers.google.com/android/guides/client-auth (use keytool to print the fingerprint in the first section)
 ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:D4:5D:D4:53:F8:3B:FB:D3:C6:28:64:1D:AA:08:1E:D8
 
+
 ### Smart App Banner
 # https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/PromotingAppswithAppBanners/PromotingAppswithAppBanners.html
 # You can find your app-id in https://itunesconnect.apple.com
@@ -155,12 +139,8 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## Bot Customizations
 USE_INBOX_AVATAR_FOR_BOT=true
 
-### APM and Error Monitoring configurations
-## Elastic APM
-## https://www.elastic.co/guide/en/apm/agent/ruby/current/getting-started-rails.html
-# ELASTIC_APM_SERVER_URL=
-# ELASTIC_APM_SECRET_TOKEN=
 
+### APM and Error Monitoring configurations
 ## Sentry
 # SENTRY_DSN=
 
@@ -173,14 +153,13 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## NewRelic
 # https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/
 # NEW_RELIC_LICENSE_KEY=
-# Set this to true to allow newrelic apm to send logs.
-# This is turned off by default.
-# NEW_RELIC_APPLICATION_LOGGING_ENABLED=
 
 ## Datadog
 ## https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#environment-variables
 # DD_TRACE_AGENT_URL=
 
+
+
 ## IP look up configuration
 ## ref https://github.com/alexreisner/geocoder/blob/master/README_API_GUIDE.md
 ## works only on accounts with ip look up feature enabled
@@ -192,6 +171,7 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## To prevent and throttle abusive requests
 # ENABLE_RACK_ATTACK=true
 
+
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
 # CW_API_ONLY_SERVER=false
@@ -205,11 +185,3 @@ USE_INBOX_AVATAR_FOR_BOT=true
 # If you want to use official mobile app,
 # the notifications would be relayed via a Chatwoot server
 ENABLE_PUSH_RELAY_SERVER=true
-
-# Stripe API key
-STRIPE_SECRET_KEY=
-STRIPE_WEBHOOK_SECRET=
-
-# Set to true if you want to upload files to cloud storage using the signed url
-# Make sure to follow https://edgeguides.rubyonrails.org/active_storage_overview.html#cross-origin-resource-sharing-cors-configuration on the cloud storage after setting this to true.
-DIRECT_UPLOADS_ENABLED=

.eslintrc.js

@@ -1,10 +1,5 @@
 module.exports = {
-  extends: [
-    'airbnb-base/legacy',
-    'prettier',
-    'plugin:vue/recommended',
-    'plugin:storybook/recommended',
-  ],
+  extends: ['airbnb-base/legacy', 'prettier', 'plugin:vue/recommended'],
   parserOptions: {
     parser: 'babel-eslint',
     ecmaVersion: 2020,
@@ -24,32 +19,17 @@ module.exports = {
     'jsx-a11y/label-has-for': 'off',
     'jsx-a11y/anchor-is-valid': 'off',
     'import/no-unresolved': 'off',
-    'vue/max-attributes-per-line': [
-      'error',
-      {
-        singleline: 20,
-        multiline: {
-          max: 1,
-          allowFirstLine: false,
-        },
+    'vue/max-attributes-per-line': ['error', {
+      'singleline': 20,
+      'multiline': {
+        'max': 1,
+        'allowFirstLine': false
       },
-    ],
-    'vue/html-self-closing': [
-      'error',
-      {
-        html: {
-          void: 'always',
-          normal: 'always',
-          component: 'always',
-        },
-        svg: 'always',
-        math: 'always',
-      },
-    ],
-    'vue/no-v-html': 'off',
-    'vue/singleline-html-element-content-newline': 'off',
-    'import/extensions': ['off'],
-    'no-console': 'error',
+    }],
+    'vue/html-self-closing': 'off',
+    "vue/no-v-html": 'off',
+    'import/extensions': ['off']
+
   },
   settings: {
     'import/resolver': {
@@ -60,10 +40,12 @@ module.exports = {
   },
   env: {
     browser: true,
-    jest: true,
     node: true,
+    jest: true,
+    jasmine: true
   },
   globals: {
+    __WEBPACK_ENV__: true,
     bus: true,
   },
 };

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,7 +6,6 @@ labels: 'Bug'
 assignees: ''
 
 ---
-
 **Describe the bug**
 
 A clear and concise description of what the bug is.
@@ -17,11 +16,11 @@ Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
-4. See the error
+4. See error
 
 **Expected behavior**
 
-Share a clear and concise description of what you expected to happen.
+A clear and concise description of what you expected to happen.
 
 **Screenshots**
 
@@ -29,50 +28,27 @@ If applicable, add screenshots to help explain your problem.
 
 **Browser logs**
 
-Share the browser logs to debug the issue further.
+Share the browser logs to debug the issue further
 
 **Server logs**
 
-Share the server logs to debug the issue further.
+Share the server logs to debug the issue further
 
 **Environment**
 
-Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
+Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self hosted installation of Chatwoot. If you are using a self hosted installation of Chatwoot describe the type of deployment (Docker/Linux VM installation/Heroku)
 
-- [ ] app.chatwoot.com (Chatwoot Cloud)
-- [ ] Self-hosted
-- - [ ] Linux VM
-- - [ ] Docker
-- - [ ] Kubernetes
-- - [ ] Heroku
-- - [ ] Other (Please specify)
-
-
-**Desktop (please complete the following information)** (If applicable)
- - OS: [e.g. Linux, Windows, MacOS]
- - Browser [e.g. chrome, firefox, safari]
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
 
-**Smartphone (please complete the following information)** (If applicable)
- - Device: [e.g. iPhone6, Pixel7]
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, firefox, safari]
+ - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
-**Docker** (If applicable)
-
-Please share the output of the following.
-- `docker version`
-- `docker info`
-- `docker-compose version`
-
-**Cloud Provider** (If applicable)
-- [ ] AWS
-- [ ] GCP
-- [ ] Azure
-- [ ] DigitalOcean
-- [ ] Others
-
 **Additional context**
 
 Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,8 @@
 
 ## Description
 
-Please include a summary of the change and issue(s) fixed. Also, mention relevant motivation, context, and any dependencies that this change requires.
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
 Fixes # (issue)
 
 ## Type of change
@@ -11,18 +12,18 @@ Please delete options that are not relevant.
 
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] This change requires a documentation update
 
 ## How Has This Been Tested?
 
-Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration.
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
 
 
 ## Checklist:
 
 - [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my code
+- [ ] I have performed a self-review of my own code
 - [ ] I have commented on my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation
 - [ ] My changes generate no new warnings

.github/workflows/lock.yml

@@ -1,36 +0,0 @@
-# We often have cases where users would comment over stale closed Github Issues.
-# This creates unnecessary noise for the original reporter and makes it harder for triaging.
-# This action locks the closed threads once it is inactive for over a month.
-
-name: 'Lock Threads'
-
-on:
-  schedule:
-    - cron: '0 * * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-  pull-requests: write
-
-concurrency:
-  group: lock
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v3
-        with: 
-          issue-inactive-days: '30'
-          issue-lock-reason: 'resolved'
-          issue-comment: >
-            This issue has been automatically locked since there
-            has not been any recent activity after it was closed.
-            Please open a new issue for related bugs.
-          pr-inactive-days: '30'
-          pr-lock-reason: 'resolved'
-          pr-comment: >
-            This pull request has been automatically locked since there
-            has not been any recent activity after it was closed.
-            Please open a new issue for related bugs.

.github/workflows/nightly_installer.yml

@@ -1,46 +0,0 @@
-# #
-# #
-# # Linux nightly installer action
-# # This action will try to install and setup
-# # chatwoot on an Ubuntu 20.04 machine using
-# # the linux installer script.
-# # 
-# # This is set to run daily at midnight.
-# #
-
-name: Run Linux nightly installer
-on:
-  schedule:
-    - cron: "0 0 * * *"
-  workflow_dispatch:
-
-jobs:
-  nightly:
-    runs-on: ubuntu-20.04
-    steps:
-
-    - name: get installer
-      run: |
-        wget https://get.chatwoot.app/linux/install.sh
-        chmod +x install.sh
-        #fix for postgtres not starting automatically in gh action env
-        sed -i '/function configure_db() {/a sudo service postgresql start' install.sh
-
-    - name: create input file
-      run: |
-        echo "no" > input
-        echo "yes" >> input
-
-    - name: Run the installer
-      run: |
-        sudo ./install.sh --install < input
-
-        #  disabling http verify for now as http 
-        #  access to port 3000 fails in gh action env
-        #    - name: Verify
-        #      if: always()
-        #      run: |
-        #        sudo netstat -ntlp | grep 3000
-        #        sudo systemctl restart chatwoot.target
-        #        curl http://localhost:3000/api
-

.github/workflows/publish_foss_docker.yml

@@ -1,63 +0,0 @@
-# #
-# # This action will publish Chatwoot CE docker image.
-# # This is set to run against merges to develop, master
-# # and when tags are created.
-# #
-
-name: Publish Chatwoot CE docker images
-on:
-  push:
-    branches:
-      - develop
-      - master
-    tags:
-      - v*
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      GIT_REF: ${{ github.head_ref || github.ref_name }} # ref_name to get tags/branches
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Strip enterprise code
-        run: |
-          rm -rf enterprise
-          rm -rf spec/enterprise
-
-      - name: Set Chatwoot edition
-        run: |
-          echo -en '\nENV CW_EDITION="ce"' >> docker/Dockerfile
-
-      - name: set docker tag
-        run: |
-          echo "DOCKER_TAG=chatwoot/chatwoot:$GIT_REF-ce" >> $GITHUB_ENV
-
-      - name: replace docker tag if master
-        if: github.ref_name == 'master'
-        run: |
-          echo "DOCKER_TAG=chatwoot/chatwoot:latest-ce" >> $GITHUB_ENV
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: docker/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ env.DOCKER_TAG }}

.github/workflows/run_foss_spec.yml

@@ -1,73 +0,0 @@
-# #
-# # This action will strip the enterprise folder
-# # and run the spec.
-# # This is set to run against every PR.
-# #
-
-name: Run Chatwoot CE spec
-on:
-  push:
-    branches:
-      - develop
-      - master
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:10.8
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: ""
-          POSTGRES_DB: postgres
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        # tmpfs makes DB faster by using RAM
-        options: >-
-          --mount type=tmpfs,destination=/var/lib/postgresql/data
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: --entrypoint redis-server
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.pull_request.head.ref }}
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.0.4 # Not needed with a .ruby-version file
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-    - name: yarn
-      run: yarn install
-
-    - name: Strip enterprise code
-      run: |
-        rm -rf enterprise
-        rm -rf spec/enterprise
-
-    - name: Create database
-      run: bundle exec rake db:create
-
-    - name: Seed database
-      run: bundle exec rake db:schema:load
-
-    - name: yarn check-files
-      run: yarn install --check-files
-
-    # Run rails tests
-    - name: Run backend tests
-      run: |
-        bundle exec rspec --profile=10 --format documentation

.gitignore

@@ -39,6 +39,9 @@ public/packs*
 *.un~
 .jest-cache
 
+#VS Code files
+.vscode
+
 # ignore jetbrains IDE files
 .idea
 
@@ -59,6 +62,4 @@ package-lock.json
 test/cypress/videos/*
 
 /config/master.key
-/config/*.enc
-
-.vscode/settings.json
+/config/*.enc

.husky/pre-commit

@@ -1,5 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-npm run eslint
-bundle exec rubocop -a
-git add

.husky/pre-push

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-sh bin/validate_push

.rubocop.yml

@@ -11,13 +11,9 @@ Metrics/ClassLength:
   Max: 125
   Exclude:
     - 'app/models/conversation.rb'
-    - 'app/models/contact.rb'
     - 'app/mailers/conversation_reply_mailer.rb'
     - 'app/models/message.rb'
     - 'app/builders/messages/facebook/message_builder.rb'
-    - 'app/controllers/api/v1/accounts/contacts_controller.rb'
-    - 'app/listeners/action_cable_listener.rb'
-    - 'app/models/conversation.rb'
 RSpec/ExampleLength:
   Max: 25
 Style/Documentation:
@@ -28,8 +24,6 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Style/SymbolArray:
   Enabled: false
-Style/OpenStructUse:
-  Enabled: false
 Style/OptionalBooleanParameter:
   Exclude:
     - 'app/services/email_templates/db_resolver_service.rb'
@@ -62,7 +56,7 @@ Metrics/BlockLength:
     - db/schema.rb
 Metrics/ModuleLength:
   Exclude:
-    - lib/seeders/message_seeder.rb
+    - lib/woot_message_seeder.rb
 Rails/ApplicationController:
   Exclude:
     - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -72,20 +66,14 @@ Rails/ApplicationController:
     - 'app/controllers/platform_controller.rb'
     - 'app/controllers/public_controller.rb'
     - 'app/controllers/survey/responses_controller.rb'
-Rails/CompactBlank:
-  Enabled: false
 Rails/EnvironmentVariableAccess:
   Enabled: false
 Rails/TimeZoneAssignment:
   Enabled: false
-Rails/RedundantPresenceValidationOnBelongsTo:
-  Enabled: false
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
   Exclude:
     - 'config/application.rb'
-Style/MapToHash:
-  Enabled: false
 RSpec/NestedGroups:
   Enabled: true
   Max: 4
@@ -93,14 +81,11 @@ RSpec/MessageSpies:
   Enabled: false
 RSpec/StubbedMock:
   Enabled: false
-RSpec/FactoryBot/SyntaxMethods:
-  Enabled: false
 Naming/VariableNumber:
   Enabled: false
 Metrics/MethodLength:
   Exclude:
     - 'db/migrate/20161123131628_devise_token_auth_create_users.rb'
-    - 'db/migrate/20211219031453_update_foreign_keys_on_delete.rb'
 Rails/CreateTableWithTimestamps:
   Exclude:
     - 'db/migrate/20170207092002_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb'
@@ -116,7 +101,6 @@ Metrics/AbcSize:
     - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
     - 'db/migrate/20161123131628_devise_token_auth_create_users.rb'
     - 'app/controllers/api/v1/accounts/inboxes_controller.rb'
-    - 'db/migrate/20211219031453_update_foreign_keys_on_delete.rb'
 Metrics/CyclomaticComplexity:
   Max: 7
   Exclude:
@@ -131,7 +115,6 @@ Rails/ReversibleMigration:
     - 'db/migrate/20191020085608_rename_old_tables.rb'
     - 'db/migrate/20191126185833_update_user_invite_foreign_key.rb'
     - 'db/migrate/20191130164019_add_template_type_to_messages.rb'
-    - 'db/migrate/20210513083044_remove_not_null_from_webhook_url_channel_api.rb'
 Rails/BulkChangeTable:
   Exclude:
     - 'db/migrate/20161025070152_removechannelsfrommodels.rb'
@@ -183,5 +166,3 @@ AllCops:
     - db/migrate/20200503151130_add_account_feature_flag.rb
     - db/migrate/20200927135222_add_last_activity_at_to_conversation.rb
     - db/migrate/20210306170117_add_last_activity_at_to_contacts.rb
-    - db/migrate/20220809104508_revert_cascading_indexes.rb
-    

.ruby-version

@@ -1 +1 @@
-3.0.4
+3.0.2

.storybook/preview.js

@@ -4,7 +4,6 @@ import Vuex from 'vuex';
 import VueI18n from 'vue-i18n';
 import Vuelidate from 'vuelidate';
 import Multiselect from 'vue-multiselect';
-import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
 
 import WootUiKit from '../app/javascript/dashboard/components';
 import i18n from '../app/javascript/dashboard/i18n';
@@ -16,7 +15,6 @@ Vue.use(Vuelidate);
 Vue.use(WootUiKit);
 Vue.use(Vuex);
 Vue.component('multiselect', Multiselect);
-Vue.component('fluent-icon', FluentIcon);
 
 const store = new Vuex.Store({});
 const i18nConfig = new VueI18n({

.vscode/extensions.json

@@ -1,32 +0,0 @@
-{
-  "recommendations": [
-    // Spell check
-    "streetsidesoftware.code-spell-checker",
-    // Better Comments
-    "aaron-bond.better-comments",
-    // Rails Test Runner
-    "davidpallinder.rails-test-runner",
-    // Eslint
-    "dbaeumer.vscode-eslint",
-    // Auto Close Tag
-    "formulahendry.auto-close-tag",
-    // Auto Rename Tag
-    "formulahendry.auto-rename-tag",
-    // Hight light colors
-    "naumovs.color-highlight",
-    // GitLens
-    "eamodio.gitlens",
-    // Ruby
-    "rebornix.ruby",
-    // Vue
-    "octref.vetur",
-    // Prettier
-    "esbenp.prettier-vscode",
-    // Dot Env
-    "mikestead.dotenv",
-    // HTML CSS Support
-    "ecmel.vscode-html-css",
-    // Tailwind CSS Intellisense
-    "bradlc.vscode-tailwindcss",
-  ]
-}

.vscode/settings.json

@@ -1 +0,0 @@
-{}

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-hello@chatwoot.com.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -1,5 +0,0 @@
-# Contributing to Chatwoot
-
-Thanks for taking the time to contribute! :tada::+1:
-
-Please refer to our [Contributing Guide](https://www.chatwoot.com/docs/contributing-guide) for detailed instructions on how to contribute.

Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
-ruby '3.0.4'
+ruby '3.0.2'
 
 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
-gem 'rails', '~> 6.1', '>= 6.1.6.1'
+gem 'rails'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
@@ -42,7 +42,7 @@ gem 'down', '~> 5.0'
 gem 'aws-sdk-s3', require: false
 gem 'azure-storage-blob', require: false
 gem 'google-cloud-storage', require: false
-gem 'image_processing', '~> 1.12.2'
+gem 'image_processing'
 
 ##-- gems for database --#
 gem 'groupdate'
@@ -56,7 +56,7 @@ gem 'activerecord-import'
 gem 'dotenv-rails'
 gem 'foreman'
 gem 'puma'
-gem 'webpacker', '~> 5.4', '>= 5.4.3'
+gem 'webpacker', '~> 5.x'
 # metrics on heroku
 gem 'barnes'
 
@@ -78,7 +78,7 @@ gem 'wisper', '2.0.0'
 # TODO: bump up gem to 2.0
 gem 'facebook-messenger'
 gem 'line-bot-api'
-gem 'twilio-ruby', '~> 5.66'
+gem 'twilio-ruby', '~> 5.32.0'
 # twitty will handle subscription of twitter account events
 # gem 'twitty', git: 'https://github.com/chatwoot/twitty'
 gem 'twitty'
@@ -89,19 +89,22 @@ gem 'slack-ruby-client'
 # for dialogflow integrations
 gem 'google-cloud-dialogflow'
 
+##--- gems for debugging and error reporting ---##
+# static analysis
+gem 'brakeman'
+
 ##-- apm and error monitoring ---#
 gem 'ddtrace'
-gem 'elastic-apm'
 gem 'newrelic_rpm'
 gem 'scout_apm'
-gem 'sentry-rails', '~> 5.3', '>= 5.3.1'
-gem 'sentry-ruby', '~> 5.3'
-gem 'sentry-sidekiq', '~> 5.3'
+gem 'sentry-rails'
+gem 'sentry-ruby'
+gem 'sentry-sidekiq'
 
 ##-- background job processing --##
-gem 'sidekiq', '~> 6.4.0'
+gem 'sidekiq'
 # We want cron jobs
-gem 'sidekiq-cron', '~> 1.3'
+gem 'sidekiq-cron'
 
 ##-- Push notification service --##
 gem 'fcm'
@@ -118,23 +121,6 @@ gem 'hairtrigger'
 
 gem 'procore-sift'
 
-# parse email
-gem 'email_reply_trimmer'
-gem 'html2text'
-
-# to calculate working hours
-gem 'working_hours'
-
-# full text search for articles
-gem 'pg_search'
-
-# Subscriptions, Billing
-gem 'stripe'
-
-## - helper gems --##
-## to populate db with sample data
-gem 'faker'
-
 group :production, :staging do
   # we dont want request timing out in development while using byebug
   gem 'rack-timeout'
@@ -158,24 +144,24 @@ group :test do
   gem 'cypress-on-rails', '~> 1.0'
   # fast cleaning of database
   gem 'database_cleaner'
-  # mock http calls
-  gem 'webmock'
 end
 
 group :development, :test do
+  # TODO: is this needed ?
+  # errors thrown by devise password gem
+  gem 'flay'
+  gem 'rspec'
+  # for error thrown by devise password gem
   gem 'active_record_query_trace'
-  ##--- gems for debugging and error reporting ---##
-  # static analysis
-  gem 'brakeman'
   gem 'bundle-audit', require: false
   gem 'byebug', platform: :mri
   gem 'climate_control'
   gem 'factory_bot_rails'
+  gem 'faker'
   gem 'listen'
   gem 'mock_redis'
   gem 'pry-rails'
-  gem 'rspec_junit_formatter'
-  gem 'rspec-rails', '~> 5.0.3'
+  gem 'rspec-rails', '~> 5.0.0'
   gem 'rubocop', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
@@ -185,4 +171,5 @@ group :development, :test do
   gem 'simplecov', '0.17.1', require: false
   gem 'spring'
   gem 'spring-watcher-listen'
+  gem 'webmock'
 end

LICENSE

@@ -1,11 +1,7 @@
+The MIT License (MIT)
+
 Copyright (c) 2017-2021 Chatwoot Inc.
 
-Portions of this software are licensed as follows:
-
-* All content that resides under the "enterprise/" directory of this repository, if that directory exists, is licensed under the license defined in "enterprise/LICENSE".
-* All third party components incorporated into the Chatwoot Software are licensed under the original license provided by the owner of the applicable component.
-* Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

README.md

@@ -6,62 +6,54 @@
 
 <p align="center">
   <a href="https://heroku.com/deploy?template=https://github.com/chatwoot/chatwoot/tree/master" alt="Deploy to Heroku">
-     <img width="150" alt="Deploy" src="https://www.herokucdn.com/deploy/button.svg"/>
-  </a>
-  <a href="https://marketplace.digitalocean.com/apps/chatwoot?refcode=f2238426a2a8" alt="Deploy to DigitalOcean">
-     <img width="200" alt="Deploy to DO" src="https://www.deploytodo.com/do-btn-blue.svg"/>
+     <img alt="Deploy" src="https://www.herokucdn.com/deploy/button.svg"/>
   </a>
 </p>
 
 ___
 
 <p align="center">
-  <a href="https://codeclimate.com/github/chatwoot/chatwoot/maintainability"><img src="https://api.codeclimate.com/v1/badges/e6e3f66332c91e5a4c0c/maintainability" alt="Maintainability"></a>
+  <a href="https://codeclimate.com/github/chatwoot/chatwoot/maintainability"><img src="https://api.codeclimate.com/v1/badges/80f9e1a7c72d186289ad/maintainability" alt="Maintainability"></a>
   <img src="https://img.shields.io/circleci/build/github/chatwoot/chatwoot" alt="CircleCI Badge">
     <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/pulls/chatwoot/chatwoot" alt="Docker Pull Badge"></a>
   <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/cloud/build/chatwoot/chatwoot" alt="Docker Build Badge"></a>
+  <img src="https://img.shields.io/github/license/chatwoot/chatwoot" alt="License">
   <img src="https://img.shields.io/github/commit-activity/m/chatwoot/chatwoot" alt="Commits-per-month">
   <a title="Crowdin" target="_self" href="https://chatwoot.crowdin.com/chatwoot"><img src="https://badges.crowdin.net/e/37ced7eba411064bd792feb3b7a28b16/localized.svg"></a>
   <a href="https://discord.gg/cJXdrwS"><img src="https://img.shields.io/discord/647412545203994635" alt="Discord"></a>
   <a href="https://huntr.dev/bounties/disclose"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="Huntr"></a>
   <a href="https://status.chatwoot.com"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fchatwoot%2Fstatus%2Fmaster%2Fapi%2Fchatwoot%2Fuptime.json" alt="uptime"></a>
   <a href="https://status.chatwoot.com"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fchatwoot%2Fstatus%2Fmaster%2Fapi%2Fchatwoot%2Fresponse-time.json" alt="response time"></a>
-  <a href="https://artifacthub.io/packages/helm/chatwoot/chatwoot"><img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/artifact-hub" alt="Artifact HUB"></a>
 </p>
 
-<img src="https://chatwoot-public-assets.s3.amazonaws.com/github/screenshot.png" width="100%" alt="Chat dashboard"/>
+<img src="https://s3.us-west-2.amazonaws.com/gh-assets.chatwoot.com/chatwoot-dashboard-assets.png" width="100%" alt="Chat dashboard"/>
 
+Chatwoot is an open-source omnichannel customer support software. The development of Chatwoot started in 2016. It failed to succeed as a business and eventually shut up shop in 2017. During 2019 #Hacktoberfest, the maintainers decided to make it open-source, instead of letting the code rust in a private repo. With a pleasant surprise, Chatwoot became a trending project on Hacker News and best of all, got lots of love from the community.
+Now, a failed project is back on track and the prospects are looking great. The team is back to working on the project and this time, we are building it in the open. Thanks to the ideas and contributions from the community.
 
 
-Chatwoot is an open-source, self-hosted customer engagement suite. Chatwoot lets you view and manage your customer data, communicate with them irrespective of which medium they use, and re-engage them based on their profile.
-
 ## Features
 
-Chatwoot supports the following conversation channels:
+Chatwoot gives an integrated view of conversations happening in different communication channels.
+
+It supports the following conversation channels:
 
  - **Website**: Talk to your customers using our live chat widget and make use of our SDK to identify a user and provide contextual support.
  - **Facebook**: Connect your Facebook pages and start replying to the direct messages to your page.
- - **Instagram**: Connect your Instagram profile and start replying to the direct messages.
  - **Twitter**: Connect your Twitter profiles and reply to direct messages or the tweets where you are mentioned.
- - **Telegram**: Connect your Telegram bot and reply to your customers right from a single dashboard.
- - **WhatsApp**: Connect your WhatsApp business account and manage the conversation in Chatwoot.
- - **Line**: Connect your Line account and manage the conversations in Chatwoot.
- - **SMS**: Connect your Twilio SMS account and reply to the SMS queries in Chatwoot.
+ - **Whatsapp**: Connect your Whatsapp business account and manage the conversation in Chatwoot
+ - **SMS**: Connect your Twilio SMS account and reply to the SMS queries in Chatwoot
  - **API Channel**: Build custom communication channels using our API channel.
- - **Email**: Forward all your email queries to Chatwoot and view it in our integrated dashboard.
-
-And more.
+ - **Email (beta)**: Forward all your email queries to Chatwoot and view it in our integrated dashboard.
 
 Other features include:
 
-- **CRM**: Save all your customer information right inside Chatwoot, use contact notes to log emails, phone calls, or meeting notes.
-- **Custom Attributes**: Define custom attribute attributes to store information about a contact or a conversation and extend the product to match your workflow.
-- **Shared multi-brand inboxes**: Manage multiple brands or pages using a shared inbox.
-- **Private notes**: Use @mentions and private notes to communicate internally about a conversation.
+- **Multi-brand inboxes**: Manage multiple brands or pages using a single dashboard.
+- **Private notes**: Inter team communication is possible using private notes in a conversation.
 - **Canned responses (Saved replies)**: Improve the response rate by adding saved replies for frequently asked questions.
-- **Conversation Labels**: Use conversation labels to create custom workflows.
+- **Conversation Labels**: Use conversation labelling to create custom workflows.
 - **Auto assignment**: Chatwoot intelligently assigns a ticket to the agents who have access to the inbox depending on their availability and load.
-- **Conversation continuity**: If the user has provided an email address through the chat widget, Chatwoot will send an email to the customer under the agent name so that the user can continue the conversation over the email.
+- **Conversation continuity**: If the user has provided an email address through the chat widget, Chatwoot would send an email to the customer under the agent name so that the user can continue the conversation over the email.
 - **Multi-lingual support**: Chatwoot supports 10+ languages.
 - **Powerful API & Webhooks**: Extend the capability of the software using Chatwoot’s webhooks and APIs.
 - **Integrations**: Chatwoot natively integrates with Slack right now. Manage your conversations in Slack without logging into the dashboard.
@@ -89,18 +81,9 @@ Deploying Chatwoot to Heroku is a breeze. It's as simple as clicking this button
 
 Follow this [link](https://www.chatwoot.com/docs/environment-variables) to understand setting the correct environment variables for the app to work with all the features. There might be breakages if you do not set the relevant environment variables.
 
-
-### DigitalOcean 1-Click Kubernetes deployment
-
-Chatwoot now supports 1-Click deployment to DigitalOcean as a kubernetes app.
-
-<a href="https://marketplace.digitalocean.com/apps/chatwoot?refcode=f2238426a2a8" alt="Deploy to DigitalOcean">
-  <img width="200" alt="Deploy to DO" src="https://www.deploytodo.com/do-btn-blue.svg"/>
-</a>
-
 ### Other deployment options
 
-For other supported options, checkout our [deployment page](https://chatwoot.com/deploy). 
+Please follow [deployment architecture guide](https://www.chatwoot.com/docs/deployment/architecture) to deploy with Docker or Caprover.
 
 ## Security
 
@@ -119,4 +102,4 @@ Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contri
 <a href="https://github.com/chatwoot/chatwoot/graphs/contributors"><img src="https://opencollective.com/chatwoot/contributors.svg?width=890&button=false" /></a>
 
 
-*Chatwoot* &copy; 2017-2022, Chatwoot Inc - Released under the MIT License.
+*Chatwoot* &copy; 2017-2021, Chatwoot Inc - Released under the MIT License.

SECURITY.md

@@ -1,55 +1,30 @@
-Chatwoot is looking forward to working with security researchers worldwide to keep Chatwoot and our users safe. If you have found an issue in our systems/applications, please reach out to us.
+# Security Policy
+Chatwoot is looking forward to working with security researchers across the world to keep Chatwoot and our users safe. If you have found an issue in our systems/applications, please reach out to us.
 
 ## Reporting a Vulnerability
 
-We use [huntr.dev](https://huntr.dev/) for security issues that affect our project. If you believe you have found a vulnerability, please disclose it via this [form](https://huntr.dev/bounties/disclose). This will enable us to review the vulnerability, fix it promptly, and reward you for your efforts.
+We use [huntr.dev](https://huntr.dev/) for security issues that affect our project. If you believe you have found a vulnerability, please disclose it via this [form](https://huntr.dev/bounties/disclose). 
 
-If you have any questions about the process, contact security@chatwoot.com. 
+This will enable us to review the vulnerability, fix it promptly, and reward you for your efforts.
 
-Please try your best to describe a clear and realistic impact for your report, and please don't open any public issues on GitHub or social media; we're doing our best to respond through Huntr as quickly as possible.
-
-> Note: Please use the email for questions related to the process. Disclosures should be done via [huntr.dev](https://huntr.dev/)
-## Supported versions
-
-| Version | Supported        |
-| ------- | --------------   |
-| latest   | ️✅               |
-| <latest   | ❌               |
+If you have any questions about the process, feel free to reach out to security@chatwoot.com.
 
 
-## Vulnerabilities we care about 🫣
-> Note: Please do not perform testing against Chatwoot production services. Use a `self-hosted instance` to perform tests.
-- Remote command execution
-- SQL Injection
-- Authentication bypass
-- Privilege Escalation
-- Cross-site scripting (XSS)
-- Performing limited admin actions without authorization
-- CSRF
+## Out of scope
 
-You can learn more about our triaging process [here](https://www.chatwoot.com/docs/contributing-guide/security-reports).
+Please do not perform testing against Chatwoot production services. Use a self hosted instance to perform tests.
 
-## Non-Qualifying Vulnerabilities
-
-We consider the following out of scope, though there may be exceptions.
+We consider the following to be out of scope, though there may be exceptions.
 
 - Missing HTTP security headers
-- Incomplete/Missing SPF/DKIM
-- Reports from automated tools or scanners
-- Theoretical attacks without proof of exploitability
-- Social engineering
-- Reflected file download
-- Physical attacks
-- Weak SSL/TLS/SSH algorithms or protocols
-- Attacks involving physical access to a user's device or a device or network that's already seriously compromised (e.g., man-in-the-middle).
-- The user attacks themselves
+- Self XSS
+- HTTP Host Header XSS without working proof-of-concept
 - Incomplete/Missing SPF/DKIM
 - Denial of Service attacks
-- Brute force attacks
 - DNSSEC
+- Social Engineering attacks
 
-If you are unsure about the scope, please create a [report](https://huntr.dev/repos/chatwoot/chatwoot/).
-
+If you are not sure about the scope, please create a report.
 
 ## Thanks
 

VERSION_CW

@@ -1 +0,0 @@
-2.2.0

VERSION_CWCTL

@@ -1 +0,0 @@
-2.1.0

app.json

@@ -32,33 +32,20 @@
     "INSTALLATION_ENV": {
       "description": "Installation method used for Chatwoot.",
       "value": "heroku"
-    },
-    "REDIS_OPENSSL_VERIFY_MODE":{
-      "description": "OpenSSL verification mode for Redis connections. ref https://help.heroku.com/HC0F8CUS/redis-connection-issues",
-      "value": "none"
     }
   },
   "formation": {
     "web": {
       "quantity": 1,
-      "size": "basic"
+      "size": "FREE"
     },
     "worker": {
       "quantity": 1,
-      "size": "basic"
+      "size": "FREE"
     }
   },
-  "stack": "heroku-20",
   "image": "heroku/ruby",
-  "addons": [
-    {
-      "plan": "heroku-redis:mini"
-    },
-    {
-      "plan": "heroku-postgresql:mini"
-    }
-  ],
-  "stack": "heroku-20",
+  "addons": [ "heroku-redis", "heroku-postgresql"],
   "buildpacks": [
     {
       "url": "heroku/ruby"

app/actions/contact_identify_action.rb

@@ -1,16 +1,7 @@
-# retain_original_contact_name: false / true
-# In case of setUser we want to update the name of the identified contact,
-# which is the default behaviour
-#
-# But, In case of contact merge during prechat form contact update.
-# We don't want to update the name of the identified original contact.
-
 class ContactIdentifyAction
-  pattr_initialize [:contact!, :params!, { retain_original_contact_name: false, discard_invalid_attrs: false }]
+  pattr_initialize [:contact!, :params!]
 
   def perform
-    @attributes_to_update = [:identifier, :name, :email, :phone_number]
-
     ActiveRecord::Base.transaction do
       merge_if_existing_identified_contact
       merge_if_existing_email_contact
@@ -27,105 +18,54 @@ class ContactIdentifyAction
   end
 
   def merge_if_existing_identified_contact
-    return unless merge_contacts?(existing_identified_contact, :identifier)
-
-    process_contact_merge(existing_identified_contact)
+    @contact = merge_contact(existing_identified_contact, @contact) if merge_contacts?(existing_identified_contact, @contact)
   end
 
   def merge_if_existing_email_contact
-    return unless merge_contacts?(existing_email_contact, :email)
-
-    process_contact_merge(existing_email_contact)
+    @contact = merge_contact(existing_email_contact, @contact) if merge_contacts?(existing_email_contact, @contact)
   end
 
   def merge_if_existing_phone_number_contact
-    return unless merge_contacts?(existing_phone_number_contact, :phone_number)
-    return unless mergable_phone_contact?
-
-    process_contact_merge(existing_phone_number_contact)
-  end
-
-  def process_contact_merge(mergee_contact)
-    @contact = merge_contact(mergee_contact, @contact)
-    @attributes_to_update.delete(:name) if retain_original_contact_name
+    @contact = merge_contact(existing_phone_number_contact, @contact) if merge_contacts?(existing_phone_number_contact, @contact)
   end
 
   def existing_identified_contact
     return if params[:identifier].blank?
 
-    @existing_identified_contact ||= account.contacts.find_by(identifier: params[:identifier])
+    @existing_identified_contact ||= Contact.where(account_id: account.id).find_by(identifier: params[:identifier])
   end
 
   def existing_email_contact
     return if params[:email].blank?
 
-    @existing_email_contact ||= account.contacts.find_by(email: params[:email])
+    @existing_email_contact ||= Contact.where(account_id: account.id).find_by(email: params[:email])
   end
 
   def existing_phone_number_contact
     return if params[:phone_number].blank?
 
-    @existing_phone_number_contact ||= account.contacts.find_by(phone_number: params[:phone_number])
+    @existing_phone_number_contact ||= Contact.where(account_id: account.id).find_by(phone_number: params[:phone_number])
   end
 
-  def merge_contacts?(existing_contact, key)
-    return if existing_contact.blank?
-
-    return true if params[:identifier].blank?
-
-    # we want to prevent merging contacts with different identifiers
-    if existing_contact.identifier.present? && existing_contact.identifier != params[:identifier]
-      # we will remove attribute from update list
-      @attributes_to_update.delete(key)
-      return false
-    end
-
-    true
-  end
-
-  # case: contact 1: email: 1@test.com, phone: 123456789
-  # params: email: 2@test.com, phone: 123456789
-  # we don't want to overwrite 1@test.com since email parameter takes higer priority
-  def mergable_phone_contact?
-    return true if params[:email].blank?
-
-    if existing_phone_number_contact.email.present? && existing_phone_number_contact.email != params[:email]
-      @attributes_to_update.delete(:phone_number)
-      return false
-    end
-    true
+  def merge_contacts?(existing_contact, _contact)
+    existing_contact && existing_contact.id != @contact.id
   end
 
   def update_contact
-    @contact.attributes = params.slice(*@attributes_to_update).reject do |_k, v|
-      v.blank?
-    end.merge({ custom_attributes: custom_attributes, additional_attributes: additional_attributes })
+    custom_attributes = params[:custom_attributes] ? @contact.custom_attributes.merge(params[:custom_attributes]) : @contact.custom_attributes
     # blank identifier or email will throw unique index error
     # TODO: replace reject { |_k, v| v.blank? } with compact_blank when rails is upgraded
-    @contact.discard_invalid_attrs if discard_invalid_attrs
-    @contact.save!
-    Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
+    @contact.update!(params.slice(:name, :email, :identifier, :phone_number).reject do |_k, v|
+                       v.blank?
+                     end.merge({ custom_attributes: custom_attributes }))
+    ContactAvatarJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
   end
 
   def merge_contact(base_contact, merge_contact)
-    return base_contact if base_contact.id == merge_contact.id
-
     ContactMergeAction.new(
       account: account,
       base_contact: base_contact,
       mergee_contact: merge_contact
     ).perform
   end
-
-  def custom_attributes
-    return @contact.custom_attributes if params[:custom_attributes].blank?
-
-    (@contact.custom_attributes || {}).deep_merge(params[:custom_attributes].stringify_keys)
-  end
-
-  def additional_attributes
-    return @contact.additional_attributes if params[:additional_attributes].blank?
-
-    (@contact.additional_attributes || {}).deep_merge(params[:additional_attributes].stringify_keys)
-  end
 end

app/actions/contact_merge_action.rb

@@ -48,10 +48,11 @@ class ContactMergeAction
 
     # attributes in base contact are given preference
     merged_attributes = mergee_contact_attributes.deep_merge(base_contact_attributes)
+    # retaining old pubsub token to notify the contacts that are listening
+    mergee_pubsub_token = mergee_contact.pubsub_token
 
     @mergee_contact.destroy!
-    Rails.configuration.dispatcher.dispatch(CONTACT_MERGED, Time.zone.now, contact: @base_contact,
-                                                                           tokens: [@base_contact.contact_inboxes.filter_map(&:pubsub_token)])
+    Rails.configuration.dispatcher.dispatch(CONTACT_MERGED, Time.zone.now, contact: @base_contact, tokens: [mergee_pubsub_token])
     @base_contact.update!(merged_attributes)
   end
 end

app/builders/account_builder.rb

@@ -2,7 +2,7 @@
 
 class AccountBuilder
   include CustomExceptions::Account
-  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin, :locale]
+  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password]
 
   def perform
     if @user.nil?
@@ -65,7 +65,6 @@ class AccountBuilder
                      password: user_password,
                      password_confirmation: user_password,
                      name: @user_full_name)
-    @user.type = 'SuperAdmin' if @super_admin
     @user.confirm if @confirmed
     @user.save!
   end

app/builders/campaigns/campaign_conversation_builder.rb

@@ -1,5 +1,5 @@
 class Campaigns::CampaignConversationBuilder
-  pattr_initialize [:contact_inbox_id!, :campaign_display_id!, :conversation_additional_attributes, :custom_attributes]
+  pattr_initialize [:contact_inbox_id!, :campaign_display_id!, :conversation_additional_attributes]
 
   def perform
     @contact_inbox = ContactInbox.find(@contact_inbox_id)
@@ -9,23 +9,19 @@ class Campaigns::CampaignConversationBuilder
       @contact_inbox.lock!
 
       # We won't send campaigns if a conversation is already present
-      raise 'Conversation alread present' if @contact_inbox.reload.conversations.present?
+      return if @contact_inbox.reload.conversations.present?
 
       @conversation = ::Conversation.create!(conversation_params)
       Messages::MessageBuilder.new(@campaign.sender, @conversation, message_params).perform
     end
     @conversation
-  rescue StandardError => e
-    Rails.logger.info(e.message)
-    nil
   end
 
   private
 
   def message_params
     ActionController::Parameters.new({
-                                       content: @campaign.message,
-                                       campaign_id: @campaign.id
+                                       content: @campaign.message
                                      })
   end
 
@@ -36,8 +32,7 @@ class Campaigns::CampaignConversationBuilder
       contact_id: @contact_inbox.contact_id,
       contact_inbox_id: @contact_inbox.id,
       campaign_id: @campaign.id,
-      additional_attributes: conversation_additional_attributes,
-      custom_attributes: custom_attributes || {}
+      additional_attributes: conversation_additional_attributes
     }
   end
 end

app/builders/contact_builder.rb

@@ -0,0 +1,76 @@
+class ContactBuilder
+  pattr_initialize [:source_id!, :inbox!, :contact_attributes!, :hmac_verified]
+
+  def perform
+    contact_inbox = inbox.contact_inboxes.find_by(source_id: source_id)
+    return contact_inbox if contact_inbox
+
+    build_contact_inbox
+  end
+
+  private
+
+  def account
+    @account ||= inbox.account
+  end
+
+  def create_contact_inbox(contact)
+    ::ContactInbox.create!(
+      contact_id: contact.id,
+      inbox_id: inbox.id,
+      source_id: source_id,
+      hmac_verified: hmac_verified || false
+    )
+  end
+
+  def update_contact_avatar(contact)
+    ::ContactAvatarJob.perform_later(contact, contact_attributes[:avatar_url]) if contact_attributes[:avatar_url]
+  end
+
+  def create_contact
+    account.contacts.create!(
+      name: contact_attributes[:name] || ::Haikunator.haikunate(1000),
+      phone_number: contact_attributes[:phone_number],
+      email: contact_attributes[:email],
+      identifier: contact_attributes[:identifier],
+      additional_attributes: contact_attributes[:additional_attributes]
+    )
+  end
+
+  def find_contact
+    contact = find_contact_by_identifier(contact_attributes[:identifier])
+    contact ||= find_contact_by_email(contact_attributes[:email])
+    contact ||= find_contact_by_phone_number(contact_attributes[:phone_number])
+    contact
+  end
+
+  def find_contact_by_identifier(identifier)
+    return if identifier.blank?
+
+    account.contacts.find_by(identifier: identifier)
+  end
+
+  def find_contact_by_email(email)
+    return if email.blank?
+
+    account.contacts.find_by(email: email.downcase)
+  end
+
+  def find_contact_by_phone_number(phone_number)
+    return if phone_number.blank?
+
+    account.contacts.find_by(phone_number: phone_number)
+  end
+
+  def build_contact_inbox
+    ActiveRecord::Base.transaction do
+      contact = find_contact || create_contact
+      contact_inbox = create_contact_inbox(contact)
+      update_contact_avatar(contact)
+      contact_inbox
+    rescue StandardError => e
+      Rails.logger.info e
+      raise e
+    end
+  end
+end

app/builders/contact_inbox_builder.rb

@@ -1,54 +1,27 @@
-# This Builder will create a contact inbox with specified attributes. If the contact inbox already exists, it will be returned.
-# For Specific Channels like whatsapp, email etc . it smartly generated appropriate the source id when none is provided.
-
 class ContactInboxBuilder
-  pattr_initialize [:contact, :inbox, :source_id, { hmac_verified: false }]
+  pattr_initialize [:contact_id!, :inbox_id!, :source_id]
 
   def perform
-    @source_id ||= generate_source_id
-    create_contact_inbox if source_id.present?
+    @contact = Contact.find(contact_id)
+    @inbox = @contact.account.inboxes.find(inbox_id)
+    return unless ['Channel::TwilioSms', 'Channel::Email', 'Channel::Api'].include? @inbox.channel_type
+
+    source_id = @source_id || generate_source_id
+    create_contact_inbox(source_id) if source_id.present?
   end
 
   private
 
   def generate_source_id
-    case @inbox.channel_type
-    when 'Channel::TwilioSms'
-      twilio_source_id
-    when 'Channel::Whatsapp'
-      wa_source_id
-    when 'Channel::Email'
-      email_source_id
-    when 'Channel::Sms'
-      phone_source_id
-    when 'Channel::Api', 'Channel::WebWidget'
-      SecureRandom.uuid
-    else
-      raise "Unsupported operation for this channel: #{@inbox.channel_type}"
-    end
-  end
+    return twilio_source_id if @inbox.channel_type == 'Channel::TwilioSms'
+    return @contact.email if @inbox.channel_type == 'Channel::Email'
+    return SecureRandom.uuid if @inbox.channel_type == 'Channel::Api'
 
-  def email_source_id
-    raise ActionController::ParameterMissing, 'contact email' unless @contact.email
-
-    @contact.email
-  end
-
-  def phone_source_id
-    raise ActionController::ParameterMissing, 'contact phone number' unless @contact.phone_number
-
-    @contact.phone_number
-  end
-
-  def wa_source_id
-    raise ActionController::ParameterMissing, 'contact phone number' unless @contact.phone_number
-
-    # whatsapp doesn't want the + in e164 format
-    @contact.phone_number.delete('+').to_s
+    nil
   end
 
   def twilio_source_id
-    raise ActionController::ParameterMissing, 'contact phone number' unless @contact.phone_number
+    return unless @contact.phone_number
 
     case @inbox.channel.medium
     when 'sms'
@@ -58,11 +31,11 @@ class ContactInboxBuilder
     end
   end
 
-  def create_contact_inbox
-    ::ContactInbox.create_with(hmac_verified: hmac_verified || false).find_or_create_by!(
+  def create_contact_inbox(source_id)
+    ::ContactInbox.find_or_create_by!(
       contact_id: @contact.id,
       inbox_id: @inbox.id,
-      source_id: @source_id
+      source_id: source_id
     )
   end
 end

app/builders/contact_inbox_with_contact_builder.rb

@@ -1,86 +0,0 @@
-# This Builder will create a contact and contact inbox with specified attributes.
-# If an existing identified contact exisits, it will be returned.
-# for contact inbox logic it uses the contact inbox builder
-
-class ContactInboxWithContactBuilder
-  pattr_initialize [:inbox!, :contact_attributes!, :source_id, :hmac_verified]
-
-  def perform
-    find_or_create_contact_and_contact_inbox
-  # in case of race conditions where contact is created by another thread
-  # we will try to find the contact and create a contact inbox
-  rescue ActiveRecord::RecordNotUnique
-    find_or_create_contact_and_contact_inbox
-  end
-
-  def find_or_create_contact_and_contact_inbox
-    @contact_inbox = inbox.contact_inboxes.find_by(source_id: source_id) if source_id.present?
-    return @contact_inbox if @contact_inbox
-
-    ActiveRecord::Base.transaction(requires_new: true) do
-      build_contact_with_contact_inbox
-      update_contact_avatar(@contact) unless @contact.avatar.attached?
-      @contact_inbox
-    end
-  end
-
-  private
-
-  def build_contact_with_contact_inbox
-    @contact = find_contact || create_contact
-    @contact_inbox = create_contact_inbox
-  end
-
-  def account
-    @account ||= inbox.account
-  end
-
-  def create_contact_inbox
-    ContactInboxBuilder.new(
-      contact: @contact,
-      inbox: @inbox,
-      source_id: @source_id,
-      hmac_verified: hmac_verified
-    ).perform
-  end
-
-  def update_contact_avatar(contact)
-    ::Avatar::AvatarFromUrlJob.perform_later(contact, contact_attributes[:avatar_url]) if contact_attributes[:avatar_url]
-  end
-
-  def create_contact
-    account.contacts.create!(
-      name: contact_attributes[:name] || ::Haikunator.haikunate(1000),
-      phone_number: contact_attributes[:phone_number],
-      email: contact_attributes[:email],
-      identifier: contact_attributes[:identifier],
-      additional_attributes: contact_attributes[:additional_attributes],
-      custom_attributes: contact_attributes[:custom_attributes]
-    )
-  end
-
-  def find_contact
-    contact = find_contact_by_identifier(contact_attributes[:identifier])
-    contact ||= find_contact_by_email(contact_attributes[:email])
-    contact ||= find_contact_by_phone_number(contact_attributes[:phone_number])
-    contact
-  end
-
-  def find_contact_by_identifier(identifier)
-    return if identifier.blank?
-
-    account.contacts.find_by(identifier: identifier)
-  end
-
-  def find_contact_by_email(email)
-    return if email.blank?
-
-    account.contacts.find_by(email: email.downcase)
-  end
-
-  def find_contact_by_phone_number(phone_number)
-    return if phone_number.blank?
-
-    account.contacts.find_by(phone_number: phone_number)
-  end
-end

app/builders/conversation_builder.rb

@@ -1,40 +0,0 @@
-class ConversationBuilder
-  pattr_initialize [:params!, :contact_inbox!]
-
-  def perform
-    look_up_exising_conversation || create_new_conversation
-  end
-
-  private
-
-  def look_up_exising_conversation
-    return unless @contact_inbox.inbox.lock_to_single_conversation?
-
-    @contact_inbox.conversations.last
-  end
-
-  def create_new_conversation
-    ::Conversation.create!(conversation_params)
-  end
-
-  def conversation_params
-    additional_attributes = params[:additional_attributes]&.permit! || {}
-    custom_attributes = params[:custom_attributes]&.permit! || {}
-    status = params[:status].present? ? { status: params[:status] } : {}
-
-    # TODO: temporary fallback for the old bot status in conversation, we will remove after couple of releases
-    # commenting this out to see if there are any errors, if not we can remove this in subsequent releases
-    # status = { status: 'pending' } if status[:status] == 'bot'
-    {
-      account_id: @contact_inbox.inbox.account_id,
-      inbox_id: @contact_inbox.inbox_id,
-      contact_id: @contact_inbox.contact_id,
-      contact_inbox_id: @contact_inbox.id,
-      additional_attributes: additional_attributes,
-      custom_attributes: custom_attributes,
-      snoozed_until: params[:snoozed_until],
-      assignee_id: params[:assignee_id],
-      team_id: params[:team_id]
-    }.merge(status)
-  end
-end

app/builders/messages/facebook/message_builder.rb

@@ -22,24 +22,28 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
     return if @inbox.channel.reauthorization_required?
 
     ActiveRecord::Base.transaction do
-      build_contact_inbox
+      build_contact
       build_message
     end
+    ensure_contact_avatar
   rescue Koala::Facebook::AuthenticationError
-    @inbox.channel.authorization_error!
+    Rails.logger.info "Facebook Authorization expired for Inbox #{@inbox.id}"
   rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
+    Sentry.capture_exception(e)
     true
   end
 
   private
 
-  def build_contact_inbox
-    @contact_inbox = ::ContactInboxWithContactBuilder.new(
-      source_id: @sender_id,
-      inbox: @inbox,
-      contact_attributes: contact_params
-    ).perform
+  def contact
+    @contact ||= @inbox.contact_inboxes.find_by(source_id: @sender_id)&.contact
+  end
+
+  def build_contact
+    return if contact.present?
+
+    @contact = Contact.create!(contact_params.except(:remote_avatar_url))
+    @contact_inbox = ContactInbox.create(contact: contact, inbox: @inbox, source_id: @sender_id)
   end
 
   def build_message
@@ -50,11 +54,19 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
     end
   end
 
+  def ensure_contact_avatar
+    return if contact_params[:remote_avatar_url].blank?
+    return if @contact.avatar.attached?
+
+    ContactAvatarJob.perform_later(@contact, contact_params[:remote_avatar_url])
+  end
+
   def conversation
     @conversation ||= Conversation.find_by(conversation_params) || build_conversation
   end
 
   def build_conversation
+    @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: @sender_id)
     Conversation.create!(conversation_params.merge(
                            contact_inbox_id: @contact_inbox.id
                          ))
@@ -82,7 +94,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
     {
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
-      contact_id: @contact_inbox.contact_id
+      contact_id: contact.id
     }
   end
 
@@ -93,7 +105,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
       message_type: @message_type,
       content: response.content,
       source_id: response.identifier,
-      sender: @outgoing_echo ? nil : @contact_inbox.contact
+      sender: @outgoing_echo ? nil : contact
     }
   end
 
@@ -101,7 +113,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
     {
       name: "#{result['first_name'] || 'John'} #{result['last_name'] || 'Doe'}",
       account_id: @inbox.account_id,
-      avatar_url: result['profile_pic']
+      remote_avatar_url: result['profile_pic'] || ''
     }
   end
 
@@ -116,10 +128,10 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
       result = {}
       # OAuthException, code: 100, error_subcode: 2018218, message: (#100) No profile available for this user
       # We don't need to capture this error as we don't care about contact params in case of echo messages
-      ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception unless @outgoing_echo
+      Sentry.capture_exception(e) unless @outgoing_echo
     rescue StandardError => e
       result = {}
-      ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
+      Sentry.capture_exception(e)
     end
     process_contact_params_result(result)
   end

app/builders/messages/instagram/message_builder.rb

@@ -24,7 +24,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     @inbox.channel.authorization_error!
     raise
   rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
+    Sentry.capture_exception(e)
     true
   end
 
@@ -38,10 +38,6 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     @outgoing_echo ? :outgoing : :incoming
   end
 
-  def message_identifier
-    message[:mid]
-  end
-
   def message_source_id
     @outgoing_echo ? recipient_id : sender_id
   end
@@ -70,9 +66,12 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     @messaging[:message][:text]
   end
 
+  def content_attributes
+    { message_id: @messaging[:message][:mid] }
+  end
+
   def build_message
     return if @outgoing_echo && already_sent_from_chatwoot?
-    return if message_content.blank? && all_unsupported_files?
 
     @message = conversation.messages.create!(message_params)
 
@@ -104,27 +103,25 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
       account_id: conversation.account_id,
       inbox_id: conversation.inbox_id,
       message_type: message_type,
-      source_id: message_identifier,
+      source_id: message_source_id,
       content: message_content,
+      content_attributes: content_attributes,
       sender: @outgoing_echo ? nil : contact
     }
   end
 
   def already_sent_from_chatwoot?
     cw_message = conversation.messages.where(
-      source_id: @messaging[:message][:mid]
+      source_id: nil,
+      message_type: 'outgoing',
+      content: message_content,
+      private: false,
+      status: :sent
     ).first
-
+    cw_message.update(content_attributes: content_attributes) if cw_message.present?
     cw_message.present?
   end
 
-  def all_unsupported_files?
-    return if attachments.empty?
-
-    attachments_type = attachments.pluck(:type).uniq.first
-    unsupported_file_type?(attachments_type)
-  end
-
   ### Sample response
   # {
   #   "object": "instagram",

app/builders/messages/message_builder.rb

@@ -8,12 +8,9 @@ class Messages::MessageBuilder
     @conversation = conversation
     @user = user
     @message_type = params[:message_type] || 'outgoing'
-    @attachments = params[:attachments]
-    @automation_rule = @params&.dig(:content_attributes, :automation_rule_id)
-    return unless params.instance_of?(ActionController::Parameters)
-
-    @in_reply_to = params.to_unsafe_h&.dig(:content_attributes, :in_reply_to)
     @items = params.to_unsafe_h&.dig(:content_attributes, :items)
+    @attachments = params[:attachments]
+    @in_reply_to = params.to_unsafe_h&.dig(:content_attributes, :in_reply_to)
   end
 
   def perform
@@ -30,18 +27,11 @@ class Messages::MessageBuilder
     return if @attachments.blank?
 
     @attachments.each do |uploaded_attachment|
-      attachment = @message.attachments.build(
+      @message.attachments.build(
         account_id: @message.account_id,
+        file_type: file_type(uploaded_attachment&.content_type),
         file: uploaded_attachment
       )
-
-      attachment.file_type = if uploaded_attachment.is_a?(String)
-                               file_type_by_signed_id(
-                                 uploaded_attachment
-                               )
-                             else
-                               file_type(uploaded_attachment&.content_type)
-                             end
     end
   end
 
@@ -71,18 +61,6 @@ class Messages::MessageBuilder
     @params[:external_created_at].present? ? { external_created_at: @params[:external_created_at] } : {}
   end
 
-  def automation_rule_id
-    @automation_rule.present? ? { content_attributes: { automation_rule_id: @automation_rule } } : {}
-  end
-
-  def campaign_id
-    @params[:campaign_id].present? ? { additional_attributes: { campaign_id: @params[:campaign_id] } } : {}
-  end
-
-  def template_params
-    @params[:template_params].present? ? { additional_attributes: { template_params: JSON.parse(@params[:template_params].to_json) } } : {}
-  end
-
   def message_sender
     return if @params[:sender_type] != 'AgentBot'
 
@@ -101,6 +79,6 @@ class Messages::MessageBuilder
       items: @items,
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id]
-    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)
+    }.merge(external_created_at)
   end
 end

app/builders/messages/messenger/message_builder.rb

@@ -1,15 +1,10 @@
 class Messages::Messenger::MessageBuilder
-  include ::FileTypeHelper
-
   def process_attachment(attachment)
-    # This check handles very rare case if there are multiple files to attach with only one usupported file
-    return if unsupported_file_type?(attachment['type'])
+    return if attachment['type'].to_sym == :template
 
     attachment_obj = @message.attachments.new(attachment_params(attachment).except(:remote_file_url))
     attachment_obj.save!
     attach_file(attachment_obj, attachment_params(attachment)[:remote_file_url]) if attachment_params(attachment)[:remote_file_url]
-    fetch_story_link(attachment_obj) if attachment_obj.file_type == 'story_mention'
-    update_attachment_file_type(attachment_obj)
   end
 
   def attach_file(attachment, file_url)
@@ -27,7 +22,7 @@ class Messages::Messenger::MessageBuilder
     file_type = attachment['type'].to_sym
     params = { file_type: file_type, account_id: @message.account_id }
 
-    if [:image, :file, :audio, :video, :share, :story_mention].include? file_type
+    if [:image, :file, :audio, :video].include? file_type
       params.merge!(file_type_params(attachment))
     elsif file_type == :location
       params.merge!(location_params(attachment))
@@ -44,50 +39,4 @@ class Messages::Messenger::MessageBuilder
       remote_file_url: attachment['payload']['url']
     }
   end
-
-  def update_attachment_file_type(attachment)
-    return if @message.reload.attachments.blank?
-    return unless attachment.file_type == 'share' || attachment.file_type == 'story_mention'
-
-    attachment.file_type = file_type(attachment.file&.content_type)
-    attachment.save!
-  end
-
-  def fetch_story_link(attachment)
-    message = attachment.message
-    result = get_story_object_from_source_id(message.source_id)
-
-    return if result.blank?
-
-    story_id = result['story']['mention']['id']
-    story_sender = result['from']['username']
-    message.content_attributes[:story_sender] = story_sender
-    message.content_attributes[:story_id] = story_id
-    message.content_attributes[:image_type] = 'story_mention'
-    message.content = I18n.t('conversations.messages.instagram_story_content', story_sender: story_sender)
-    message.save!
-  end
-
-  def get_story_object_from_source_id(source_id)
-    k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
-    k.get_object(source_id, fields: %w[story from]) || {}
-  rescue Koala::Facebook::AuthenticationError
-    @inbox.channel.authorization_error!
-    raise
-  rescue Koala::Facebook::ClientError => e
-    # The exception occurs when we are trying fetch the deleted story or blocked story.
-    @message.attachments.destroy_all
-    @message.update(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
-    Rails.logger.error e
-    {}
-  rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
-    {}
-  end
-
-  private
-
-  def unsupported_file_type?(attachment_type)
-    [:template, :unsupported_type].include? attachment_type.to_sym
-  end
 end

app/builders/notification_builder.rb

@@ -15,9 +15,6 @@ class NotificationBuilder
 
   def user_subscribed_to_notification?
     notification_setting = user.notification_settings.find_by(account_id: account.id)
-    # added for the case where an assignee might be removed from the account but remains in conversation
-    return if notification_setting.blank?
-
     return true if notification_setting.public_send("email_#{notification_type}?")
     return true if notification_setting.public_send("push_#{notification_type}?")
 

app/builders/notification_subscription_builder.rb

@@ -25,7 +25,7 @@ class NotificationSubscriptionBuilder
   end
 
   def build_identifier_subscription
-    @identifier_subscription = user.notification_subscriptions.create!(params.merge(identifier: identifier))
+    @identifier_subscription = user.notification_subscriptions.create(params.merge(identifier: identifier))
   end
 
   def update_identifier_subscription

app/builders/v2/report_builder.rb

@@ -1,17 +1,10 @@
 class V2::ReportBuilder
   include DateRangeHelper
-  include ReportHelper
   attr_reader :account, :params
 
-  DEFAULT_GROUP_BY = 'day'.freeze
-  AGENT_RESULTS_PER_PAGE = 25
-
   def initialize(account, params)
     @account = account
     @params = params
-
-    timezone_offset = (params[:timezone_offset] || 0).to_f
-    @timezone = ActiveSupport::TimeZone[timezone_offset]&.name
   end
 
   def timeseries
@@ -20,14 +13,8 @@ class V2::ReportBuilder
 
   # For backward compatible with old report
   def build
-    if %w[avg_first_response_time avg_resolution_time].include?(params[:metric])
-      timeseries.each_with_object([]) do |p, arr|
-        arr << { value: p[1], timestamp: p[0].in_time_zone(@timezone).to_i, count: @grouped_values.count[p[0]] }
-      end
-    else
-      timeseries.each_with_object([]) do |p, arr|
-        arr << { value: p[1], timestamp: p[0].in_time_zone(@timezone).to_i }
-      end
+    timeseries.each_with_object([]) do |p, arr|
+      arr << { value: p[1], timestamp: p[0].to_time.to_i }
     end
   end
 
@@ -42,16 +29,23 @@ class V2::ReportBuilder
     }
   end
 
-  def conversation_metrics
-    if params[:type].equal?(:account)
-      conversations
-    else
-      agent_metrics.sort_by { |hash| hash[:metric][:open] }.reverse
+  private
+
+  def scope
+    case params[:type]
+    when :account
+      account
+    when :inbox
+      inbox
+    when :agent
+      user
+    when :label
+      label
+    when :team
+      team
     end
   end
 
-  private
-
   def inbox
     @inbox ||= account.inboxes.find(params[:id])
   end
@@ -68,40 +62,56 @@ class V2::ReportBuilder
     @team ||= account.teams.find(params[:id])
   end
 
-  def get_grouped_values(object_scope)
-    @grouped_values = object_scope.group_by_period(
-      params[:group_by] || DEFAULT_GROUP_BY,
-      :created_at,
-      default_value: 0,
-      range: range,
-      permit: %w[day week month year],
-      time_zone: @timezone
-    )
+  def conversations_count
+    scope.conversations
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .count
   end
 
-  def agent_metrics
-    account_users = @account.account_users.page(params[:page]).per(AGENT_RESULTS_PER_PAGE)
-    account_users.each_with_object([]) do |account_user, arr|
-      @user = account_user.user
-      arr << {
-        id: @user.id,
-        name: @user.name,
-        email: @user.email,
-        thumbnail: @user.avatar_url,
-        availability: account_user.availability_status,
-        metric: conversations
-      }
-    end
+  def incoming_messages_count
+    scope.messages.incoming.unscope(:order)
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .count
   end
 
-  def conversations
-    @open_conversations = scope.conversations.where(account_id: @account.id).open
-    first_response_count = @account.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
-    metric = {
-      open: @open_conversations.count,
-      unattended: @open_conversations.count - first_response_count
-    }
-    metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
-    metric
+  def outgoing_messages_count
+    scope.messages.outgoing.unscope(:order)
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .count
+  end
+
+  def resolutions_count
+    scope.conversations
+         .resolved
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .count
+  end
+
+  def avg_first_response_time
+    scope.events
+         .where(name: 'first_response')
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .average(:value)
+  end
+
+  def avg_resolution_time
+    scope.events.where(name: 'conversation_resolved')
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .average(:value)
+  end
+
+  # Taking average of average is not too accurate
+  # https://en.wikipedia.org/wiki/Simpson's_paradox
+  # TODO: Will optimize this later
+  def avg_resolution_time_summary
+    return 0 if avg_resolution_time.values.empty?
+
+    (avg_resolution_time.values.sum / avg_resolution_time.values.length)
+  end
+
+  def avg_first_response_time_summary
+    return 0 if avg_first_response_time.values.empty?
+
+    (avg_first_response_time.values.sum / avg_first_response_time.values.length)
   end
 end

app/channels/room_channel.rb

@@ -1,8 +1,5 @@
 class RoomChannel < ApplicationCable::Channel
   def subscribed
-    # TODO: should we only do ensure stream  if current account is present?
-    # for now going ahead with guard clauses in update_subscription and broadcast_presence
-
     ensure_stream
     current_user
     current_account
@@ -18,8 +15,6 @@ class RoomChannel < ApplicationCable::Channel
   private
 
   def broadcast_presence
-    return if @current_account.blank?
-
     data = { account_id: @current_account.id, users: ::OnlineStatusTracker.get_available_users(@current_account.id) }
     data[:contacts] = ::OnlineStatusTracker.get_available_contacts(@current_account.id) if @current_user.is_a? User
     ActionCable.server.broadcast(@pubsub_token, { event: 'presence.update', data: data })
@@ -31,22 +26,18 @@ class RoomChannel < ApplicationCable::Channel
   end
 
   def update_subscription
-    return if @current_account.blank?
-
     ::OnlineStatusTracker.update_presence(@current_account.id, @current_user.class.name, @current_user.id)
   end
 
   def current_user
     @current_user ||= if params[:user_id].blank?
-                        ContactInbox.find_by!(pubsub_token: @pubsub_token).contact
+                        Contact.find_by!(pubsub_token: @pubsub_token)
                       else
                         User.find_by!(pubsub_token: @pubsub_token, id: params[:user_id])
                       end
   end
 
   def current_account
-    return if current_user.blank?
-
     @current_account ||= if @current_user.is_a? Contact
                            @current_user.account
                          else

app/controllers/api/v1/accounts/agent_bots_controller.rb

@@ -18,7 +18,7 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    @agent_bot.destroy!
+    @agent_bot.destroy
     head :ok
   end
 
@@ -30,6 +30,6 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
   end
 
   def permitted_params
-    params.permit(:name, :description, :outgoing_url, :bot_type, bot_config: [:csml_content])
+    params.permit(:name, :description, :outgoing_url)
   end
 end

app/controllers/api/v1/accounts/agents_controller.rb

@@ -2,7 +2,6 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   before_action :fetch_agent, except: [:create, :index]
   before_action :check_authorization
   before_action :find_user, only: [:create]
-  before_action :validate_limit, only: [:create]
   before_action :create_user, only: [:create]
   before_action :save_account_user, only: [:create]
 
@@ -18,7 +17,7 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    @agent.current_account_user.destroy!
+    @agent.current_account_user.destroy
     head :ok
   end
 
@@ -39,7 +38,7 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   # TODO: move this to a builder and combine the save account user method into a builder
   # ensure the account user association is also created in a single transaction
   def create_user
-    return @user.send_confirmation_instructions if @user
+    return if @user
 
     @user = User.create!(new_agent_params.slice(:email, :name, :password, :password_confirmation))
   end
@@ -68,10 +67,6 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   end
 
   def agents
-    @agents ||= Current.account.users.order_by_full_name.includes(:account_users, { avatar_attachment: [:blob] })
-  end
-
-  def validate_limit
-    render_payment_required('Account limit exceeded. Please purchase more licenses') if agents.count >= Current.account.usage_limits[:agents]
+    @agents ||= Current.account.users.order_by_full_name.includes({ avatar_attachment: [:blob] })
   end
 end

app/controllers/api/v1/accounts/articles_controller.rb

@@ -1,58 +0,0 @@
-class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
-  before_action :portal
-  before_action :check_authorization
-  before_action :fetch_article, except: [:index, :create]
-  before_action :set_current_page, only: [:index]
-
-  def index
-    @portal_articles = @portal.articles
-    @all_articles = @portal_articles.search(list_params)
-    @articles_count = @all_articles.count
-    @articles = @all_articles.page(@current_page)
-  end
-
-  def create
-    @article = @portal.articles.create!(article_params)
-    @article.associate_root_article(article_params[:associated_article_id])
-    @article.draft!
-    render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
-  end
-
-  def edit; end
-
-  def show; end
-
-  def update
-    @article.update!(article_params)
-  end
-
-  def destroy
-    @article.destroy!
-    head :ok
-  end
-
-  private
-
-  def fetch_article
-    @article = @portal.articles.find(params[:id])
-  end
-
-  def portal
-    @portal ||= Current.account.portals.find_by!(slug: params[:portal_id])
-  end
-
-  def article_params
-    params.require(:article).permit(
-      :title, :slug, :content, :description, :position, :category_id, :author_id, :associated_article_id, :status, meta: [:title, :description,
-                                                                                                                          { tags: [] }]
-    )
-  end
-
-  def list_params
-    params.permit(:locale, :query, :page, :category_slug, :status, :author_id)
-  end
-
-  def set_current_page
-    @current_page = params[:page] || 1
-  end
-end

app/controllers/api/v1/accounts/assignable_agents_controller.rb

@@ -1,24 +0,0 @@
-class Api::V1::Accounts::AssignableAgentsController < Api::V1::Accounts::BaseController
-  before_action :fetch_inboxes
-
-  def index
-    agent_ids = @inboxes.map do |inbox|
-      authorize inbox, :show?
-      member_ids = inbox.members.pluck(:user_id)
-      member_ids
-    end
-    agent_ids = agent_ids.inject(:&)
-    agents = Current.account.users.where(id: agent_ids)
-    @assignable_agents = (agents + Current.account.administrators).uniq
-  end
-
-  private
-
-  def fetch_inboxes
-    @inboxes = Current.account.inboxes.find(permitted_params[:inbox_ids])
-  end
-
-  def permitted_params
-    params.permit(inbox_ids: [])
-  end
-end

app/controllers/api/v1/accounts/automation_rules_controller.rb

@@ -1,87 +0,0 @@
-class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseController
-  before_action :check_authorization
-  before_action :fetch_automation_rule, only: [:show, :update, :destroy, :clone]
-
-  def index
-    @automation_rules = Current.account.automation_rules
-  end
-
-  def create
-    @automation_rule = Current.account.automation_rules.new(automation_rules_permit)
-    @automation_rule.actions = params[:actions]
-    @automation_rule.conditions = params[:conditions]
-
-    render json: { error: @automation_rule.errors.messages }, status: :unprocessable_entity and return unless @automation_rule.valid?
-
-    @automation_rule.save!
-    process_attachments
-    @automation_rule
-  end
-
-  def attach_file
-    file_blob = ActiveStorage::Blob.create_and_upload!(
-      key: nil,
-      io: params[:attachment].tempfile,
-      filename: params[:attachment].original_filename,
-      content_type: params[:attachment].content_type
-    )
-    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
-  end
-
-  def show; end
-
-  def update
-    ActiveRecord::Base.transaction do
-      automation_rule_update
-      process_attachments
-
-    rescue StandardError => e
-      Rails.logger.error e
-      render json: { error: @automation_rule.errors.messages }.to_json, status: :unprocessable_entity
-    end
-  end
-
-  def destroy
-    @automation_rule.destroy!
-    head :ok
-  end
-
-  def clone
-    automation_rule = Current.account.automation_rules.find_by(id: params[:automation_rule_id])
-    new_rule = automation_rule.dup
-    new_rule.save!
-    @automation_rule = new_rule
-  end
-
-  def process_attachments
-    actions = @automation_rule.actions.filter_map { |k, _v| k if k['action_name'] == 'send_attachment' }
-    return if actions.blank?
-
-    actions.each do |action|
-      blob_id = action['action_params']
-      blob = ActiveStorage::Blob.find_by(id: blob_id)
-      @automation_rule.files.attach(blob)
-    end
-  end
-
-  private
-
-  def automation_rule_update
-    @automation_rule.update!(automation_rules_permit)
-    @automation_rule.actions = params[:actions] if params[:actions]
-    @automation_rule.conditions = params[:conditions] if params[:conditions]
-    @automation_rule.save!
-  end
-
-  def automation_rules_permit
-    params.permit(
-      :name, :description, :event_name, :account_id, :active,
-      conditions: [:attribute_key, :filter_operator, :query_operator, :custom_attribute_type, { values: [] }],
-      actions: [:action_name, { action_params: [] }]
-    )
-  end
-
-  def fetch_automation_rule
-    @automation_rule = Current.account.automation_rules.find_by(id: params[:id])
-  end
-end

app/controllers/api/v1/accounts/base_controller.rb

@@ -1,6 +1,32 @@
 class Api::V1::Accounts::BaseController < Api::BaseController
   include SwitchLocale
-  include EnsureCurrentAccountHelper
   before_action :current_account
   around_action :switch_locale_using_account_locale
+
+  private
+
+  def current_account
+    @current_account ||= ensure_current_account
+    Current.account = @current_account
+  end
+
+  def ensure_current_account
+    account = Account.find(params[:account_id])
+    if current_user
+      account_accessible_for_user?(account)
+    elsif @resource.is_a?(AgentBot)
+      account_accessible_for_bot?(account)
+    end
+    account
+  end
+
+  def account_accessible_for_user?(account)
+    @current_account_user = account.account_users.find_by(user_id: current_user.id)
+    Current.account_user = @current_account_user
+    render_unauthorized('You are not authorized to access this account') unless @current_account_user
+  end
+
+  def account_accessible_for_bot?(account)
+    render_unauthorized('You are not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
+  end
 end

app/controllers/api/v1/accounts/bulk_actions_controller.rb

@@ -1,26 +0,0 @@
-class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseController
-  before_action :type_matches?
-
-  def create
-    if type_matches?
-      ::BulkActionsJob.perform_later(
-        account: @current_account,
-        user: current_user,
-        params: permitted_params
-      )
-      head :ok
-    else
-      render json: { success: false }, status: :unprocessable_entity
-    end
-  end
-
-  private
-
-  def type_matches?
-    ['Conversation'].include?(params[:type])
-  end
-
-  def permitted_params
-    params.permit(:type, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
-  end
-end

app/controllers/api/v1/accounts/callbacks_controller.rb

@@ -15,7 +15,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
       set_instagram_id(page_access_token, facebook_channel)
       set_avatar(@facebook_inbox, page_id)
     rescue StandardError => e
-      ChatwootExceptionTracker.new(e).capture_exception
+      Sentry.capture_exception(e)
     end
   end
 
@@ -60,7 +60,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
       set_instagram_id(access_token, fb_page)
       fb_page&.reauthorized!
     rescue StandardError => e
-      ChatwootExceptionTracker.new(e).capture_exception
+      Sentry.capture_exception(e)
     end
   end
 
@@ -74,10 +74,10 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
   end
 
   def long_lived_token(omniauth_token)
-    koala = Koala::Facebook::OAuth.new(GlobalConfigService.load('FB_APP_ID', ''), GlobalConfigService.load('FB_APP_SECRET', ''))
+    koala = Koala::Facebook::OAuth.new(ENV['FB_APP_ID'], ENV['FB_APP_SECRET'])
     koala.exchange_access_token_info(omniauth_token)['access_token']
   rescue StandardError => e
-    Rails.logger.error e
+    Rails.logger.info e
   end
 
   def mark_already_existing_facebook_pages(data)
@@ -90,7 +90,9 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
   end
 
   def set_avatar(facebook_inbox, page_id)
-    avatar_url = "https://graph.facebook.com/#{page_id}/picture?type=large"
-    Avatar::AvatarFromUrlJob.perform_later(facebook_inbox, avatar_url)
+    avatar_file = Down.download(
+      "http://graph.facebook.com/#{page_id}/picture?type=large"
+    )
+    facebook_inbox.avatar.attach(io: avatar_file, filename: avatar_file.original_filename, content_type: avatar_file.content_type)
   end
 end

app/controllers/api/v1/accounts/campaigns_controller.rb

@@ -11,14 +11,14 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    @campaign.destroy!
+    @campaign.destroy
     head :ok
   end
 
   def show; end
 
   def update
-    @campaign.update!(campaign_params)
+    @campaign.update(campaign_params)
   end
 
   private

app/controllers/api/v1/accounts/canned_responses_controller.rb

@@ -17,7 +17,7 @@ class Api::V1::Accounts::CannedResponsesController < Api::V1::Accounts::BaseCont
   end
 
   def destroy
-    @canned_response.destroy!
+    @canned_response.destroy
     head :ok
   end
 
@@ -33,7 +33,7 @@ class Api::V1::Accounts::CannedResponsesController < Api::V1::Accounts::BaseCont
 
   def canned_responses
     if params[:search]
-      Current.account.canned_responses.where('short_code ILIKE :search OR content ILIKE :search', search: "%#{params[:search]}%")
+      Current.account.canned_responses.where('short_code ILIKE ?', "#{params[:search]}%")
     else
       Current.account.canned_responses
     end

app/controllers/api/v1/accounts/categories_controller.rb

@@ -1,58 +0,0 @@
-class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseController
-  before_action :portal
-  before_action :check_authorization
-  before_action :fetch_category, except: [:index, :create]
-  before_action :set_current_page, only: [:index]
-
-  def index
-    @current_locale = params[:locale]
-    @categories = @portal.categories.search(params)
-  end
-
-  def create
-    @category = @portal.categories.create!(category_params)
-    @category.related_categories << related_categories_records
-    render json: { error: @category.errors.messages }, status: :unprocessable_entity and return unless @category.valid?
-
-    @category.save!
-  end
-
-  def show; end
-
-  def update
-    @category.update!(category_params)
-    @category.related_categories = related_categories_records if related_categories_records.any?
-    render json: { error: @category.errors.messages }, status: :unprocessable_entity and return unless @category.valid?
-
-    @category.save!
-  end
-
-  def destroy
-    @category.destroy!
-    head :ok
-  end
-
-  private
-
-  def fetch_category
-    @category = @portal.categories.find(params[:id])
-  end
-
-  def portal
-    @portal ||= Current.account.portals.find_by(slug: params[:portal_id])
-  end
-
-  def related_categories_records
-    @portal.categories.where(id: params[:category][:related_category_ids])
-  end
-
-  def category_params
-    params.require(:category).permit(
-      :name, :description, :position, :slug, :locale, :parent_category_id, :associated_category_id
-    )
-  end
-
-  def set_current_page
-    @current_page = params[:page] || 1
-  end
-end

app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb

@@ -7,6 +7,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
       build_inbox
       setup_webhooks if @twilio_channel.sms?
     rescue StandardError => e
+      Sentry.capture_exception(e)
       render_could_not_create_error(e.message)
     end
   end
@@ -27,8 +28,6 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
   end
 
   def phone_number
-    return if permitted_params[:phone_number].blank?
-
     medium == 'sms' ? permitted_params[:phone_number] : "whatsapp:#{permitted_params[:phone_number]}"
   end
 
@@ -40,11 +39,10 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
     @twilio_channel = Current.account.twilio_sms.create!(
       account_sid: permitted_params[:account_sid],
       auth_token: permitted_params[:auth_token],
-      messaging_service_sid: permitted_params[:messaging_service_sid].presence,
       phone_number: phone_number,
       medium: medium
     )
-    @inbox = Current.account.inboxes.create!(
+    @inbox = Current.account.inboxes.create(
       name: permitted_params[:name],
       channel: @twilio_channel
     )
@@ -52,7 +50,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
 
   def permitted_params
     params.require(:twilio_channel).permit(
-      :account_id, :messaging_service_sid, :phone_number, :account_sid, :auth_token, :name, :medium
+      :account_id, :phone_number, :account_sid, :auth_token, :name, :medium
     )
   end
 end

app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb

@@ -2,11 +2,8 @@ class Api::V1::Accounts::Contacts::ContactInboxesController < Api::V1::Accounts:
   before_action :ensure_inbox, only: [:create]
 
   def create
-    @contact_inbox = ContactInboxBuilder.new(
-      contact: @contact,
-      inbox: @inbox,
-      source_id: params[:source_id]
-    ).perform
+    source_id = params[:source_id] || SecureRandom.uuid
+    @contact_inbox = ContactInbox.create!(contact: @contact, inbox: @inbox, source_id: source_id)
   end
 
   private

app/controllers/api/v1/accounts/contacts/conversations_controller.rb

@@ -2,7 +2,7 @@ class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::
   def index
     @conversations = Current.account.conversations.includes(
       :assignee, :contact, :inbox, :taggings
-    ).where(inbox_id: inbox_ids, contact_id: @contact.id).order(id: :desc).limit(20)
+    ).where(inbox_id: inbox_ids, contact_id: @contact.id)
   end
 
   private

app/controllers/api/v1/accounts/contacts/notes_controller.rb

@@ -10,7 +10,7 @@ class Api::V1::Accounts::Contacts::NotesController < Api::V1::Accounts::Contacts
   end
 
   def destroy
-    @note.destroy!
+    @note.destroy
     head :ok
   end
 

app/controllers/api/v1/accounts/contacts_controller.rb

@@ -1,19 +1,17 @@
 class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   include Sift
+
   sort_on :email, type: :string
-  sort_on :name, internal_name: :order_on_name, type: :scope, scope_params: [:direction]
+  sort_on :name, type: :string
   sort_on :phone_number, type: :string
-  sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
-  sort_on :company, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
-  sort_on :city, internal_name: :order_on_city, type: :scope, scope_params: [:direction]
-  sort_on :country, internal_name: :order_on_country_name, type: :scope, scope_params: [:direction]
+  sort_on :last_activity_at, type: :datetime
 
   RESULTS_PER_PAGE = 15
 
   before_action :check_authorization
-  before_action :set_current_page, only: [:index, :active, :search, :filter]
-  before_action :fetch_contact, only: [:show, :update, :destroy, :avatar, :contactable_inboxes, :destroy_custom_attributes]
-  before_action :set_include_contact_inboxes, only: [:index, :search, :filter]
+  before_action :set_current_page, only: [:index, :active, :search]
+  before_action :fetch_contact, only: [:show, :update, :destroy, :contactable_inboxes]
+  before_action :set_include_contact_inboxes, only: [:index, :search]
 
   def index
     @contacts_count = resolved_contacts.count
@@ -25,7 +23,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
 
     contacts = resolved_contacts.where(
       'name ILIKE :search OR email ILIKE :search OR phone_number ILIKE :search OR contacts.identifier LIKE :search',
-      search: "%#{params[:q].strip}%"
+      search: "%#{params[:q]}%"
     )
     @contacts_count = contacts.count
     @contacts = fetch_contacts_with_conversation_count(contacts)
@@ -64,25 +62,22 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     @contactable_inboxes = @all_contactable_inboxes.select { |contactable_inbox| policy(contactable_inbox[:inbox]).show? }
   end
 
-  # TODO : refactor this method into dedicated contacts/custom_attributes controller class and routes
-  def destroy_custom_attributes
-    @contact.custom_attributes = @contact.custom_attributes.excluding(params[:custom_attributes])
-    @contact.save!
-  end
-
   def create
     ActiveRecord::Base.transaction do
-      @contact = Current.account.contacts.new(permitted_params.except(:avatar_url))
+      @contact = Current.account.contacts.new(contact_params)
       @contact.save!
       @contact_inbox = build_contact_inbox
-      process_avatar
     end
   end
 
   def update
     @contact.assign_attributes(contact_update_params)
     @contact.save!
-    process_avatar if permitted_params[:avatar].present? || permitted_params[:avatar_url].present?
+  rescue ActiveRecord::RecordInvalid => e
+    render json: {
+      message: e.record.errors.full_messages.join(', '),
+      contact: Current.account.contacts.find_by(email: contact_params[:email])
+    }, status: :unprocessable_entity
   end
 
   def destroy
@@ -97,19 +92,16 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     head :ok
   end
 
-  def avatar
-    @contact.avatar.purge if @contact.avatar.attached?
-    @contact
-  end
-
   private
 
   # TODO: Move this to a finder class
   def resolved_contacts
     return @resolved_contacts if @resolved_contacts
 
-    @resolved_contacts = Current.account.contacts.resolved_contacts
-
+    @resolved_contacts = Current.account.contacts
+                                .where.not(email: [nil, ''])
+                                .or(Current.account.contacts.where.not(phone_number: [nil, '']))
+                                .or(Current.account.contacts.where.not(identifier: [nil, '']))
     @resolved_contacts = @resolved_contacts.tagged_with(params[:labels], any: true) if params[:labels].present?
     @resolved_contacts
   end
@@ -134,26 +126,23 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     return if params[:inbox_id].blank?
 
     inbox = Current.account.inboxes.find(params[:inbox_id])
-    ContactInboxBuilder.new(
-      contact: @contact,
-      inbox: inbox,
-      source_id: params[:source_id]
-    ).perform
+    source_id = params[:source_id] || SecureRandom.uuid
+    ContactInbox.create(contact: @contact, inbox: inbox, source_id: source_id)
   end
 
-  def permitted_params
-    params.permit(:name, :identifier, :email, :phone_number, :avatar, :avatar_url, additional_attributes: {}, custom_attributes: {})
+  def contact_params
+    params.require(:contact).permit(:name, :identifier, :email, :phone_number, additional_attributes: {}, custom_attributes: {})
   end
 
   def contact_custom_attributes
-    return @contact.custom_attributes.merge(permitted_params[:custom_attributes]) if permitted_params[:custom_attributes]
+    return @contact.custom_attributes.merge(contact_params[:custom_attributes]) if contact_params[:custom_attributes]
 
     @contact.custom_attributes
   end
 
   def contact_update_params
     # we want the merged custom attributes not the original one
-    permitted_params.except(:custom_attributes, :avatar_url).merge({ custom_attributes: contact_custom_attributes })
+    contact_params.except(:custom_attributes).merge({ custom_attributes: contact_custom_attributes })
   end
 
   def set_include_contact_inboxes
@@ -168,10 +157,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     @contact = Current.account.contacts.includes(contact_inboxes: [:inbox]).find(params[:id])
   end
 
-  def process_avatar
-    ::Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
-  end
-
   def render_error(error, error_status)
     render json: error, status: error_status
   end

app/controllers/api/v1/accounts/conversations/base_controller.rb

@@ -1,11 +1,10 @@
 class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::BaseController
-  include EnsureCurrentAccountHelper
   before_action :conversation
 
   private
 
   def conversation
-    @conversation ||= Current.account.conversations.find_by!(display_id: params[:conversation_id])
+    @conversation ||= Current.account.conversations.find_by(display_id: params[:conversation_id])
     authorize @conversation.inbox, :show?
   end
 end

app/controllers/api/v1/accounts/conversations/direct_uploads_controller.rb

@@ -1,17 +0,0 @@
-class Api::V1::Accounts::Conversations::DirectUploadsController < ActiveStorage::DirectUploadsController
-  include EnsureCurrentAccountHelper
-  before_action :current_account
-  before_action :conversation
-
-  def create
-    return if @conversation.nil? || @current_account.nil?
-
-    super
-  end
-
-  private
-
-  def conversation
-    @conversation ||= Current.account.conversations.find_by(display_id: params[:conversation_id])
-  end
-end

app/controllers/api/v1/accounts/conversations/messages_controller.rb

@@ -13,7 +13,7 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
 
   def destroy
     ActiveRecord::Base.transaction do
-      message.update!(content: I18n.t('conversations.messages.deleted'), content_attributes: { deleted: true })
+      message.update!(content: I18n.t('conversations.messages.deleted'), deleted: true)
       message.attachments.destroy_all
     end
   end

app/controllers/api/v1/accounts/conversations_controller.rb

@@ -3,7 +3,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   include DateRangeHelper
 
   before_action :conversation, except: [:index, :meta, :search, :create, :filter]
-  before_action :inbox, :contact, :contact_inbox, only: [:create]
+  before_action :contact_inbox, only: [:create]
 
   def index
     result = conversation_finder.perform
@@ -24,7 +24,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   def create
     ActiveRecord::Base.transaction do
-      @conversation = ConversationBuilder.new(params: params, contact_inbox: @contact_inbox).perform
+      @conversation = ::Conversation.create!(conversation_params)
       Messages::MessageBuilder.new(Current.user, @conversation, params[:message]).perform if params[:message].present?
     end
   end
@@ -61,7 +61,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     else
       @status = @conversation.toggle_status
     end
-    assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
   end
 
   def toggle_typing_status
@@ -75,13 +74,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   end
 
   def update_last_seen
-    update_last_seen_on_conversation(DateTime.now.utc, assignee?)
-  end
-
-  def unread
-    last_incoming_message = @conversation.messages.incoming.last
-    last_seen_at = last_incoming_message.created_at - 1.second if last_incoming_message.present?
-    update_last_seen_on_conversation(last_seen_at, true)
+    @conversation.agent_last_seen_at = DateTime.now.utc
+    @conversation.assignee_last_seen_at = DateTime.now.utc if assignee?
+    @conversation.save!
   end
 
   def custom_attributes
@@ -91,26 +86,12 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   private
 
-  def update_last_seen_on_conversation(last_seen_at, update_assignee)
-    # rubocop:disable Rails/SkipsModelValidations
-    @conversation.update_column(:agent_last_seen_at, last_seen_at)
-    @conversation.update_column(:assignee_last_seen_at, last_seen_at) if update_assignee.present?
-    # rubocop:enable Rails/SkipsModelValidations
-  end
-
   def set_conversation_status
-    # TODO: temporary fallback for the old bot status in conversation, we will remove after couple of releases
-    # commenting this out to see if there are any errors, if not we can remove this in subsequent releases
-    # status = params[:status] == 'bot' ? 'pending' : params[:status]
-    @conversation.status = params[:status]
+    status = params[:status] == 'bot' ? 'pending' : params[:status]
+    @conversation.status = status
     @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
   end
 
-  def assign_conversation
-    @agent = Current.account.users.find(current_user.id)
-    @conversation.update_assignee(@agent)
-  end
-
   def trigger_typing_event(event, is_private)
     user = current_user.presence || @resource
     Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private)
@@ -121,44 +102,51 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     authorize @conversation.inbox, :show?
   end
 
-  def inbox
-    return if params[:inbox_id].blank?
-
-    @inbox = Current.account.inboxes.find(params[:inbox_id])
-    authorize @inbox, :show?
-  end
-
-  def contact
-    return if params[:contact_id].blank?
-
-    @contact = Current.account.contacts.find(params[:contact_id])
-  end
-
   def contact_inbox
     @contact_inbox = build_contact_inbox
 
-    # fallback for the old case where we do look up only using source id
-    # In future we need to change this and make sure we do look up on combination of inbox_id and source_id
-    # and deprecate the support of passing only source_id as the param
     @contact_inbox ||= ::ContactInbox.find_by!(source_id: params[:source_id])
     authorize @contact_inbox.inbox, :show?
   end
 
   def build_contact_inbox
-    return if @inbox.blank? || @contact.blank?
+    return if params[:contact_id].blank? || params[:inbox_id].blank?
+
+    inbox = Current.account.inboxes.find(params[:inbox_id])
+    authorize inbox, :show?
 
     ContactInboxBuilder.new(
-      contact: @contact,
-      inbox: @inbox,
+      contact_id: params[:contact_id],
+      inbox_id: inbox.id,
       source_id: params[:source_id]
     ).perform
   end
 
+  def conversation_params
+    additional_attributes = params[:additional_attributes]&.permit! || {}
+    custom_attributes = params[:custom_attributes]&.permit! || {}
+    status = params[:status].present? ? { status: params[:status] } : {}
+
+    # TODO: temporary fallback for the old bot status in conversation, we will remove after couple of releases
+    status = { status: 'pending' } if status[:status] == 'bot'
+    {
+      account_id: Current.account.id,
+      inbox_id: @contact_inbox.inbox_id,
+      contact_id: @contact_inbox.contact_id,
+      contact_inbox_id: @contact_inbox.id,
+      additional_attributes: additional_attributes,
+      custom_attributes: custom_attributes,
+      snoozed_until: params[:snoozed_until],
+      assignee_id: params[:assignee_id],
+      team_id: params[:team_id]
+    }.merge(status)
+  end
+
   def conversation_finder
-    @conversation_finder ||= ConversationFinder.new(Current.user, params)
+    @conversation_finder ||= ConversationFinder.new(current_user, params)
   end
 
   def assignee?
-    @conversation.assignee_id? && Current.user == @conversation.assignee
+    @conversation.assignee_id? && current_user == @conversation.assignee
   end
 end

app/controllers/api/v1/accounts/csat_survey_responses_controller.rb

@@ -5,7 +5,7 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
   RESULTS_PER_PAGE = 25
 
   before_action :check_authorization
-  before_action :set_csat_survey_responses, only: [:index, :metrics, :download]
+  before_action :set_csat_survey_responses, only: [:index, :metrics]
   before_action :set_current_page, only: [:index]
   before_action :set_current_page_surveys, only: [:index]
   before_action :set_total_sent_messages_count, only: [:metrics]
@@ -19,12 +19,6 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
     @ratings_count = @csat_survey_responses.group(:rating).count
   end
 
-  def download
-    response.headers['Content-Type'] = 'text/csv'
-    response.headers['Content-Disposition'] = 'attachment; filename=csat_report.csv'
-    render layout: false, template: 'api/v1/accounts/csat_survey_responses/download', formats: [:csv]
-  end
-
   private
 
   def set_total_sent_messages_count
@@ -36,7 +30,8 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
   def set_csat_survey_responses
     @csat_survey_responses = filtrate(
       Current.account.csat_survey_responses.includes([:conversation, :assigned_agent, :contact])
-    ).filter_by_created_at(range).filter_by_assigned_agent_id(params[:user_ids])
+    )
+    @csat_survey_responses = @csat_survey_responses.where(created_at: range) if range.present?
   end
 
   def set_current_page_surveys

app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb

@@ -18,14 +18,16 @@ class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Account
   end
 
   def destroy
-    @custom_attribute_definition.destroy!
+    @custom_attribute_definition.destroy
     head :no_content
   end
 
   private
 
   def fetch_custom_attributes_definitions
-    @custom_attribute_definitions = Current.account.custom_attribute_definitions.with_attribute_model(permitted_params[:attribute_model])
+    @custom_attribute_definitions = Current.account.custom_attribute_definitions.where(
+      attribute_model: permitted_params[:attribute_model] || DEFAULT_ATTRIBUTE_MODEL
+    )
   end
 
   def fetch_custom_attribute_definition
@@ -39,7 +41,7 @@ class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Account
       :attribute_display_type,
       :attribute_key,
       :attribute_model,
-      attribute_values: []
+      :default_value
     )
   end
 

app/controllers/api/v1/accounts/custom_filters_controller.rb

@@ -18,7 +18,7 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
   end
 
   def destroy
-    @custom_filter.destroy!
+    @custom_filter.destroy
     head :no_content
   end
 

app/controllers/api/v1/accounts/dashboard_apps_controller.rb

@@ -1,44 +0,0 @@
-class Api::V1::Accounts::DashboardAppsController < Api::V1::Accounts::BaseController
-  before_action :fetch_dashboard_apps, except: [:create]
-  before_action :fetch_dashboard_app, only: [:show, :update, :destroy]
-
-  def index; end
-
-  def show; end
-
-  def create
-    @dashboard_app = Current.account.dashboard_apps.create!(
-      permitted_payload.merge(user_id: Current.user.id)
-    )
-  end
-
-  def update
-    @dashboard_app.update!(permitted_payload)
-  end
-
-  def destroy
-    @dashboard_app.destroy!
-    head :no_content
-  end
-
-  private
-
-  def fetch_dashboard_apps
-    @dashboard_apps = Current.account.dashboard_apps
-  end
-
-  def fetch_dashboard_app
-    @dashboard_app = @dashboard_apps.find(permitted_params[:id])
-  end
-
-  def permitted_payload
-    params.require(:dashboard_app).permit(
-      :title,
-      content: [:url, :type]
-    )
-  end
-
-  def permitted_params
-    params.permit(:id)
-  end
-end

app/controllers/api/v1/accounts/inbox_members_controller.rb

@@ -1,11 +1,11 @@
 class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseController
   before_action :fetch_inbox
-  before_action :current_agents_ids, only: [:create, :update]
+  before_action :current_agents_ids, only: [:update]
 
   def create
     authorize @inbox, :create?
     ActiveRecord::Base.transaction do
-      agents_to_be_added_ids.map { |user_id| @inbox.add_member(user_id) }
+      params[:user_ids].map { |user_id| @inbox.add_member(user_id) }
     end
     fetch_updated_agents
   end

app/controllers/api/v1/accounts/inboxes_controller.rb

@@ -1,8 +1,6 @@
 class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
-  include Api::V1::InboxesHelper
   before_action :fetch_inbox, except: [:index, :create]
   before_action :fetch_agent_bot, only: [:set_agent_bot]
-  before_action :validate_limit, only: [:create]
   # we are already handling the authorization in fetch inbox
   before_action :check_authorization, except: [:show]
 
@@ -12,7 +10,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
 
   def show; end
 
-  # Deprecated: This API will be removed in 2.7.0
   def assignable_agents
     @assignable_agents = (Current.account.users.where(id: @inbox.members.select(:user_id)) + Current.account.administrators).uniq
   end
@@ -42,30 +39,18 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def update
-    @inbox.update!(permitted_params.except(:channel))
-    update_inbox_working_hours
+    @inbox.update(permitted_params.except(:channel))
+    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
+
     channel_attributes = get_channel_attributes(@inbox.channel_type)
 
     # Inbox update doesn't necessarily need channel attributes
     return if permitted_params(channel_attributes)[:channel].blank?
 
-    if @inbox.inbox_type == 'Email'
-      begin
-        validate_email_channel(channel_attributes)
-      rescue StandardError => e
-        render json: { message: e }, status: :unprocessable_entity and return
-      end
-      @inbox.channel.reauthorized!
-    end
-
     @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
     update_channel_feature_flags
   end
 
-  def update_inbox_working_hours
-    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
-  end
-
   def agent_bot
     @agent_bot = @inbox.agent_bot
   end
@@ -82,7 +67,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    @inbox.destroy!
+    @inbox.destroy
     head :ok
   end
 
@@ -97,10 +82,27 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
   end
 
-  def create_channel
-    return unless %w[web_widget api email line telegram whatsapp sms].include?(permitted_params[:channel][:type])
+  def inbox_name(channel)
+    return channel.try(:bot_name) if channel.is_a?(Channel::Telegram)
 
-    account_channels_method.create!(permitted_params(channel_type_from_params::EDITABLE_ATTRS)[:channel].except(:type))
+    permitted_params[:name]
+  end
+
+  def create_channel
+    case permitted_params[:channel][:type]
+    when 'web_widget'
+      Current.account.web_widgets.create!(permitted_params(Channel::WebWidget::EDITABLE_ATTRS)[:channel].except(:type))
+    when 'api'
+      Current.account.api_channels.create!(permitted_params(Channel::Api::EDITABLE_ATTRS)[:channel].except(:type))
+    when 'email'
+      Current.account.email_channels.create!(permitted_params(Channel::Email::EDITABLE_ATTRS)[:channel].except(:type))
+    when 'line'
+      Current.account.line_channels.create!(permitted_params(Channel::Line::EDITABLE_ATTRS)[:channel].except(:type))
+    when 'telegram'
+      Current.account.telegram_channels.create!(permitted_params(Channel::Telegram::EDITABLE_ATTRS)[:channel].except(:type))
+    when 'whatsapp'
+      Current.account.whatsapp_channels.create!(permitted_params(Channel::Whatsapp::EDITABLE_ATTRS)[:channel].except(:type))
+    end
   end
 
   def update_channel_feature_flags
@@ -111,38 +113,28 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     @inbox.channel.save!
   end
 
-  def inbox_attributes
-    [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
-     :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
-     :lock_to_single_conversation]
-  end
-
   def permitted_params(channel_attributes = [])
     params.permit(
-      *inbox_attributes,
+      :name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
+      :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone,
       channel: [:type, *channel_attributes]
     )
   end
 
-  def channel_type_from_params
-    {
-      'web_widget' => Channel::WebWidget,
-      'api' => Channel::Api,
-      'email' => Channel::Email,
-      'line' => Channel::Line,
-      'telegram' => Channel::Telegram,
-      'whatsapp' => Channel::Whatsapp,
-      'sms' => Channel::Sms
-    }[permitted_params[:channel][:type]]
-  end
-
   def get_channel_attributes(channel_type)
-    if channel_type.constantize.const_defined?(:EDITABLE_ATTRS)
-      channel_type.constantize::EDITABLE_ATTRS.presence
+    case channel_type
+    when 'Channel::WebWidget'
+      Channel::WebWidget::EDITABLE_ATTRS
+    when 'Channel::Api'
+      Channel::Api::EDITABLE_ATTRS
+    when 'Channel::Email'
+      Channel::Email::EDITABLE_ATTRS
+    when 'Channel::Telegram'
+      Channel::Telegram::EDITABLE_ATTRS
+    when 'Channel::Line'
+      Channel::Line::EDITABLE_ATTRS
     else
       []
     end
   end
 end
-
-Api::V1::Accounts::InboxesController.prepend_mod_with('Api::V1::Accounts::InboxesController')

app/controllers/api/v1/accounts/integrations/hooks_controller.rb

@@ -11,7 +11,7 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Base
   end
 
   def destroy
-    @hook.destroy!
+    @hook.destroy
     head :ok
   end
 

app/controllers/api/v1/accounts/integrations/slack_controller.rb

@@ -20,7 +20,7 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
   end
 
   def destroy
-    @hook.destroy!
+    @hook.destroy
 
     head :ok
   end

app/controllers/api/v1/accounts/kbase/base_controller.rb

@@ -0,0 +1,9 @@
+class Api::V1::Accounts::Kbase::BaseController < Api::V1::Accounts::BaseController
+  before_action :portal
+
+  private
+
+  def portal
+    @portal ||= Current.account.kbase_portals.find_by(id: params[:portal_id])
+  end
+end

app/controllers/api/v1/accounts/kbase/categories_controller.rb

@@ -0,0 +1,32 @@
+class Api::V1::Accounts::Kbase::CategoriesController < Api::V1::Accounts::Kbase::BaseController
+  before_action :fetch_category, except: [:index, :create]
+
+  def index
+    @categories = @portal.categories
+  end
+
+  def create
+    @category = @portal.categories.create!(category_params)
+  end
+
+  def update
+    @category.update!(category_params)
+  end
+
+  def destroy
+    @category.destroy
+    head :ok
+  end
+
+  private
+
+  def fetch_category
+    @category = @portal.categories.find(params[:id])
+  end
+
+  def category_params
+    params.require(:category).permit(
+      :name, :description, :position
+    )
+  end
+end

app/controllers/api/v1/accounts/kbase/portals_controller.rb

@@ -0,0 +1,32 @@
+class Api::V1::Accounts::Kbase::PortalsController < Api::V1::Accounts::Kbase::BaseController
+  before_action :fetch_portal, except: [:index, :create]
+
+  def index
+    @portals = Current.account.kbase_portals
+  end
+
+  def create
+    @portal = Current.account.kbase_portals.create!(portal_params)
+  end
+
+  def update
+    @portal.update!(portal_params)
+  end
+
+  def destroy
+    @portal.destroy
+    head :ok
+  end
+
+  private
+
+  def fetch_portal
+    @portal = current_account.kbase_portals.find(params[:id])
+  end
+
+  def portal_params
+    params.require(:portal).permit(
+      :account_id, :color, :custom_domain, :header_text, :homepage_link, :name, :page_title, :slug
+    )
+  end
+end

app/controllers/api/v1/accounts/labels_controller.rb

@@ -18,7 +18,7 @@ class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    @label.destroy!
+    @label.destroy
     head :ok
   end
 

app/controllers/api/v1/accounts/macros_controller.rb

@@ -1,89 +0,0 @@
-class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
-  before_action :fetch_macro, only: [:show, :update, :destroy, :execute]
-  before_action :check_authorization, only: [:show, :update, :destroy, :execute]
-
-  def index
-    @macros = Macro.with_visibility(current_user, params)
-  end
-
-  def create
-    @macro = Current.account.macros.new(macros_with_user.merge(created_by_id: current_user.id))
-    @macro.set_visibility(current_user, permitted_params)
-    @macro.actions = params[:actions]
-
-    render json: { error: @macro.errors.messages }, status: :unprocessable_entity and return unless @macro.valid?
-
-    @macro.save!
-    process_attachments
-    @macro
-  end
-
-  def show
-    head :not_found if @macro.nil?
-  end
-
-  def destroy
-    @macro.destroy!
-    head :ok
-  end
-
-  def attach_file
-    file_blob = ActiveStorage::Blob.create_and_upload!(
-      key: nil,
-      io: params[:attachment].tempfile,
-      filename: params[:attachment].original_filename,
-      content_type: params[:attachment].content_type
-    )
-    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
-  end
-
-  def update
-    ActiveRecord::Base.transaction do
-      @macro.update!(macros_with_user)
-      @macro.set_visibility(current_user, permitted_params)
-      process_attachments
-      @macro.save!
-    rescue StandardError => e
-      Rails.logger.error e
-      render json: { error: @macro.errors.messages }.to_json, status: :unprocessable_entity
-    end
-  end
-
-  def execute
-    ::MacrosExecutionJob.perform_later(@macro, conversation_ids: params[:conversation_ids], user: Current.user)
-
-    head :ok
-  end
-
-  private
-
-  def process_attachments
-    actions = @macro.actions.filter_map { |k, _v| k if k['action_name'] == 'send_attachment' }
-    return if actions.blank?
-
-    actions.each do |action|
-      blob_id = action['action_params']
-      blob = ActiveStorage::Blob.find_by(id: blob_id)
-      @macro.files.attach(blob)
-    end
-  end
-
-  def permitted_params
-    params.permit(
-      :name, :account_id, :visibility,
-      actions: [:action_name, { action_params: [] }]
-    )
-  end
-
-  def macros_with_user
-    permitted_params.merge(updated_by_id: current_user.id)
-  end
-
-  def fetch_macro
-    @macro = Current.account.macros.find_by(id: params[:id])
-  end
-
-  def check_authorization
-    authorize(@macro) if @macro.present?
-  end
-end

app/controllers/api/v1/accounts/portals_controller.rb

@@ -1,83 +0,0 @@
-class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
-  include ::FileTypeHelper
-
-  before_action :fetch_portal, except: [:index, :create]
-  before_action :check_authorization
-  before_action :set_current_page, only: [:index]
-
-  def index
-    @portals = Current.account.portals
-  end
-
-  def add_members
-    agents = Current.account.agents.where(id: portal_member_params[:member_ids])
-    @portal.members << agents
-  end
-
-  def show
-    @all_articles = @portal.articles
-    @articles = @all_articles.search(locale: params[:locale])
-  end
-
-  def create
-    @portal = Current.account.portals.build(portal_params)
-    @portal.custom_domain = parsed_custom_domain
-    @portal.save!
-    process_attached_logo
-  end
-
-  def update
-    ActiveRecord::Base.transaction do
-      @portal.update!(portal_params) if params[:portal].present?
-      # @portal.custom_domain = parsed_custom_domain
-      process_attached_logo
-    rescue StandardError => e
-      Rails.logger.error e
-      render json: { error: @portal.errors.messages }.to_json, status: :unprocessable_entity
-    end
-  end
-
-  def destroy
-    @portal.destroy!
-    head :ok
-  end
-
-  def archive
-    @portal.update(archive: true)
-    head :ok
-  end
-
-  def process_attached_logo
-    @portal.logo.attach(params[:logo])
-  end
-
-  private
-
-  def fetch_portal
-    @portal = Current.account.portals.find_by(slug: permitted_params[:id])
-  end
-
-  def permitted_params
-    params.permit(:id)
-  end
-
-  def portal_params
-    params.require(:portal).permit(
-      :account_id, :color, :custom_domain, :header_text, :homepage_link, :name, :page_title, :slug, :archived, { config: [:default_locale,
-                                                                                                                          { allowed_locales: [] }] }
-    )
-  end
-
-  def portal_member_params
-    params.require(:portal).permit(:account_id, member_ids: [])
-  end
-
-  def set_current_page
-    @current_page = params[:page] || 1
-  end
-
-  def parsed_custom_domain
-    domain = URI.parse(@portal.custom_domain)
-    domain.is_a?(URI::HTTP) ? domain.host : @portal.custom_domain
-  end
-end

app/controllers/api/v1/accounts/team_members_controller.rb

@@ -1,7 +1,6 @@
 class Api::V1::Accounts::TeamMembersController < Api::V1::Accounts::BaseController
   before_action :fetch_team
   before_action :check_authorization
-  before_action :validate_member_id_params, only: [:create, :update, :destroy]
 
   def index
     @team_members = @team.team_members.map(&:user)
@@ -9,7 +8,7 @@ class Api::V1::Accounts::TeamMembersController < Api::V1::Accounts::BaseControll
 
   def create
     ActiveRecord::Base.transaction do
-      @team_members = members_to_be_added_ids.map { |user_id| @team.add_member(user_id) }
+      @team_members = params[:user_ids].map { |user_id| @team.add_member(user_id) }
     end
   end
 
@@ -46,10 +45,4 @@ class Api::V1::Accounts::TeamMembersController < Api::V1::Accounts::BaseControll
   def fetch_team
     @team = Current.account.teams.find(params[:team_id])
   end
-
-  def validate_member_id_params
-    invalid_ids = params[:user_ids].map(&:to_i) - @team.account.user_ids
-
-    render json: { error: 'Invalid User IDs' }, status: :unauthorized and return if invalid_ids.present?
-  end
 end

app/controllers/api/v1/accounts/teams_controller.rb

@@ -18,7 +18,7 @@ class Api::V1::Accounts::TeamsController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    @team.destroy!
+    @team.destroy
     head :ok
   end
 

app/controllers/api/v1/accounts/webhooks_controller.rb

@@ -16,14 +16,14 @@ class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    @webhook.destroy!
+    @webhook.destroy
     head :ok
   end
 
   private
 
   def webhook_params
-    params.require(:webhook).permit(:inbox_id, :url, subscriptions: [])
+    params.require(:webhook).permit(:inbox_id, :url)
   end
 
   def fetch_webhook

app/controllers/api/v1/accounts_controller.rb

@@ -4,7 +4,6 @@ class Api::V1::AccountsController < Api::BaseController
   skip_before_action :authenticate_user!, :set_current_user, :handle_with_exception,
                      only: [:create], raise: false
   before_action :check_signup_enabled, only: [:create]
-  before_action :validate_captcha, only: [:create]
   before_action :fetch_account, except: [:create]
   before_action :check_authorization, except: [:create]
 
@@ -19,12 +18,11 @@ class Api::V1::AccountsController < Api::BaseController
       user_full_name: account_params[:user_full_name],
       email: account_params[:email],
       user_password: account_params[:password],
-      locale: account_params[:locale],
       user: current_user
     ).perform
     if @user
       send_auth_headers(@user)
-      render 'api/v1/accounts/create', format: :json, locals: { resource: @user }
+      render 'api/v1/accounts/create.json', locals: { resource: @user }
     else
       render_error_response(CustomExceptions::Account::SignupFailed.new({}))
     end
@@ -32,7 +30,7 @@ class Api::V1::AccountsController < Api::BaseController
 
   def show
     @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
-    render 'api/v1/accounts/show', format: :json
+    render 'api/v1/accounts/show.json'
   end
 
   def update
@@ -57,11 +55,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def check_signup_enabled
-    raise ActionController::RoutingError, 'Not Found' if GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false') == 'false'
-  end
-
-  def validate_captcha
-    raise ActionController::InvalidAuthenticityToken, 'Invalid Captcha' unless ChatwootCaptcha.new(params[:h_captcha_client_response]).valid?
+    raise ActionController::RoutingError, 'Not Found' if GlobalConfig.get_value('ENABLE_ACCOUNT_SIGNUP') == 'false'
   end
 
   def pundit_user

app/controllers/api/v1/notification_subscriptions_controller.rb

@@ -7,12 +7,6 @@ class Api::V1::NotificationSubscriptionsController < Api::BaseController
     render json: notification_subscription
   end
 
-  def destroy
-    notification_subscription = NotificationSubscription.where(["subscription_attributes->>'push_token' = ?", params[:push_token]]).first
-    notification_subscription.destroy! if notification_subscription.present?
-    head :ok
-  end
-
   private
 
   def set_user

app/controllers/api/v1/profiles_controller.rb

@@ -13,24 +13,10 @@ class Api::V1::ProfilesController < Api::BaseController
     @user.update!(profile_params)
   end
 
-  def avatar
-    @user.avatar.attachment.destroy! if @user.avatar.attached?
-    head :ok
-  end
-
-  def auto_offline
-    @user.account_users.find_by!(account_id: auto_offline_params[:account_id]).update!(auto_offline: auto_offline_params[:auto_offline] || false)
-  end
-
   def availability
     @user.account_users.find_by!(account_id: availability_params[:account_id]).update!(availability: availability_params[:availability])
   end
 
-  def set_active_account
-    @user.account_users.find_by(account_id: profile_params[:account_id]).update(active_at: Time.now.utc)
-    head :ok
-  end
-
   private
 
   def set_user
@@ -41,18 +27,12 @@ class Api::V1::ProfilesController < Api::BaseController
     params.require(:profile).permit(:account_id, :availability)
   end
 
-  def auto_offline_params
-    params.require(:profile).permit(:account_id, :auto_offline)
-  end
-
   def profile_params
     params.require(:profile).permit(
       :email,
       :name,
       :display_name,
       :avatar,
-      :message_signature,
-      :account_id,
       ui_settings: {}
     )
   end

app/controllers/api/v1/webhooks_controller.rb

@@ -10,7 +10,7 @@ class Api::V1::WebhooksController < ApplicationController
     twitter_consumer.consume
     head :ok
   rescue StandardError => e
-    ChatwootExceptionTracker.new(e).capture_exception
+    Sentry.capture_exception(e)
     head :ok
   end
 

app/controllers/api/v1/widget/base_controller.rb

@@ -1,6 +1,5 @@
 class Api::V1::Widget::BaseController < ApplicationController
   include SwitchLocale
-  include WebsiteTokenHelper
 
   before_action :set_web_widget
   before_action :set_contact
@@ -20,6 +19,23 @@ class Api::V1::Widget::BaseController < ApplicationController
     @conversation ||= conversations.last
   end
 
+  def auth_token_params
+    @auth_token_params ||= ::Widget::TokenService.new(token: request.headers['X-Auth-Token']).decode_token
+  end
+
+  def set_web_widget
+    @web_widget = ::Channel::WebWidget.find_by!(website_token: permitted_params[:website_token])
+    @current_account = @web_widget.account
+  end
+
+  def set_contact
+    @contact_inbox = @web_widget.inbox.contact_inboxes.find_by(
+      source_id: auth_token_params[:source_id]
+    )
+    @contact = @contact_inbox&.contact
+    raise ActiveRecord::RecordNotFound unless @contact
+  end
+
   def create_conversation
     ::Conversation.create!(conversation_params)
   end
@@ -36,27 +52,32 @@ class Api::V1::Widget::BaseController < ApplicationController
       contact_id: @contact.id,
       contact_inbox_id: @contact_inbox.id,
       additional_attributes: {
-        browser_language: browser.accept_language&.first&.code,
         browser: browser_params,
-        initiated_at: timestamp_params,
-        referer: permitted_params[:message][:referer_url]
-      },
-      custom_attributes: permitted_params[:custom_attributes].presence || {}
+        referer: permitted_params[:message][:referer_url],
+        initiated_at: timestamp_params
+      }
     }
   end
 
+  def update_contact(email)
+    contact_with_email = @current_account.contacts.find_by(email: email)
+    if contact_with_email
+      @contact = ::ContactMergeAction.new(
+        account: @current_account,
+        base_contact: contact_with_email,
+        mergee_contact: @contact
+      ).perform
+    else
+      @contact.update!(email: email, name: contact_name)
+    end
+  end
+
   def contact_email
-    permitted_params.dig(:contact, :email)&.downcase
+    permitted_params[:contact][:email].downcase
   end
 
   def contact_name
-    return if @contact.email.present? || @contact.phone_number.present? || @contact.identifier.present?
-
-    permitted_params.dig(:contact, :name) || (contact_email.split('@')[0] if contact_email.present?)
-  end
-
-  def contact_phone_number
-    permitted_params.dig(:contact, :phone_number)
+    params[:contact][:name] || contact_email.split('@')[0]
   end
 
   def browser_params
@@ -73,6 +94,10 @@ class Api::V1::Widget::BaseController < ApplicationController
     { timestamp: permitted_params[:message][:timestamp] }
   end
 
+  def permitted_params
+    params.permit(:website_token)
+  end
+
   def message_params
     {
       account_id: conversation.account_id,

app/controllers/api/v1/widget/contacts_controller.rb

@@ -1,64 +1,23 @@
 class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
-  include WidgetHelper
-
-  before_action :validate_hmac, only: [:set_user]
+  before_action :process_hmac
 
   def show; end
 
   def update
-    identify_contact(@contact)
-  end
-
-  def set_user
-    contact = nil
-
-    if a_different_contact?
-      @contact_inbox, @widget_auth_token = build_contact_inbox_with_token(@web_widget)
-      contact = @contact_inbox.contact
-    else
-      contact = @contact
-    end
-
-    @contact_inbox.update(hmac_verified: true) if should_verify_hmac? && valid_hmac?
-
-    identify_contact(contact)
-  end
-
-  # TODO : clean up this with proper routes delete contacts/custom_attributes
-  def destroy_custom_attributes
-    @contact.custom_attributes = @contact.custom_attributes.excluding(params[:custom_attributes])
-    @contact.save!
-    render json: @contact
+    contact_identify_action = ContactIdentifyAction.new(
+      contact: @contact,
+      params: permitted_params.to_h.deep_symbolize_keys
+    )
+    render json: contact_identify_action.perform
   end
 
   private
 
-  def identify_contact(contact)
-    contact_identify_action = ContactIdentifyAction.new(
-      contact: contact,
-      params: permitted_params.to_h.deep_symbolize_keys,
-      discard_invalid_attrs: true
-    )
-    @contact = contact_identify_action.perform
-  end
+  def process_hmac
+    return if params[:identifier_hash].blank?
+    raise StandardError, 'HMAC failed: Invalid Identifier Hash Provided' unless valid_hmac?
 
-  def a_different_contact?
-    @contact.identifier.present? && @contact.identifier != permitted_params[:identifier]
-  end
-
-  def validate_hmac
-    return unless should_verify_hmac?
-
-    render json: { error: 'HMAC failed: Invalid Identifier Hash Provided' }, status: :unauthorized unless valid_hmac?
-  end
-
-  def should_verify_hmac?
-    return false if params[:identifier_hash].blank? && !@web_widget.hmac_mandatory
-
-    # Taking an extra caution that the hmac is triggered whenever identifier is present
-    return false if params[:custom_attributes].present? && params[:identifier].blank?
-
-    true
+    @contact_inbox.update(hmac_verified: true)
   end
 
   def valid_hmac?
@@ -70,7 +29,6 @@ class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
   end
 
   def permitted_params
-    params.permit(:website_token, :identifier, :identifier_hash, :email, :name, :avatar_url, :phone_number, custom_attributes: {},
-                                                                                                            additional_attributes: {})
+    params.permit(:website_token, :identifier, :identifier_hash, :email, :name, :avatar_url, :phone_number, custom_attributes: {})
   end
 end

app/controllers/api/v1/widget/conversations_controller.rb

@@ -7,21 +7,12 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
 
   def create
     ActiveRecord::Base.transaction do
-      process_update_contact
+      update_contact(contact_email) if @contact.email.blank? && contact_email.present?
       @conversation = create_conversation
-      conversation.messages.create!(message_params)
+      conversation.messages.create(message_params)
     end
   end
 
-  def process_update_contact
-    @contact = ContactIdentifyAction.new(
-      contact: @contact,
-      params: { email: contact_email, phone_number: contact_phone_number, name: contact_name },
-      retain_original_contact_name: true,
-      discard_invalid_attrs: true
-    ).perform
-  end
-
   def update_last_seen
     head :ok && return if conversation.nil?
 
@@ -53,18 +44,6 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
     head :ok
   end
 
-  def toggle_status
-    return head :not_found if conversation.nil?
-
-    return head :forbidden unless @web_widget.end_conversation?
-
-    unless conversation.resolved?
-      conversation.status = :resolved
-      conversation.save!
-    end
-    head :ok
-  end
-
   private
 
   def trigger_typing_event(event)
@@ -72,8 +51,6 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
   end
 
   def permitted_params
-    params.permit(:id, :typing_status, :website_token, :email, contact: [:name, :email, :phone_number],
-                                                               message: [:content, :referer_url, :timestamp, :echo_id],
-                                                               custom_attributes: {})
+    params.permit(:id, :typing_status, :website_token, :email, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
   end
 end

app/controllers/api/v1/widget/direct_uploads_controller.rb

@@ -1,11 +0,0 @@
-class Api::V1::Widget::DirectUploadsController < ActiveStorage::DirectUploadsController
-  include WebsiteTokenHelper
-  before_action :set_web_widget
-  before_action :set_contact
-
-  def create
-    return if @contact.nil? || @current_account.nil?
-
-    super
-  end
-end

app/controllers/api/v1/widget/messages_controller.rb

@@ -15,10 +15,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
   def update
     if @message.content_type == 'input_email'
       @message.update!(submitted_email: contact_email)
-      ContactIdentifyAction.new(
-        contact: @contact,
-        params: { email: contact_email }
-      ).perform
+      update_contact(contact_email)
     else
       @message.update!(message_update_params[:message])
     end
@@ -32,12 +29,11 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
     return if params[:message][:attachments].blank?
 
     params[:message][:attachments].each do |uploaded_attachment|
-      attachment = @message.attachments.new(
+      @message.attachments.new(
         account_id: @message.account_id,
+        file_type: helpers.file_type(uploaded_attachment&.content_type),
         file: uploaded_attachment
       )
-
-      attachment.file_type = helpers.file_type(uploaded_attachment&.content_type) if uploaded_attachment.is_a?(ActionDispatch::Http::UploadedFile)
     end
   end
 

app/controllers/api/v2/accounts/reports_controller.rb

@@ -1,5 +1,4 @@
 class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
-  include Api::V2::Accounts::ReportsHelper
   before_action :check_authorization
 
   def index
@@ -13,103 +12,56 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
   end
 
   def agents
-    @report_data = generate_agents_report
-    generate_csv('agents_report', 'api/v2/accounts/reports/agents')
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=agents_report.csv'
+    render layout: false, template: 'api/v2/accounts/reports/agents.csv.erb', format: 'csv'
   end
 
   def inboxes
-    @report_data = generate_inboxes_report
-    generate_csv('inboxes_report', 'api/v2/accounts/reports/inboxes')
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=inboxes_report.csv'
+    render layout: false, template: 'api/v2/accounts/reports/inboxes.csv.erb', format: 'csv'
   end
 
   def labels
-    @report_data = generate_labels_report
-    generate_csv('labels_report', 'api/v2/accounts/reports/labels')
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=labels_report.csv'
+    render layout: false, template: 'api/v2/accounts/reports/labels.csv.erb', format: 'csv'
   end
 
   def teams
-    @report_data = generate_teams_report
-    generate_csv('teams_report', 'api/v2/accounts/reports/teams')
-  end
-
-  def conversations
-    return head :unprocessable_entity if params[:type].blank?
-
-    render json: conversation_metrics
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=teams_report.csv'
+    render layout: false, template: 'api/v2/accounts/reports/teams.csv.erb', format: 'csv'
   end
 
   private
 
-  def generate_csv(filename, template)
-    response.headers['Content-Type'] = 'text/csv'
-    response.headers['Content-Disposition'] = "attachment; filename=#{filename}.csv"
-    render layout: false, template: template, formats: [:csv]
-  end
-
   def check_authorization
     raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
   end
 
-  def common_params
+  def summary_params
     {
       type: params[:type].to_sym,
-      id: params[:id],
-      group_by: params[:group_by],
-      business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
+      since: params[:since],
+      until: params[:until],
+      id: params[:id]
     }
   end
 
-  def current_summary_params
-    common_params.merge({
-                          since: range[:current][:since],
-                          until: range[:current][:until]
-                        })
-  end
-
-  def previous_summary_params
-    common_params.merge({
-                          since: range[:previous][:since],
-                          until: range[:previous][:until]
-                        })
-  end
-
   def report_params
-    common_params.merge({
-                          metric: params[:metric],
-                          since: params[:since],
-                          until: params[:until],
-                          timezone_offset: params[:timezone_offset]
-                        })
-  end
-
-  def conversation_params
     {
+      metric: params[:metric],
       type: params[:type].to_sym,
-      user_id: params[:user_id],
-      page: params[:page].presence || 1
-    }
-  end
-
-  def range
-    {
-      current: {
-        since: params[:since],
-        until: params[:until]
-      },
-      previous: {
-        since: (params[:since].to_i - (params[:until].to_i - params[:since].to_i)).to_s,
-        until: params[:since]
-      }
+      since: params[:since],
+      until: params[:until],
+      id: params[:id]
     }
   end
 
   def summary_metrics
-    summary = V2::ReportBuilder.new(Current.account, current_summary_params).summary
-    summary[:previous] = V2::ReportBuilder.new(Current.account, previous_summary_params).summary
-    summary
-  end
-
-  def conversation_metrics
-    V2::ReportBuilder.new(Current.account, conversation_params).conversation_metrics
+    builder = V2::ReportBuilder.new(Current.account, summary_params)
+    builder.summary
   end
 end

app/controllers/application_controller.rb

@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   include DeviseTokenAuth::Concerns::SetUserByToken
   include RequestExceptionHandler
-  include Pundit::Authorization
+  include Pundit
   include SwitchLocale
 
   skip_before_action :verify_authenticity_token
@@ -17,6 +17,10 @@ class ApplicationController < ActionController::Base
     Current.user = @user
   end
 
+  def current_subscription
+    @subscription ||= Current.account.subscription
+  end
+
   def pundit_user
     {
       user: Current.user,

app/controllers/concerns/ensure_current_account_helper.rb

@@ -1,34 +0,0 @@
-module EnsureCurrentAccountHelper
-  private
-
-  def current_account
-    @current_account ||= ensure_current_account
-    Current.account = @current_account
-  end
-
-  def ensure_current_account
-    account = Account.find(params[:account_id])
-    ensure_account_is_active?(account)
-
-    if current_user
-      account_accessible_for_user?(account)
-    elsif @resource.is_a?(AgentBot)
-      account_accessible_for_bot?(account)
-    end
-    account
-  end
-
-  def account_accessible_for_user?(account)
-    @current_account_user = account.account_users.find_by(user_id: current_user.id)
-    Current.account_user = @current_account_user
-    render_unauthorized('You are not authorized to access this account') unless @current_account_user
-  end
-
-  def account_accessible_for_bot?(account)
-    render_unauthorized('You are not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
-  end
-
-  def ensure_account_is_active?(account)
-    render_unauthorized('Account is suspended') unless account.active?
-  end
-end

app/controllers/concerns/meta_token_verify_concern.rb

@@ -1,20 +0,0 @@
-# services from Meta (Prev: Facebook) needs a token verification step for webhook subscriptions,
-# This concern handles the token verification step.
-
-module MetaTokenVerifyConcern
-  def verify
-    service = is_a?(Webhooks::WhatsappController) ? 'whatsapp' : 'instagram'
-    if valid_token?(params['hub.verify_token'])
-      Rails.logger.info("#{service.capitalize} webhook verified")
-      render json: params['hub.challenge']
-    else
-      render status: :unauthorized, json: { error: 'Error; wrong verify token' }
-    end
-  end
-
-  private
-
-  def valid_token?(_token)
-    raise 'Overwrite this method your controller'
-  end
-end

app/controllers/concerns/request_exception_handler.rb

@@ -9,12 +9,11 @@ module RequestExceptionHandler
 
   def handle_with_exception
     yield
-  rescue ActiveRecord::RecordNotFound
+  rescue ActiveRecord::RecordNotFound => e
+    Sentry.capture_exception(e)
     render_not_found_error('Resource could not be found')
   rescue Pundit::NotAuthorizedError
     render_unauthorized('You are not authorized to do this action')
-  rescue ActionController::ParameterMissing => e
-    render_could_not_create_error(e.message)
   ensure
     # to address the thread variable leak issues in Puma/Thin webserver
     Current.reset
@@ -32,18 +31,13 @@ module RequestExceptionHandler
     render json: { error: message }, status: :unprocessable_entity
   end
 
-  def render_payment_required(message)
-    render json: { error: message }, status: :payment_required
-  end
-
   def render_internal_server_error(message)
     render json: { error: message }, status: :internal_server_error
   end
 
   def render_record_invalid(exception)
     render json: {
-      message: exception.record.errors.full_messages.join(', '),
-      attributes: exception.record.errors.attribute_names
+      message: exception.record.errors.full_messages.join(', ')
     }, status: :unprocessable_entity
   end