Merge branch 'develop' into fix/missing-postmessage-validation

2026-04-29 17:27:16 +05:30 · 2026-04-24 16:15:00 +05:30 · 2026-04-23 18:22:15 +05:30 · 2026-01-21 13:42:18 +05:30 · 2026-01-15 11:38:30 +05:30 · 2026-01-12 16:34:13 +05:30
1957 changed files with 10905 additions and 105098 deletions
@@ -2,22 +2,8 @@
 ignore:
  - CVE-2021-41098 # https://github.com/chatwoot/chatwoot/issues/3097 (update once azure blob storage is updated)
  - GHSA-57hq-95w6-v4fc # Devise confirmable race condition — patched locally in User model (remove once on Devise 5+)
-  # Devise 5 is currently blocked by devise-secure_password/devise_token_auth/devise-two-factor.
+  # Chatwoot defaults to Active Storage redirect-style URLs, and its recommended
-  # Chatwoot does not enable Timeoutable, so the timeout redirect path is not reachable.
+  # storage setup uses local/cloud storage with optional direct uploads to the
-  - GHSA-jp94-3292-c3xv
+  # storage provider rather than Rails proxy mode. Revisit if we enable
-  # Rails 7.1 has no patched release for the Active Storage proxy range
+  # rails_storage_proxy or other app-served Active Storage proxy routes.
  # advisories. Chatwoot limits proxy range requests locally.
  - CVE-2026-33658
  # Rails 7.1 has no patched release for this Active Storage direct-upload
  # advisory. Chatwoot filters internal metadata keys locally.
  - CVE-2026-33173
  - CVE-2026-33174
  # Rails 7.1 has no patched release for these Rails advisories. These are not
  # reachable through Chatwoot's current usage patterns and should be removed
  # once we upgrade to Rails 7.2.3.1+.
  - CVE-2026-33168
  - CVE-2026-33169
  - CVE-2026-33170
  - CVE-2026-33176
  - CVE-2026-33195
  - CVE-2026-33202
@@ -144,7 +144,7 @@ jobs:
  # Backend tests with parallelization
  backend-tests:
    <<: *defaults
-    parallelism: 20
+    parallelism: 18
    steps:
      - checkout
      - node/install:
@@ -98,8 +98,6 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
 MAILER_INBOUND_EMAIL_DOMAIN=
 # Maximum time in seconds to process a single IMAP email
 # EMAIL_PROCESSING_TIMEOUT_SECONDS=60
 # Set this to the appropriate ingress channel with regards to incoming emails
 # Possible values are :
 # relay for Exim, Postfix, Qmail
@@ -234,10 +232,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # Comma-separated list of trusted IPs that bypass Rack Attack throttling rules
 # RACK_ATTACK_ALLOWED_IPS=127.0.0.1,::1,192.168.0.10
 ## SafeFetch private network access
 ## Keep disabled by default. Self-hosted installations can enable this to allow SafeFetch requests to private network URLs.
 # SAFE_FETCH_ALLOW_PRIVATE_NETWORK=false
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
 # CW_API_ONLY_SERVER=false
@@ -1,195 +0,0 @@
 #!/usr/bin/env python3
 """Sync triage GitHub security advisories to Linear issues."""
 from __future__ import annotations
 import os
 import sys
 from typing import Any
 import requests
 GITHUB_API = "https://api.github.com"
 LINEAR_API = "https://api.linear.app/graphql"
 SEVERITY_PRIORITY = {"critical": 1, "high": 2, "medium": 3, "low": 4}
 SEVERITY_COLOR = {
    "critical": 15548997,
    "high": 15105570,
    "medium": 15844367,
    "low": 3066993,
 }
 DEFAULT_COLOR = 9807270
 def required_env(name: str) -> str:
    value = os.environ.get(name)
    if not value:
        sys.exit(f"Missing required env var: {name}")
    return value
 def fetch_triage_advisories(repo: str, token: str) -> list[dict[str, Any]]:
    url: str | None = f"{GITHUB_API}/repos/{repo}/security-advisories"
    params: dict[str, Any] | None = {"state": "triage", "per_page": 100}
    headers = {
        "Accept": "application/vnd.github+json",
        "Authorization": f"Bearer {token}",
        "X-GitHub-Api-Version": "2022-11-28",
    }
    advisories: list[dict[str, Any]] = []
    while url:
        r = requests.get(url, headers=headers, params=params, timeout=30)
        r.raise_for_status()
        advisories.extend(r.json())
        next_link = r.links.get("next")
        url = next_link["url"] if next_link else None
        params = None
    return advisories
 def linear_call(query: str, variables: dict[str, Any], api_key: str) -> dict[str, Any]:
    r = requests.post(
        LINEAR_API,
        headers={"Authorization": api_key},
        json={"query": query, "variables": variables},
        timeout=30,
    )
    r.raise_for_status()
    return r.json()
 def linear_issue_exists(ghsa_id: str, api_key: str) -> bool:
    query = (
        "query($q: String!) { issues(filter: {title: {contains: $q}}, first: 1) "
        "{ nodes { id } } }"
    )
    resp = linear_call(query, {"q": ghsa_id}, api_key)
    return len(resp.get("data", {}).get("issues", {}).get("nodes", [])) > 0
 def linear_create_issue(input_data: dict[str, Any], api_key: str) -> dict[str, str] | None:
    query = (
        "mutation($input: IssueCreateInput!) { issueCreate(input: $input) "
        "{ success issue { identifier url } } }"
    )
    resp = linear_call(query, {"input": input_data}, api_key)
    create = resp.get("data", {}).get("issueCreate") or {}
    if not create.get("success"):
        return None
    return create.get("issue")
 def reporter_login(advisory: dict[str, Any]) -> str:
    for credit in advisory.get("credits") or []:
        user = (credit or {}).get("user") or {}
        if user.get("login"):
            return user["login"]
    return "unknown"
 def cvss_score(advisory: dict[str, Any]) -> str:
    score = (advisory.get("cvss") or {}).get("score")
    return str(score) if score is not None else "n/a"
 def build_description(adv: dict[str, Any]) -> str:
    return (
        f"**GHSA:** {adv['ghsa_id']}\n"
        f"**CVE:** {adv.get('cve_id') or 'n/a'}\n"
        f"**Severity:** {adv.get('severity') or 'unknown'} (CVSS {cvss_score(adv)})\n"
        f"**Reporter:** {reporter_login(adv)}\n"
        f"**Reported:** {(adv.get('created_at') or '').split('T')[0]}\n"
        f"**Advisory:** {adv['html_url']}\n\n"
        f"---\n\n"
        f"{adv.get('description') or 'No description provided.'}"
    )
 def post_discord(adv: dict[str, Any], issue: dict[str, str], webhook_url: str) -> None:
    severity = adv.get("severity") or "unknown"
    title = f"[{adv['ghsa_id']}] {adv['summary']}"[:250]
    payload = {
        "username": "GHSA Sync",
        "embeds": [
            {
                "title": title,
                "url": issue["url"],
                "color": SEVERITY_COLOR.get(severity, DEFAULT_COLOR),
                "fields": [
                    {"name": "Linear", "value": issue["identifier"], "inline": True},
                    {
                        "name": "Severity",
                        "value": f"{severity} (CVSS {cvss_score(adv)})",
                        "inline": True,
                    },
                    {
                        "name": "Advisory",
                        "value": f"[GitHub]({adv['html_url']})",
                        "inline": True,
                    },
                ],
            }
        ],
    }
    try:
        requests.post(webhook_url, json=payload, timeout=10)
    except requests.RequestException:
        pass
 def main() -> int:
    repo = required_env("GITHUB_REPOSITORY")
    gh_token = required_env("GHSA_READ_TOKEN")
    linear_api_key = required_env("LINEAR_API_KEY")
    team_id = required_env("LINEAR_TEAM_ID")
    project_id = required_env("LINEAR_PROJECT_ID")
    label_id = required_env("LINEAR_LABEL_ID")
    discord_webhook = os.environ.get("DISCORD_WEBHOOK_URL") or None
    advisories = fetch_triage_advisories(repo, gh_token)
    print(f"Fetched {len(advisories)} triage advisories")
    created = skipped = failed = 0
    for adv in advisories:
        ghsa_id = adv.get("ghsa_id")
        if not ghsa_id:
            failed += 1
            continue
        try:
            if linear_issue_exists(ghsa_id, linear_api_key):
                skipped += 1
                continue
            severity = adv.get("severity") or "unknown"
            issue = linear_create_issue(
                {
                    "title": f"[{ghsa_id}] {adv.get('summary', '')}",
                    "description": build_description(adv),
                    "teamId": team_id,
                    "projectId": project_id,
                    "labelIds": [label_id],
                    "priority": SEVERITY_PRIORITY.get(severity, 3),
                },
                linear_api_key,
            )
        except requests.RequestException:
            failed += 1
            continue
        if not issue:
            failed += 1
            continue
        created += 1
        if discord_webhook:
            post_discord(adv, issue, discord_webhook)
    print(f"Created {created}, skipped {skipped}, failed {failed}")
    return 1 if failed > 0 else 0
 if __name__ == "__main__":
    sys.exit(main())
@@ -11,9 +11,6 @@ concurrency:
  group: pr-${{ github.workflow }}-${{ github.head_ref }}
  cancel-in-progress: true
 permissions:
  contents: read
 jobs:
  deployment_check:
    name: Check Deployment
@@ -8,9 +8,6 @@ on:
    branches:
      - develop
 permissions:
  contents: read
 jobs:
  test:
    runs-on: ubuntu-22.04
@@ -1,29 +0,0 @@
 name: Sync GHSA advisories to Linear
 on:
  schedule:
    - cron: '0 4 * * *'  # daily at 09:30 IST
  workflow_dispatch: {}
 permissions:
  contents: read
 jobs:
  sync:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-python@v5
        with:
          python-version: '3.11'
      - name: Install dependencies
        run: pip install requests==2.32.3
      - name: Sync advisories
        env:
          GHSA_READ_TOKEN: ${{ secrets.GHSA_READ_TOKEN }}
          LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
          LINEAR_TEAM_ID: ${{ secrets.LINEAR_TEAM_ID }}
          LINEAR_PROJECT_ID: ${{ secrets.LINEAR_PROJECT_ID }}
          LINEAR_LABEL_ID: ${{ secrets.LINEAR_LABEL_ID }}
          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
        run: python3 .github/scripts/ghsa_linear_sync.py
@@ -10,9 +10,6 @@ concurrency:
  group: pr-${{ github.workflow }}-${{ github.head_ref }}
  cancel-in-progress: true
 permissions:
  contents: read
 jobs:
  log_lines_check:
    runs-on: ubuntu-latest
@@ -14,9 +14,6 @@ on:
    - cron: "0 0 * * *"
  workflow_dispatch:
 permissions:
  contents: read
 jobs:
  nightly:
    runs-on: ubuntu-24.04
@@ -3,10 +3,6 @@ name: Publish Codespace Base Image
 on:
  workflow_dispatch:
 permissions:
  contents: read
  packages: write
 jobs:
  publish-code-space-image:
    runs-on: ubuntu-latest
@@ -18,9 +18,6 @@ on:
 env:
  DOCKER_REPO: chatwoot/chatwoot
 permissions:
  contents: read
 jobs:
  build:
    strategy:
@@ -18,9 +18,6 @@ on:
 env:
  DOCKER_REPO: chatwoot/chatwoot
 permissions:
  contents: read
 jobs:
  build:
    strategy:
@@ -10,9 +10,6 @@ concurrency:
  group: pr-${{ github.workflow }}-${{ github.head_ref }}
  cancel-in-progress: true
 permissions:
  contents: read
 jobs:
  test:
    runs-on: ubuntu-22.04
@@ -7,9 +7,6 @@ on:
      - master
  workflow_dispatch:
 permissions:
  contents: read
 jobs:
  test-build:
    strategy:
@@ -22,7 +22,6 @@ gem 'time_diff'
 gem 'tzinfo-data'
 gem 'valid_email2'
 gem 'email-provider-info'
 gem 'gemoji'
 # compress javascript config.assets.js_compressor
 gem 'uglifier'
 ##-- used for single column multiple binary flags in notification settings/feature flagging --##
@@ -76,7 +75,7 @@ gem 'faraday_middleware-aws-sigv4'
 ##--- gems for server & infra configuration ---##
 gem 'dotenv-rails', '>= 3.0.0'
 gem 'foreman'
-gem 'puma', '~> 7.2', '>= 7.2.1'
+gem 'puma'
 gem 'vite_rails'
 # metrics on heroku
 gem 'barnes'
@@ -89,7 +88,7 @@ gem 'rails-i18n', '~> 7.0'
 # two-factor authentication
 gem 'devise-two-factor', '>= 5.0.0'
 # authorization
-gem 'jwt', '~> 2.10', '>= 2.10.3'
+gem 'jwt'
 gem 'pundit'
 # super admin
@@ -133,9 +132,9 @@ gem 'sentry-ruby', require: false
 gem 'sentry-sidekiq', '>= 5.19.0', require: false
 ##-- background job processing --##
-gem 'sidekiq', '~> 7.3', '>= 7.3.1'
+gem 'sidekiq', '>= 7.3.1'
 # We want cron jobs
