Hotfix: Fix for private note in emails - Merge branch 'hotfix/1.4.1'

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>

.circleci/config.yml

@@ -7,12 +7,13 @@ defaults: &defaults
   working_directory: ~/build
   docker:
     # specify the version you desire here
-    - image: circleci/ruby:2.6.5-node-browsers
+    - image: circleci/ruby:2.7.0-node-browsers
 
     # Specify service dependencies here if necessary
     # CircleCI maintains a library of pre-built images
     # documented at https://circleci.com/docs/2.0/circleci-images/
-    - image: circleci/postgres:9.4
+    - image: circleci/postgres:alpine
+    - image: circleci/redis:alpine
   environment:
       - CC_TEST_REPORTER_ID: b1b5c4447bf93f6f0b06a64756e35afd0810ea83649f03971cbf303b4449456f
 
@@ -94,24 +95,24 @@ jobs:
           command: yarn run eslint
 
       # Run rails tests
-      - run: 
+      - run:
           name: Run backend tests
           command: |
             bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
             ./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.backend.json coverage/backend/.resultset.json
       - persist_to_workspace:
           root: tmp
-          paths: 
+          paths:
             - codeclimate.backend.json
 
-      - run: 
+      - run:
           name: Run frontend tests
           command: |
             yarn test:coverage
             ./tmp/cc-test-reporter format-coverage -t lcov -o tmp/codeclimate.frontend.json buildreports/lcov.info
       - persist_to_workspace:
           root: tmp
-          paths: 
+          paths:
             - codeclimate.frontend.json
 
       # collect reports
@@ -125,4 +126,4 @@ jobs:
           name: Upload coverage results to Code Climate
           command: |
             ./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
+            ./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.total.json

.codeclimate.yml

@@ -1,7 +1,7 @@
 version: "2"
 plugins:
   rubocop:
-    enabled: true
+    enabled: false
     channel: rubocop-0-73
   eslint:
     enabled: false
@@ -10,7 +10,7 @@ plugins:
   scss-lint:
     enabled: true
   brakeman:
-    enabled: true
+    enabled: false
 checks:
   similar-code:
     enabled: false
@@ -26,3 +26,7 @@ exclude_patterns:
   - "node_modules/**/*"
   - "lib/tasks/auto_annotate_models.rake"
   - "app/test-matchers.js"
+  - "docs/*"
+  - "**/*.md"
+  - "**/*.yml"
+  - "app/javascript/dashboard/i18n/locale"

.env.example

@@ -1,5 +1,24 @@
+# Used to verify the integrity of signed cookies. so ensure a secure value is set
+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
+
+# Force all access to the app over SSL, default is set to false
+FORCE_SSL=false
+
+# This lets you control new sign ups on your chatwoot installation
+# true : default option, allows sign ups
+# false : disables all the end points related to sign ups
+# api_only: disables the UI for signup, but you can create sign ups via the account apis
+ENABLE_ACCOUNT_SIGNUP=true
+
+# Redis config
 REDIS_URL=redis://redis:6379
-SECRET_KEY_BASE=
+# If you are using docker-compose, set this variable's value to be any string,
+# which will be the password for the redis service running inside the docker-compose
+# to make it secure
+REDIS_PASSWORD=
 
 # Postgres Database config variables
 POSTGRES_HOST=postgres
@@ -8,34 +27,72 @@ POSTGRES_PASSWORD=
 RAILS_ENV=development
 RAILS_MAX_THREADS=5
 
-#fb app
-FB_VERIFY_TOKEN=
-FB_APP_SECRET=
-FB_APP_ID=
-
-#mail
+# Mail outgoing
 MAILER_SENDER_EMAIL=accounts@chatwoot.com
 SMTP_PORT=1025
 SMTP_DOMAIN=chatwoot.com
+# if you are running docker-compose, set SMTP_ADDRESS value as "mailhog",
+# else set the value as "localhost"
 SMTP_ADDRESS=mailhog
 SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_AUTHENTICATION=
 SMTP_ENABLE_STARTTLS_AUTO=
 
-#misc
-FRONTEND_URL=http://0.0.0.0:3000
+# Mail Incoming
+
+# Set this to appropriate ingress channel with regards to incoming emails
+# Possible values are :
+# :relay for Exim, Postfix, Qmail
+# :mailgun for Mailgun
+# :mandrill for Mandrill
+# :postmark for Postmark
+# :sendgrid for Sendgrid
+RAILS_INBOUND_EMAIL_SERVICE=
+# Use one of the following based on the email ingress service
+# Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
+RAILS_INBOUND_EMAIL_PASSWORD=
+MAILGUN_INGRESS_SIGNING_KEY=
+MANDRILL_INGRESS_API_KEY=
+
+# Storage
 ACTIVE_STORAGE_SERVICE=local
 
-#s3
+# Amazon S3
 S3_BUCKET_NAME=
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
 
-#sentry
+# Sentry
 SENTRY_DSN=
 
+# Log settings
+# Disable if you want to write logs to a file
+RAILS_LOG_TO_STDOUT=true
+LOG_LEVEL=info
+LOG_SIZE=500
+
+# Credentials to access sidekiq dashboard in production
+SIDEKIQ_AUTH_USERNAME=
+SIDEKIQ_AUTH_PASSWORD=
+
+### This environment variables are only required if you are setting up social media channels
+#facebook
+FB_VERIFY_TOKEN=
+FB_APP_SECRET=
+FB_APP_ID=
+
+# Twitter
+TWITTER_APP_ID=
+TWITTER_CONSUMER_KEY=
+TWITTER_CONSUMER_SECRET=
+TWITTER_ENVIRONMENT=
+
+### Change this env variable only if you are using a custom build mobile app
+## Mobile app env variables
+IOS_APP_ID=6C953F3RX2.com.chatwoot.app
+
 ####  This environment variables are only required in hosted version which has billing
 ENABLE_BILLING=
 
@@ -43,4 +100,9 @@ ENABLE_BILLING=
 CHARGEBEE_API_KEY=
 CHARGEBEE_SITE=
 CHARGEBEE_WEBHOOK_USERNAME=
-CHARGEBEE_WEBHOOK_PASSWORD=
+CHARGEBEE_WEBHOOK_PASSWORD=
+
+## Push Notification
+## generate a new key value here : https://d3v.one/vapid-key-generator/
+# VAPID_PUBLIC_KEY=
+# VAPID_PRIVATE_KEY=

.eslintrc.js

@@ -1,8 +1,8 @@
 module.exports = {
-  extends: ['airbnb/base', 'prettier', 'plugin:vue/recommended'],
+  extends: ['airbnb-base/legacy', 'prettier', 'plugin:vue/recommended'],
   parserOptions: {
     parser: 'babel-eslint',
-    ecmaVersion: 2017,
+    ecmaVersion: 2020,
     sourceType: 'module',
   },
   plugins: ['html', 'prettier', 'babel'],
@@ -24,10 +24,12 @@ module.exports = {
       'multiline': {
         'max': 1,
         'allowFirstLine': false
-      }
+      },
     }],
     'vue/html-self-closing': 'off',