-gem 'sidekiq-cron', '>= 2.4.0'
+gem 'sidekiq-cron', '>= 1.12.0'
 # for sidekiq healthcheck
 gem 'sidekiq_alive'
@@ -195,10 +194,10 @@ gem 'reverse_markdown'
 gem 'iso-639'
 gem 'ruby-openai'
-gem 'ai-agents', '>= 0.10.0'
+gem 'ai-agents', '>= 0.9.1'
 # TODO: Move this gem as a dependency of ai-agents
-gem 'ruby_llm', '>= 1.14.1'
+gem 'ruby_llm', '>= 1.8.2'
 gem 'ruby_llm-schema'
 gem 'cld3', '~> 3.7'
@@ -209,8 +208,6 @@ gem 'opentelemetry-exporter-otlp'
 gem 'shopify_api'
 gem 'firecrawl-sdk', '~> 1.0', require: 'firecrawl'
 ### Gems required only in specific deployment environments ###
 ##############################################################
@@ -108,8 +108,8 @@ GEM
    acts-as-taggable-on (12.0.0)
      activerecord (>= 7.1, < 8.1)
      zeitwerk (>= 2.4, < 3.0)
-    addressable (2.9.0)
+    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 8.0)
+      public_suffix (>= 2.0.2, < 7.0)
    administrate (0.20.1)
      actionpack (>= 6.0, < 8.0)
      actionview (>= 6.0, < 8.0)
@@ -126,8 +126,8 @@ GEM
      jbuilder (~> 2)
      rails (>= 4.2, < 7.2)
      selectize-rails (~> 0.6)
-    ai-agents (0.10.0)
+    ai-agents (0.9.1)
-      ruby_llm (~> 1.14)
+      ruby_llm (~> 1.9.1)
    annotaterb (4.20.0)
      activerecord (>= 6.0.0)
      activesupport (>= 6.0.0)
@@ -196,9 +196,6 @@ GEM
      bigdecimal
      rexml
    crass (1.0.6)
    cronex (0.15.0)
      tzinfo
      unicode (>= 0.4.4.5)
    csv (3.3.0)
    csv-safe (3.3.1)
      csv (~> 3.0)
@@ -215,7 +212,7 @@ GEM
      logger
      msgpack
    datadog-ruby_core_source (3.4.1)
-    date (3.5.1)
+    date (3.4.1)
    debug (1.8.0)
      irb (>= 1.5.0)
      reline (>= 0.3.1)
@@ -301,7 +298,7 @@ GEM
      railties (>= 5.0.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
-    faraday (2.14.2)
+    faraday (2.14.1)
      faraday-net_http (>= 2.0, < 3.5)
      json
      logger
@@ -310,8 +307,8 @@ GEM
    faraday-mashify (1.0.0)
      faraday (~> 2.0)
      hashie
-    faraday-multipart (1.2.0)
+    faraday-multipart (1.0.4)
-      multipart-post (~> 2.0)
+      multipart-post (~> 2)
    faraday-net_http (3.4.2)
      net-http (~> 0.5)
    faraday-net_http_persistent (2.1.0)
@@ -339,7 +336,6 @@ GEM
    ffi-compiler (1.0.1)
      ffi (>= 1.0.0)
      rake
    firecrawl-sdk (1.4.1)
    flag_shih_tzu (0.3.23)
    foreman (0.87.2)
    fugit (1.11.1)
@@ -353,7 +349,6 @@ GEM
      googleapis-common-protos-types (>= 1.3.1, < 2.a)
      googleauth (~> 1.0)
      grpc (~> 1.36)
    gemoji (4.1.0)
    geocoder (1.8.1)
    gli (2.22.2)
      ostruct
@@ -470,7 +465,7 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.19.5)
+    json (2.19.2)
    json_refs (0.1.8)
      hana
    json_schemer (0.2.24)
@@ -491,7 +486,7 @@ GEM
    judoscale-sidekiq (1.8.2)
      judoscale-ruby (= 1.8.2)
      sidekiq (>= 5.0)
-    jwt (2.10.3)
+    jwt (2.10.1)
      base64
    kaminari (1.2.2)
      activesupport (>= 4.1.0)
@@ -578,7 +573,7 @@ GEM
      uri (>= 0.11.1)
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.24)
+    net-imap (0.4.20)
      date
      net-protocol
    net-pop (0.1.2)
@@ -593,15 +588,15 @@ GEM
      sidekiq
    newrelic_rpm (9.6.0)
      base64
-    nio4r (2.7.5)
+    nio4r (2.7.3)
-    nokogiri (1.19.3)
+    nokogiri (1.19.1)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.19.3-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-darwin)
+    nokogiri (1.19.1-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
@@ -681,14 +676,14 @@ GEM
      method_source (~> 1.0)
    pry-rails (0.3.9)
      pry (>= 0.10.4)
-    public_suffix (7.0.5)
+    public_suffix (6.0.2)
-    puma (7.2.1)
+    puma (6.4.3)
      nio4r (~> 2.0)
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
    racc (1.8.1)
-    rack (3.2.6)
+    rack (3.2.5)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
    rack-contrib (2.5.0)
@@ -703,7 +698,7 @@ GEM
      rack (>= 3.0.0, < 4)
    rack-proxy (0.7.7)
      rack
-    rack-session (2.1.2)
+    rack-session (2.1.1)
      base64 (>= 0.1.0)
      rack (>= 3.0.0)
    rack-test (2.1.0)
@@ -839,17 +834,17 @@ GEM
    ruby2ruby (2.5.0)
      ruby_parser (~> 3.1)
      sexp_processor (~> 4.6)
-    ruby_llm (1.15.0)
+    ruby_llm (1.9.2)
      base64
      event_stream_parser (~> 1)
      faraday (>= 1.10.0)
      faraday-multipart (>= 1)
      faraday-net_http (>= 1)
      faraday-retry (>= 1)
-      marcel (~> 1)
+      marcel (~> 1.0)
-      ruby_llm-schema (~> 0)
+      ruby_llm-schema (~> 0.2.1)
      zeitwerk (~> 2)
-    ruby_llm-schema (0.3.0)
+    ruby_llm-schema (0.2.5)
    ruby_parser (3.20.0)
      sexp_processor (~> 4.16)
    sass (3.7.4)
@@ -906,11 +901,10 @@ GEM
      logger
      rack (>= 2.2.4)
      redis-client (>= 0.22.2)
-    sidekiq-cron (2.4.0)
+    sidekiq-cron (1.12.0)
-      cronex (>= 0.13.0)
+      fugit (~> 1.8)
      fugit (~> 1.8, >= 1.11.1)
      globalid (>= 1.0.1)
-      sidekiq (>= 6.5.0)
+      sidekiq (>= 6)
    sidekiq_alive (2.5.0)
      gserver (~> 0.0.1)
      sidekiq (>= 5, < 9)
@@ -966,7 +960,7 @@ GEM
    time_diff (0.3.0)
      activesupport
      i18n
-    timeout (0.6.1)
+    timeout (0.4.3)
    trailblazer-option (0.1.2)
    twilio-ruby (7.6.0)
      faraday (>= 0.9, < 3.0)
@@ -984,7 +978,6 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.8.2)
    unicode (0.4.4.5)
    unicode-display_width (3.1.4)
      unicode-emoji (~> 4.0, >= 4.0.4)
    unicode-emoji (4.0.4)
@@ -996,13 +989,11 @@ GEM
      activemodel (>= 3.2)
      mail (~> 2.5)
    version_gem (1.1.4)
-    vite_rails (3.10.0)
+    vite_rails (3.0.17)
-      railties (>= 5.1, < 9)
+      railties (>= 5.1, < 8)
      vite_ruby (~> 3.0, >= 3.2.2)
-    vite_ruby (3.10.2)
+    vite_ruby (3.8.0)
      dry-cli (>= 0.7, < 2)
      logger (~> 1.6)
      mutex_m
      rack-proxy (~> 0.6, >= 0.6.1)
      zeitwerk (~> 2.2)
    warden (1.2.9)
@@ -1027,7 +1018,7 @@ GEM
    working_hours (1.4.1)
      activesupport (>= 3.2)
      tzinfo
-    zeitwerk (2.7.5)
+    zeitwerk (2.7.4)
 PLATFORMS
  arm64-darwin-20
@@ -1047,7 +1038,7 @@ DEPENDENCIES
  administrate (>= 0.20.1)
  administrate-field-active_storage (>= 1.0.3)
  administrate-field-belongs_to_search (>= 0.9.0)
-  ai-agents (>= 0.10.0)
+  ai-agents (>= 0.9.1)
  annotaterb
  attr_extras
  audited (~> 5.4, >= 5.4.1)
@@ -1082,10 +1073,8 @@ DEPENDENCIES
  faker
  faraday_middleware-aws-sigv4
  fcm
  firecrawl-sdk (~> 1.0)
  flag_shih_tzu
  foreman
  gemoji
  geocoder
  gmail_xoauth
  google-cloud-dialogflow-v2 (>= 0.24.0)
@@ -1104,7 +1093,7 @@ DEPENDENCIES
  json_schemer
  judoscale-rails
  judoscale-sidekiq
-  jwt (~> 2.10, >= 2.10.3)
+  jwt
  kaminari
  koala
  letter_opener
@@ -1132,7 +1121,7 @@ DEPENDENCIES
  pgvector
  procore-sift
  pry-rails
-  puma (~> 7.2, >= 7.2.1)
+  puma
  pundit
  rack-attack (>= 6.7.0)
  rack-cors (= 2.0.0)
@@ -1153,7 +1142,7 @@ DEPENDENCIES
  rubocop-rails
  rubocop-rspec
  ruby-openai
-  ruby_llm (>= 1.14.1)
+  ruby_llm (>= 1.8.2)
  ruby_llm-schema
  scout_apm
  scss_lint
@@ -1164,8 +1153,8 @@ DEPENDENCIES
  sentry-sidekiq (>= 5.19.0)
  shopify_api
  shoulda-matchers
-  sidekiq (~> 7.3, >= 7.3.1)
+  sidekiq (>= 7.3.1)
-  sidekiq-cron (>= 2.4.0)
+  sidekiq-cron (>= 1.12.0)
  sidekiq_alive
  simplecov (>= 0.21)
  simplecov_json_formatter
@@ -1 +1 @@
-4.14.1
+4.13.0
@@ -92,18 +92,10 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
  def fallback_params(attachment)
    {
      fallback_title: attachment['title'],
-      external_url: attachment['url'] || attachment.dig('payload', 'url')
+      external_url: attachment['url']
    }
  end
  # Facebook shared posts point to page URLs, not downloadable media URLs.
  # Keep this Facebook-only so Messenger/Instagram share attachments still use the parent media handling.
  def normalize_file_type(type)
    return :fallback if type.to_sym == :share
    super
  end
  def conversation_params
    {
      account_id: @inbox.account_id,
@@ -13,7 +13,6 @@ class Messages::MessageBuilder
    @account = conversation.account
    @message_type = params[:message_type] || 'outgoing'
    @attachments = params[:attachments]
    @is_voice_message = ActiveModel::Type::Boolean.new.cast(params[:is_voice_message])
    @automation_rule = content_attributes&.dig(:automation_rule_id)
    return unless params.instance_of?(ActionController::Parameters)
@@ -57,25 +56,16 @@ class Messages::MessageBuilder
        file: uploaded_attachment
      )
-      attachment.file_type = attachment_file_type(uploaded_attachment)
+      attachment.file_type = if uploaded_attachment.is_a?(String)
-      tag_voice_message(attachment)
+                               file_type_by_signed_id(
                                 uploaded_attachment
                               )
                             else
                               file_type(uploaded_attachment&.content_type)
                             end
    end
  end
  def attachment_file_type(uploaded_attachment)
    if uploaded_attachment.is_a?(String)
      file_type_by_signed_id(uploaded_attachment)
    else
      file_type(uploaded_attachment&.content_type)
    end
  end
  def tag_voice_message(attachment)
    return unless @is_voice_message && attachment.file_type == 'audio'
    attachment.meta = (attachment.meta || {}).merge('is_voice_message' => true)
  end
  def process_emails
    return unless @conversation.inbox&.inbox_type == 'Email'
@@ -28,10 +28,6 @@ class Messages::Messenger::MessageBuilder
      filename: attachment_file.original_filename,
      content_type: attachment_file.content_type
    )
    # The Attachment row is saved before the blob is attached, so the
    # after_create_commit broadcast bails on `file.attached?`. Re-fire here
    # for audio so the bubble updates without waiting on transcription.
    attachment.message&.reload&.send_update_event if attachment.file_type.to_sym == :audio
  end
  def attachment_params(attachment)
@@ -27,8 +27,6 @@ class NotificationBuilder
    return if notification_type == 'conversation_creation' && !user_subscribed_to_notification?
    # skip notifications for blocked conversations except for user mentions
    return if primary_actor.contact.blocked? && notification_type != 'conversation_mention'
    # respect conversation access (inbox/team membership and custom-role permissions)
    return unless user_can_access_conversation?
    user.notifications.create!(
      notification_type: notification_type,
@@ -38,17 +36,4 @@ class NotificationBuilder
      secondary_actor: secondary_actor || current_user
    )
  end
  def user_can_access_conversation?
    conversation = primary_actor.is_a?(Conversation) ? primary_actor : primary_actor.try(:conversation)
    return true if conversation.blank?
    account_user = AccountUser.find_by(account_id: account.id, user_id: user.id)
    return false if account_user.blank?
    ConversationPolicy.new(
      { user: user, account: account, account_user: account_user },
      conversation
    ).show?
  end
 end
@@ -31,24 +31,13 @@ class V2::Reports::BotMetricsBuilder
  end
  def bot_resolutions_count
-    # Exclude conversations that also had a handoff in the same range — handoff wins
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
-    account.reporting_events.joins(:conversation).select(:conversation_id)
+                                                                                 created_at: range).distinct.count
           .where(account_id: account.id, name: :conversation_bot_resolved, created_at: range)
           .where.not(conversation_id: bot_handoff_conversation_ids_subquery)
           .distinct.count
  end
  def bot_handoffs_count
-    account.reporting_events.joins(:conversation).select(:conversation_id)
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_handoff,
-           .where(account_id: account.id, name: :conversation_bot_handoff, created_at: range)
+                                                                                 created_at: range).distinct.count
           .distinct.count
  end
  def bot_handoff_conversation_ids_subquery
    account.reporting_events
           .where(name: :conversation_bot_handoff, created_at: range)
           .where.not(conversation_id: nil)
           .select(:conversation_id)
  end
  def bot_resolution_rate
@@ -7,7 +7,6 @@ class RoomChannel < ApplicationCable::Channel
    ensure_stream
    update_subscription
    broadcast_presence
    transmit_cache_keys
  end
  def update_presence
@@ -25,19 +24,6 @@ class RoomChannel < ApplicationCable::Channel
    ActionCable.server.broadcast(pubsub_token, { event: 'presence.update', data: data })
  end
  # Push the authoritative cache-key map to this subscriber on every
  # (re)subscribe. Boot and reconnect cache freshness ride the same
  # account.cache_invalidated event the dashboard already handles for live
  # invalidations — the client never pulls /cache_keys itself.
  def transmit_cache_keys
    return if @current_account.blank? || !@current_user.is_a?(User)
    transmit({
               event: Events::Types::ACCOUNT_CACHE_INVALIDATED,
               data: { account_id: @current_account.id, cache_keys: @current_account.cache_keys }
             })
  end
  def ensure_stream
    stream_from pubsub_token
    stream_from "account_#{@current_account.id}" if @current_account.present? && @current_user.is_a?(User)
@@ -1,7 +1,7 @@
 class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::BaseController
  before_action :portal
  before_action :check_authorization
-  before_action :set_articles, only: [:update_status, :update_category, :delete_articles]
+  before_action :set_articles, only: [:update_status, :delete_articles]
  def translate
    head :not_implemented
@@ -19,18 +19,6 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
    render_could_not_create_error(e.message)
  end
  def update_category
    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
    return render_could_not_create_error(I18n.t('portals.articles.category_not_found')) unless category_valid?
    ActiveRecord::Base.transaction do
      @articles.find_each { |article| article.update!(category_id: params[:category_id]) }
    end
    head :ok
  rescue ActiveRecord::RecordInvalid => e
    render_could_not_create_error(e.message)
  end
  def delete_articles
    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
@@ -51,9 +39,5 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
  def set_articles
    @articles = @portal.articles.where(id: params[:ids])
  end
  def category_valid?
    @portal.categories.exists?(id: params[:category_id])
  end
 end
 Api::V1::Accounts::Articles::BulkActionsController.prepend_mod_with('Api::V1::Accounts::Articles::BulkActionsController')
@@ -1,18 +0,0 @@
 class Api::V1::Accounts::Contacts::AttachmentsController < Api::V1::Accounts::Contacts::BaseController
  RESULTS_PER_PAGE = 100
  def index
    conversations = Conversations::PermissionFilterService.new(
      Current.account.conversations.where(contact_id: @contact.id),
      Current.user,
      Current.account
    ).perform
    @attachments = Attachment.where(message_id: Message.where(conversation_id: conversations).select(:id))
                             .includes({ file_attachment: :blob }, message: [:conversation, :inbox, { sender: { avatar_attachment: :blob } }])
                             .order(created_at: :desc)
                             .page(params[:page])
                             .per(RESULTS_PER_PAGE)
    @attachments_count = @attachments.total_count
  end
 end
@@ -1,16 +0,0 @@
 class Api::V1::Accounts::Conversations::UnreadCountsController < Api::V1::Accounts::BaseController
  before_action :ensure_unread_counts_enabled
  def index
    counts = ::Conversations::UnreadCounts::Counter.new(account: Current.account, user: Current.user).perform
    render json: { payload: counts }
  end
  private
  def ensure_unread_counts_enabled
    return if Current.account.feature_enabled?('conversation_unread_counts')
    render json: { error: I18n.t('errors.conversations.unread_counts.feature_not_enabled') }, status: :forbidden
  end
 end
@@ -28,7 +28,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  def attachments
    @attachments_count = @conversation.attachments.count
    @attachments = @conversation.attachments
-                                .includes({ file_attachment: :blob }, message: [:inbox, { sender: { avatar_attachment: :blob } }])
+                                .includes(:message)
                                .order(created_at: :desc)
                                .page(attachment_params[:page])
                                .per(ATTACHMENT_RESULTS_PER_PAGE)
@@ -162,8 +162,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    # rubocop:disable Rails/SkipsModelValidations
    @conversation.update_columns(updates)
    # rubocop:enable Rails/SkipsModelValidations
    ::Conversations::UnreadCounts::Notifier.new(@conversation).perform
  end
  def should_update_last_seen?
@@ -1,7 +1,6 @@
 class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Accounts::BaseController
  before_action :fetch_custom_attributes_definitions, except: [:create]
  before_action :fetch_custom_attribute_definition, only: [:show, :update, :destroy]
  before_action :check_authorization
  DEFAULT_ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
  def index; end
@@ -9,9 +9,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  include Api::V1::Accounts::Concerns::WhatsappHealthManagement
  def index
-    @inboxes = policy_scope(Current.account.inboxes)
+    @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
               .includes(:channel, :portal, :working_hours, { avatar_attachment: :blob })
               .order_by_name
  end
  def show; end
@@ -87,7 +85,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end
  def fetch_agent_bot
-    @agent_bot = AgentBot.accessible_to(Current.account).find(params[:agent_bot]) if params[:agent_bot]
+    @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
  end
  def create_channel
@@ -11,7 +11,7 @@ class Api::V1::Accounts::Instagram::AuthorizationsController < Api::V1::Accounts
        enable_fb_login: '0',
        force_authentication: '1',
        response_type: 'code',
-        state: generate_instagram_token(Current.account.id, params[:return_to])
+        state: generate_instagram_token(Current.account.id)
      }
    )
    if redirect_url
@@ -18,16 +18,7 @@ class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
  end
  def destroy
    label_title = @label.title
    account_id = Current.account.id
    label_deleted_at = Time.current
    @label.destroy!
    Labels::RemoveAssociationsJob.perform_later(
      label_title: label_title,
      account_id: account_id,
      label_deleted_at: label_deleted_at
    )
    head :ok
  end
@@ -6,7 +6,8 @@ class Api::V1::Accounts::Microsoft::AuthorizationsController < Api::V1::Accounts
      {
        redirect_uri: "#{base_url}/microsoft/callback",
        scope: scope,
-        state: state
+        state: state,
        prompt: 'consent'
      }
    )
    if redirect_url
@@ -41,9 +41,9 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
  def destroy_all
    if params[:type] == 'read'
-      ::Notification::DeleteNotificationJob.perform_later(Current.user, Current.account, type: :read)
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :read)
    else
-      ::Notification::DeleteNotificationJob.perform_later(Current.user, Current.account, type: :all)
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :all)
    end
    head :ok
  end
@@ -69,7 +69,7 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
  end
  def fetch_notification
-    @notification = current_user.notifications.where(account_id: Current.account.id).find(params[:id])
+    @notification = current_user.notifications.find(params[:id])
  end
  def set_current_page
@@ -8,15 +8,7 @@ class Api::V1::Accounts::OauthAuthorizationController < Api::V1::Accounts::BaseC
  end
  def state
-    # The sgid purpose doubles as a return hint: onboarding tags it so the callback
+    Current.account.to_sgid(expires_in: 15.minutes).to_s
    # can route the user back to inbox setup. The purpose is part of the signed
    # payload (tamper-proof), and a non-onboarding request keeps the default
    # purpose, leaving callers like Notion byte-identical.
    Current.account.to_sgid(expires_in: 15.minutes, for: state_purpose).to_s
  end
  def state_purpose
    params[:return_to] == 'onboarding' ? 'onboarding' : 'default'
  end
  def base_url
@@ -1,36 +0,0 @@
 class Api::V1::Accounts::OnboardingsController < Api::V1::Accounts::BaseController
  before_action :check_admin_authorization?
  def update
    @account = Current.account
    finalize = finalizing_account_details?
    @account.assign_attributes(account_params)
    @account.custom_attributes.merge!(custom_attributes_params)
    @account.custom_attributes.delete('onboarding_step') if finalize
    @account.save!
    # TODO: re-enable when the help center generation UI is ready to surface progress
    # Onboarding::HelpCenterCreationService.new(@account, Current.user).perform if finalize && website.present?
    render 'api/v1/accounts/update', format: :json
  end
  private
  def finalizing_account_details?
    @account.custom_attributes['onboarding_step'] == 'account_details'
  end
  def website
    custom_attributes_params[:website]
  end
  def account_params
    params.permit(:name, :locale)
  end
  def custom_attributes_params
    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role, :website)
  end
 end
@@ -18,7 +18,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    @portal = Current.account.portals.build(portal_params.merge(live_chat_widget_params))
    @portal.custom_domain = parsed_custom_domain
    @portal.save!
-    process_attached_logo if params[:blob_id].present?
+    process_attached_logo
  end
  def update
@@ -78,23 +78,16 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  def portal_params
    params.require(:portal).permit(
      :id, :color, :custom_domain, :header_text, :homepage_link,
-      :name, :page_title, :slug, :archived,
+      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }, { draft_locales: [] }] }
      { config: [:default_locale, :layout, { allowed_locales: [] }, { draft_locales: [] },
                 { social_profiles: %i[facebook x instagram linkedin youtube tiktok github whatsapp] },
                 { locale_translations: locale_translation_keys.index_with { %i[name page_title header_text] } }] }
    )
  end
  def locale_translation_keys
    params.dig(:portal, :config, :locale_translations)&.keys || []
  end
  def live_chat_widget_params
    permitted_params = params.permit(:inbox_id)
    return {} unless permitted_params.key?(:inbox_id)
    return { channel_web_widget_id: nil } if permitted_params[:inbox_id].blank?
-    inbox = Current.account.inboxes.find(permitted_params[:inbox_id])
+    inbox = Inbox.find(permitted_params[:inbox_id])
    return {} unless inbox.web_widget?
    { channel_web_widget_id: inbox.channel.id }
@@ -105,8 +98,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  end
  def parsed_custom_domain
    return @portal.custom_domain if @portal.custom_domain.blank?
    domain = URI.parse(@portal.custom_domain)
    domain.is_a?(URI::HTTP) ? domain.host : @portal.custom_domain
  end
@@ -3,7 +3,7 @@ class Api::V1::Accounts::Tiktok::AuthorizationsController < Api::V1::Accounts::O
  def create
    redirect_url = Tiktok::AuthClient.authorize_url(
-      state: generate_tiktok_token(Current.account.id, params[:return_to])
+      state: generate_tiktok_token(Current.account.id)
    )
    if redirect_url
@@ -0,0 +1,18 @@
 class Api::V1::Accounts::WorkingHoursController < Api::V1::Accounts::BaseController
  before_action :check_authorization
  before_action :fetch_webhook, only: [:update]
  def update
    @working_hour.update!(working_hour_params)
  end
  private
  def working_hour_params
    params.require(:working_hour).permit(:inbox_id, :open_hour, :open_minutes, :close_hour, :close_minutes, :closed_all_day)
  end
  def fetch_working_hour
    @working_hour = Current.account.working_hours.find(params[:id])
  end
 end
@@ -50,6 +50,7 @@ class Api::V1::AccountsController < Api::BaseController
  end
  def cache_keys
    expires_in 10.seconds, public: false, stale_while_revalidate: 5.minutes
    render json: { cache_keys: cache_keys_for_account }, status: :ok
  end
@@ -57,6 +58,7 @@ class Api::V1::AccountsController < Api::BaseController
    @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email))
    @account.custom_attributes.merge!(custom_attributes_params)
    @account.settings.merge!(settings_params)
    @account.custom_attributes.delete('onboarding_step') if @account.custom_attributes['onboarding_step'] == 'account_details'
    @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
    @account.save!
  end
@@ -92,7 +94,11 @@ class Api::V1::AccountsController < Api::BaseController
  end
  def cache_keys_for_account
-    @account.cache_keys
+    {
      label: fetch_value_for_key(params[:id], Label.name.underscore),
      inbox: fetch_value_for_key(params[:id], Inbox.name.underscore),
      team: fetch_value_for_key(params[:id], Team.name.underscore)
    }
  end
  def fetch_account
@@ -105,7 +111,7 @@ class Api::V1::AccountsController < Api::BaseController
  end
  def custom_attributes_params