-    "vue/no-v-html": 'off'
+    "vue/no-v-html": 'off',
+    'import/extensions': ['off']
+
   },
   settings: {
     'import/resolver': {

.gitignore

@@ -37,6 +37,10 @@ public/packs*
 *.swo
 *.un~
 .jest-cache
+
+#VS Code files
+.vscode
+
 # ignore jetbrains IDE files
 .idea
 
@@ -48,4 +52,6 @@ coverage
 
 # ignore packages
 node_modules
-package-lock.json
+package-lock.json
+
+*.dump

.nvmrc

@@ -0,0 +1 @@
+12.16.1

.rubocop.yml

@@ -4,21 +4,38 @@ require:
   - rubocop-rspec
 inherit_from: .rubocop_todo.yml
 
-Metrics/LineLength:
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Layout/LineLength:
   Max: 150
+Metrics/ClassLength:
+  Max: 125
 RSpec/ExampleLength:
-  Max: 15
-Documentation:
+  Max: 25
+Style/Documentation:
   Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 Style/SymbolArray:
   Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/GlobalVars:
+  Exclude:
+    - 'config/initializers/redis.rb'
+    - 'lib/redis/alfred.rb'
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
     - '**/routes.rb'
     - 'config/environments/*'
+    - db/schema.rb
 Rails/ApplicationController:
   Exclude:
     - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -32,14 +49,60 @@ Style/ClassAndModuleChildren:
 RSpec/NestedGroups:
   Enabled: true
   Max: 4
+RSpec/MessageSpies:
+  Enabled: false
+Metrics/MethodLength:
+  Exclude:
+    - 'db/migrate/20161123131628_devise_token_auth_create_users.rb'
+Rails/CreateTableWithTimestamps:
+  Exclude:
+    - 'db/migrate/20170207092002_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb'
+Style/GuardClause:
+  Exclude:
+    - 'app/builders/account_builder.rb'
+    - 'app/models/attachment.rb'
+    - 'app/models/message.rb'
+    - 'lib/webhooks/chargebee.rb'
+    - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
+Metrics/AbcSize:
+  Exclude: 
+    - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
+Rails/ReversibleMigration:
+  Exclude:
+    - 'db/migrate/20161025070152_removechannelsfrommodels.rb'
+    - 'db/migrate/20161025070645_remchannel.rb'
+    - 'db/migrate/20161025070645_remchannel.rb'
+    - 'db/migrate/20161110102609_removeinboxid.rb'
+    - 'db/migrate/20170519091539_add_avatar_to_fb.rb'
+    - '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'
+Rails/BulkChangeTable:
+  Exclude:
+    - 'db/migrate/20161025070152_removechannelsfrommodels.rb'
+    - 'db/migrate/20200121190901_create_account_users.rb'
+    - 'db/migrate/20170211092540_notnullableusers.rb'
+    - 'db/migrate/20170403095203_contactadder.rb'
+    - 'db/migrate/20170406104018_add_default_status_conv.rb'
+    - 'db/migrate/20170511134418_latlong.rb'
+    - 'db/migrate/20191027054756_create_contact_inboxes.rb'
+    - 'db/migrate/20191130164019_add_template_type_to_messages.rb'
+Rails/UniqueValidationWithoutIndex: 
+  Exclude:
+    - 'app/models/channel/twitter_profile.rb'
+    - 'app/models/webhook.rb'
 AllCops:
   Exclude:
-    - db/*
-    - bin/**/*
-    - db/**/*
-    - config/**/*
-    - public/**/*
-    - vendor/**/*
-    - node_modules/**/*
-    - lib/tasks/auto_annotate_models.rake
-    - config/environments/**/*
+    - 'bin/**/*'
+    - 'db/schema.rb'
+    - 'config/**/*'
+    - 'public/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'config/environments/**/*'
+    - 'tmp/**/*'
+    - 'storage/**/*'

.rubocop_todo.yml

@@ -282,15 +282,6 @@ Style/GlobalVars:
   Exclude:
     - 'lib/redis/alfred.rb'
 
-# Offense count: 7
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'app/builders/account_builder.rb'
-    - 'app/models/attachment.rb'
-    - 'app/models/message.rb'
-    - 'lib/webhooks/chargebee.rb'
-
 # Offense count: 4
 Style/IdenticalConditionalBranches:
   Exclude:

.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.0

.scss-lint.yml

@@ -1,7 +1,281 @@
+# Default application configuration that all configurations inherit from.
+
+scss_files: '**/*.scss'
+plugin_directories: ['.scss-linters']
+
+# List of gem names to load custom linters from (make sure they are already
+# installed)
+plugin_gems: []
+
+# Default severity of all linters.
+severity: warning
+
 linters:
+  BangFormat:
+    enabled: true
+    space_before_bang: true
+    space_after_bang: false
+
+  BemDepth:
+    enabled: false
+    max_elements: 1
+
+  BorderZero:
+    enabled: true
+    convention: zero # or `none`
+
+  ChainedClasses:
+    enabled: false
+
+  ColorKeyword:
+    enabled: true
+
+  ColorVariable:
+    enabled: true
+
+  Comment:
+    enabled: true
+    style: silent
+
+  DebugStatement:
+    enabled: true
+
+  DeclarationOrder:
+    enabled: true
+
+  DisableLinterReason:
+    enabled: false
+
+  DuplicateProperty:
+    enabled: true
+
+  ElsePlacement:
+    enabled: true
+    style: same_line # or 'new_line'
+
+  EmptyLineBetweenBlocks:
+    enabled: true
+    ignore_single_line_blocks: true
+
+  EmptyRule:
+    enabled: true
+
+  ExtendDirective:
+    enabled: false
+
+  FinalNewline:
+    enabled: true
+    present: true
+
+  HexLength:
+    enabled: true
+    style: short # or 'long'
+
+  HexNotation:
+    enabled: true
+    style: lowercase # or 'uppercase'
+
+  HexValidation:
+    enabled: true
+
+  IdSelector:
+    enabled: true
+
+  ImportantRule:
+    enabled: false
+
+  ImportPath:
+    enabled: true
+    leading_underscore: false
+    filename_extension: false
+
+  Indentation:
+    enabled: true
+    allow_non_nested_indentation: false
+    character: space # or 'tab'
+    width: 2
+
   LeadingZero:
     enabled: false
 
+  MergeableSelector:
+    enabled: true
+    force_nesting: true
+
+  NameFormat:
+    enabled: true
+    allow_leading_underscore: true
+    convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
+
+  NestingDepth:
+    enabled: true
+    max_depth: 6
+    ignore_parent_selectors: false
+
+  PlaceholderInExtend:
+    enabled: true
+
+  PrivateNamingConvention:
+    enabled: false
+    prefix: _
+
+  PropertyCount:
+    enabled: false
+    include_nested: false
+    max_properties: 10
+
+  PropertySortOrder:
+    enabled: true
+    ignore_unspecified: false
+    min_properties: 2
+    separate_groups: false
+
+  PropertySpelling:
+    enabled: true
+    extra_properties: []
+    disabled_properties: []
+
+  PropertyUnits:
+    enabled: true
+    global: [
+        'ch',
+        'em',
+        'ex',
+        'rem', # Font-relative lengths
+        'cm',
+        'in',
+        'mm',
+        'pc',
+        'pt',
+        'px',
+        'q', # Absolute lengths
+        'vh',
+        'vw',
+        'vmin',
+        'vmax', # Viewport-percentage lengths
+        'fr', # Grid fractional lengths
+        'deg',
+        'grad',
+        'rad',
+        'turn', # Angle
+        'ms',
+        's', # Duration
+        'Hz',
+        'kHz', # Frequency
+        'dpi',
+        'dpcm',
+        'dppx', # Resolution
+        '%',
+      ] # Other
+    properties: {}
+
+  PseudoElement:
+    enabled: true
+
+  QualifyingElement:
+    enabled: true
+    allow_element_with_attribute: false
+    allow_element_with_class: false
+    allow_element_with_id: false
+
+  SelectorDepth:
+    enabled: true
+    max_depth: 5
+
+  SelectorFormat:
+    enabled: false
+
+  Shorthand:
+    enabled: true
+    allowed_shorthands: [1, 2, 3, 4]
+
+  SingleLinePerProperty:
+    enabled: true
+    allow_single_line_rule_sets: true
+
+  SingleLinePerSelector:
+    enabled: true
+
+  SpaceAfterComma:
+    enabled: true
+    style: one_space # or 'no_space', or 'at_least_one_space'
+
+  SpaceAfterComment:
+    enabled: false
+    style: one_space # or 'no_space', or 'at_least_one_space'
+    allow_empty_comments: true
+
+  SpaceAfterPropertyColon:
+    enabled: true
+    style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
+
+  SpaceAfterPropertyName:
+    enabled: true
+
+  SpaceAfterVariableColon:
+    enabled: false
+    style: one_space # or 'no_space', 'at_least_one_space' or 'one_space_or_newline'
+
+  SpaceAfterVariableName:
+    enabled: true
+
+  SpaceAroundOperator:
+    enabled: true
+    style: one_space # or 'at_least_one_space', or 'no_space'
+
+  SpaceBeforeBrace:
+    enabled: true
+    style: space # or 'new_line'
+    allow_single_line_padding: false
+
+  SpaceBetweenParens:
+    enabled: true
+    spaces: 0
+
+  StringQuotes:
+    enabled: true
+    style: single_quotes # or double_quotes
+
+  TrailingSemicolon:
+    enabled: true
+
+  TrailingWhitespace:
+    enabled: true
+
+  TrailingZero:
+    enabled: false
+
+  TransitionAll:
+    enabled: false
+
+  UnnecessaryMantissa:
+    enabled: false
+
+  UnnecessaryParentReference:
+    enabled: false
+
+  UrlFormat:
+    enabled: true
+
+  UrlQuotes:
+    enabled: true
+
+  VariableForProperty:
+    enabled: false
+    properties: []
+
+  VendorPrefix:
+    enabled: true
+    identifier_list: base
+    additional_identifiers: []
+    excluded_identifiers: []
+
+  ZeroUnit:
+    enabled: true
+
+  Compass::*:
+    enabled: false
+
 exclude:
   - 'app/javascript/widget/assets/scss/_reset.scss'
   - 'app/javascript/widget/assets/scss/sdk.css'

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.6.5'
+ruby '2.7.0'
 
 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
@@ -16,6 +16,8 @@ gem 'hashie'
 gem 'jbuilder'
 gem 'kaminari'
 gem 'responders'
+gem 'rest-client'
+gem 'telephone_number'
 gem 'time_diff'
 gem 'tzinfo-data'
 gem 'valid_email2'
@@ -23,9 +25,13 @@ gem 'valid_email2'
 gem 'uglifier'
 
 ##-- for active storage --##
+gem 'aws-sdk-s3', require: false
+gem 'azure-storage-blob', require: false
+gem 'google-cloud-storage', require: false
 gem 'mini_magick'
 
 ##-- gems for database --#
+gem 'groupdate'
 gem 'pg'
 gem 'redis'
 gem 'redis-namespace'
@@ -48,16 +54,15 @@ gem 'pundit'
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
 gem 'wisper', '2.0.0'
 
-##--- gems for reporting ---##
-gem 'nightfury'
-
 ##--- gems for billing ---##
 gem 'chargebee'
 
 ##--- gems for channels ---##
 gem 'facebook-messenger'
 gem 'telegram-bot-ruby'
-gem 'twitter'
+gem 'twilio-ruby', '~> 5.32.0'
+# twitty will handle subscription of twitter account events
+gem 'twitty', git: 'https://github.com/chatwoot/twitty'
 # facebook client
 gem 'koala'
 # Random name generator
@@ -66,37 +71,47 @@ gem 'haikunator'
 ##--- gems for debugging and error reporting ---##
 # static analysis
 gem 'brakeman'
+gem 'scout_apm'
 gem 'sentry-raven'
 
-##-- TODO: move these gems to appropriate groups --##
-# remove this gem in favor of active storage -  github #158
-gem 'carrierwave-aws'
+##-- background job processing --##
 gem 'sidekiq'
 
+##-- used for single column multiple binary flags in notification settings/feature flagging --##
+gem 'flag_shih_tzu'
+
+##-- Push notification service --##
+gem 'webpush'
+
 group :development do
   gem 'annotate'
   gem 'bullet'
   gem 'letter_opener'
   gem 'web-console'
+
+  # used in swagger build
+  gem 'json_refs', git: 'https://github.com/tzmfreedom/json_refs', ref: 'e32deb0'
 end
 
 group :development, :test do
+  # locking until https://github.com/codeclimate/test-reporter/issues/418 is resolved
   gem 'action-cable-testing'
   gem 'bundle-audit', require: false
   gem 'byebug', platform: :mri
   gem 'factory_bot_rails'
   gem 'faker'
   gem 'listen'
-  gem 'mock_redis'
+  gem 'mock_redis', git: 'https://github.com/sds/mock_redis', ref: '16d00789f0341a3aac35126c0ffe97a596753ff9'
   gem 'pry-rails'
   gem 'rspec-rails', '~> 4.0.0.beta2'
   gem 'rubocop', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
   gem 'rubocop-rspec', require: false
+  gem 'scss_lint', require: false
   gem 'seed_dump'
   gem 'shoulda-matchers'
-  gem 'simplecov', require: false
+  gem 'simplecov', '0.17.1', require: false
   gem 'spring'
   gem 'spring-watcher-listen'
 end

Gemfile.lock

@@ -1,58 +1,80 @@
+GIT
+  remote: https://github.com/chatwoot/twitty
+  revision: af4f3e45dca55e42c64f7741a1fedfaa94d36419
+  specs:
+    twitty (0.1.0)
+      oauth
+
+GIT
+  remote: https://github.com/sds/mock_redis
+  revision: 16d00789f0341a3aac35126c0ffe97a596753ff9
+  ref: 16d00789f0341a3aac35126c0ffe97a596753ff9
+  specs:
+    mock_redis (0.22.0)
+
+GIT
+  remote: https://github.com/tzmfreedom/json_refs
+  revision: e32deb073ce9aef39bdd63556bffd7fe7c2a803d
+  ref: e32deb0
+  specs:
+    json_refs (0.1.2)
+      hana
+
 GEM
   remote: https://rubygems.org/
   specs:
-    action-cable-testing (0.6.0)
+    action-cable-testing (0.6.1)
       actioncable (>= 5.0)
-    actioncable (6.0.2.1)
-      actionpack (= 6.0.2.1)
+    actioncable (6.0.2.2)
+      actionpack (= 6.0.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionmailbox (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.1)
-      actionview (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actiontext (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.1)
-      activesupport (= 6.0.2.1)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activestorage (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activestorage (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.2.1)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -62,40 +84,46 @@ GEM
       activerecord (>= 5.0, < 6.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    annotate (3.0.3)
+    annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
-    attr_extras (6.2.1)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.259.0)
-    aws-sdk-core (3.86.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    attr_extras (6.2.3)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.296.0)
+    aws-sdk-core (3.94.0)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.27.0)
+    aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.1)
+    aws-sdk-s3 (1.61.2)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    azure-storage-blob (2.0.0)
+      azure-storage-common (~> 2.0)
+      nokogiri (~> 1.10.4)
+    azure-storage-common (2.0.1)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0.0.rc1)
+      nokogiri (~> 1.10.4)
     bcrypt (3.1.13)
     bindex (0.8.1)
-    bootsnap (1.4.5)
+    bootsnap (1.4.6)
       msgpack (~> 1.0)
-    brakeman (4.7.2)
-    browser (2.7.1)
-    buftok (0.2.0)
+    brakeman (4.8.1)
+    browser (4.0.0)
     builder (3.2.4)
-    bullet (6.0.2)
+    bullet (6.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundle-audit (0.1.0)
@@ -103,26 +131,18 @@ GEM
     bundler-audit (0.6.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
-    byebug (11.0.1)
-    carrierwave (2.0.2)
-      activemodel (>= 5.0.0)
-      activesupport (>= 5.0.0)
-      addressable (~> 2.6)
-      image_processing (~> 1.1)
-      mimemagic (>= 0.3.0)
-      mini_mime (>= 0.1.3)
-    carrierwave-aws (1.4.0)
-      aws-sdk-s3 (~> 1.0)
-      carrierwave (>= 0.7, < 2.1)
-    chargebee (2.7.1)
+    byebug (11.1.1)
+    chargebee (2.7.5)
       json_pure (~> 2.1)
       rest-client (>= 1.8, < 3.0)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
-    crass (1.0.5)
+    crass (1.0.6)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (4.7.1)
@@ -136,6 +156,7 @@ GEM
       devise (> 3.5.2, < 5)
       rails (>= 4.2.0, < 6.1)
     diff-lcs (1.3)
+    digest-crc (0.5.1)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -149,155 +170,180 @@ GEM
     facebook-messenger (1.4.1)
       httparty (~> 0.13, >= 0.13.7)
       rack (>= 1.4.5)
-    factory_bot (5.1.1)
+    factory_bot (5.1.2)
       activesupport (>= 4.2.0)
     factory_bot_rails (5.1.1)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
-    faker (2.9.0)
-      i18n (>= 1.6, < 1.8)
-    faraday (0.17.1)
+    faker (2.11.0)
+      i18n (>= 1.6, < 2)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.3)
-    foreman (0.86.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    ffi (1.12.2)
+    flag_shih_tzu (0.3.23)
+    foreman (0.87.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    google-api-client (0.38.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.3.1)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.0)
+    google-cloud-storage (1.26.0)
+      addressable (~> 2.5)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.12.0)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.14)
+    groupdate (5.0.0)
+      activesupport (>= 5)
     haikunator (1.1.0)
-    hashie (4.0.0)
-    http (3.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
+    hana (1.3.5)
+    hashie (4.1.0)
+    hkdf (0.3.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
-    http_parser.rb (0.6.0)
-    httparty (0.17.3)
+    httparty (0.18.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.7.0)
+    httpclient (2.8.3)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    image_processing (1.10.0)
-      mini_magick (>= 4.9.5, < 5)
-      ruby-vips (>= 2.0.13, < 3)
     inflecto (0.0.2)
     jaro_winkler (1.5.4)
-    jbuilder (2.9.1)
-      activesupport (>= 4.2.0)
+    jbuilder (2.10.0)
+      activesupport (>= 5.0.0)
     jmespath (1.4.0)
     json (2.3.0)
-    json_pure (2.2.0)
+    json_pure (2.3.0)
     jwt (2.2.1)
-    kaminari (1.1.1)
+    kaminari (1.2.0)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.0)
+      kaminari-activerecord (= 1.2.0)
+      kaminari-core (= 1.2.0)
+    kaminari-actionview (1.2.0)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.0)
+    kaminari-activerecord (1.2.0)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
+      kaminari-core (= 1.2.0)
+    kaminari-core (1.2.0)
     koala (3.0.0)
       addressable
       faraday
       json (>= 1.8)
-    launchy (2.4.3)
-      addressable (~> 2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
     letter_opener (1.7.0)
       launchy (~> 2.2)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.9.2)
-    mime-types (3.3)
+    memoist (0.16.2)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    mimemagic (0.3.3)
-    mini_magick (4.9.5)
+    mimemagic (0.3.4)
+    mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    mock_redis (0.22.0)
-    msgpack (1.3.1)
+    minitest (5.14.0)
+    msgpack (1.3.3)
+    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    naught (1.1.0)
     netrc (0.11.0)
-    nightfury (1.0.1)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
+    oauth (0.5.4)
     orm_adapter (0.5.0)
+    os (1.1.0)
     parallel (1.19.1)
-    parser (2.6.5.0)
+    parser (2.7.1.1)
       ast (~> 2.4.0)
-    pg (1.1.4)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.1)
-    puma (4.3.1)
+    public_suffix (4.0.4)
+    puma (4.3.3)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
-    rack (2.0.8)
-    rack-cache (1.10.0)
+    rack (2.2.2)
+    rack-cache (1.11.1)
       rack (>= 0.4)
-    rack-cors (1.1.0)
+    rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (2.0.7)
+    rack-protection (2.0.8.1)
       rack
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.2.1)
-      actioncable (= 6.0.2.1)
-      actionmailbox (= 6.0.2.1)
-      actionmailer (= 6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actiontext (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    rails (6.0.2.2)
+      actioncable (= 6.0.2.2)
+      actionmailbox (= 6.0.2.2)
+      actionmailer (= 6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actiontext (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       bundler (>= 1.3.0)
-      railties (= 6.0.2.1)
+      railties (= 6.0.2.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.1.3)
     redis-namespace (1.7.0)
@@ -305,8 +351,12 @@ GEM
     redis-rack-cache (2.2.1)
       rack-cache (>= 1.10, < 2)
       redis-store (>= 1.6, < 2)
-    redis-store (1.8.1)
+    redis-store (1.8.2)
       redis (>= 4, < 5)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -315,53 +365,69 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    retriable (3.1.2)
+    rexml (3.2.4)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (4.0.0.beta3)
+    rspec-rails (4.0.0)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
-      rspec-core (~> 3.8)
-      rspec-expectations (~> 3.8)
-      rspec-mocks (~> 3.8)
-      rspec-support (~> 3.8)
-    rspec-support (3.9.0)
-    rubocop (0.78.0)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.2)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.4.0)
+    rubocop-rails (2.5.2)
+      activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    rubocop-rspec (1.37.1)
+    rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
-    ruby-vips (2.0.16)
-      ffi (~> 1.9)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    scout_apm (2.6.7)
+      parser
+    scss_lint (0.59.0)
+      sass (~> 3.5, >= 3.5.5)
     seed_dump (3.3.1)
       activerecord (>= 4)
       activesupport (>= 4)
-    sentry-raven (2.13.0)
-      faraday (>= 0.7.6, < 1.0)
-    shoulda-matchers (4.1.2)
+    semantic_range (2.3.0)
+    sentry-raven (3.0.0)
+      faraday (>= 1.0)
+    shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
-    sidekiq (6.0.4)
+    sidekiq (6.0.6)
       connection_pool (>= 2.2.2)
-      rack (>= 2.0.0)
+      rack (~> 2.0)
       rack-protection (>= 2.0.0)
       redis (>= 4.1.0)
-    simple_oauth (0.3.1)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -378,38 +444,33 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    telegram-bot-ruby (0.11.0)
+    telegram-bot-ruby (0.12.0)
       faraday
       inflecto
       virtus
+    telephone_number (1.4.6)
     thor (0.20.3)
     thread_safe (0.3.6)
     time_diff (0.3.0)
       activesupport
       i18n
-    twitter (6.2.0)
-      addressable (~> 2.3)
-      buftok (~> 0.2.0)
-      equalizer (~> 0.0.11)
-      http (~> 3.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
-      memoizable (~> 0.4.0)
-      multipart-post (~> 2.0)
-      naught (~> 1.0)
-      simple_oauth (~> 0.3.0)
-    tzinfo (1.2.5)
+    twilio-ruby (5.32.0)
+      faraday (~> 1.0.0)
+      jwt (>= 1.5, <= 2.5)
+      nokogiri (>= 1.6, < 2.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
+    uber (0.1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
     uniform_notifier (1.13.0)
-    valid_email2 (3.1.3)
+    valid_email2 (3.2.2)
       activemodel (>= 3.2)
       mail (~> 2.5)
     virtus (1.0.5)
@@ -424,15 +485,19 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webpacker (4.2.2)
-      activesupport (>= 4.2)
+    webpacker (5.0.1)
+      activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
+    webpush (1.0.0)
+      hkdf (~> 0.2)
+      jwt (~> 2.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     wisper (2.0.0)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -442,13 +507,14 @@ DEPENDENCIES
   acts-as-taggable-on
   annotate
   attr_extras
+  aws-sdk-s3
+  azure-storage-blob
   bootsnap
   brakeman
   browser
   bullet
   bundle-audit
   byebug
-  carrierwave-aws
   chargebee
   devise
   devise_token_auth
@@ -456,18 +522,21 @@ DEPENDENCIES
   facebook-messenger
   factory_bot_rails
   faker
+  flag_shih_tzu
   foreman
+  google-cloud-storage
+  groupdate
   haikunator
   hashie
   jbuilder
+  json_refs!
   jwt
   kaminari
   koala
   letter_opener
   listen
   mini_magick
-  mock_redis
-  nightfury
+  mock_redis!
   pg
   pry-rails
   puma
@@ -478,30 +547,36 @@ DEPENDENCIES
   redis-namespace
   redis-rack-cache
   responders
+  rest-client
   rspec-rails (~> 4.0.0.beta2)
   rubocop
   rubocop-performance
   rubocop-rails
   rubocop-rspec
+  scout_apm
+  scss_lint
   seed_dump
   sentry-raven
   shoulda-matchers
   sidekiq
-  simplecov
+  simplecov (= 0.17.1)
   spring
   spring-watcher-listen
   telegram-bot-ruby
+  telephone_number
   time_diff
-  twitter
+  twilio-ruby (~> 5.32.0)
+  twitty!
   tzinfo-data
   uglifier
   valid_email2
   web-console
   webpacker
+  webpush
   wisper (= 2.0.0)
 
 RUBY VERSION
-   ruby 2.6.5p114
+   ruby 2.7.0p0
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

Procfile.dev

@@ -1,3 +1,3 @@
 backend: bin/rails s -p 3000
 frontend: bin/webpack-dev-server
-worker: bundle exec sidekiq
+worker: bundle exec sidekiq -C config/sidekiq.yml

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://storage.googleapis.com/chatwoot-assets/woot-logo.svg" alt="Woot-logo" width="240">
+  <img src="https://s3.us-west-2.amazonaws.com/gh-assets.chatwoot.com/brand.svg" alt="Woot-logo" width="240">
 
   <div align="center">A simple and elegant live chat software</div>
   <div align="center">An opensource alternative to Intercom, Zendesk, Drift, Crisp etc.</div>
@@ -23,7 +23,7 @@ ___
   <a href="https://discord.gg/cJXdrwS"><img src="https://img.shields.io/badge/chat-Discord-violet?logo=discord" alt="Chat on Discord"></a>
 </p>
 
-![ChatUI progess](https://storage.googleapis.com/chatwoot-assets/dashboard-screen.png)
+![ChatUI progess](https://s3.us-west-2.amazonaws.com/gh-assets.chatwoot.com/chatwoot-dashboard-assets.png)
 
 ## Background
 
@@ -37,6 +37,11 @@ Detailed documentation is available at [www.chatwoot.com/docs](https://www.chatw
 
 You can find the quick setup docs [here](https://www.chatwoot.com/docs/quick-setup).
 
+## Branching model
+
+We use [git-flow](https://nvie.com/posts/a-successful-git-branching-model/) branching model. The base branch is `develop`.
+If you are looking for a stable version, please use the `master` or tags labelled as `v1.x.x`. 
+
 ## Heroku one-click deploy
 
 Deploying chatwoot to heroku, it's a breeze. It's as simple as clicking this button.
@@ -47,16 +52,10 @@ Follow this [link](https://www.chatwoot.com/docs/environment-variables) to under
 
 ## Docker
 
-You can use our official Docker image from [https://hub.docker.com/r/chatwoot/chatwoot](https://hub.docker.com/r/chatwoot/chatwoot)
-
-```bash
-docker pull chatwoot/chatwoot
-```
+Follow our [docker development guide](https://www.chatwoot.com/docs/installation-guide-docker) to develop and debug the application using `docker-compose`.
 
 Follow our [environment variables](https://www.chatwoot.com/docs/environment-variables/) guide to setup environment for Docker.
 
-Follow our [docker development guide](https://www.chatwoot.com/docs/installation-guide-docker) to develop and debug the application using docker composer.
-
 ## Contributors ✨
 
 Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contributors):

__mocks__/fileMock.js

@@ -0,0 +1 @@
+module.exports = '';

app/actions/contact_identify_action.rb

@@ -0,0 +1,47 @@
+class ContactIdentifyAction
+  pattr_initialize [:contact!, :params!]
+
+  def perform
+    ActiveRecord::Base.transaction do
+      @contact = merge_contact(existing_identified_contact, @contact) if merge_contacts?(existing_identified_contact, @contact)
+      @contact = merge_contact(existing_email_contact, @contact) if merge_contacts?(existing_email_contact, @contact)
+      update_contact
+    end
+    @contact
+  end
+
+  private
+
+  def account
+    @account ||= @contact.account
+  end
+
+  def existing_identified_contact
+    return if params[:identifier].blank?
+
+    @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 ||= Contact.where(account_id: account.id).find_by(email: params[:email])
+  end
+
+  def merge_contacts?(existing_contact, _contact)
+    existing_contact && existing_contact.id != @contact.id
+  end
+
+  def update_contact
+    @contact.update!(params.slice(:name, :email, :identifier))
+    ContactAvatarJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present?
+  end
+
+  def merge_contact(base_contact, merge_contact)
+    ContactMergeAction.new(
+      account: account,
+      base_contact: base_contact,
+      mergee_contact: merge_contact
+    ).perform
+  end
+end

app/actions/contact_merge_action.rb

@@ -5,9 +5,11 @@ class ContactMergeAction
     ActiveRecord::Base.transaction do
       validate_contacts
       merge_conversations
+      merge_messages
       merge_contact_inboxes
       remove_mergee_contact
     end
+    @base_contact
   end
 
   private
@@ -15,7 +17,7 @@ class ContactMergeAction
   def validate_contacts
     return if belongs_to_account?(@base_contact) && belongs_to_account?(@mergee_contact)
 
-    raise Exception, 'contact does not belong to the account'
+    raise StandardError, 'contact does not belong to the account'
   end
 
   def belongs_to_account?(contact)
@@ -26,6 +28,10 @@ class ContactMergeAction
     Conversation.where(contact_id: @mergee_contact.id).update(contact_id: @base_contact.id)
   end
 
+  def merge_messages
+    Message.where(contact_id: @mergee_contact.id).update(contact_id: @base_contact.id)
+  end
+
   def merge_contact_inboxes
     ContactInbox.where(contact_id: @mergee_contact.id).update(contact_id: @base_contact.id)
   end

app/builders/account_builder.rb

@@ -42,18 +42,26 @@ class AccountBuilder
 
   def create_and_link_user
     password = Time.now.to_i
-    @user = @account.users.new(email: @email,
-                               password: password,
-                               password_confirmation: password,
-                               role: User.roles['administrator'],
-                               name: email_to_name(@email))
+    @user = User.new(email: @email,
+                     password: password,
+                     password_confirmation: password,
+                     name: email_to_name(@email))
     if @user.save!
+      link_user_to_account(@user, @account)
       @user
     else
       raise UserErrors.new(errors: @user.errors)
     end
   end
 
+  def link_user_to_account(user, account)
+    AccountUser.create!(
+      account_id: account.id,
+      user_id: user.id,
+      role: AccountUser.roles['administrator']
+    )
+  end
+
   def email_to_name(email)
     name = email[/[^@]+/]
     name.split('.').map(&:capitalize).join(' ')

app/builders/contact_builder.rb

@@ -0,0 +1,38 @@
+class ContactBuilder
+  pattr_initialize [:source_id!, :inbox!, :contact_attributes!]
+
+  def perform
+    contact_inbox = inbox.contact_inboxes.find_by(source_id: source_id)
+    return contact_inbox if contact_inbox
+
+    build_contact
+  end
+
+  private
+
+  def account
+    @account ||= inbox.account
+  end
+
+  def build_contact
+    ActiveRecord::Base.transaction do
+      contact = account.contacts.create!(
+        name: contact_attributes[:name],
+        phone_number: contact_attributes[:phone_number],
+        email: contact_attributes[:email],
+        identifier: contact_attributes[:identifier],
+        additional_attributes: contact_attributes[:additional_attributes]
+      )
+      contact_inbox = ::ContactInbox.create!(
+        contact_id: contact.id,
+        inbox_id: inbox.id,
+        source_id: source_id
+      )
+
+      ::ContactAvatarJob.perform_later(contact, contact_attributes[:avatar_url]) if contact_attributes[:avatar_url]
+      contact_inbox
+    rescue StandardError => e
+      Rails.logger e
+    end
+  end
+end

app/builders/messages/message_builder.rb

@@ -1,130 +1,138 @@
-require 'open-uri'
-
 # This class creates both outgoing messages from chatwoot and echo outgoing messages based on the flag `outgoing_echo`
 # Assumptions
-# 1. Incase of an outgoing message which is echo, fb_id will NOT be nil,
+# 1. Incase of an outgoing message which is echo, source_id will NOT be nil,
 #    based on this we are showing "not sent from chatwoot" message in frontend
 #    Hence there is no need to set user_id in message for outgoing echo messages.
 
-module Messages
-  class MessageBuilder
-    attr_reader :response
+class Messages::MessageBuilder
+  attr_reader :response
 
-    def initialize(response, inbox, outgoing_echo = false)
-      @response = response
-      @inbox = inbox
-      @sender_id = (outgoing_echo ? @response.recipient_id : @response.sender_id)
-      @message_type = (outgoing_echo ? :outgoing : :incoming)
+  def initialize(response, inbox, outgoing_echo = false)
+    @response = response
+    @inbox = inbox
+    @sender_id = (outgoing_echo ? @response.recipient_id : @response.sender_id)
+    @message_type = (outgoing_echo ? :outgoing : :incoming)
+  end
+
+  def perform
+    ActiveRecord::Base.transaction do
+      build_contact
+      build_message
     end
+  rescue StandardError => e
+    Raven.capture_exception(e)
+    true
+  end
 
-    def perform
-      ActiveRecord::Base.transaction do
-        build_contact
-        build_message
-      end
-    rescue StandardError => e
-      Raven.capture_exception(e)
-      true
-    end
+  private
 
-    private
+  def contact
+    @contact ||= @inbox.contact_inboxes.find_by(source_id: @sender_id)&.contact
+  end
 
-    def contact
-      @contact ||= @inbox.contact_inboxes.find_by(source_id: @sender_id)&.contact
-    end
+  def build_contact
+    return if contact.present?
 
-    def build_contact
-      return if contact.present?
+    @contact = Contact.create!(contact_params.except(:remote_avatar_url))
+    ContactAvatarJob.perform_later(@contact, contact_params[:remote_avatar_url]) if contact_params[:remote_avatar_url]
+    @contact_inbox = ContactInbox.create(contact: contact, inbox: @inbox, source_id: @sender_id)
+  end
 
-      @contact = Contact.create!(contact_params)
-      ContactInbox.create(contact: contact, inbox: @inbox, source_id: @sender_id)
-    end
-
-    def build_message
-      @message = conversation.messages.new(message_params)
-      (response.attachments || []).each do |attachment|
-        @message.build_attachment(attachment_params(attachment))
-      end
-      @message.save!
-    end
-
-    def build_attachment; end
-
-    def conversation
-      @conversation ||= Conversation.find_by(conversation_params) || Conversation.create!(conversation_params)
-    end
-
-    def attachment_params(attachment)
-      file_type = attachment['type'].to_sym
-      params = { file_type: file_type, account_id: @message.account_id }
-
-      if [:image, :file, :audio, :video].include? file_type
-        params.merge!(file_type_params(attachment))
-      elsif file_type == :location
-        params.merge!(location_params(attachment))
-      elsif file_type == :fallback
-        params.merge!(fallback_params(attachment))
-      end
-
-      params
-    end
-
-    def file_type_params(attachment)
-      {
-        external_url: attachment['payload']['url'],
-        remote_file_url: attachment['payload']['url']
-      }
-    end
-
-    def location_params(attachment)
-      lat = attachment['payload']['coordinates']['lat']
-      long = attachment['payload']['coordinates']['long']
-      {
-        external_url: attachment['url'],
-        coordinates_lat: lat,
-        coordinates_long: long,
-        fallback_title: attachment['title']
-      }
-    end
-
-    def fallback_params(attachment)
-      {
-        fallback_title: attachment['title'],
-        external_url: attachment['url']
-      }
-    end
-
-    def conversation_params
-      {
-        account_id: @inbox.account_id,
-        inbox_id: @inbox.id,
-        contact_id: contact.id
-      }
-    end
-
-    def message_params
-      {
-        account_id: conversation.account_id,
-        inbox_id: conversation.inbox_id,
-        message_type: @message_type,
-        content: response.content,
-        fb_id: response.identifier
-      }
-    end
-
-    def contact_params
-      begin
-        k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
-        result = k.get_object(@sender_id) || {}
-      rescue Exception => e
-        result = {}
-        Raven.capture_exception(e)
-      end
-      {
-        name: "#{result['first_name'] || 'John'} #{result['last_name'] || 'Doe'}",
-        account_id: @inbox.account_id,
-        remote_avatar_url: result['profile_pic'] || nil
-      }
+  def build_message
+    @message = conversation.messages.create!(message_params)
+    (response.attachments || []).each do |attachment|
+      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]
     end
   end
+
+  def attach_file(attachment, file_url)
+    file_resource = LocalResource.new(file_url)
+    attachment.file.attach(io: file_resource.file, filename: file_resource.tmp_filename, content_type: file_resource.encoding)
+  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
+                         ))
+  end
+
+  def attachment_params(attachment)
+    file_type = attachment['type'].to_sym
+    params = { file_type: file_type, account_id: @message.account_id }
+
+    if [:image, :file, :audio, :video].include? file_type
+      params.merge!(file_type_params(attachment))
+    elsif file_type == :location
+      params.merge!(location_params(attachment))
+    elsif file_type == :fallback
+      params.merge!(fallback_params(attachment))
+    end
+
+    params
+  end
+
+  def file_type_params(attachment)
+    {
+      external_url: attachment['payload']['url'],
+      remote_file_url: attachment['payload']['url']
+    }
+  end
+
+  def location_params(attachment)
+    lat = attachment['payload']['coordinates']['lat']
+    long = attachment['payload']['coordinates']['long']
+    {
+      external_url: attachment['url'],
+      coordinates_lat: lat,
+      coordinates_long: long,
+      fallback_title: attachment['title']
+    }
+  end
+
+  def fallback_params(attachment)
+    {
+      fallback_title: attachment['title'],
+      external_url: attachment['url']
+    }
+  end
+
+  def conversation_params
+    {
+      account_id: @inbox.account_id,
+      inbox_id: @inbox.id,
+      contact_id: contact.id
+    }
+  end
+
+  def message_params
+    {
+      account_id: conversation.account_id,
+      inbox_id: conversation.inbox_id,
+      message_type: @message_type,
+      content: response.content,
+      source_id: response.identifier
+    }
+  end
+
+  def contact_params
+    begin
+      k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
+      result = k.get_object(@sender_id) || {}
+    rescue Exception => e
+      result = {}
+      Raven.capture_exception(e)
+    end
+    {
+      name: "#{result['first_name'] || 'John'} #{result['last_name'] || 'Doe'}",
+      account_id: @inbox.account_id,
+      remote_avatar_url: result['profile_pic'] || ''
+    }
+  end
 end

app/builders/messages/outgoing/normal_builder.rb

@@ -1,16 +1,31 @@
 class Messages::Outgoing::NormalBuilder
+  include ::FileTypeHelper
   attr_reader :message
 
   def initialize(user, conversation, params)
-    @content = params[:message]
-    @private = ['1', 'true', 1, true].include? params[:private]
+    @content = params[:content]
+    @private = params[:private] || false
     @conversation = conversation
     @user = user
     @fb_id = params[:fb_id]
+    @content_type = params[:content_type]
+    @items = params.to_unsafe_h&.dig(:content_attributes, :items)
+    @attachments = params[:attachments]
   end
 
   def perform
-    @message = @conversation.messages.create!(message_params)
+    @message = @conversation.messages.build(message_params)
+    if @attachments.present?
+      @attachments.each do |uploaded_attachment|
+        attachment = @message.attachments.new(
+          account_id: @message.account_id,
+          file_type: file_type(uploaded_attachment&.content_type)
+        )
+        attachment.file.attach(uploaded_attachment)
+      end
+    end
+    @message.save
+    @message
   end
 
   private
@@ -22,8 +37,10 @@ class Messages::Outgoing::NormalBuilder
       message_type: :outgoing,
       content: @content,
       private: @private,
-      user_id: @user.id,
-      fb_id: @fb_id
+      user_id: @user&.id,
+      source_id: @fb_id,
+      content_type: @content_type,
+      items: @items
     }
   end
 end

app/builders/notification_builder.rb

@@ -0,0 +1,32 @@
+class NotificationBuilder
+  pattr_initialize [:notification_type!, :user!, :account!, :primary_actor!]
+
+  def perform
+    return unless user_subscribed_to_notification?
+
+    build_notification
+  end
+
+  private
+
+  def secondary_actor
+    Current.user
+  end
+
+  def user_subscribed_to_notification?
+    notification_setting = user.notification_settings.find_by(account_id: account.id)
+    return true if notification_setting.public_send("email_#{notification_type}?")
+    return true if notification_setting.public_send("push_#{notification_type}?")
+
+    false
+  end
+
+  def build_notification
+    user.notifications.create!(
+      notification_type: notification_type,
+      account: account,
+      primary_actor: primary_actor,
+      secondary_actor: secondary_actor
+    )
+  end
+end

app/builders/notification_subscription_builder.rb

@@ -0,0 +1,28 @@
+class NotificationSubscriptionBuilder
+  pattr_initialize [:params, :user!]
+
+  def perform
+    # if multiple accounts were used to login in same browser
+    move_subscription_to_user if identifier_subscription && identifier_subscription.user_id != user.id
+    build_identifier_subscription if identifier_subscription.blank?
+    identifier_subscription
+  end
+
+  private
+
+  def identifier
+    @identifier ||= params[:subscription_attributes][:endpoint] if params[:subscription_type] == 'browser_push'
+  end
+
+  def identifier_subscription
+    @identifier_subscription ||= NotificationSubscription.find_by(identifier: identifier)
+  end
+
+  def move_subscription_to_user
+    @identifier_subscription.update(user_id: user.id)
+  end
+
+  def build_identifier_subscription
+    user.notification_subscriptions.create(params.merge(identifier: identifier))
+  end
+end

app/builders/report_builder.rb

@@ -1,77 +0,0 @@
-class ReportBuilder
-  include CustomExceptions::Report
-
-  # Usage
-  #  rb = ReportBuilder.new a, { metric: 'conversations_count', type: :account, id: 1}
-  #  rb = ReportBuilder.new a, { metric: 'avg_first_response_time', type: :agent, id: 1}
-
-  IDENTITY_MAPPING = {
-    account: AccountIdentity,
-    agent: AgentIdentity
-  }.freeze
-
-  def initialize(account, params)
-    @account = account
-    @params = params
-    @identity = get_identity
-    @start_time, @end_time = validate_times
-  end
-
-  def build
-    metric = @identity.send(@params[:metric])
-    if metric.get.nil?
-      metric.delete
-      result = {}
-    else
-      result = metric.get_padded_range(@start_time, @end_time) || {}
-    end
-    formatted_hash(result)
-  end
-
-  private
-
-  def get_identity
-    identity_class = IDENTITY_MAPPING[@params[:type]]
-    raise InvalidIdentity if identity_class.nil?
-
-    @params[:id] = @account.id if identity_class == AccountIdentity
-    identity_id = @params[:id]
-    raise IdentityNotFound if identity_id.nil?
-
-    tags = identity_class == AccountIdentity ? nil : { account_id: @account.id }
-    identity = identity_class.new(identity_id, tags: tags)
-    raise MetricNotFound if @params[:metric].blank?
-    raise MetricNotFound unless identity.respond_to?(@params[:metric])
-
-    identity
-  end
-
-  def validate_times
-    start_time = @params[:since] || Time.now.end_of_day - 30.days
-    end_time = @params[:until] || Time.now.end_of_day
-    start_time = begin
-                   parse_date_time(start_time)
-                 rescue StandardError
-                   raise(InvalidStartTime)
-                 end
-    end_time = begin
-                 parse_date_time(end_time)
-               rescue StandardError
-                 raise(InvalidEndTime)
-               end
-    [start_time, end_time]
-  end
-
-  def parse_date_time(datetime)
-    return datetime if datetime.is_a?(DateTime)
-    return datetime.to_datetime if datetime.is_a?(Time) || datetime.is_a?(Date)
-
-    DateTime.strptime(datetime, '%s')
-  end
-
-  def formatted_hash(hash)
-    hash.each_with_object([]) do |p, arr|
-      arr << { value: p[1], timestamp: p[0] }
-    end
-  end
-end

app/builders/v2/report_builder.rb

@@ -0,0 +1,111 @@
+class V2::ReportBuilder
+  attr_reader :account, :params
+
+  def initialize(account, params)
+    @account = account
+    @params = params
+  end
+
+  def timeseries
+    send(params[:metric])
+  end
+
+  # For backward compatible with old report
+  def build
+    timeseries.each_with_object([]) do |p, arr|
+      arr << { value: p[1], timestamp: p[0].to_time.to_i }
+    end
+  end
+
+  def summary
+    {
+      conversations_count: conversations_count.values.sum,
+      incoming_messages_count: incoming_messages_count.values.sum,
+      outgoing_messages_count: outgoing_messages_count.values.sum,
+      avg_first_response_time: avg_first_response_time_summary,
+      avg_resolution_time: avg_resolution_time_summary,
+      resolutions_count: resolutions_count.values.sum
+    }
+  end
+
+  private
+
+  def scope
+    return account if params[:type].match?('account')
+    return inbox if params[:type].match?('inbox')
+    return user if params[:type].match?('agent')
+  end
+
+  def inbox
+    @inbox ||= account.inboxes.where(id: params[:id]).first
+  end
+
+  def user
+    @user ||= account.users.where(id: params[:id]).first
+  end
+
+  def conversations_count
+    scope.conversations
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .count
+  end
+
+  # unscoped removes all scopes added to a model previously
+  def incoming_messages_count
+    scope.messages.unscoped.where(account_id: account.id).incoming
+         .group_by_day(:created_at, range: range, default_value: 0)
+         .count
+  end
+
+  def outgoing_messages_count
+    scope.messages.unscoped.where(account_id: account.id).outgoing
+         .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
+
+  def range
+    parse_date_time(params[:since])..parse_date_time(params[:until])
+  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
+
+  def parse_date_time(datetime)
+    return datetime if datetime.is_a?(DateTime)
+    return datetime.to_datetime if datetime.is_a?(Time) || datetime.is_a?(Date)
+
+    DateTime.strptime(datetime, '%s')
+  end
+end

app/channels/room_channel.rb

@@ -1,5 +1,10 @@
 class RoomChannel < ApplicationCable::Channel
   def subscribed
     stream_from params[:pubsub_token]
+    ::OnlineStatusTracker.add_subscription(params[:pubsub_token])
+  end
+
+  def unsubscribed
+    ::OnlineStatusTracker.remove_subscription(params[:pubsub_token])
   end
 end

app/controllers/api/base_controller.rb

@@ -1,16 +1,21 @@
 class Api::BaseController < ApplicationController
+  include AccessTokenAuthHelper
   respond_to :json
-  before_action :authenticate_user!
-  unless Rails.env.development?
-    rescue_from StandardError do |exception|
-      Raven.capture_exception(exception)
-      render json: { error: '500 error', message: exception.message }.to_json, status: 500
-    end
-  end
+  before_action :authenticate_access_token!, if: :authenticate_by_access_token?
+  before_action :validate_bot_access_token!, if: :authenticate_by_access_token?
+  before_action :authenticate_user!, unless: :authenticate_by_access_token?
 
   private
 
+  def authenticate_by_access_token?
+    request.headers[:api_access_token].present? || request.headers[:HTTP_API_ACCESS_TOKEN].present?
+  end
+
   def set_conversation
     @conversation ||= current_account.conversations.find_by(display_id: params[:conversation_id])
   end
+
+  def check_billing_enabled
+    raise ActionController::RoutingError, 'Not Found' unless ENV['BILLING_ENABLED']
+  end
 end

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

@@ -0,0 +1,54 @@
+class Api::V1::Accounts::AccountsController < Api::BaseController
+  include AuthHelper
+
+  skip_before_action :verify_authenticity_token, only: [:create]
+  skip_before_action :authenticate_user!, :set_current_user, :check_subscription, :handle_with_exception,
+                     only: [:create], raise: false
+  before_action :check_signup_enabled, only: [:create]
+  before_action :check_authorization, except: [:create]
+  before_action :fetch_account, except: [:create]
+
+  rescue_from CustomExceptions::Account::InvalidEmail,
+              CustomExceptions::Account::UserExists,
+              CustomExceptions::Account::UserErrors,
+              with: :render_error_response
+
+  def create
+    @user = AccountBuilder.new(
+      account_name: account_params[:account_name],
+      email: account_params[:email]
+    ).perform
+    if @user
+      send_auth_headers(@user)
+      render 'devise/auth.json', locals: { resource: @user }
+    else
+      render_error_response(CustomExceptions::Account::SignupFailed.new({}))
+    end
+  end
+
+  def show
+    render 'api/v1/accounts/show.json'
+  end
+
+  def update
+    @account.update!(account_params.slice(:name, :locale, :domain, :support_email, :domain_emails_enabled))
+  end
+
+  private
+
+  def check_authorization
+    authorize(Account)
+  end
+
+  def fetch_account
+    @account = current_user.accounts.find(params[:id])
+  end
+
+  def account_params
+    params.permit(:account_name, :email, :name, :locale, :domain, :support_email, :domain_emails_enabled)
+  end
+
+  def check_signup_enabled
+    raise ActionController::RoutingError, 'Not Found' if ENV.fetch('ENABLE_ACCOUNT_SIGNUP', true) == 'false'
+  end
+end

app/controllers/api/v1/accounts/actions/contact_merges_controller.rb

@@ -1,4 +1,4 @@
-class Api::V1::Actions::ContactMergesController < Api::BaseController
+class Api::V1::Accounts::Actions::ContactMergesController < Api::BaseController
   before_action :set_base_contact, only: [:create]
   before_action :set_mergee_contact, only: [:create]
 

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

@@ -0,0 +1,69 @@
+class Api::V1::Accounts::AgentsController < Api::BaseController
+  before_action :fetch_agent, except: [:create, :index]
+  before_action :check_authorization
+  before_action :find_user, only: [:create]
+  before_action :create_user, only: [:create]
+  before_action :save_account_user, only: [:create]
+
+  def index
+    @agents = agents
+  end
+
+  def destroy
+    @agent.account_user.destroy
+    head :ok
+  end
+
+  def update
+    @agent.update!(agent_params.except(:role))
+    @agent.account_user.update!(role: agent_params[:role]) if agent_params[:role]
+    render 'api/v1/models/user.json', locals: { resource: @agent }
+  end
+
+  def create
+    render 'api/v1/models/user.json', locals: { resource: @user }
+  end
+
+  private
+
+  def check_authorization
+    authorize(User)
+  end
+
+  def fetch_agent
+    @agent = agents.find(params[:id])
+  end
+
+  def find_user
+    @user =  User.find_by(email: new_agent_params[:email])
+  end
+
+  def create_user
+    return if @user
+
+    @user = User.create!(new_agent_params.slice(:email, :name, :password, :password_confirmation))
+  end
+
+  def save_account_user
+    AccountUser.create!(
+      account_id: current_account.id,
+      user_id: @user.id,
+      role: new_agent_params[:role],
+      inviter_id: current_user.id
+    )
+  end
+
+  def agent_params
+    params.require(:agent).permit(:email, :name, :role)
+  end
+
+  def new_agent_params
+    time = Time.now.to_i
+    params.require(:agent).permit(:email, :name, :role)
+          .merge!(password: time, password_confirmation: time, inviter: current_user)
+  end
+
+  def agents
+    @agents ||= current_account.users
+  end
+end

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

@@ -1,38 +1,36 @@
-require 'rest-client'
-require 'telegram/bot'
-class Api::V1::CallbacksController < ApplicationController
-  skip_before_action :verify_authenticity_token, only: [:register_facebook_page]
-  skip_before_action :authenticate_user!, only: [:register_facebook_page], raise: false
+class Api::V1::Accounts::CallbacksController < Api::BaseController
+  before_action :inbox, only: [:reauthorize_page]
 
   def register_facebook_page
     user_access_token = params[:user_access_token]
     page_access_token = params[:page_access_token]
-    page_name = params[:page_name]
     page_id = params[:page_id]
     inbox_name = params[:inbox_name]
-    facebook_channel = current_account.facebook_pages.create!(
-      name: page_name, page_id: page_id, user_access_token: user_access_token,
-      page_access_token: page_access_token, remote_avatar_url: set_avatar(page_id)
-    )
-    inbox = current_account.inboxes.create!(name: inbox_name, channel: facebook_channel)
-    render json: inbox
+    ActiveRecord::Base.transaction do
+      facebook_channel = current_account.facebook_pages.create!(
+        page_id: page_id, user_access_token: user_access_token,
+        page_access_token: page_access_token
+      )
+      @facebook_inbox = current_account.inboxes.create!(name: inbox_name, channel: facebook_channel)
+      set_avatar(@facebook_inbox, page_id)
+    rescue StandardError => e
+      Rails.logger e
+    end
   end
 
-  def get_facebook_pages
+  def facebook_pages
     @page_details = mark_already_existing_facebook_pages(fb_object.get_connections('me', 'accounts'))
   end
 
   # get params[:inbox_id], current_account, params[:omniauth_token]
   def reauthorize_page
-    if @inbox&.first&.facebook?
+    if @inbox&.facebook?
       fb_page_id = @inbox.channel.page_id
       page_details = fb_object.get_connections('me', 'accounts')
 
-      (page_details || []).each do |page_detail|
-        if fb_page_id == page_detail['id'] # found the page which has to be reauthorised
-          update_fb_page(fb_page_id, page_detail['access_token'])
-          head :ok
-        end
+      if (page_detail = (page_details || []).detect { |page| fb_page_id == page['id'] })
+        update_fb_page(fb_page_id, page_detail['access_token'])
+        return head :ok
       end
     end
 
@@ -45,18 +43,13 @@ class Api::V1::CallbacksController < ApplicationController
     @inbox = current_account.inboxes.find_by(id: params[:inbox_id])
   end
 
-  def update_fb_page
-    if fb_page(fb_page_id)
-      fb_page.update_attributes!(
-        user_access_token: @user_access_token, page_access_token: access_token
-      )
-      head :ok
-    else
-      head :unprocessable_entity
-    end
+  def update_fb_page(fb_page_id, access_token)
+    get_fb_page(fb_page_id)&.update!(
+      user_access_token: @user_access_token, page_access_token: access_token
+    )
   end
 
-  def fb_page(fb_page_id)
+  def get_fb_page(fb_page_id)
     current_account.facebook_pages.find_by(page_id: fb_page_id)
   end
 
@@ -67,19 +60,30 @@ class Api::V1::CallbacksController < ApplicationController
 
   def long_lived_token(omniauth_token)
     koala = Koala::Facebook::OAuth.new(ENV['FB_APP_ID'], ENV['FB_APP_SECRET'])
-    long_lived_token = koala.exchange_access_token_info(omniauth_token)['access_token']
+    koala.exchange_access_token_info(omniauth_token)['access_token']
+  rescue StandardError => e
+    Rails.logger e
   end
 
   def mark_already_existing_facebook_pages(data)
     return [] if data.empty?
 
     data.inject([]) do |result, page_detail|
-      current_account.facebook_pages.exists?(page_id: page_detail['id']) ? page_detail.merge!(exists: true) : page_detail.merge!(exists: false)
+      page_detail[:exists] = current_account.facebook_pages.exists?(page_id: page_detail['id']) ? true : false
       result << page_detail
     end
   end
 
-  def set_avatar(page_id)
+  def set_avatar(facebook_inbox, page_id)
+    uri = get_avatar_url(page_id)
+
+    return unless uri
+
+    avatar_resource = LocalResource.new(uri)
+    facebook_inbox.avatar.attach(io: avatar_resource.file, filename: avatar_resource.tmp_filename, content_type: avatar_resource.encoding)
+  end
+
+  def get_avatar_url(page_id)
     begin
       url = 'http://graph.facebook.com/' << page_id << '/picture?type=large'
       uri = URI.parse(url)
@@ -88,12 +92,12 @@ class Api::V1::CallbacksController < ApplicationController
         response = uri.open(redirect: false)
       rescue OpenURI::HTTPRedirect => e
         uri = e.uri # assigned from the "Location" response header
-        retry if (tries -= 1) > 0
+        retry if (tries -= 1).positive?
         raise
       end
       pic_url = response.base_uri.to_s
-      Rails.logger.info(pic_url)
     rescue StandardError => e
+      Rails.logger.debug "Rescued: #{e.inspect}"
       pic_url = nil
     end
     pic_url

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

@@ -1,4 +1,4 @@
-class Api::V1::CannedResponsesController < Api::BaseController
+class Api::V1::Accounts::CannedResponsesController < Api::BaseController
   before_action :fetch_canned_response, only: [:update, :destroy]
 
   def index

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

@@ -0,0 +1,57 @@
+class Api::V1::Accounts::Channels::TwilioChannelsController < Api::BaseController
+  before_action :authorize_request
+
+  def create
+    ActiveRecord::Base.transaction do
+      authenticate_twilio
+      build_inbox
+      setup_webhooks if @twilio_channel.sms?
+    rescue Twilio::REST::TwilioError => e
+      render_could_not_create_error(e.message)
+    rescue StandardError => e
+      render_could_not_create_error(e.message)
+    end
+  end
+
+  private
+
+  def authorize_request
+    authorize ::Inbox
+  end
+
+  def authenticate_twilio
+    client = Twilio::REST::Client.new(permitted_params[:account_sid], permitted_params[:auth_token])
+    client.messages.list(limit: 1)
+  end
+
+  def setup_webhooks
+    ::Twilio::WebhookSetupService.new(inbox: @inbox).perform
+  end
+
+  def phone_number
+    medium == 'sms' ? permitted_params[:phone_number] : "whatsapp:#{permitted_params[:phone_number]}"
+  end
+
+  def medium
+    permitted_params[:medium]
+  end
+
+  def build_inbox
+    @twilio_channel = current_account.twilio_sms.create!(
+      account_sid: permitted_params[:account_sid],
+      auth_token: permitted_params[:auth_token],
+      phone_number: phone_number,
+      medium: medium
+    )
+    @inbox = current_account.inboxes.create(
+      name: permitted_params[:name],
+      channel: @twilio_channel
+    )
+  end
+
+  def permitted_params
+    params.require(:twilio_channel).permit(
+      :account_id, :phone_number, :account_sid, :auth_token, :name, :medium
+    )
+  end
+end

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

@@ -0,0 +1,23 @@
+class Api::V1::Accounts::Contacts::ConversationsController < Api::BaseController
+  def index
+    @conversations = current_account.conversations.includes(
+      :assignee, :contact, :inbox
+    ).where(inbox_id: inbox_ids, contact_id: permitted_params[:contact_id])
+  end
+
+  private
+
+  def inbox_ids
+    if current_user.administrator?
+      current_account.inboxes.pluck(:id)
+    elsif current_user.agent?
+      current_user.assigned_inboxes.pluck(:id)
+    else
+      []
+    end
+  end
+
+  def permitted_params
+    params.permit(:contact_id)
+  end
+end

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

@@ -1,14 +1,9 @@
-class Api::V1::ContactsController < Api::BaseController
+class Api::V1::Accounts::ContactsController < Api::BaseController
   protect_from_forgery with: :null_session
 
   before_action :check_authorization
   before_action :fetch_contact, only: [:show, :update]
 
-  skip_before_action :authenticate_user!, only: [:create]
-  skip_before_action :set_current_user, only: [:create]
-  skip_before_action :check_subscription, only: [:create]
-  skip_around_action :handle_with_exception, only: [:create]
-
   def index
     @contacts = current_account.contacts
   end

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

@@ -1,7 +1,8 @@
-class Api::V1::Conversations::AssignmentsController < Api::BaseController
+class Api::V1::Accounts::Conversations::AssignmentsController < Api::BaseController
   before_action :set_conversation, only: [:create]
 
-  def create # assign agent to a conversation
+  # assign agent to a conversation
+  def create
     # if params[:assignee_id] is not a valid id, it will set to nil, hence unassigning the conversation
     assignee = current_account.users.find_by(id: params[:assignee_id])
     @conversation.update_assignee(assignee)

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

@@ -1,4 +1,4 @@
-class Api::V1::Conversations::LabelsController < Api::BaseController
+class Api::V1::Accounts::Conversations::LabelsController < Api::BaseController
   before_action :set_conversation, only: [:create, :index]
 
   def create
@@ -6,7 +6,8 @@ class Api::V1::Conversations::LabelsController < Api::BaseController
     @labels = @conversation.label_list
   end
 
-  def index # all labels of the current conversation
+  # all labels of the current conversation
+  def index
     @labels = @conversation.label_list
   end
 end

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

@@ -0,0 +1,18 @@
+class Api::V1::Accounts::Conversations::MessagesController < Api::BaseController
+  before_action :set_conversation, only: [:index, :create]
+
+  def index
+    @messages = message_finder.perform
+  end
+
+  def create
+    mb = Messages::Outgoing::NormalBuilder.new(current_user, @conversation, params)
+    @message = mb.perform
+  end
+
+  private
+
+  def message_finder
+    @message_finder ||= MessageFinder.new(@conversation, params)
+  end
+end

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

@@ -0,0 +1,73 @@
+class Api::V1::Accounts::ConversationsController < Api::BaseController
+  include Events::Types
+  before_action :conversation, except: [:index]
+  before_action :contact_inbox, only: [:create]
+
+  def index
+    result = conversation_finder.perform
+    @conversations = result[:conversations]
+    @conversations_count = result[:count]
+  end
+
+  def meta
+    result = conversation_finder.perform
+    @conversations_count = result[:count]
+  end
+
+  def create
+    @conversation = ::Conversation.create!(conversation_params)
+  end
+
+  def show; end
+
+  def toggle_status
+    @status = @conversation.toggle_status
+  end
+
+  def toggle_typing_status
+    if params[:typing_status] == 'on'
+      trigger_typing_event(CONVERSATION_TYPING_ON)
+    elsif params[:typing_status] == 'off'
+      trigger_typing_event(CONVERSATION_TYPING_OFF)
+    end
+    head :ok
+  end
+
+  def update_last_seen
+    @conversation.agent_last_seen_at = parsed_last_seen_at
+    @conversation.save!
+    head :ok
+  end
+
+  private
+
+  def trigger_typing_event(event)
+    user = current_user.presence || @resource
+    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user)
+  end
+
+  def parsed_last_seen_at
+    DateTime.strptime(params[:agent_last_seen_at].to_s, '%s')
+  end
+
+  def conversation
+    @conversation ||= current_account.conversations.find_by(display_id: params[:id])
+  end
+
+  def contact_inbox
+    @contact_inbox ||= ::ContactInbox.find_by!(source_id: params[:source_id])
+  end
+
+  def conversation_params
+    {
+      account_id: current_account.id,
+      inbox_id: @contact_inbox.inbox_id,
+      contact_id: @contact_inbox.contact_id,
+      contact_inbox_id: @contact_inbox.id
+    }
+  end
+
+  def conversation_finder
+    @conversation_finder ||= ConversationFinder.new(current_user, params)
+  end
+end

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

@@ -1,4 +1,4 @@
-class Api::V1::FacebookIndicatorsController < Api::BaseController
+class Api::V1::Accounts::FacebookIndicatorsController < Api::BaseController
   before_action :set_access_token
   around_action :handle_with_exception
 
@@ -26,6 +26,7 @@ class Api::V1::FacebookIndicatorsController < Api::BaseController
   def handle_with_exception
     yield
   rescue Facebook::Messenger::Error => e
+    Rails.logger.debug "Rescued: #{e.inspect}"
     true
   end
 

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

@@ -0,0 +1,45 @@
+class Api::V1::Accounts::InboxMembersController < Api::BaseController
+  before_action :fetch_inbox, only: [:create, :show]
+  before_action :current_agents_ids, only: [:create]
+
+  def create
+    # update also done via same action
+    update_agents_list
+    head :ok
+  rescue StandardError => e
+    Rails.logger.debug "Rescued: #{e.inspect}"
+    render_could_not_create_error('Could not add agents to inbox')
+  end
+
+  def show
+    @agents = current_account.users.where(id: @inbox.members.pluck(:user_id))
+  end
+
+  private
+
+  def update_agents_list
+    # get all the user_ids which the inbox currently has as members.
+    # get the list of  user_ids from params
+    # the missing ones are the agents which are to be deleted from the inbox
+    # the new ones are the agents which are to be added to the inbox
+
+    agents_to_be_added_ids.each { |user_id| @inbox.add_member(user_id) }
+    agents_to_be_removed_ids.each { |user_id| @inbox.remove_member(user_id) }
+  end
+
+  def agents_to_be_added_ids
+    params[:user_ids] - @current_agents_ids
+  end
+
+  def agents_to_be_removed_ids
+    @current_agents_ids - params[:user_ids]
+  end
+
+  def current_agents_ids
+    @current_agents_ids = @inbox.members.pluck(:id)
+  end
+
+  def fetch_inbox
+    @inbox = current_account.inboxes.find(params[:inbox_id])
+  end
+end

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

@@ -0,0 +1,66 @@
+class Api::V1::Accounts::InboxesController < Api::BaseController
+  before_action :check_authorization
+  before_action :fetch_inbox, except: [:index, :create]
+  before_action :fetch_agent_bot, only: [:set_agent_bot]
+
+  def index
+    @inboxes = policy_scope(current_account.inboxes)
+  end
+
+  def create
+    ActiveRecord::Base.transaction do
+      channel = web_widgets.create!(permitted_params[:channel].except(:type)) if permitted_params[:channel][:type] == 'web_widget'
+      @inbox = current_account.inboxes.build(name: permitted_params[:name], channel: channel)
+      @inbox.avatar.attach(permitted_params[:avatar])
+      @inbox.save!
+    end
+  end
+
+  def update
+    @inbox.update(inbox_update_params.except(:channel))
+    @inbox.channel.update!(inbox_update_params[:channel]) if @inbox.channel.is_a?(Channel::WebWidget) && inbox_update_params[:channel].present?
+  end
+
+  def set_agent_bot
+    if @agent_bot
+      agent_bot_inbox = @inbox.agent_bot_inbox || AgentBotInbox.new(inbox: @inbox)
+      agent_bot_inbox.agent_bot = @agent_bot
+      agent_bot_inbox.save!
+    elsif @inbox.agent_bot_inbox.present?
+      @inbox.agent_bot_inbox.destroy!
+    end
+    head :ok
+  end
+
+  def destroy
+    @inbox.destroy
+    head :ok
+  end
+
+  private
+
+  def fetch_inbox
+    @inbox = current_account.inboxes.find(params[:id])
+  end
+
+  def fetch_agent_bot
+    @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
+  end
+
+  def web_widgets
+    current_account.web_widgets
+  end
+
+  def check_authorization
+    authorize(Inbox)
+  end
+
+  def permitted_params
+    params.permit(:id, :avatar, :name, channel: [:type, :website_url, :widget_color, :welcome_title, :welcome_tagline, :agent_away_message])
+  end
+
+  def inbox_update_params
+    params.permit(:enable_auto_assignment, :name, :avatar, channel: [:website_url, :widget_color, :welcome_title,
+                                                                     :welcome_tagline, :agent_away_message])
+  end
+end

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

@@ -0,0 +1,10 @@
+class Api::V1::Accounts::LabelsController < Api::BaseController
+  # list all labels in account
+  def index
+    @labels = current_account.all_conversation_tags
+  end
+
+  def most_used
+    @labels = ActsAsTaggableOn::Tag.most_used(params[:count] || 10)
+  end
+end

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

@@ -0,0 +1,30 @@
+class Api::V1::Accounts::NotificationSettingsController < Api::BaseController
+  before_action :set_user, :load_notification_setting
+
+  def show; end
+
+  def update
+    update_flags
+    @notification_setting.save!
+    render action: 'show'
+  end
+
+  private
+
+  def set_user
+    @user = current_user
+  end
+
+  def load_notification_setting
+    @notification_setting = @user.notification_settings.find_by(account_id: current_account.id)
+  end
+
+  def notification_setting_params
+    params.require(:notification_settings).permit(selected_email_flags: [], selected_push_flags: [])
+  end
+
+  def update_flags
+    @notification_setting.selected_email_flags = notification_setting_params[:selected_email_flags]
+    @notification_setting.selected_push_flags = notification_setting_params[:selected_push_flags]
+  end
+end

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

@@ -0,0 +1,21 @@
+class Api::V1::Accounts::NotificationsController < Api::BaseController
+  protect_from_forgery with: :null_session
+
+  before_action :fetch_notification, only: [:update]
+
+  def index
+    @notifications = current_user.notifications.where(account_id: current_account.id)
+    render json: @notifications
+  end
+
+  def update
+    @notification.update(read_at: DateTime.now.utc)
+    render json: @notification
+  end
+
+  private
+
+  def fetch_notification
+    @notification = current_user.notifications.find(params[:id])
+  end
+end

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

@@ -1,6 +1,8 @@
-class Api::V1::SubscriptionsController < ApplicationController
+class Api::V1::Accounts::SubscriptionsController < Api::BaseController
   skip_before_action :check_subscription
 
+  before_action :check_billing_enabled
+
   def index
     render json: current_account.subscription_data
   end

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

@@ -0,0 +1,36 @@
+class Api::V1::Accounts::WebhooksController < Api::BaseController
+  before_action :check_authorization
+  before_action :fetch_webhook, only: [:update, :destroy]
+
+  def index
+    @webhooks = current_account.webhooks
+  end
+
+  def create
+    @webhook = current_account.webhooks.new(webhook_params)
+    @webhook.save!
+  end
+
+  def update
+    @webhook.update!(webhook_params)
+  end
+
+  def destroy
+    @webhook.destroy
+    head :ok
+  end
+
+  private
+
+  def webhook_params
+    params.require(:webhook).permit(:inbox_id, :url)
+  end
+
+  def fetch_webhook
+    @webhook = current_account.webhooks.find(params[:id])
+  end
+
+  def check_authorization
+    authorize(Webhook)
+  end
+end

app/controllers/api/v1/accounts_controller.rb

@@ -1,33 +0,0 @@
-class Api::V1::AccountsController < Api::BaseController
-  include AuthHelper
-
-  skip_before_action :verify_authenticity_token, only: [:create]
-  skip_before_action :authenticate_user!, :set_current_user, :check_subscription, :handle_with_exception,
-                     only: [:create], raise: false
-
-  rescue_from CustomExceptions::Account::InvalidEmail,
-              CustomExceptions::Account::UserExists,
-              CustomExceptions::Account::UserErrors,
-              with: :render_error_response
-
-  def create
-    @user = AccountBuilder.new(
-      account_name: account_params[:account_name],
-      email: account_params[:email]
-    ).perform
-    if @user
-      send_auth_headers(@user)
-      render json: {
-        data: @user.token_validation_response
-      }
-    else
-      render_error_response(CustomExceptions::Account::SignupFailed.new({}))
-    end
-  end
-
-  private
-
-  def account_params
-    params.permit(:account_name, :email)
-  end
-end

app/controllers/api/v1/agent_bots_controller.rb

@@ -0,0 +1,8 @@
+class Api::V1::AgentBotsController < Api::BaseController
+  skip_before_action :authenticate_user!
+  skip_before_action :check_subscription
+
+  def index
+    render json: AgentBot.all
+  end
+end

app/controllers/api/v1/agents_controller.rb

@@ -1,52 +0,0 @@
-class Api::V1::AgentsController < Api::BaseController
-  before_action :fetch_agent, except: [:create, :index]
-  before_action :check_authorization
-  before_action :build_agent, only: [:create]
-
-  def index
-    render json: agents
-  end
-
-  def destroy
-    @agent.destroy
-    head :ok
-  end
-
-  def update
-    @agent.update!(agent_params)
-    render json: @agent
-  end
-
-  def create
-    @agent.save!
-    render json: @agent
-  end
-
-  private
-
-  def check_authorization
-    authorize(User)
-  end
-
-  def fetch_agent
-    @agent = agents.find(params[:id])
-  end
-
-  def build_agent
-    @agent = agents.new(new_agent_params)
-  end
-
-  def agent_params
-    params.require(:agent).permit(:email, :name, :role)
-  end
-
-  def new_agent_params
-    time = Time.now.to_i
-    params.require(:agent).permit(:email, :name, :role)
-          .merge!(password: time, password_confirmation: time, inviter: current_user)
-  end
-
-  def agents
-    @agents ||= current_account.users
-  end
-end

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

@@ -1,8 +0,0 @@
-class Api::V1::Conversations::MessagesController < Api::BaseController
-  before_action :set_conversation, only: [:create]
-
-  def create
-    mb = Messages::Outgoing::NormalBuilder.new(current_user, @conversation, params)
-    @message = mb.perform
-  end
-end

app/controllers/api/v1/conversations_controller.rb

@@ -1,52 +0,0 @@
-class Api::V1::ConversationsController < Api::BaseController
-  before_action :set_conversation, except: [:index, :get_messages]
-
-  # TODO: move this to public controller
-  skip_before_action :authenticate_user!, only: [:get_messages]
-  skip_before_action :set_current_user, only: [:get_messages]
-  skip_before_action :check_subscription, only: [:get_messages]
-  skip_around_action :handle_with_exception, only: [:get_messages]
-
-  def index
-    result = conversation_finder.perform
-    @conversations = result[:conversations]
-    @conversations_count = result[:count]
-  end
-
-  def show
-    @messages = messages_finder.perform
-  end
-
-  def toggle_status
-    @status = @conversation.toggle_status
-  end
-
-  def update_last_seen
-    @conversation.agent_last_seen_at = parsed_last_seen_at
-    @conversation.save!
-    head :ok
-  end
-
-  def get_messages
-    @conversation = Conversation.find(params[:id])
-    @messages = messages_finder.perform
-  end
-
-  private
-
-  def parsed_last_seen_at
-    DateTime.strptime(params[:agent_last_seen_at].to_s, '%s')
-  end
-
-  def set_conversation
-    @conversation ||= current_account.conversations.find_by(display_id: params[:id])
-  end
-
-  def conversation_finder
-    @conversation_finder ||= ConversationFinder.new(current_user, params)
-  end
-
-  def messages_finder
-    @message_finder ||= MessageFinder.new(@conversation, params)
-  end
-end

app/controllers/api/v1/inbox_members_controller.rb

@@ -1,55 +0,0 @@
-module Api
-  module V1
-    class InboxMembersController < Api::BaseController
-      before_action :fetch_inbox, only: [:create, :show]
-      before_action :current_agents_ids, only: [:create]
-
-      def create
-        # update also done via same action
-        if @inbox
-          begin
-            update_agents_list
-            head :ok
-          rescue StandardError => e
-            Rails.logger.debug "Rescued: #{e.inspect}"
-            render_could_not_create_error('Could not add agents to inbox')
-          end
-        else
-          render_not_found_error('Agents or inbox not found')
-        end
-      end
-
-      def show
-        @agents = current_account.users.where(id: @inbox.members.pluck(:user_id))
-      end
-
-      private
-
-      def update_agents_list
-        # get all the user_ids which the inbox currently has as members.
-        # get the list of  user_ids from params
-        # the missing ones are the agents which are to be deleted from the inbox
-        # the new ones are the agents which are to be added to the inbox
-
-        agents_to_be_added_ids.each { |user_id| @inbox.add_member(user_id) }
-        agents_to_be_removed_ids.each { |user_id| @inbox.remove_member(user_id) }
-      end
-
-      def agents_to_be_added_ids
-        params[:user_ids] - @current_agents_ids
-      end
-
-      def agents_to_be_removed_ids
-        @current_agents_ids - params[:user_ids]
-      end
-
-      def current_agents_ids
-        @current_agents_ids = @inbox.members.pluck(:id)
-      end
-
-      def fetch_inbox
-        @inbox = current_account.inboxes.find(params[:inbox_id])
-      end
-    end
-  end
-end

app/controllers/api/v1/inboxes_controller.rb

@@ -1,23 +0,0 @@
-class Api::V1::InboxesController < Api::BaseController
-  before_action :check_authorization
-  before_action :fetch_inbox, only: [:destroy]
-
-  def index
-    @inboxes = policy_scope(current_account.inboxes)
-  end
-
-  def destroy
-    @inbox.destroy
-    head :ok
-  end
-
-  private
-
-  def fetch_inbox
-    @inbox = current_account.inboxes.find(params[:id])
-  end
-
-  def check_authorization
-    authorize(Inbox)
-  end
-end

app/controllers/api/v1/labels_controller.rb

@@ -1,5 +0,0 @@
-class Api::V1::LabelsController < Api::BaseController
-  def index # list all labels in account
-    @labels = current_account.all_conversation_tags
-  end
-end

app/controllers/api/v1/notification_subscriptions_controller.rb

@@ -0,0 +1,19 @@
+class Api::V1::NotificationSubscriptionsController < Api::BaseController
+  before_action :set_user
+
+  def create
+    notification_subscription = NotificationSubscriptionBuilder.new(user: @user, params: notification_subscription_params).perform
+
+    render json: notification_subscription
+  end
+
+  private
+
+  def set_user
+    @user = current_user
+  end
+
+  def notification_subscription_params
+    params.require(:notification_subscription).permit(:subscription_type, subscription_attributes: {})
+  end
+end

app/controllers/api/v1/profiles_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::ProfilesController < Api::BaseController
-  before_action :fetch_user
+  before_action :set_user
 
   def show
     render json: @user
@@ -7,12 +7,11 @@ class Api::V1::ProfilesController < Api::BaseController
 
   def update
     @user.update!(profile_params)
-    render json: @user
   end
 
   private
 
-  def fetch_user
+  def set_user
     @user = current_user
   end
 

app/controllers/api/v1/reports_controller.rb

@@ -1,103 +0,0 @@
-class Api::V1::ReportsController < Api::BaseController
-  include CustomExceptions::Report
-  include Constants::Report
-
-  around_action :report_exception
-
-  def account
-    builder = ReportBuilder.new(current_account, account_report_params)
-    data = builder.build
-    render json: data
-  end
-
-  def agent
-    builder = ReportBuilder.new(current_account, agent_report_params)
-    data = builder.build
-    render json: data
-  end
-
-  def account_summary
-    render json: account_summary_metrics
-  end
-
-  def agent_summary
-    render json: agent_summary_metrics
-  end
-
-  private
-
-  def report_exception
-    yield
-  rescue InvalidIdentity, IdentityNotFound, MetricNotFound, InvalidStartTime, InvalidEndTime => e
-    render_error_response(e)
-  end
-
-  def current_account
-    current_user.account
-  end
-
-  def agent
-    @agent ||= current_account.users.find(params[:agent_id])
-  end
-
-  def account_summary_metrics
-    summary_metrics(ACCOUNT_METRICS, :account_summary_params, AVG_ACCOUNT_METRICS)
-  end
-
-  def agent_summary_metrics
-    summary_metrics(AGENT_METRICS, :agent_summary_params, AVG_AGENT_METRICS)
-  end
-
-  def summary_metrics(metrics, calc_function, avg_metrics)
-    metrics.each_with_object({}) do |metric, result|
-      data = ReportBuilder.new(current_account, send(calc_function, metric)).build
-
-      if avg_metrics.include?(metric)
-        sum = data.inject(0) { |sum, hash| sum + hash[:value].to_i }
-        sum /= data.length unless sum.zero?
-      else
-        sum = data.inject(0) { |sum, hash| sum + hash[:value].to_i }
-      end
-
-      result[metric] = sum
-    end
-  end
-
-  def account_summary_params(metric)
-    {
-      metric: metric.to_s,
-      type: :account,
-      since: params[:since],
-      until: params[:until]
-    }
-  end
-
-  def agent_summary_params(metric)
-    {
-      metric: metric.to_s,
-      type: :agent,
-      since: params[:since],
-      until: params[:until],
-      id: params[:id]
-    }
-  end
-
-  def account_report_params
-    {
-      metric: params[:metric],
-      type: :account,
-      since: params[:since],
-      until: params[:until]
-    }
-  end
-
-  def agent_report_params
-    {
-      metric: params[:metric],
-      type: :agent,
-      id: params[:id],
-      since: params[:since],
-      until: params[:until]
-    }
-  end
-end

app/controllers/api/v1/webhooks_controller.rb

@@ -3,7 +3,9 @@ class Api::V1::WebhooksController < ApplicationController
   skip_before_action :set_current_user
   skip_before_action :check_subscription
 
-  before_action :login_from_basic_auth
+  before_action :login_from_basic_auth, only: [:chargebee]
+  before_action :check_billing_enabled, only: [:chargebee]
+
   def chargebee
     chargebee_consumer.consume
     head :ok
@@ -12,8 +14,26 @@ class Api::V1::WebhooksController < ApplicationController
     head :ok
   end
 
+  def twitter_crc
+    render json: { response_token: "sha256=#{twitter_client.generate_crc(params[:crc_token])}" }
+  end
+
+  def twitter_events
+    twitter_consumer.consume
+    head :ok
+  rescue StandardError => e
+    Raven.capture_exception(e)
+    head :ok
+  end
+
   private
 
+  def twitter_client
+    Twitty::Facade.new do |config|
+      config.consumer_secret = ENV.fetch('TWITTER_CONSUMER_SECRET', nil)
+    end
+  end
+
   def login_from_basic_auth
     authenticate_or_request_with_http_basic do |username, password|
       username == ENV['CHARGEBEE_WEBHOOK_USERNAME'] && password == ENV['CHARGEBEE_WEBHOOK_PASSWORD']
@@ -21,6 +41,10 @@ class Api::V1::WebhooksController < ApplicationController
   end
 
   def chargebee_consumer
-    @consumer ||= ::Webhooks::Chargebee.new(params)
+    @chargebee_consumer ||= ::Webhooks::Chargebee.new(params)
+  end
+
+  def twitter_consumer
+    @twitter_consumer ||= ::Webhooks::Twitter.new(params)
   end
 end

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

@@ -0,0 +1,30 @@
+class Api::V1::Widget::BaseController < ApplicationController
+  private
+
+  def conversation
+    @conversation ||= @contact_inbox.conversations.where(
+      inbox_id: auth_token_params[:inbox_id]
+    ).last
+  end
+
+  def auth_token_params
+    @auth_token_params ||= ::Widget::TokenService.new(token: request.headers[header_name]).decode_token
+  end
+
+  def header_name
+    'X-Auth-Token'
+  end
+
+  def set_web_widget
+    @web_widget = ::Channel::WebWidget.find_by!(website_token: permitted_params[:website_token])
+    @account = @web_widget.account
+    switch_locale @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
+  end
+end

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

@@ -0,0 +1,18 @@
+class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
+  before_action :set_web_widget
+  before_action :set_contact
+
+  def update
+    contact_identify_action = ContactIdentifyAction.new(
+      contact: @contact,
+      params: permitted_params.to_h.deep_symbolize_keys
+    )
+    render json: contact_identify_action.perform
+  end
+
+  private
+
+  def permitted_params
+    params.permit(:website_token, :identifier, :email, :name, :avatar_url)
+  end
+end

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

@@ -0,0 +1,27 @@
+class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
+  include Events::Types
+  before_action :set_web_widget
+  before_action :set_contact
+
+  def toggle_typing
+    head :ok && return if conversation.nil?
+
+    if permitted_params[:typing_status] == 'on'
+      trigger_typing_event(CONVERSATION_TYPING_ON)
+    elsif permitted_params[:typing_status] == 'off'
+      trigger_typing_event(CONVERSATION_TYPING_OFF)
+    end
+
+    head :ok
+  end
+
+  private
+
+  def trigger_typing_event(event)
+    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: conversation, user: @contact)
+  end
+
+  def permitted_params
+    params.permit(:id, :typing_status, :website_token)
+  end
+end

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

@@ -0,0 +1,16 @@
+class Api::V1::Widget::EventsController < Api::V1::Widget::BaseController
+  include Events::Types
+  before_action :set_web_widget
+  before_action :set_contact
+
+  def create
+    Rails.configuration.dispatcher.dispatch(permitted_params[:name], Time.zone.now, contact_inbox: @contact_inbox)
+    head :no_content
+  end
+
+  private
+
+  def permitted_params
+    params.permit(:name, :website_token)
+  end
+end

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

@@ -0,0 +1,13 @@
+class Api::V1::Widget::InboxMembersController < Api::V1::Widget::BaseController
+  before_action :set_web_widget
+
+  def index
+    @inbox_members = @web_widget.inbox.inbox_members.includes(:user)
+  end
+
+  private
+
+  def permitted_params
+    params.permit(:website_token)
+  end
+end

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

@@ -1,48 +0,0 @@
-class Api::V1::Widget::InboxesController < Api::BaseController
-  before_action :authorize_request
-  before_action :set_web_widget_channel, only: [:update]
-  before_action :set_inbox, only: [:update]
-
-  def create
-    ActiveRecord::Base.transaction do
-      channel = web_widgets.create!(
-        website_name: permitted_params[:website][:website_name],
-        website_url: permitted_params[:website][:website_url],
-        widget_color: permitted_params[:website][:widget_color]
-      )
-      @inbox = inboxes.create!(name: permitted_params[:website][:website_name], channel: channel)
-    end
-  end
-
-  def update
-    @channel.update!(
-      widget_color: permitted_params[:website][:widget_color]
-    )
-  end
-
-  private
-
-  def authorize_request
-    authorize ::Inbox
-  end
-
-  def inboxes
-    current_account.inboxes
-  end
-
-  def web_widgets
-    current_account.web_widgets
-  end
-
-  def set_web_widget_channel
-    @channel = web_widgets.find_by(id: permitted_params[:id])
-  end
-
-  def set_inbox
-    @inbox = @channel.inbox
-  end
-
-  def permitted_params
-    params.permit(:id, website: [:website_name, :website_url, :widget_color])
-  end
-end

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

@@ -0,0 +1,24 @@
+class Api::V1::Widget::LabelsController < Api::V1::Widget::BaseController
+  before_action :set_web_widget
+  before_action :set_contact
+
+  def create
+    conversation.label_list.add(permitted_params[:label])
+    conversation.save!
+
+    head :no_content
+  end
+
+  def destroy
+    conversation.label_list.remove(permitted_params[:id])
+    conversation.save!
+
+    head :no_content
+  end
+
+  private
+
+  def permitted_params
+    params.permit(:id, :label, :website_token)
+  end
+end

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

@@ -1,6 +1,8 @@
-class Api::V1::Widget::MessagesController < ActionController::Base
-  skip_before_action :verify_authenticity_token
+class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
+  before_action :set_web_widget
+  before_action :set_contact
   before_action :set_conversation, only: [:create]
+  before_action :set_message, only: [:update]
 
   def index
     @messages = conversation.nil? ? [] : message_finder.perform
@@ -8,16 +10,34 @@ class Api::V1::Widget::MessagesController < ActionController::Base
 
   def create
     @message = conversation.messages.new(message_params)
-    @message.save!
+    @message.save
+    build_attachment
+  end
+
+  def update
+    if @message.content_type == 'input_email'
+      @message.update!(submitted_email: contact_email)
+      update_contact(contact_email)
+    else
+      @message.update!(message_update_params[:message])
+    end
+  rescue StandardError => e
+    render json: { error: @contact.errors, message: e.message }.to_json, status: 500
   end
 
   private
 
-  def conversation
-    @conversation ||= ::Conversation.find_by(
-      contact_id: cookie_params[:contact_id],
-      inbox_id: cookie_params[:inbox_id]
-    )
+  def build_attachment
+    return if params[:message][:attachments].blank?
+
+    params[:message][:attachments].each do |uploaded_attachment|
+      attachment = @message.attachments.new(
+        account_id: @message.account_id,
+        file_type: helpers.file_type(uploaded_attachment&.content_type)
+      )
+      attachment.file.attach(uploaded_attachment)
+    end
+    @message.save!
   end
 
   def set_conversation
@@ -27,9 +47,10 @@ class Api::V1::Widget::MessagesController < ActionController::Base
   def message_params
     {
       account_id: conversation.account_id,
+      contact_id: @contact.id,
+      content: permitted_params[:message][:content],
       inbox_id: conversation.inbox_id,
-      message_type: :incoming,
-      content: permitted_params[:message][:content]
+      message_type: :incoming
     }
   end
 
@@ -37,7 +58,8 @@ class Api::V1::Widget::MessagesController < ActionController::Base
     {
       account_id: inbox.account_id,
       inbox_id: inbox.id,
-      contact_id: cookie_params[:contact_id],
+      contact_id: @contact.id,
+      contact_inbox_id: @contact_inbox.id,
       additional_attributes: {
         browser: browser_params,
         referer: permitted_params[:message][:referer_url],
@@ -63,13 +85,7 @@ class Api::V1::Widget::MessagesController < ActionController::Base
   end
 
   def inbox
-    @inbox ||= ::Inbox.find_by(id: cookie_params[:inbox_id])
-  end
-
-  def cookie_params
-    @cookie_params ||= JWT.decode(
-      request.headers[header_name], secret_key, true, algorithm: 'HS256'
-    ).first.symbolize_keys
+    @inbox ||= ::Inbox.find_by(id: auth_token_params[:inbox_id])
   end
 
   def message_finder_params
@@ -83,15 +99,39 @@ class Api::V1::Widget::MessagesController < ActionController::Base
     @message_finder ||= MessageFinder.new(conversation, message_finder_params)
   end
 
-  def header_name
-    'X-Auth-Token'
+  def update_contact(email)
+    contact_with_email = @account.contacts.find_by(email: email)
+    if contact_with_email
+      @contact = ::ContactMergeAction.new(
+        account: @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[:contact][:email].downcase
+  end
+
+  def contact_name
+    contact_email.split('@')[0]
+  end
+
+  def message_update_params
+    params.permit(message: [submitted_values: [:name, :title, :value]])
   end
 
   def permitted_params
-    params.permit(:before, message: [:content, :referer_url, :timestamp])
+    params.permit(:id, :before, :website_token, contact: [:email], message: [:content, :referer_url, :timestamp])
   end
 
-  def secret_key
-    Rails.application.secrets.secret_key_base
+  def set_message
+    @message = @web_widget.inbox.messages.find(permitted_params[:id])
   end
 end

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

@@ -0,0 +1,39 @@
+class Api::V2::Accounts::ReportsController < Api::BaseController
+  def account
+    builder = V2::ReportBuilder.new(current_account, account_report_params)
+    data = builder.build
+    render json: data
+  end
+
+  def account_summary
+    render json: account_summary_metrics
+  end
+
+  private
+
+  def current_account
+    current_user.account
+  end
+
+  def account_summary_params
+    {
+      type: :account,
+      since: params[:since],
+      until: params[:until]
+    }
+  end
+
+  def account_report_params
+    {
+      metric: params[:metric],
+      type: :account,
+      since: params[:since],
+      until: params[:until]
+    }
+  end
+
+  def account_summary_metrics
+    builder = V2::ReportBuilder.new(current_account, account_summary_params)
+    builder.summary
+  end
+end

app/controllers/api_controller.rb

@@ -0,0 +1,8 @@
+class ApiController < ApplicationController
+  skip_before_action :set_current_user, only: [:index]
+  skip_before_action :check_subscription, only: [:index]
+
+  def index
+    render json: { version: Chatwoot.config[:version], timestamp: Time.now.utc.to_formatted_s(:db) }
+  end
+end

app/controllers/apple_app_controller.rb

@@ -0,0 +1,6 @@
+class AppleAppController < ApplicationController
+  def site_association
+    site_association_json = render_to_string action: 'site_association', layout: false
+    send_data site_association_json, filename: 'apple-app-site-association', type: 'application/json'
+  end
+end

app/controllers/application_controller.rb

@@ -14,7 +14,30 @@ class ApplicationController < ActionController::Base
   private
 
   def current_account
-    @_ ||= current_user.account
+    @_ ||= find_current_account
+  end
+
+  def find_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
+    switch_locale account
+    account
+  end
+
+  def switch_locale(account)
+    I18n.locale = (I18n.available_locales.map(&:to_s).include?(account.locale) ? account.locale : nil) || I18n.default_locale
+  end
+
+  def account_accessible_for_user?(account)
+    render_unauthorized('You are not authorized to access this account') unless account.account_users.find_by(user_id: current_user.id)
+  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 handle_with_exception
@@ -67,7 +90,7 @@ class ApplicationController < ActionController::Base
   def check_subscription
     # This block is left over from the initial version of chatwoot
     # We might reuse this later in the hosted version of chatwoot.
-    return unless ENV['BILLING_ENABLED']
+    return if !ENV['BILLING_ENABLED'] || !current_user
 
     if current_subscription.trial? && current_subscription.expiry < Date.current
       render json: { error: 'Trial Expired' }, status: :trial_expired

app/controllers/concerns/access_token_auth_helper.rb

@@ -0,0 +1,26 @@
+module AccessTokenAuthHelper
+  BOT_ACCESSIBLE_ENDPOINTS = {
+    'api/v1/accounts/conversations' => %w[toggle_status create],
+    'api/v1/accounts/conversations/messages' => ['create']
+  }.freeze
+
+  def authenticate_access_token!
+    token = request.headers[:api_access_token] || request.headers[:HTTP_API_ACCESS_TOKEN]
+    access_token = AccessToken.find_by(token: token)
+    render_unauthorized('Invalid Access Token') && return unless access_token
+
+    token_owner = access_token.owner
+    @resource = token_owner
+  end
+
+  def validate_bot_access_token!
+    return if current_user.is_a?(User)
+    return if agent_bot_accessible?
+
+    render_unauthorized('Access to this endpoint is not authorized for bots')
+  end
+
+  def agent_bot_accessible?
+    BOT_ACCESSIBLE_ENDPOINTS.fetch(params[:controller], []).include?(params[:action])
+  end
+end

app/controllers/devise_overrides/confirmations_controller.rb

@@ -1,4 +1,4 @@
-class ConfirmationsController < Devise::ConfirmationsController
+class DeviseOverrides::ConfirmationsController < Devise::ConfirmationsController
   skip_before_action :require_no_authentication, raise: false
   skip_before_action :authenticate_user!, raise: false
 

app/controllers/devise_overrides/passwords_controller.rb

@@ -1,4 +1,4 @@
-class PasswordsController < Devise::PasswordsController
+class DeviseOverrides::PasswordsController < Devise::PasswordsController
   include AuthHelper
 
   skip_before_action :require_no_authentication, raise: false
@@ -11,9 +11,7 @@ class PasswordsController < Devise::PasswordsController
     @recoverable = User.find_by(reset_password_token: reset_password_token)
     if @recoverable && reset_password_and_confirmation(@recoverable)
       send_auth_headers(@recoverable)
-      render json: {
-        data: @recoverable.token_validation_response
-      }
+      render 'devise/auth.json', locals: { resource: @recoverable }
     else
       render json: { "message": 'Invalid token', "redirect_url": '/' }, status: 422
     end

app/controllers/devise_overrides/sessions_controller.rb

@@ -0,0 +1,9 @@
+class DeviseOverrides::SessionsController < ::DeviseTokenAuth::SessionsController
+  # Prevent session parameter from being passed
+  # Unpermitted parameter: session
+  wrap_parameters format: []
+
+  def render_create_success
+    render 'devise/auth.json', locals: { resource: @resource }
+  end
+end

app/controllers/devise_overrides/token_validations_controller.rb

@@ -0,0 +1,10 @@
+class DeviseOverrides::TokenValidationsController < ::DeviseTokenAuth::TokenValidationsController
+  def validate_token
+    # @resource will have been set by set_user_by_token concern
+    if @resource
+      render 'devise/token.json'
+    else
+      render_validate_token_error
+    end
+  end
+end

app/controllers/home_controller.rb

@@ -1,13 +0,0 @@
-require 'rest-client'
-require 'telegram/bot'
-class HomeController < ApplicationController
-  skip_before_action :verify_authenticity_token, only: [:telegram]
-  skip_before_action :authenticate_user!, only: [:telegram], raise: false
-  skip_before_action :set_current_user
-  skip_before_action :check_subscription
-  def index; end
-
-  def status
-    head :ok
-  end
-end

app/controllers/sessions_controller.rb

@@ -1,5 +0,0 @@
-class SessionsController < ::DeviseTokenAuth::SessionsController
-  # Prevent session parameter from being passed
-  # Unpermitted parameter: session
-  wrap_parameters format: []
-end

app/controllers/swagger_controller.rb

@@ -0,0 +1,18 @@
+class SwaggerController < ApplicationController
+  def respond
+    if Rails.env.development? || Rails.env.test?
+      render inline: File.read(Rails.root.join('swagger', derived_path))
+    else
+      head 404
+    end
+  end
+
+  private
+
+  def derived_path
+    params[:path] ||= 'index.html'
+    path = params[:path]
+    path << ".#{params[:format]}" unless path.ends_with?(params[:format].to_s)
+    path
+  end
+end

app/controllers/twilio/callback_controller.rb

@@ -0,0 +1,31 @@
+class Twilio::CallbackController < ApplicationController
+  def create
+    ::Twilio::IncomingMessageService.new(params: permitted_params).perform
+
+    head :no_content
+  end
+
+  private
+
+  def permitted_params
+    params.permit(
+      :ApiVersion,
+      :SmsSid,
+      :From,
+      :ToState,
+      :ToZip,
+      :AccountSid,
+      :MessageSid,
+      :FromCountry,
+      :ToCity,
+      :FromCity,
+      :To,
+      :FromZip,
+      :Body,
+      :ToCountry,
+      :FromState,
+      :MediaUrl0,
+      :MediaContentType0
+    )
+  end
+end

app/controllers/twitter/authorizations_controller.rb

@@ -0,0 +1,30 @@
+class Twitter::AuthorizationsController < Twitter::BaseController
+  def create
+    @response = twitter_client.request_oauth_token(url: twitter_callback_url)
+
+    if @response.status == '200'
+      ::Redis::Alfred.setex(oauth_token, account.id)
+      redirect_to oauth_authorize_endpoint(oauth_token)
+    else
+      redirect_to app_new_twitter_inbox_url(account_id: account.id)
+    end
+  end
+
+  private
+
+  def oauth_token
+    parsed_body['oauth_token']
+  end
+
+  def user
+    @user ||= User.find_by(id: params[:user_id])
+  end
+
+  def account
+    @account ||= user.account
+  end
+
+  def oauth_authorize_endpoint(oauth_token)
+    "#{twitter_api_base_url}/oauth/authorize?oauth_token=#{oauth_token}"
+  end
+end

app/controllers/twitter/base_controller.rb

@@ -0,0 +1,24 @@
+class Twitter::BaseController < ApplicationController
+  private
+
+  def parsed_body
+    @parsed_body ||= Rack::Utils.parse_nested_query(@response.raw_response.body)
+  end
+
+  def host
+    ENV.fetch('FRONTEND_URL', '')
+  end
+
+  def twitter_client
+    Twitty::Facade.new do |config|
+      config.consumer_key = ENV.fetch('TWITTER_CONSUMER_KEY', nil)
+      config.consumer_secret = ENV.fetch('TWITTER_CONSUMER_SECRET', nil)
+      config.base_url = twitter_api_base_url
+      config.environment = ENV.fetch('TWITTER_ENVIRONMENT', '')
+    end
+  end
+
+  def twitter_api_base_url
+    'https://api.twitter.com'
+  end
+end

app/controllers/twitter/callbacks_controller.rb

@@ -0,0 +1,56 @@
+class Twitter::CallbacksController < Twitter::BaseController
+  def show
+    return redirect_to twitter_app_redirect_url if permitted_params[:denied]
+
+    @response = twitter_client.access_token(
+      oauth_token: permitted_params[:oauth_token],
+      oauth_verifier: permitted_params[:oauth_verifier]
+    )
+    if @response.status == '200'
+      inbox = build_inbox
+      ::Redis::Alfred.delete(permitted_params[:oauth_token])
+      ::Twitter::WebhookSubscribeService.new(inbox_id: inbox.id).perform
+      redirect_to app_twitter_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)
+    else
+      redirect_to twitter_app_redirect_url
+    end
+  end
+
+  private
+
+  def parsed_body
+    @parsed_body ||= Rack::Utils.parse_nested_query(@response.raw_response.body)
+  end
+
+  def account_id
+    ::Redis::Alfred.get(permitted_params[:oauth_token])
+  end
+
+  def account
+    @account ||= Account.find_by!(id: account_id)
+  end
+
+  def twitter_app_redirect_url
+    app_new_twitter_inbox_url(account_id: account.id)
+  end
+
+  def build_inbox
+    ActiveRecord::Base.transaction do
+      twitter_profile = account.twitter_profiles.create(
+        twitter_access_token: parsed_body['oauth_token'],
+        twitter_access_token_secret: parsed_body['oauth_token_secret'],
+        profile_id: parsed_body['user_id']
+      )
+      account.inboxes.create(
+        name: parsed_body['screen_name'],
+        channel: twitter_profile
+      )
+    rescue StandardError => e
+      Rails.logger e
+    end
+  end
+
+  def permitted_params
+    params.permit(:oauth_token, :oauth_verifier, :denied)
+  end
+end

app/controllers/widgets_controller.rb

@@ -4,66 +4,45 @@ class WidgetsController < ActionController::Base
   before_action :set_contact
   before_action :build_contact
 
+  def index; end
+
   private
 
-  def set_contact
-    return if cookie_params[:source_id].nil?
-
-    contact_inbox = ::ContactInbox.find_by(
-      inbox_id: @web_widget.inbox.id,
-      source_id: cookie_params[:source_id]
-    )
-
-    @contact = contact_inbox ? contact_inbox.contact : nil
-  end
-
-  def set_token
-    @token = conversation_token
-  end
-
   def set_web_widget
     @web_widget = ::Channel::WebWidget.find_by!(website_token: permitted_params[:website_token])
   end
 
+  def set_token
+    @token = permitted_params[:cw_conversation]
+    @auth_token_params = if @token.present?
+                           ::Widget::TokenService.new(token: @token).decode_token
+                         else
+                           {}
+                         end
+  end
+
+  def set_contact
+    return if @auth_token_params[:source_id].nil?
+
+    contact_inbox = ::ContactInbox.find_by(
+      inbox_id: @web_widget.inbox.id,
+      source_id: @auth_token_params[:source_id]
+    )
+
+    @contact = contact_inbox ? contact_inbox.contact : nil
+  end
+
   def build_contact
     return if @contact.present?
 
     contact_inbox = @web_widget.create_contact_inbox
     @contact = contact_inbox.contact
 
-    payload = {
-      source_id: contact_inbox.source_id,
-      contact_id: @contact.id,
-      inbox_id: @web_widget.inbox.id
-    }
-    @token = JWT.encode payload, secret_key, 'HS256'
-  end
-
-  def cookie_params
-    return @cookie_params if @cookie_params.present?
-
-    if conversation_token.present?
-      begin
-        @cookie_params = JWT.decode(
-          conversation_token, secret_key, true, algorithm: 'HS256'
-        ).first.symbolize_keys
-      rescue StandardError
-        @cookie_params = {}
-      end
-      return @cookie_params
-    end
-    {}
-  end
-
-  def conversation_token
-    permitted_params[:cw_conversation]
+    payload = { source_id: contact_inbox.source_id, inbox_id: @web_widget.inbox.id }
+    @token = ::Widget::TokenService.new(payload: payload).generate_token
   end
 
   def permitted_params
     params.permit(:website_token, :cw_conversation)
   end
-
-  def secret_key
-    Rails.application.secrets.secret_key_base
-  end
 end

app/dispatchers/async_dispatcher.rb

@@ -1,11 +1,15 @@
 class AsyncDispatcher < BaseDispatcher
   def dispatch(event_name, timestamp, data)
+    EventDispatcherJob.perform_later(event_name, timestamp, data)
+  end
+
+  def publish_event(event_name, timestamp, data)
     event_object = Events::Base.new(event_name, timestamp, data)
     publish(event_object.method_name, event_object)
   end
 
   def listeners
-    listeners = [ReportingListener.instance]
+    listeners = [EventListener.instance, WebhookListener.instance]
     listeners << SubscriptionListener.instance if ENV['BILLING_ENABLED']
     listeners
   end

app/dispatchers/sync_dispatcher.rb

@@ -5,6 +5,6 @@ class SyncDispatcher < BaseDispatcher
   end
 
   def listeners
-    [ActionCableListener.instance]
+    [ActionCableListener.instance, AgentBotListener.instance, NotificationListener.instance]
   end
 end

app/finders/conversation_finder.rb

@@ -1,23 +1,18 @@
 class ConversationFinder
   attr_reader :current_user, :current_account, :params
 
-  ASSIGNEE_TYPES = { me: 0, unassigned: 1, all: 2 }.freeze
-
-  ASSIGNEE_TYPES_BY_ID = ASSIGNEE_TYPES.invert
-  ASSIGNEE_TYPES_BY_ID.default = :me
-
   DEFAULT_STATUS = 'open'.freeze
 
   # assumptions
   # inbox_id if not given, take from all conversations, else specific to inbox
-  # assignee_type if not given, take 'me'
+  # assignee_type if not given, take 'all'
   # conversation_status if not given, take 'open'
 
   # response of this class will be of type
   # {conversations: [array of conversations], count: {open: count, resolved: count}}
 
   # params
-  # assignee_type_id, inbox_id, :status
+  # assignee_type, inbox_id, :status
 
   def initialize(current_user, params)
     @current_user = current_user
@@ -31,6 +26,7 @@ class ConversationFinder
 
     find_all_conversations
     filter_by_status
+    filter_by_labels if params[:labels]
 
     mine_count, unassigned_count, all_count = set_count_for_all_conversations
 
@@ -61,8 +57,7 @@ class ConversationFinder
   end
 
   def set_assignee_type
-    @assignee_type_id = ASSIGNEE_TYPES[ASSIGNEE_TYPES_BY_ID[params[:assignee_type_id].to_i]]
-    # ente budhiparamaya neekam kandit enthu tonunu? ;)
+    @assignee_type = params[:assignee_type]
   end
 
   def find_all_conversations
@@ -72,12 +67,10 @@ class ConversationFinder
   end
 
   def filter_by_assignee_type
-    if @assignee_type_id == ASSIGNEE_TYPES[:me]
+    if @assignee_type == 'me'
       @conversations = @conversations.assigned_to(current_user)
-    elsif @assignee_type_id == ASSIGNEE_TYPES[:unassigned]
+    elsif @assignee_type == 'unassigned'
       @conversations = @conversations.unassigned
-    elsif @assignee_type_id == ASSIGNEE_TYPES[:all]
-      @conversations
     end
     @conversations
   end
@@ -86,6 +79,10 @@ class ConversationFinder
     @conversations = @conversations.where(status: params[:status] || DEFAULT_STATUS)
   end
 
+  def filter_by_labels
+    @conversations = @conversations.tagged_with(params[:labels], any: true)
+  end
+
   def set_count_for_all_conversations
     [
       @conversations.assigned_to(current_user).count,

app/finders/message_finder.rb

@@ -11,7 +11,7 @@ class MessageFinder
   private
 
   def conversation_messages
-    @conversation.messages.includes(:attachment, user: { avatar_attachment: :blob })
+    @conversation.messages.includes(:attachments, user: { avatar_attachment: :blob })
   end
 
   def messages

app/helpers/api/v1/webhooks_helper.rb

@@ -1,2 +0,0 @@
-module Api::V1::WebhooksHelper
-end

app/helpers/application_helper.rb

@@ -1,2 +1,5 @@
 module ApplicationHelper
+  def available_locales_with_name
+    LANGUAGES_CONFIG.map { |_key, val| val.slice(:name, :iso_639_1_code) }
+  end
 end

app/helpers/file_type_helper.rb

@@ -0,0 +1,14 @@
+module FileTypeHelper
+  def file_type(content_type)
+    return :image if [
+      'image/jpeg',
+      'image/png',
+      'image/svg+xml',
+      'image/gif',
+      'image/tiff',
+      'image/bmp'
+    ].include?(content_type)
+
+    :file
+  end
+end

app/identities/account_identity.rb

@@ -1,10 +0,0 @@
-class AccountIdentity < Nightfury::Identity::Base
-  metric :conversations_count, :count_time_series, store_as: :b, step: :day
-  metric :incoming_messages_count, :count_time_series, step: :day
-  metric :outgoing_messages_count, :count_time_series, step: :day
-  metric :avg_first_response_time, :avg_time_series, store_as: :d, step: :day
-  metric :avg_resolution_time, :avg_time_series, store_as: :f, step: :day
-  metric :resolutions_count, :count_time_series, store_as: :g, step: :day
-end
-
-AccountIdentity.store_as = :ci

app/identities/agent_identity.rb

@@ -1,8 +0,0 @@
-class AgentIdentity < Nightfury::Identity::Base
-  metric :avg_first_response_time, :avg_time_series, store_as: :d, step: :day
-  metric :avg_resolution_time, :avg_time_series, store_as: :f, step: :day
-  metric :resolutions_count, :count_time_series, store_as: :g, step: :day
-  tag :account_id, store_as: :co
-end
-
-AgentIdentity.store_as = :ai

app/javascript/dashboard/App.vue

@@ -8,7 +8,10 @@
 </template>
 
 <script>
+import Vue from 'vue';
+import { mapGetters } from 'vuex';
 import WootSnackbarBox from './components/SnackbarContainer';
+import { accountIdFromPathname } from './helper/URLHelper';
 
 export default {
   name: 'App',
@@ -17,9 +20,28 @@ export default {
     WootSnackbarBox,
   },
 
+  computed: {
+    ...mapGetters({
+      getAccount: 'accounts/getAccount',
+    }),
+  },
+
   mounted() {
-    this.$store.dispatch('set_user');
-    this.$store.dispatch('validityCheck');
+    this.$store.dispatch('setUser');
+    this.initializeAccount();
+  },
+
+  methods: {
+    async initializeAccount() {
+      const { pathname } = window.location;
+      const accountId = accountIdFromPathname(pathname);
+
+      if (accountId) {
+        await this.$store.dispatch('accounts/get');
+        const { locale } = this.getAccount(accountId);
+        Vue.config.lang = locale;
+      }
+    },
   },
 };
 </script>

app/javascript/dashboard/api/ApiClient.js

@@ -3,9 +3,25 @@
 const API_VERSION = `/api/v1`;
 
 class ApiClient {
-  constructor(url) {
+  constructor(resource, options = {}) {
     this.apiVersion = API_VERSION;
-    this.url = `${this.apiVersion}/${url}`;
+    this.options = options;
+    this.resource = resource;
+  }
+
+  get url() {
+    let url = this.apiVersion;
+    if (this.options.accountScoped) {
+      const isInsideAccountScopedURLs = window.location.pathname.includes(
+        '/app/accounts'
+      );
+
+      if (isInsideAccountScopedURLs) {
+        const accountId = window.location.pathname.split('/')[3];
+        url = `${url}/accounts/${accountId}`;
+      }
+    }
+    return `${url}/${this.resource}`;
   }
 
   get() {

app/javascript/dashboard/api/account.js

@@ -0,0 +1,9 @@
+import ApiClient from './ApiClient';
+
+class AccountAPI extends ApiClient {
+  constructor() {
+    super('', { accountScoped: true });
+  }
+}
+
+export default new AccountAPI();

app/javascript/dashboard/api/agents.js

@@ -2,7 +2,7 @@ import ApiClient from './ApiClient';
 
 class Agents extends ApiClient {
   constructor() {
-    super('agents');
+    super('agents', { accountScoped: true });
   }
 }
 

app/javascript/dashboard/api/auth.js

@@ -1,29 +1,10 @@
 /* eslint no-console: 0 */
 /* global axios */
 /* eslint no-undef: "error" */
-/* eslint-env browser */
-/* eslint no-unused-expressions: ["error", { "allowShortCircuit": true }] */
 
-import moment from 'moment';
 import Cookies from 'js-cookie';
 import endPoints from './endPoints';
-import { frontendURL } from '../helper/URLHelper';
-
-const setAuthCredentials = response => {
-  const expiryDate = moment.unix(response.headers.expiry);
-  Cookies.set('auth_data', response.headers, {
-    expires: expiryDate.diff(moment(), 'days'),
-  });
-  Cookies.set('user', response.data.data, {
-    expires: expiryDate.diff(moment(), 'days'),
-  });
-};
-
-const clearCookiesOnLogout = () => {
-  Cookies.remove('auth_data');
-  Cookies.remove('user');
-  window.location = frontendURL('login');
-};
+import { setAuthCredentials, clearCookiesOnLogout } from '../store/utils/api';
 
 export default {
   login(creds) {
@@ -60,20 +41,7 @@ export default {
   },
   validityCheck() {
     const urlData = endPoints('validityCheck');
-    const fetchPromise = new Promise((resolve, reject) => {
-      axios
-        .get(urlData.url)
-        .then(response => {
-          resolve(response);
-        })
-        .catch(error => {
-          if (error.response.status === 401) {
-            clearCookiesOnLogout();
-          }
-          reject(error);
-        });
-    });
-    return fetchPromise;
+    return axios.get(urlData.url);
   },
   logout() {
     const urlData = endPoints('logout');
@@ -136,13 +104,7 @@ export default {
           password,
         })
         .then(response => {
-          const expiryDate = moment.unix(response.headers.expiry);
-          Cookies.set('auth_data', response.headers, {
-            expires: expiryDate.diff(moment(), 'days'),
-          });
-          Cookies.set('user', response.data.data, {
-            expires: expiryDate.diff(moment(), 'days'),
-          });
+          setAuthCredentials(response);
           resolve(response);
         })
         .catch(error => {
@@ -155,4 +117,22 @@ export default {
     const urlData = endPoints('resetPassword');
     return axios.post(urlData.url, { email });
   },
+
+  profileUpdate({ name, email, password, password_confirmation, avatar }) {
+    const formData = new FormData();
+    if (name) {
+      formData.append('profile[name]', name);
+    }
+    if (email) {
+      formData.append('profile[email]', email);
+    }
+    if (password && password_confirmation) {
+      formData.append('profile[password]', password);
+      formData.append('profile[password_confirmation]', password_confirmation);
+    }
+    if (avatar) {
+      formData.append('profile[avatar]', avatar);
+    }
+    return axios.put(endPoints('profileUpdate').url, formData);
+  },
 };

app/javascript/dashboard/api/cannedResponse.js

@@ -4,7 +4,7 @@ import ApiClient from './ApiClient';
 
 class CannedResponse extends ApiClient {
   constructor() {
-    super('canned_responses');
+    super('canned_responses', { accountScoped: true });
   }
 
   get({ searchKey }) {