-    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role, :website)
+    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role)
  end
  def settings_params
@@ -8,8 +8,7 @@ class Api::V1::NotificationSubscriptionsController < Api::BaseController
  end
  def destroy
-    notification_subscription = current_user.notification_subscriptions
+    notification_subscription = NotificationSubscription.where(["subscription_attributes->>'push_token' = ?", params[:push_token]]).first
                                            .where(["subscription_attributes->>'push_token' = ?", params[:push_token]]).first
    notification_subscription.destroy! if notification_subscription.present?
    head :ok
  end
@@ -13,17 +13,11 @@ class Api::V1::ProfilesController < Api::BaseController
    @user.assign_attributes(profile_params)
    @user.custom_attributes.merge!(custom_attributes_params)
    @user.save!
    # Profile updates can change cached agent fields, including avatar-backed thumbnails.
    @user.invalidate_avatar_cache
  end
  def avatar
    @user.avatar.attachment.destroy! if @user.avatar.attached?
    @user.reload
    # Agent thumbnails are cached separately, and avatar attachment deletes do not dirty user columns.
    @user.invalidate_avatar_cache
  end
  def auto_offline
@@ -83,10 +83,6 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
  end
  def set_message
-    # `conversation.messages.find` would be simpler, but `conversation` is `conversations.last`,
+    @message = @web_widget.inbox.messages.find(permitted_params[:id])
    # which means a visitor with more than one open thread could not edit a message in any
    # but their most recent one. Scoping across all of the visitor's conversations keeps the
    # happy path correct for that future multi-conversation widget flow.
    @message = Message.where(conversation_id: conversations.select(:id)).find(permitted_params[:id])
  end
 end
@@ -1,9 +1,8 @@
 module AccessTokenAuthHelper
  BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[show toggle_status toggle_typing_status toggle_priority create update custom_attributes],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_typing_status toggle_priority create update custom_attributes],
    'api/v1/accounts/conversations/messages' => ['create'],
-    'api/v1/accounts/conversations/assignments' => ['create'],
+    'api/v1/accounts/conversations/assignments' => ['create']
    'api/v1/accounts/conversations/labels' => %w[index create]
  }.freeze
  def ensure_access_token
@@ -2,10 +2,6 @@
 # This concern handles the token verification step.
 module MetaTokenVerifyConcern
  CHANNEL_APP_SECRET_KEYS = %w[app_secret app_secret_key client_secret api_secret].freeze
  META_SIGNATURE_HEADER = 'X-Hub-Signature-256'.freeze
  META_SIGNATURE_PREFIX = 'sha256='.freeze
  def verify
    service = is_a?(Webhooks::WhatsappController) ? 'whatsapp' : 'instagram'
    if valid_token?(params['hub.verify_token'])
@@ -18,53 +14,6 @@ module MetaTokenVerifyConcern
  private
  def verify_meta_signature!
    return unless meta_signature_verification_required?
    return if valid_meta_signature?
    head :unauthorized
  end
  def valid_meta_signature?
    signature = request.headers[META_SIGNATURE_HEADER]
    return false unless signature&.start_with?(META_SIGNATURE_PREFIX)
    meta_app_secrets.any? do |secret|
      next false if secret.blank?
      expected_signature = "#{META_SIGNATURE_PREFIX}#{OpenSSL::HMAC.hexdigest('SHA256', secret, meta_request_body)}"
      ActiveSupport::SecurityUtils.secure_compare(expected_signature, signature)
    end
  end
  def meta_request_body
    @meta_request_body ||= request.raw_post
  end
  def meta_app_secrets
    raise 'Overwrite this method in your controller'
  end
  def meta_signature_verification_required?
    true
  end
  def channel_meta_app_secrets(channel)
    return [] if channel.blank?
    secrets = []
    secrets << channel.app_secret if channel.respond_to?(:app_secret)
    secrets.concat(provider_config_meta_app_secrets(channel))
    secrets.compact_blank.uniq
  end
  def provider_config_meta_app_secrets(channel)
    return [] unless channel.respond_to?(:provider_config)
    provider_config = channel.provider_config.to_h.with_indifferent_access
    CHANNEL_APP_SECRET_KEYS.filter_map { |key| provider_config[key].presence }
  end
  def valid_token?(_token)
    raise 'Overwrite this method your controller'
  end
@@ -80,17 +80,10 @@ class DashboardController < ActionController::Base
      IS_ENTERPRISE: ChatwootApp.enterprise?,
      AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
      GIT_SHA: GIT_HASH,
-      ALLOWED_LOGIN_METHODS: allowed_login_methods,
+      ALLOWED_LOGIN_METHODS: allowed_login_methods
      ACTIVE_PLATFORM_BANNERS: active_platform_banners
    }
  end
  def active_platform_banners
    return [] unless ChatwootApp.chatwoot_cloud?
    PlatformBanner.active.order(created_at: :desc).as_json(only: %i[id banner_message banner_type updated_at])
  end
  def allowed_login_methods
    methods = ['email']
    methods << 'google_oauth' if GlobalConfigService.load('ENABLE_GOOGLE_OAUTH_LOGIN', 'true').to_s != 'false'
@@ -25,14 +25,6 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
  private
  def render_create_error_not_confirmed
    render_error(
      :unauthorized,
      I18n.t('devise_token_auth.sessions.not_confirmed', email: @resource.email),
      error_code: 'user_not_confirmed'
    )
  end
  def find_user_for_authentication
    return nil unless params[:email].present? && params[:password].present?
@@ -28,8 +28,6 @@ class Instagram::CallbacksController < ApplicationController
    @long_lived_token_response = exchange_for_long_lived_token(@response.token)
    inbox, already_exists = find_or_create_inbox
    return redirect_to app_onboarding_inbox_setup_url(account_id: account_id) if return_to == 'onboarding'
    if already_exists
      redirect_to app_instagram_inbox_settings_url(account_id: account_id, inbox_id: inbox.id)
    else
@@ -151,10 +149,6 @@ class Instagram::CallbacksController < ApplicationController
    verify_instagram_token(params[:state])
  end
  def return_to
    instagram_token_return_to(params[:state])
  end
  def oauth_code
    params[:code]
  end
@@ -14,11 +14,4 @@ class Microsoft::CallbacksController < OauthCallbackController
  def imap_address
    'outlook.office365.com'
  end
  # Exchange Online's SMTP AUTH (XOAUTH2) rejects proxy addresses in the SASL `user=` field;
  # it must match the token's UPN. `preferred_username` is the documented v2.0 claim;
  # `upn` is the v1.0 fallback.
  def imap_login_identity
    users_data['preferred_username'] || users_data['upn'] || super
  end
 end
@@ -16,8 +16,6 @@ class OauthCallbackController < ApplicationController
  def handle_response
    inbox, already_exists = find_or_create_inbox
    return redirect_to app_onboarding_inbox_setup_url(account_id: account.id) if return_to == 'onboarding'
    if already_exists
      redirect_to app_email_inbox_settings_url(account_id: account.id, inbox_id: inbox.id)
    else
@@ -46,7 +44,7 @@ class OauthCallbackController < ApplicationController
  def update_channel(channel_email)
    channel_email.update!({
-                            imap_login: imap_login_identity, imap_address: imap_address,
+                            imap_login: users_data['email'], imap_address: imap_address,
                            imap_port: '993', imap_enabled: true,
                            provider: provider_name,
                            provider_config: {
@@ -57,13 +55,6 @@ class OauthCallbackController < ApplicationController
                          })
  end
  # Identity used as the IMAP/SMTP login (SASL XOAUTH2 `user=` field). Defaults to the
  # id_token's email claim; providers override when their server requires a different
  # claim (e.g. Microsoft SMTP requires UPN).
  def imap_login_identity
    users_data['email']
  end
  def provider_name
    raise NotImplementedError
  end
@@ -90,19 +81,10 @@ class OauthCallbackController < ApplicationController
    decoded_token[0]
  end
  # The sgid purpose carries the onboarding return hint (see
  # OauthAuthorizationController#state). Try the onboarding purpose first — a match
  # both resolves the account and records the return target — then fall back to the
  # default purpose used by every other caller.
  def account_from_signed_id
    raise ActionController::BadRequest, 'Missing state variable' if params[:state].blank?
-    if (account = GlobalID::Locator.locate_signed(params[:state], for: 'onboarding'))
+    account = GlobalID::Locator.locate_signed(params[:state])
      @return_to = 'onboarding'
    else
      account = GlobalID::Locator.locate_signed(params[:state])
    end
    raise 'Invalid or expired state' if account.nil?
    account
@@ -112,11 +94,6 @@ class OauthCallbackController < ApplicationController
    @account ||= account_from_signed_id
  end
  def return_to
    account # resolving the sgid records which purpose matched
    @return_to
  end
  # Fallback name, for when name field is missing from users_data
  def fallback_name
    users_data['email'].split('@').first.parameterize.titleize
@@ -24,10 +24,6 @@ class Public::Api::V1::InboxesController < PublicController
  def set_conversation
    return if params[:conversation_id].blank?
-    @conversation = if @contact_inbox.hmac_verified?
+    @conversation = @contact_inbox.contact.conversations.find_by!(display_id: params[:conversation_id])
                      @contact_inbox.contact.conversations.find_by!(display_id: params[:conversation_id])
                    else
                      @contact_inbox.conversations.find_by!(display_id: params[:conversation_id])
                    end
  end
 end
@@ -1,11 +1,9 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
-  before_action :ensure_custom_domain_request, only: [:show, :index, :show_markdown]
+  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
  before_action :set_portal_layout
  before_action :set_view_variant
  before_action :ensure_portal_feature_enabled
  before_action :set_category, except: [:index, :show, :tracking_pixel]
-  before_action :set_article, only: [:show, :show_markdown]
+  before_action :set_article, only: [:show]
  layout 'portal'
  def index
@@ -23,13 +21,6 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  def show
    @og_image_url = helpers.set_og_image_url(@portal.name, @article.title)
    @parsed_content = render_article_content(@article.content.to_s)
  end
  def show_markdown
    return head :not_found unless @article&.published?
    render plain: @article.content.to_s, content_type: 'text/markdown; charset=utf-8'
  end
  def tracking_pixel
@@ -71,6 +62,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  def set_article
    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
    @parsed_content = render_article_content(@article.content.to_s)
  end
  def set_category
@@ -7,8 +7,6 @@ class Public::Api::V1::Portals::BaseController < PublicController
  around_action :set_locale
  after_action :allow_iframe_requests
  PORTAL_LAYOUTS = %w[classic documentation].freeze
  private
  def show_plain_layout
@@ -19,14 +17,6 @@ class Public::Api::V1::Portals::BaseController < PublicController
    @theme_from_params = params[:theme] if %w[dark light].include?(params[:theme])
  end
  def set_portal_layout
    @portal_layout = PORTAL_LAYOUTS.include?(@portal&.layout) ? @portal.layout : 'classic'
  end
  def set_view_variant
    request.variant = :documentation if @portal_layout == 'documentation' && !@is_plain_layout_enabled
  end
  def portal
    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
  end
@@ -52,7 +42,7 @@ class Public::Api::V1::Portals::BaseController < PublicController
    article_locale = if article.category.present?
                       article.category.locale
                     else
-                       article.locale
+                       article.portal.default_locale
                     end
    @locale = validate_and_get_locale(article_locale)
    I18n.with_locale(@locale, &)
@@ -1,18 +1,12 @@
 class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
  before_action :set_portal_layout
  before_action :set_view_variant
  before_action :ensure_portal_feature_enabled
  before_action :set_category, only: [:show]
  before_action :load_category_articles, only: [:show], if: -> { @portal_layout == 'documentation' }
  layout 'portal'
  def index
-    respond_to do |format|
+    @categories = @portal.categories.order(position: :asc)
      format.html { redirect_to public_portal_locale_path(@portal.slug, params[:locale]), status: :moved_permanently }
      format.json { @categories = @portal.categories.order(position: :asc) }
    end
  end
  def show
@@ -27,9 +21,4 @@ class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals:
    Rails.logger.info "Category: not found for slug: #{params[:category_slug]}"
    render_404 && return if @category.blank?
  end
  def load_category_articles
    @articles = @category.articles.published.order(:position).includes(:author)
    @category_authors = @articles.filter_map(&:author).uniq
  end
 end
@@ -1,31 +0,0 @@
 class Public::Api::V1::Portals::SearchController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:index]
  before_action :portal
  before_action :set_portal_layout
  before_action :set_view_variant
  before_action :ensure_portal_feature_enabled
  layout 'portal'
  def index
    @query = params[:query].to_s.strip
    @articles = @portal.articles.published.includes(:category).where(locale: params[:locale])
    search_articles
    @articles = @articles.page(params[:page]).per(10)
  end
  private
  def search_articles
    @articles = @query.present? ? @articles.search(search_params) : @articles.none
  end
  def search_params
    params.permit(:query, :locale, :sort, :status, :page).tap do |permitted|
      permitted[:query] = @query
    end
  end
 end
 Public::Api::V1::Portals::SearchController.prepend_mod_with('Public::Api::V1::Portals::SearchController')
@@ -2,14 +2,11 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
  before_action :ensure_custom_domain_request, only: [:show]
  before_action :redirect_to_portal_with_locale, only: [:show]
  before_action :portal
  before_action :set_portal_layout
  before_action :set_view_variant
  before_action :ensure_portal_feature_enabled
  before_action :load_home_data, only: [:show], if: -> { @portal_layout == 'documentation' }
  layout 'portal'
  def show
-    @og_image_url = helpers.set_og_image_url('', @portal.localized_value('header_text', @locale))
+    @og_image_url = helpers.set_og_image_url('', @portal.header_text)
  end
  def sitemap
@@ -31,28 +28,4 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
    portal
    redirect_to "/hc/#{@portal.slug}/#{@portal.default_locale}"
  end
  def load_home_data
    base_articles = @portal.articles.published.where(locale: @locale).includes(:author, :category)
    @visible_categories = @portal.categories
                                 .where(locale: @locale)
                                 .joins(:articles).where(articles: { status: :published })
                                 .order(position: :asc)
                                 .group('categories.id')
    @popular_topics = @visible_categories.first(3)
    @featured = base_articles.order_by_views.limit(6)
    @category_contributors = build_category_contributors(@visible_categories)
  end
  def build_category_contributors(categories)
    category_ids = categories.map(&:id)
    return {} if category_ids.empty?
    @portal.articles
           .published
           .where(locale: @locale, category_id: category_ids)
           .includes(:author)
           .group_by(&:category_id)
           .transform_values { |articles| articles.filter_map(&:author).uniq.first(3) }
  end
 end
@@ -27,7 +27,7 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
    if errors.any?
      redirect_to super_admin_app_config_path(config: @config), alert: errors.join(', ')
    else
-      redirect_to super_admin_settings_path, flash: success_flash
+      redirect_to super_admin_settings_path, notice: "App Configs - #{@config.titleize} updated successfully"
    end
  end
@@ -58,21 +58,6 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
      %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS WEBHOOK_TIMEOUT MAXIMUM_FILE_UPLOAD_SIZE WIDGET_TOKEN_EXPIRY]
    )
  end
  def success_notice
    message = "#{@config.titleize} settings updated successfully"
    return message unless restart_required_config_saved?
    "#{message.delete_suffix('.')}. Restart Chatwoot web and worker processes to apply this change everywhere."
  end
  def success_flash
    restart_required_config_saved? ? { success: success_notice } : { notice: success_notice }
  end
  def restart_required_config_saved?
    params.fetch('app_config', {}).keys.intersect?(InstallationConfig::RESTART_REQUIRED_CONFIG_KEYS)
  end
 end
 SuperAdmin::AppConfigsController.prepend_mod_with('SuperAdmin::AppConfigsController')
@@ -25,29 +25,6 @@ class SuperAdmin::InstallationConfigsController < SuperAdmin::ApplicationControl
    resource_class.editable
  end
  def create
    resource = new_resource(resource_params)
    authorize_resource(resource)
    if resource.save
      redirect_to after_resource_created_path(resource), flash: success_flash(resource)
    else
      render :new, locals: {
        page: Administrate::Page::Form.new(dashboard, resource)
      }, status: :unprocessable_entity
    end
  end
  def update
    if requested_resource.update(resource_params)
      redirect_to after_resource_updated_path(requested_resource), flash: success_flash(requested_resource)
    else
      render :edit, locals: {
        page: Administrate::Page::Form.new(dashboard, requested_resource)
      }, status: :unprocessable_entity
    end
  end
  # Override `resource_params` if you want to transform the submitted
  # data before it's persisted. For example, the following would turn all
  # empty values into nil values. It uses other APIs such as `resource_class`
@@ -65,20 +42,6 @@ class SuperAdmin::InstallationConfigsController < SuperAdmin::ApplicationControl
          .transform_values { |value| value == '' ? nil : value }.merge(locked: false)
  end
  private
  def success_flash(resource)
    message = translate_with_resource('update.success')
    message = translate_with_resource('create.success') if action_name == 'create'
    return { notice: message } unless restart_required_config?(resource)
    { success: "#{message.delete_suffix('.')}. Restart Chatwoot web and worker processes to apply this change everywhere." }
  end
  def restart_required_config?(resource)
    resource.name.in?(InstallationConfig::RESTART_REQUIRED_CONFIG_KEYS)
  end
  # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
  # for more information
 end
@@ -1,9 +0,0 @@
 class SuperAdmin::PlatformBannersController < SuperAdmin::ApplicationController
  before_action :ensure_chatwoot_cloud
  private
  def ensure_chatwoot_cloud
    raise ActionController::RoutingError, 'Not Found' unless ChatwootApp.chatwoot_cloud?
  end
 end
@@ -1,12 +1,7 @@
 class SwaggerController < ApplicationController
  def respond
    if Rails.env.development? || Rails.env.test?
-      swagger_root = Rails.root.join('swagger')
+      render inline: Rails.root.join('swagger', derived_path).read
      file_path = swagger_root.join(derived_path).cleanpath
      return head :not_found unless file_path.to_s.start_with?("#{swagger_root}/") && file_path.file?
      render inline: file_path.read
    else
      head :not_found
    end
@@ -16,8 +11,8 @@ class SwaggerController < ApplicationController
  def derived_path
    params[:path] ||= 'index.html'
-    path = Rack::Utils.clean_path_info(params[:path]).delete_prefix('/')
+    path = Rack::Utils.clean_path_info(params[:path])
-    path << ".#{Rack::Utils.clean_path_info(params[:format]).delete_prefix('/')}" unless path.ends_with?(params[:format].to_s)
+    path << ".#{Rack::Utils.clean_path_info(params[:format])}" unless path.ends_with?(params[:format].to_s)
    path
  end
 end
@@ -20,8 +20,6 @@ class Tiktok::CallbacksController < ApplicationController
  def process_successful_authorization
    inbox, already_exists = find_or_create_inbox
    return redirect_to app_onboarding_inbox_setup_url(account_id: account_id) if return_to == 'onboarding'
    if already_exists
      redirect_to app_tiktok_inbox_settings_url(account_id: account_id, inbox_id: inbox.id)
    else
@@ -129,10 +127,6 @@ class Tiktok::CallbacksController < ApplicationController
    @account_id ||= verify_tiktok_token(params[:state])
  end
  def return_to
    tiktok_token_return_to(params[:state])
  end
  def account
    @account ||= Account.find(account_id)
  end
@@ -31,11 +31,7 @@ class Twilio::CallbackController < ApplicationController
      :Latitude,
      :Longitude,
      :MessageType,
-      :ProfileName,
+      :ProfileName
      :ExternalUserId,
      :ParentExternalUserId,
      :ProfileUsername,
      :Username
    )
  end
 end
@@ -1,8 +1,6 @@
 class Webhooks::InstagramController < ActionController::API
  include MetaTokenVerifyConcern
  before_action :verify_meta_signature!, only: :events
  def events
    Rails.logger.info('Instagram webhook received events')
    if params['object'].casecmp('instagram').zero?
@@ -41,38 +39,4 @@ class Webhooks::InstagramController < ActionController::API
    token == GlobalConfigService.load('IG_VERIFY_TOKEN', '') ||
      token == GlobalConfigService.load('INSTAGRAM_VERIFY_TOKEN', '')
  end
  def meta_app_secrets
    [
      *instagram_channel_meta_app_secrets,
      GlobalConfigService.load('INSTAGRAM_APP_SECRET', nil),
      GlobalConfigService.load('FB_APP_SECRET', nil)
    ]
  end
  def instagram_channel_meta_app_secrets
    instagram_channels_from_payload.flat_map { |channel| channel_meta_app_secrets(channel) }
  end
  def instagram_channels_from_payload
    Array(params.to_unsafe_hash[:entry]).flat_map do |entry|
      instagram_ids_from_entry(entry.with_indifferent_access).flat_map do |instagram_id|
        [
          Channel::Instagram.find_by(instagram_id: instagram_id),
          Channel::FacebookPage.find_by(instagram_id: instagram_id)
        ]
      end
    end.compact.uniq
  end
  def instagram_ids_from_entry(entry)
    messages = entry[:messaging].presence || entry[:standby] || []
    messages.filter_map { |messaging| instagram_id_from_messaging(messaging.with_indifferent_access) }
  end
  def instagram_id_from_messaging(messaging)
    return messaging.dig(:sender, :id) if messaging.dig(:message, :is_echo).present?
    messaging.dig(:recipient, :id)
  end
 end
@@ -1,8 +1,6 @@
 class Webhooks::WhatsappController < ActionController::API
  include MetaTokenVerifyConcern
  before_action :verify_meta_signature!, only: :process_payload
  def process_payload
    if inactive_whatsapp_number?
      Rails.logger.warn("Rejected webhook for inactive WhatsApp number: #{params[:phone_number]}")
@@ -22,45 +20,6 @@ class Webhooks::WhatsappController < ActionController::API
    token == whatsapp_webhook_verify_token if whatsapp_webhook_verify_token.present?
  end
  def meta_app_secrets
    [
      *channel_meta_app_secrets(whatsapp_channel),
      GlobalConfigService.load('WHATSAPP_APP_SECRET', nil)
    ]
  end
  def whatsapp_channel
    @whatsapp_channel ||= whatsapp_business_payload_channel || Channel::Whatsapp.find_by(phone_number: params[:phone_number])
  end
  def meta_signature_verification_required?
    return true if whatsapp_channel.blank?
    return false unless whatsapp_channel.provider == 'whatsapp_cloud'
    return true if channel_meta_app_secrets(whatsapp_channel).present?
    whatsapp_channel.provider_config['source'] == 'embedded_signup'
  end
  def whatsapp_business_payload_channel
    return unless params[:object] == 'whatsapp_business_account'
    metadata = params.dig(:entry, 0, :changes, 0, :value, :metadata)
    return if metadata.blank?
    phone_number = normalized_phone_number(metadata[:display_phone_number])
    phone_number_id = metadata[:phone_number_id]
    channel = Channel::Whatsapp.find_by(phone_number: phone_number)
    return channel if channel && channel.provider_config['phone_number_id'] == phone_number_id
  end
  def normalized_phone_number(phone_number)
    return if phone_number.blank?
    phone_number = phone_number.to_s
    phone_number.start_with?('+') ? phone_number : "+#{phone_number}"
  end
  def inactive_whatsapp_number?
    phone_number = params[:phone_number]
    return false if phone_number.blank?
@@ -1,20 +0,0 @@
 require 'administrate/base_dashboard'
 class PlatformBannerDashboard < Administrate::BaseDashboard
  ATTRIBUTE_TYPES = {
    id: Field::Number,
    banner_message: Field::Text.with_options(truncate: 200),
    banner_type: Field::Select.with_options(collection: %w[info warning error]),
    active: Field::Boolean,
    created_at: Field::DateTime,
    updated_at: Field::DateTime
  }.freeze
  COLLECTION_ATTRIBUTES = %i[id banner_message banner_type active created_at].freeze
  SHOW_PAGE_ATTRIBUTES = %i[id banner_message banner_type active created_at updated_at].freeze
  FORM_ATTRIBUTES = %i[banner_message banner_type active].freeze
  def display_resource(platform_banner)
    "Banner ##{platform_banner.id} (#{platform_banner.banner_type})"
  end
 end
@@ -17,7 +17,6 @@ class AsyncDispatcher < BaseDispatcher
      InstallationWebhookListener.instance,
      NotificationListener.instance,
      ParticipationListener.instance,
      Conversations::UnreadCounts::Listener.instance,
      ReportingEventListener.instance,
      WebhookListener.instance
    ]
@@ -12,7 +12,7 @@ class ContactDrop < BaseDrop
  end
  def first_name
-    @obj.try(:name).try(:split).try(:first).try(:capitalize)
+    @obj.try(:name).try(:split).try(:first).try(:capitalize) if @obj.try(:name).try(:split).try(:size) > 1
  end
  def last_name
@@ -7,15 +7,11 @@ class UserDrop < BaseDrop
    @obj.try(:available_name)
  end
  def email
    @obj.try(:email)
  end
  def first_name
-    @obj.try(:name).try(:split).try(:first).try(:capitalize)
+    @obj.try(:name).try(:split).try(:first).try(:capitalize) if @obj.try(:name).try(:split).try(:size) > 1
  end
  def last_name
-    @obj.try(:name).try(:split).try(:last).try(:capitalize) if @obj.try(:name).try(:split).try(:size).to_i > 1
+    @obj.try(:name).try(:split).try(:last).try(:capitalize) if @obj.try(:name).try(:split).try(:size) > 1
  end
 end
@@ -48,5 +48,3 @@ class MessageFinder
    messages.reorder('created_at desc').limit(20).reverse
  end
 end
 MessageFinder.prepend_mod_with('MessageFinder')
@@ -17,12 +17,15 @@ module Api::V1::InboxesHelper
  def validate_imap(channel_data)
    return unless channel_data.key?('imap_enabled') && channel_data[:imap_enabled]
-    # Validate the user-selected auth mechanism before opening the connection.
+    Mail.defaults do
-    authentication = Imap::Authentication.validate_user_configurable!(channel_data[:imap_authentication])
+      retriever_method :imap, { address: channel_data[:imap_address],
                                port: channel_data[:imap_port],
                                user_name: channel_data[:imap_login],
                                password: channel_data[:imap_password],
                                enable_ssl: channel_data[:imap_enable_ssl] }
    end
-    # Use the same auth adapter as the fetch service so LOGIN uses the IMAP LOGIN command,
+    check_imap_connection(channel_data)
    # not SASL AUTH=LOGIN.
    check_imap_connection(channel_data, authentication)
  end
  def validate_smtp(channel_data)
@@ -34,8 +37,8 @@ module Api::V1::InboxesHelper
    check_smtp_connection(channel_data, smtp)
  end
-  def check_imap_connection(channel_data, authentication)
+  def check_imap_connection(channel_data)
-    imap = open_imap_connection(channel_data, authentication)
+    Mail.connection {} # rubocop:disable:block
  rescue SocketError => e
    raise StandardError, I18n.t('errors.inboxes.imap.socket_error')
  rescue Net::IMAP::NoResponseError => e
@@ -50,20 +53,9 @@ module Api::V1::InboxesHelper
  rescue StandardError => e
    raise StandardError, e.message
  ensure
    imap.disconnect if imap.present? && !imap.disconnected?
    Rails.logger.error "[Api::V1::InboxesHelper] check_imap_connection failed with #{e.message}" if e.present?
  end
  def open_imap_connection(channel_data, authentication)
    imap = build_imap_connection(channel_data)
    Imap::Authentication.authenticate!(imap, authentication, channel_data[:imap_login], channel_data[:imap_password])
    imap
  end
  def build_imap_connection(channel_data)
    Net::IMAP.new(channel_data[:imap_address], port: channel_data[:imap_port], ssl: channel_data[:imap_enable_ssl])
  end
  def check_smtp_connection(channel_data, smtp)
    smtp.open_timeout = 10
    smtp.start(channel_data[:smtp_domain], channel_data[:smtp_login], channel_data[:smtp_password],
@@ -17,7 +17,6 @@ module FileTypeHelper
  def image_file?(content_type)
    [
      'image/jpeg',
      'image/jpg',
      'image/png',
      'image/gif',
      'image/bmp',
@@ -4,21 +4,21 @@ module Instagram::IntegrationHelper
  # Generates a signed JWT token for Instagram integration
  #
  # @param account_id [Integer] The account ID to encode in the token
  # @param return_to [String, nil] Optional onboarding return hint
  # @return [String, nil] The encoded JWT token or nil if client secret is missing
-  def generate_instagram_token(account_id, return_to = nil)
+  def generate_instagram_token(account_id)
    return if client_secret.blank?
-    JWT.encode(token_payload(account_id, return_to), client_secret, 'HS256')
+    JWT.encode(token_payload(account_id), client_secret, 'HS256')
  rescue StandardError => e
    Rails.logger.error("Failed to generate Instagram token: #{e.message}")
    nil
  end
-  def token_payload(account_id, return_to = nil)
+  def token_payload(account_id)
-    payload = { sub: account_id, iat: Time.current.to_i }
+    {
-    payload[:return_to] = return_to if return_to.present?
+      sub: account_id,
-    payload
+      iat: Time.current.to_i
    }
  end
  # Verifies and decodes a Instagram JWT token
@@ -28,14 +28,7 @@ module Instagram::IntegrationHelper
  def verify_instagram_token(token)
    return if token.blank? || client_secret.blank?
-    decode_token(token, client_secret)&.dig('sub')
+    decode_token(token, client_secret)
  end
  # Reads the onboarding return hint from a Instagram JWT token, if present.
  def instagram_token_return_to(token)
    return if token.blank? || client_secret.blank?
    decode_token(token, client_secret)&.dig('return_to')
  end
  private
@@ -48,7 +41,7 @@ module Instagram::IntegrationHelper
    JWT.decode(token, secret, true, {
                 algorithm: 'HS256',
                 verify_expiration: true
-               }).first
+               }).first['sub']
  rescue StandardError => e
    Rails.logger.error("Unexpected error verifying Instagram token: #{e.message}")
    nil
@@ -45,16 +45,9 @@ module PortalHelper
    theme.present? && theme != 'system' ? "?theme=#{theme}" : ''
  end
  def portal_query_string(theme, is_plain_layout_enabled)
    query_params = {}
    query_params[:theme] = theme if theme.present? && theme != 'system'
    query_params[:show_plain_layout] = true if is_plain_layout_enabled
    query_params.present? ? "?#{query_params.to_query}" : ''
  end
  def generate_home_link(portal_slug, portal_locale, theme, is_plain_layout_enabled)
    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/#{portal_locale}#{portal_query_string(theme, is_plain_layout_enabled)}"
+      "/hc/#{portal_slug}/#{portal_locale}#{theme_query_string(theme)}"
    else
      "/hc/#{portal_slug}/#{portal_locale}"
    end
@@ -68,7 +61,7 @@ module PortalHelper
    is_plain_layout_enabled = params[:is_plain_layout_enabled]
    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/#{category_locale}/categories/#{category_slug}#{portal_query_string(theme, is_plain_layout_enabled)}"
+      "/hc/#{portal_slug}/#{category_locale}/categories/#{category_slug}#{theme_query_string(theme)}"
    else
      "/hc/#{portal_slug}/#{category_locale}/categories/#{category_slug}"
    end
@@ -76,7 +69,7 @@ module PortalHelper
  def generate_article_link(portal_slug, article_slug, theme, is_plain_layout_enabled)
    if is_plain_layout_enabled
-      "/hc/#{portal_slug}/articles/#{article_slug}#{portal_query_string(theme, is_plain_layout_enabled)}"
+      "/hc/#{portal_slug}/articles/#{article_slug}#{theme_query_string(theme)}"
    else
      "/hc/#{portal_slug}/articles/#{article_slug}"
    end
@@ -103,15 +96,4 @@ module PortalHelper
    colors[username.length % colors.size]
  end
  def format_authors_label(authors)
    return if authors.blank?
    names = authors.map(&:available_name)
    return names.to_sentence if names.size <= 3
    I18n.t('public_portal.sidebar.authors_others',
           names: names.first(2).join(', '),
           count: authors.size - 2)
  end
 end
@@ -53,12 +53,13 @@ module ReportHelper
  end
  def resolutions
-    scope.reporting_events.where(account_id: account.id, name: :conversation_resolved, created_at: range)
+    scope.reporting_events.where(account_id: account.id, name: :conversation_resolved,
                                 created_at: range)
  end
  def bot_resolutions
-    scope.reporting_events.where(account_id: account.id, name: :conversation_bot_resolved, created_at: range)
+    scope.reporting_events.where(account_id: account.id, name: :conversation_bot_resolved,
-         .where.not(conversation_id: bot_handoff_conversation_ids_subquery)
+                                 created_at: range)
  end
  def bot_handoffs
@@ -66,10 +67,6 @@ module ReportHelper
                                                                               created_at: range).distinct
  end
  def bot_handoff_conversation_ids_subquery
    bot_handoffs
  end
  def avg_first_response_time
    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'first_response', account_id: account.id))
    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
@@ -34,12 +34,6 @@ disable_branding:
  enabled: <%= (ChatwootHub.pricing_plan != 'community') %>
  icon: 'icon-sailbot-fill'
  enterprise: true
 voice_calls:
  name: 'Voice Calls'
  description: 'Enable voice calling capabilities for your agents and customers.'
  enabled: <%= (ChatwootHub.pricing_plan != 'community') %>
  icon: 'icon-voice-line'
  enterprise: true
 # ------- Product Features ------- #
 help_center:
@@ -2,12 +2,11 @@ module Tiktok::IntegrationHelper
  # Generates a signed JWT token for Tiktok integration
  #
  # @param account_id [Integer] The account ID to encode in the token
  # @param return_to [String, nil] Optional onboarding return hint
  # @return [String, nil] The encoded JWT token or nil if client secret is missing
-  def generate_tiktok_token(account_id, return_to = nil)
+  def generate_tiktok_token(account_id)
    return if client_secret.blank?
-    JWT.encode(token_payload(account_id, return_to), client_secret, 'HS256')
+    JWT.encode(token_payload(account_id), client_secret, 'HS256')
  rescue StandardError => e
    Rails.logger.error("Failed to generate TikTok token: #{e.message}")
    nil
@@ -20,14 +19,7 @@ module Tiktok::IntegrationHelper
  def verify_tiktok_token(token)
    return if token.blank? || client_secret.blank?
-    decode_token(token, client_secret)&.dig('sub')
+    decode_token(token, client_secret)
  end
  # Reads the onboarding return hint from a Tiktok JWT token, if present.
  def tiktok_token_return_to(token)
    return if token.blank? || client_secret.blank?
    decode_token(token, client_secret)&.dig('return_to')
  end
  private
@@ -36,17 +28,18 @@ module Tiktok::IntegrationHelper
    @client_secret ||= GlobalConfigService.load('TIKTOK_APP_SECRET', nil)
  end
-  def token_payload(account_id, return_to = nil)
+  def token_payload(account_id)
-    payload = { sub: account_id, iat: Time.current.to_i }
+    {
-    payload[:return_to] = return_to if return_to.present?
+      sub: account_id,
-    payload
+      iat: Time.current.to_i
    }
  end
  def decode_token(token, secret)
    JWT.decode(token, secret, true, {
                 algorithm: 'HS256',
                 verify_expiration: true
-               }).first
+               }).first['sub']
  rescue StandardError => e
    Rails.logger.error("Unexpected error verifying Tiktok token: #{e.message}")
    nil
@@ -3,7 +3,6 @@ import { mapGetters } from 'vuex';
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
 import StatusBanner from './components/app/StatusBanner.vue';
 import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
 import vueActionCable from './helper/actionCable';
@@ -19,7 +18,6 @@ import {
  verifyServiceWorkerExistence,
 } from './helper/pushHelper';
 import ReconnectService from 'dashboard/helper/ReconnectService';
 import paintStoresFromCache from 'dashboard/helper/CacheHelper/paintStoresFromCache';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 export default {
@@ -29,7 +27,6 @@ export default {
    LoadingState,
    NetworkNotification,
    UpdateBanner,
    StatusBanner,
    PaymentPendingBanner,
    WootSnackbarBox,
    PendingEmailVerificationBanner,
@@ -109,21 +106,14 @@ export default {
      this.$store.dispatch('setActiveAccount', {
        accountId: this.currentAccountId,
      });
      const { pubsub_token: pubsubToken } = this.currentUser || {};
      vueActionCable.init(this.store, pubsubToken);
      // Paint cached config from IndexedDB instantly while the cable
      // connects. Freshness needs no orchestration here: RoomChannel pushes
      // the cache-key map on every (re)subscribe and on every server-side
      // change, all through the same account.cache_invalidated event.
      await paintStoresFromCache(this.$store, this.currentAccountId);
      const account = this.getAccount(this.currentAccountId);
      const { locale, latest_chatwoot_version: latestChatwootVersion } =
        account;
      const { pubsub_token: pubsubToken } = this.currentUser || {};
      // If user locale is set, use it; otherwise use account locale
      this.setLocale(this.uiSettings?.locale || locale);
      this.latestChatwootVersion = latestChatwootVersion;
      vueActionCable.init(this.store, pubsubToken);
      this.reconnectService = new ReconnectService(this.store, this.router);
      window.reconnectService = this.reconnectService;
@@ -147,7 +137,6 @@ export default {
    :dir="isRTL ? 'rtl' : 'ltr'"
  >
    <UpdateBanner :latest-chatwoot-version="latestChatwootVersion" />
    <StatusBanner />
    <template v-if="currentAccountId">
      <PendingEmailVerificationBanner v-if="hideOnOnboardingView" />
      <PaymentPendingBanner v-if="hideOnOnboardingView" />
@@ -5,15 +5,14 @@ import ApiClient from './ApiClient';
 class CacheEnabledApiClient extends ApiClient {
  constructor(resource, options = {}) {
    super(resource, options);
    // `cacheModel` is the Rails Model.name.underscore value — simultaneously
    // the server cache-key name and the IDB object-store name.
    this.cacheModelName = options.cacheModel;
    // inbox/label endpoints wrap collections in { payload }; the rest return
    // the bare array.
    this.payloadEnvelope = options.payloadEnvelope || false;
    this.dataManager = new DataManager(this.accountIdFromRoute);
  }
  // eslint-disable-next-line class-methods-use-this
  get cacheModelName() {
    throw new Error('cacheModelName is not defined');
  }
  get(cache = false) {
    if (cache) {
      return this.getFromCache();
@@ -26,14 +25,14 @@ class CacheEnabledApiClient extends ApiClient {
    return axios.get(this.url);
  }
  // eslint-disable-next-line class-methods-use-this
  extractDataFromResponse(response) {
-    return this.payloadEnvelope ? response.data.payload : response.data;
+    return response.data.payload;
  }
  // eslint-disable-next-line class-methods-use-this
  marshallData(dataToParse) {
-    return this.payloadEnvelope
+    return { data: { payload: dataToParse } };
      ? { data: { payload: dataToParse } }
      : { data: dataToParse };
  }
  async getFromCache() {
@@ -44,23 +43,24 @@ class CacheEnabledApiClient extends ApiClient {
      return this.getFromNetwork();
    }
-    // Trust the IDB cache. Freshness is maintained by the
+    const { data } = await axios.get(
-    // account.cache_invalidated event alone: RoomChannel pushes the cache-key
+      `/api/v1/accounts/${this.accountIdFromRoute}/cache_keys`
-    // map on every (re)subscribe — boot and reconnect included — and the
+    );
-    // server broadcasts it on every change. Skipping a per-call /cache_keys
+    const cacheKeyFromApi = data.cache_keys[this.cacheModelName];
-    // preflight eliminates N GET requests per cold settings-page load.
+    const isCacheValid = await this.validateCacheKey(cacheKeyFromApi);
    const localData = await this.dataManager.get({
      modelName: this.cacheModelName,
    });
-    if (localData.length > 0) {
+    let localData = [];
-      return this.marshallData(localData);
+    if (isCacheValid) {
      localData = await this.dataManager.get({
        modelName: this.cacheModelName,
      });
    }
-    // Empty IDB (first load or wiped): fetch data without a cache key. The
+    if (localData.length === 0) {
-    // next pushed key map won't match the missing key and will refetch once,
+      return this.refetchAndCommit(cacheKeyFromApi);
-    // stamping the authoritative key — the client never pulls keys itself.
+    }
-    return this.refetchAndCommit(null);
+
    return this.marshallData(localData);
  }
  async refetchAndCommit(newKey = null) {
@@ -69,9 +69,7 @@ class CacheEnabledApiClient extends ApiClient {
    try {
      await this.dataManager.initDb();
-      // Await replace so data is persisted before the cache key is — otherwise
+      this.dataManager.replace({
      // a concurrent reader could see a fresh key paired with stale data.
      await this.dataManager.replace({
        modelName: this.cacheModelName,
        data: this.extractDataFromResponse(response),
      });
@@ -91,15 +89,8 @@ class CacheEnabledApiClient extends ApiClient {
      await this.dataManager.initDb();
    }
-    const cacheKey = await this.dataManager.getCacheKey(this.cacheModelName);
+    const cachekey = await this.dataManager.getCacheKey(this.cacheModelName);
-    if (cacheKey === undefined) {
+    return cacheKeyFromApi === cachekey;
      const localData = await this.dataManager.get({
        modelName: this.cacheModelName,
      });
      return localData.length === 0;
    }
    return cacheKeyFromApi === cacheKey;
  }
 }
@@ -9,6 +9,13 @@ class AccountAPI extends ApiClient {
  createAccount(data) {
    return axios.post(`${this.apiVersion}/accounts`, data);
  }
  async getCacheKeys() {
    const response = await axios.get(
      `/api/v1/accounts/${this.accountIdFromRoute}/cache_keys`
    );
    return response.data.cache_keys;
  }
 }
 export default new AccountAPI();
@@ -1,10 +1,10 @@
 /* global axios */
-import CacheEnabledApiClient from './CacheEnabledApiClient';
+import ApiClient from './ApiClient';
-class Agents extends CacheEnabledApiClient {
+class Agents extends ApiClient {
  constructor() {
-    super('agents', { accountScoped: true, cacheModel: 'account_user' });
+    super('agents', { accountScoped: true });
  }
  bulkInvite({ emails }) {
@@ -1,15 +1,13 @@
-import CacheEnabledApiClient from './CacheEnabledApiClient';
+/* global axios */
 import ApiClient from './ApiClient';
-class AttributeAPI extends CacheEnabledApiClient {
+class AttributeAPI extends ApiClient {
  constructor() {
-    super('custom_attribute_definitions', {
+    super('custom_attribute_definitions', { accountScoped: true });
      accountScoped: true,
      cacheModel: 'custom_attribute_definition',
    });
  }
  getAttributesByModel() {
-    return super.get(true);
+    return axios.get(this.url);
  }
 }
@@ -1,20 +1,15 @@
 /* global axios */
-import CacheEnabledApiClient from './CacheEnabledApiClient';
+import ApiClient from './ApiClient';
-class CannedResponse extends CacheEnabledApiClient {
+class CannedResponse extends ApiClient {
  constructor() {
-    super('canned_responses', {
+    super('canned_responses', { accountScoped: true });
      accountScoped: true,
      cacheModel: 'canned_response',
    });
  }
-  get({ searchKey } = {}) {
+  get({ searchKey }) {
-    if (searchKey) {
+    const url = searchKey ? `${this.url}?search=${searchKey}` : this.url;
-      return axios.get(`${this.url}?search=${searchKey}`);
+    return axios.get(url);
    }
    return super.get(true);
  }
 }
@@ -6,22 +6,15 @@ class CaptainDocument extends ApiClient {
    super('captain/documents', { accountScoped: true });
  }
-  get({ page = 1, searchKey, assistantId, filter, source, sort } = {}) {
+  get({ page = 1, searchKey, assistantId } = {}) {
    return axios.get(this.url, {
      params: {
        page,
-        search_key: searchKey,
+        searchKey,
        assistant_id: assistantId,
        filter,
        source,
        sort,
      },
    });
  }
  sync(id) {
    return axios.post(`${this.url}/${id}/sync`);
  }
 }
 export default new CaptainDocument();
@@ -48,12 +48,6 @@ class TwilioVoiceClient extends EventTarget {
    return !!this.activeConnection;
  }
  setMuted(shouldMute) {
    if (!this.activeConnection) return false;
    this.activeConnection.mute(shouldMute);
    return shouldMute;
  }
  endClientCall() {
    if (this.activeConnection) {
      this.activeConnection.disconnect();
@@ -74,7 +68,7 @@ class TwilioVoiceClient extends EventTarget {
    this.inboxId = null;
  }
-  async joinClientCall({ to, conversationId, callSid }) {
+  async joinClientCall({ to, conversationId }) {
    if (!this.device || !this.initialized || !to) return null;
    if (this.activeConnection) return this.activeConnection;
@@ -82,7 +76,6 @@ class TwilioVoiceClient extends EventTarget {
      To: to,
      is_agent: 'true',
      conversation_id: conversationId,
      call_sid: callSid,
    };
    const connection = await this.device.connect({ params });
@@ -12,10 +12,10 @@ class VoiceAPI extends ApiClient {
    return ContactsAPI.initiateCall(contactId, inboxId).then(r => r.data);
  }
-  leaveConference({ inboxId, conversationId, callSid }) {
+  leaveConference(inboxId, conversationId) {
    return axios
      .delete(`${this.baseUrl()}/inboxes/${inboxId}/conference`, {
-        params: { conversation_id: conversationId, call_sid: callSid },
+        params: { conversation_id: conversationId },
      })
      .then(r => r.data);
  }
@@ -1,45 +0,0 @@
 /* global axios */
 import ApiClient from '../../ApiClient';
 class WhatsappCallsAPI extends ApiClient {
  constructor() {
    super('whatsapp_calls', { accountScoped: true });
  }
  show(callId) {
    return axios.get(`${this.url}/${callId}`).then(r => r.data);
  }
  initiate(conversationId, sdpOffer) {
    return axios
      .post(`${this.url}/initiate`, {
        conversation_id: conversationId,
        sdp_offer: sdpOffer,
      })
      .then(r => r.data);
  }
  accept(callId, sdpAnswer) {
    return axios
      .post(`${this.url}/${callId}/accept`, { sdp_answer: sdpAnswer })
      .then(r => r.data);
  }
  reject(callId) {
    return axios.post(`${this.url}/${callId}/reject`).then(r => r.data);
  }
  terminate(callId) {
    return axios.post(`${this.url}/${callId}/terminate`).then(r => r.data);
  }
  uploadRecording(callId, blob, filename = 'call-recording.webm') {
    const formData = new FormData();
    formData.append('recording', blob, filename);
    return axios
      .post(`${this.url}/${callId}/upload_recording`, formData)
      .then(r => r.data);
  }
 }
 export default new WhatsappCallsAPI();
@@ -1,12 +1,21 @@
 /* global axios */
 import ApiClient from './ApiClient';
-const buildParams = params =>
+export const buildCompanyParams = (page, sort) => {
-  new URLSearchParams(
+  let params = `page=${page}`;
-    Object.entries(params).filter(
+  if (sort) {
-      ([key, value]) => value !== undefined && (value !== '' || key === 'q')
+    params = `${params}&sort=${sort}`;
-    )
+  }
-  ).toString();
+  return params;
 };
 export const buildSearchParams = (query, page, sort) => {
  let params = `q=${encodeURIComponent(query)}&page=${page}`;
  if (sort) {
    params = `${params}&sort=${sort}`;
  }
  return params;
 };
 class CompanyAPI extends ApiClient {
  constructor() {
@@ -15,49 +24,14 @@ class CompanyAPI extends ApiClient {
  get(params = {}) {
    const { page = 1, sort = 'name' } = params;
-    const requestURL = `${this.url}?${buildParams({ page, sort })}`;
+    const requestURL = `${this.url}?${buildCompanyParams(page, sort)}`;
    return axios.get(requestURL);
  }
  search(query = '', page = 1, sort = 'name') {
-    const requestURL = `${this.url}/search?${buildParams({ q: query, page, sort })}`;
+    const requestURL = `${this.url}/search?${buildSearchParams(query, page, sort)}`;
    return axios.get(requestURL);
  }
  listContacts(id, page = 1) {
    return axios.get(`${this.url}/${id}/contacts?${buildParams({ page })}`);
  }
  listNotes(id) {
    return axios.get(`${this.url}/${id}/notes`);
  }
  listConversations(id) {
    return axios.get(`${this.url}/${id}/conversations`);
  }
  searchContacts(id, query = '', page = 1) {
    const requestURL = `${this.url}/${id}/contacts/search?${buildParams({ q: query, page })}`;
    return axios.get(requestURL);
  }
  createContact(id, payload) {
    return axios.post(`${this.url}/${id}/contacts`, payload);
  }
  removeContact(id, contactId) {
    return axios.delete(`${this.url}/${id}/contacts/${contactId}`);
  }
  destroyCustomAttributes(id, customAttributes) {
    return axios.post(`${this.url}/${id}/destroy_custom_attributes`, {
      custom_attributes: customAttributes,
    });
  }
  destroyAvatar(id) {
    return axios.delete(`${this.url}/${id}/avatar`);
  }
 }
 export default new CompanyAPI();
@@ -35,9 +35,8 @@ class ContactAPI extends ApiClient {
    return axios.patch(`${this.url}/${id}?include_contact_inboxes=false`, data);
  }
-  getConversations(contactId, { inboxId } = {}) {
+  getConversations(contactId) {
-    const params = inboxId ? { inbox_id: inboxId } : {};
+    return axios.get(`${this.url}/${contactId}/conversations`);
    return axios.get(`${this.url}/${contactId}/conversations`, { params });
  }
  getContactableInboxes(contactId) {
@@ -48,10 +47,9 @@ class ContactAPI extends ApiClient {
    return axios.get(`${this.url}/${contactId}/labels`);
  }
-  initiateCall(contactId, inboxId, conversationId = null) {
+  initiateCall(contactId, inboxId) {
    return axios.post(`${this.url}/${contactId}/call`, {
      inbox_id: inboxId,
      conversation_id: conversationId,
    });
  }
@@ -13,10 +13,6 @@ class ConversationApi extends ApiClient {
  updateLabels(conversationID, labels) {
    return axios.post(`${this.url}/${conversationID}/labels`, { labels });
  }
  getUnreadCounts() {
    return axios.get(`${this.url}/unread_counts`);
  }
 }
 export default new ConversationApi();
@@ -87,13 +87,6 @@ class ArticlesAPI extends PortalsAPI {
    );
  }
  bulkUpdateCategory({ portalSlug, articleIds, categoryId }) {
    return axios.patch(
      `${this.url}/${portalSlug}/articles/bulk_actions/update_category`,
      { ids: articleIds, category_id: categoryId }
    );
  }
  bulkDelete({ portalSlug, articleIds }) {
    return axios.delete(
      `${this.url}/${portalSlug}/articles/bulk_actions/delete_articles`,
@@ -12,7 +12,6 @@ export const buildCreatePayload = ({
  bccEmails = '',
  toEmails = '',
  templateParams,
  isVoiceMessage = false,
 }) => {
  let payload;
  if (files && files.length !== 0) {
@@ -34,9 +33,6 @@ export const buildCreatePayload = ({
    if (contentAttributes) {
      payload.append('content_attributes', JSON.stringify(contentAttributes));
    }
    if (isVoiceMessage) {
      payload.append('is_voice_message', true);
    }
  } else {
    payload = {
      content: message,
@@ -68,7 +64,6 @@ class MessageApi extends ApiClient {
    bccEmails = '',
    toEmails = '',
    templateParams,
    isVoiceMessage = false,
  }) {
    return axios({
      method: 'post',
@@ -83,7 +78,6 @@ class MessageApi extends ApiClient {
        bccEmails,
        toEmails,
        templateParams,
        isVoiceMessage,
      }),
    });
  }
@@ -3,11 +3,12 @@ import CacheEnabledApiClient from './CacheEnabledApiClient';
 class Inboxes extends CacheEnabledApiClient {
  constructor() {
-    super('inboxes', {
+    super('inboxes', { accountScoped: true });
-      accountScoped: true,
+  }
-      cacheModel: 'inbox',
+
-      payloadEnvelope: true,
+  // eslint-disable-next-line class-methods-use-this
-    });
+  get cacheModelName() {
    return 'inbox';
  }
  getCampaigns(inboxId) {
@@ -51,14 +52,6 @@ class Inboxes extends CacheEnabledApiClient {
  resetSecret(inboxId) {
    return axios.post(`${this.url}/${inboxId}/reset_secret`);
  }
  enableWhatsappCalling(inboxId) {
    return axios.post(`${this.url}/${inboxId}/enable_whatsapp_calling`);
  }
  disableWhatsappCalling(inboxId) {
    return axios.post(`${this.url}/${inboxId}/disable_whatsapp_calling`);
  }
 }
 export default new Inboxes();
@@ -2,11 +2,12 @@ import CacheEnabledApiClient from './CacheEnabledApiClient';
 class LabelsAPI extends CacheEnabledApiClient {
  constructor() {
-    super('labels', {
+    super('labels', { accountScoped: true });
-      accountScoped: true,
+  }
-      cacheModel: 'label',
+
-      payloadEnvelope: true,
+  // eslint-disable-next-line class-methods-use-this
-    });
+  get cacheModelName() {
    return 'label';
  }
 }
@@ -1,14 +0,0 @@
 /* global axios */
 import ApiClient from './ApiClient';
 class OnboardingAPI extends ApiClient {
  constructor() {
    super('onboarding', { accountScoped: true });
  }
  update(data) {
    return axios.patch(this.url, data);
  }
 }
 export default new OnboardingAPI();
@@ -153,33 +153,4 @@ describe('#PortalAPI', () => {
      );
    });
  });
  describe('API calls', () => {
    const originalAxios = window.axios;
    const axiosMock = {
      post: vi.fn(() => Promise.resolve()),
      get: vi.fn(() => Promise.resolve()),
      patch: vi.fn(() => Promise.resolve()),
      delete: vi.fn(() => Promise.resolve()),
    };
    beforeEach(() => {
      window.axios = axiosMock;
    });
    afterEach(() => {
      window.axios = originalAxios;
    });
    it('#bulkUpdateCategory', () => {
      articlesAPI.bulkUpdateCategory({
        portalSlug: 'room-rental',
        articleIds: [1, 2, 3],
        categoryId: 7,
      });
      expect(axiosMock.patch).toHaveBeenCalledWith(
        '/api/v1/portals/room-rental/articles/bulk_actions/update_category',
        { ids: [1, 2, 3], category_id: 7 }
      );
    });
  });
 });
@@ -1,4 +1,7 @@
-import companyAPI from '../companies';
+import companyAPI, {
  buildCompanyParams,
  buildSearchParams,
 } from '../companies';
 import ApiClient from '../ApiClient';
 describe('#CompanyAPI', () => {
@@ -6,6 +9,7 @@ describe('#CompanyAPI', () => {
    expect(companyAPI).toBeInstanceOf(ApiClient);
    expect(companyAPI).toHaveProperty('get');
    expect(companyAPI).toHaveProperty('show');
    expect(companyAPI).toHaveProperty('create');
    expect(companyAPI).toHaveProperty('update');
    expect(companyAPI).toHaveProperty('delete');
    expect(companyAPI).toHaveProperty('search');
@@ -28,69 +32,111 @@ describe('#CompanyAPI', () => {
      window.axios = originalAxios;
    });
-    it('#get includes pagination and sorting params', () => {
+    it('#get with default params', () => {
      companyAPI.get({});
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies?page=1&sort=name'
      );
    });
-    it('#search encodes query params', () => {
+    it('#get with page and sort params', () => {
-      companyAPI.search('acme & co', 2, 'domain');
+      companyAPI.get({ page: 2, sort: 'domain' });
      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/companies/search?q=acme+%26+co&page=2&sort=domain'
+        '/api/v1/companies?page=2&sort=domain'
      );
    });
-    it('#search keeps empty query param for backend validation', () => {
+    it('#get with descending sort', () => {
      companyAPI.get({ page: 1, sort: '-created_at' });
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies?page=1&sort=-created_at'
      );
    });
    it('#search with query', () => {
      companyAPI.search('acme', 1, 'name');
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies/search?q=acme&page=1&sort=name'
      );
    });
    it('#search with special characters in query', () => {
      companyAPI.search('acme & co', 2, 'domain');
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies/search?q=acme%20%26%20co&page=2&sort=domain'
      );
    });
    it('#search with descending sort', () => {
      companyAPI.search('test', 1, '-created_at');
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies/search?q=test&page=1&sort=-created_at'
      );
    });
    it('#search with empty query', () => {
      companyAPI.search('', 1, 'name');
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/companies/search?q=&page=1&sort=name'
      );
    });
  });
 });
-    it('#destroyAvatar deletes the company avatar endpoint', () => {
+describe('#buildCompanyParams', () => {
-      companyAPI.destroyAvatar(1);
+  it('returns correct string with page only', () => {
-      expect(axiosMock.delete).toHaveBeenCalledWith(
+    expect(buildCompanyParams(1)).toBe('page=1');
-        '/api/v1/companies/1/avatar'
+  });
-      );
+
-    });
+  it('returns correct string with page and sort', () => {
-
+    expect(buildCompanyParams(1, 'name')).toBe('page=1&sort=name');
-    it('#listContacts fetches company contacts', () => {
+  });
-      companyAPI.listContacts(1, 2);
+
-      expect(axiosMock.get).toHaveBeenCalledWith(
+  it('returns correct string with different page', () => {
-        '/api/v1/companies/1/contacts?page=2'
+    expect(buildCompanyParams(3, 'domain')).toBe('page=3&sort=domain');
-      );
+  });
-    });
+
-
+  it('returns correct string with descending sort', () => {
-    it('#searchContacts encodes contact search params', () => {
+    expect(buildCompanyParams(1, '-created_at')).toBe(
-      companyAPI.searchContacts(1, 'jane & co', 3);
+      'page=1&sort=-created_at'
-      expect(axiosMock.get).toHaveBeenCalledWith(
+    );
-        '/api/v1/companies/1/contacts/search?q=jane+%26+co&page=3'
+  });
-      );
+
-    });
+  it('returns correct string without sort parameter', () => {
-
+    expect(buildCompanyParams(2, '')).toBe('page=2');
-    it('#createContact links a contact to the company', () => {
+  });
-      companyAPI.createContact(1, { contact_id: 2 });
+});
-      expect(axiosMock.post).toHaveBeenCalledWith(
+
-        '/api/v1/companies/1/contacts',
+describe('#buildSearchParams', () => {
-        { contact_id: 2 }
+  it('returns correct string with all parameters', () => {
-      );
+    expect(buildSearchParams('acme', 1, 'name')).toBe(
-    });
+      'q=acme&page=1&sort=name'
-
+    );
-    it('#removeContact unlinks a contact from the company', () => {
+  });
-      companyAPI.removeContact(1, 2);
+
-      expect(axiosMock.delete).toHaveBeenCalledWith(
+  it('returns correct string with special characters', () => {
-        '/api/v1/companies/1/contacts/2'
+    expect(buildSearchParams('acme & co', 2, 'domain')).toBe(
-      );
+      'q=acme%20%26%20co&page=2&sort=domain'
-    });
+    );
-
+  });
-    it('#destroyCustomAttributes removes company custom attributes', () => {
+
-      companyAPI.destroyCustomAttributes(1, ['plan']);
+  it('returns correct string with empty query', () => {
-      expect(axiosMock.post).toHaveBeenCalledWith(
+    expect(buildSearchParams('', 1, 'name')).toBe('q=&page=1&sort=name');
-        '/api/v1/companies/1/destroy_custom_attributes',
+  });
-        { custom_attributes: ['plan'] }
+
-      );
+  it('returns correct string without sort parameter', () => {
-    });
+    expect(buildSearchParams('test', 1, '')).toBe('q=test&page=1');
  });
  it('returns correct string with descending sort', () => {
    expect(buildSearchParams('company', 3, '-created_at')).toBe(
      'q=company&page=3&sort=-created_at'
    );
  });
  it('encodes special characters correctly', () => {
    expect(buildSearchParams('test@example.com', 1, 'name')).toBe(
      'q=test%40example.com&page=1&sort=name'
    );
  });
 });
@@ -41,8 +41,7 @@ describe('#ContactsAPI', () => {
    it('#getConversations', () => {
      contactAPI.getConversations(1);
      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/contacts/1/conversations',
+        '/api/v1/contacts/1/conversations'
        { params: {} }
      );
    });
@@ -11,7 +11,6 @@ describe('#ConversationApi', () => {
    expect(conversationsAPI).toHaveProperty('delete');
    expect(conversationsAPI).toHaveProperty('getLabels');
    expect(conversationsAPI).toHaveProperty('updateLabels');
    expect(conversationsAPI).toHaveProperty('getUnreadCounts');
  });
  describe('API calls', () => {
@@ -48,12 +47,5 @@ describe('#ConversationApi', () => {
        }
      );
    });
    it('#getUnreadCounts', () => {
      conversationsAPI.getUnreadCounts();
      expect(axiosMock.get).toHaveBeenCalledWith(
        '/api/v1/conversations/unread_counts'
      );
    });
  });
 });
@@ -83,29 +83,5 @@ describe('#ConversationAPI', () => {
        template_params: undefined,
      });
    });
    it('appends is_voice_message when isVoiceMessage is true', () => {
      const formPayload = buildCreatePayload({
        message: 'voice message',
        echoId: 42,
        isPrivate: false,
        files: [new Blob(['audio-data'], { type: 'audio/ogg' })],
        isVoiceMessage: true,
      });
      expect(formPayload).toBeInstanceOf(FormData);
      expect(formPayload.get('is_voice_message')).toEqual('true');
    });
    it('does not append is_voice_message when isVoiceMessage is false', () => {
      const formPayload = buildCreatePayload({
        message: 'regular audio',
        echoId: 43,
        isPrivate: false,
        files: [new Blob(['audio-data'], { type: 'audio/ogg' })],
        isVoiceMessage: false,
      });
      expect(formPayload).toBeInstanceOf(FormData);
      expect(formPayload.get('is_voice_message')).toBeNull();
    });
  });
 });
@@ -1,9 +1,25 @@
 /* global axios */
 // import ApiClient from './ApiClient';
 import CacheEnabledApiClient from './CacheEnabledApiClient';
 export class TeamsAPI extends CacheEnabledApiClient {
  constructor() {
-    super('teams', { accountScoped: true, cacheModel: 'team' });
+    super('teams', { accountScoped: true });
  }
  // eslint-disable-next-line class-methods-use-this
  get cacheModelName() {
    return 'team';
  }
  // eslint-disable-next-line class-methods-use-this
  extractDataFromResponse(response) {
    return response.data;
  }
  // eslint-disable-next-line class-methods-use-this
  marshallData(dataToParse) {
    return { data: dataToParse };
  }
  getAgents({ teamId }) {
@@ -49,7 +49,6 @@ const emit = defineEmits(['edit', 'delete']);
 const { t } = useI18n();
 const STATUS_COMPLETED = 'completed';
 const STATUS_PROCESSING = 'processing';
 const { formatMessage } = useMessageFormatter();
@@ -69,15 +68,9 @@ const campaignStatus = computed(() => {
      : t('CAMPAIGN.LIVE_CHAT.CARD.STATUS.DISABLED');
  }
-  if (props.status === STATUS_COMPLETED) {
+  return props.status === STATUS_COMPLETED
-    return t('CAMPAIGN.SMS.CARD.STATUS.COMPLETED');
+    ? t('CAMPAIGN.SMS.CARD.STATUS.COMPLETED')
-  }
+    : t('CAMPAIGN.SMS.CARD.STATUS.SCHEDULED');
  if (props.status === STATUS_PROCESSING) {
    return t('CAMPAIGN.SMS.CARD.STATUS.PROCESSING');
  }
  return t('CAMPAIGN.SMS.CARD.STATUS.SCHEDULED');
 });
 const inboxName = computed(() => props.inbox?.name || '');
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vishnu NarayananandGitHub	8b759496f2	Merge branch 'develop' into fix/missing-postmessage-validation	2026-04-29 17:27:16 +05:30
Vishnu NarayananandGitHub	98fa5f60e9	Merge branch 'develop' into fix/missing-postmessage-validation	2026-04-24 16:15:00 +05:30
Vishnu NarayananandGitHub	7a8829e79e	Merge branch 'develop' into fix/missing-postmessage-validation	2026-04-23 18:22:15 +05:30
Shivam MishraandGitHub	bf397750f3	Merge branch 'develop' into fix/missing-postmessage-validation	2026-01-21 13:42:18 +05:30
Vinay KeerthiandGitHub	f253ea0abc	Merge branch 'develop' into fix/missing-postmessage-validation	2026-01-15 11:38:30 +05:30
Vinay Keerthi	3aea425abc	fix: handle same-origin deployments in postMessage validation Fall back to window.location.origin when baseUrl is empty or relative, supporting same-origin deployments while maintaining origin validation.	2026-01-12 16:34:13 +05:30
Vinay Keerthi	eee307b36b	fix: add postMessage origin validation in widget SDK Adds origin validation for postMessage communication in the widget SDK: - Extract and validate origin from configured baseUrl - Use specific target origin instead of wildcard when sending messages - Validate sender origin when receiving messages Fixes: CW-6301	2026-01-12 16:27:52 +05:30