fix(contacts): expose root country code

Gemfile

@@ -89,7 +89,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

Gemfile.lock

@@ -301,7 +301,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
@@ -491,7 +491,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)
@@ -1102,7 +1102,7 @@ DEPENDENCIES
   json_schemer
   judoscale-rails
   judoscale-sidekiq
-  jwt (~> 2.10, >= 2.10.3)
+  jwt
   kaminari
   koala
   letter_opener

app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue

@@ -16,6 +16,7 @@ const props = defineProps({
   name: { type: String, default: '' },
   email: { type: String, default: '' },
   additionalAttributes: { type: Object, default: () => ({}) },
+  countryCode: { type: String, default: '' },
   phoneNumber: { type: String, default: '' },
   thumbnail: { type: String, default: '' },
   availabilityStatus: { type: String, default: null },
@@ -42,6 +43,7 @@ const getInitialContactData = () => ({
   name: props.name,
   email: props.email,
   phoneNumber: props.phoneNumber,
+  countryCode: props.countryCode,
   additionalAttributes: props.additionalAttributes,
 });
 
@@ -58,12 +60,13 @@ const countriesMap = computed(() => {
 
 const countryDetails = computed(() => {
   const attributes = props.additionalAttributes || {};
-  const { country, countryCode, city } = attributes;
+  const { country, countryCode: additionalCountryCode, city } = attributes;
+  const countryCode = props.countryCode || additionalCountryCode;
 
   if (!country && !countryCode) return null;
 
   const activeCountry =
-    countriesMap.value[country] || countriesMap.value[countryCode];
+    countriesMap.value[countryCode] || countriesMap.value[country];
 
   if (!activeCountry) return null;
 

app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue

@@ -96,6 +96,7 @@ const prepareStateBasedOnProps = () => {
     name = '',
     email: emailAddress,
     phoneNumber,
+    countryCode: contactCountryCode = '',
     additionalAttributes = {},
   } = props.contactData || {};
   const { firstName, lastName } = splitName(name || '');
@@ -122,7 +123,7 @@ const prepareStateBasedOnProps = () => {
     additionalAttributes: {
       description,
       companyName,
-      countryCode,
+      countryCode: contactCountryCode || countryCode,
       country,
       city,
       socialProfiles: {

app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue

@@ -94,6 +94,7 @@ const handleAvatarHover = (id, isHovered) => {
         :email="contact.email"
         :thumbnail="contact.thumbnail"
         :phone-number="contact.phoneNumber"
+        :country-code="contact.countryCode"
         :additional-attributes="contact.additionalAttributes"
         :availability-status="contact.availabilityStatus"
         :is-expanded="expandedCardId === contact.id"

app/javascript/dashboard/components-next/sidebar/SidebarProfileMenuStatus.vue

@@ -78,27 +78,26 @@ function changeAvailabilityStatus(availability) {
 <template>
   <DropdownSection class="[&>ul]:overflow-visible">
     <div class="grid gap-0">
-      <DropdownItem preserve-open class="gap-1">
-        <div class="flex-grow flex items-center gap-1 min-w-0">
+      <DropdownItem preserve-open>
+        <div class="flex-grow flex items-center gap-1">
           {{ $t('SIDEBAR.SET_YOUR_AVAILABILITY') }}
         </div>
-        <DropdownContainer class="shrink-0">
+        <DropdownContainer>
           <template #trigger="{ toggle }">
             <Button
               size="sm"
               color="slate"
               variant="faded"
+              class="min-w-[96px]"
               icon="i-lucide-chevron-down"
               trailing-icon
               @click="toggle"
             >
-              <div class="flex gap-1 items-center min-w-0 text-sm">
+              <div class="flex gap-1 items-center flex-grow text-sm">
                 <div class="p-1 flex-shrink-0">
                   <div class="size-2 rounded-sm" :class="activeStatus.color" />
                 </div>
-                <span class="truncate max-w-[7rem]">
-                  {{ activeStatus.label }}
-                </span>
+                <span>{{ activeStatus.label }}</span>
               </div>
             </Button>
           </template>
@@ -115,12 +114,12 @@ function changeAvailabilityStatus(availability) {
         </DropdownContainer>
       </DropdownItem>
       <DropdownItem>
-        <div class="flex-grow min-w-0">
+        <div class="flex-grow flex items-center gap-1">
           {{ $t('SIDEBAR.SET_AUTO_OFFLINE.TEXT') }}
           <Icon
             v-tooltip.top="$t('SIDEBAR.SET_AUTO_OFFLINE.INFO_SHORT')"
             icon="i-lucide-info"
-            class="inline-block align-middle ms-1 size-4 text-n-slate-10"
+            class="size-4 text-n-slate-10"
           />
         </div>
         <ToggleSwitch v-model="autoOfflineToggle" />

app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue

@@ -37,6 +37,10 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  countryCode: {
+    type: String,
+    default: '',
+  },
   updatedAt: {
     type: Number,
     default: 0,
@@ -60,12 +64,17 @@ const updatedAtTime = computed(() => {
 });
 
 const countryDetails = computed(() => {
-  const { country, countryCode, city } = props.additionalAttributes;
+  const {
+    country,
+    countryCode: additionalCountryCode,
+    city,
+  } = props.additionalAttributes;
+  const countryCode = props.countryCode || additionalCountryCode;
 
   if (!country && !countryCode) return null;
 
   const activeCountry =
-    countriesMap.value[country] || countriesMap.value[countryCode];
+    countriesMap.value[countryCode] || countriesMap.value[country];
 
   if (!activeCountry) return null;
 

app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue

@@ -41,6 +41,7 @@ const accountId = useMapGetter('getCurrentAccountId');
           :name="contact.name"
           :email="contact.email"
           :phone="contact.phoneNumber"
+          :country-code="contact.countryCode"
           :additional-attributes="contact.additionalAttributes"
           :account-id="accountId"
           :thumbnail="contact.thumbnail"

app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue

@@ -72,12 +72,14 @@ export default {
         city = '',
         country_code: countryCode,
       } = this.additionalAttributes;
+      const canonicalCountryCode =
+        this.contact.country_code || this.contact.countryCode || countryCode;
       const cityAndCountry = [city, country].filter(item => !!item).join(', ');
 
       if (!cityAndCountry) {
         return '';
       }
-      return this.findCountryFlag(countryCode, cityAndCountry);
+      return this.findCountryFlag(canonicalCountryCode, cityAndCountry);
     },
     socialProfiles() {
       const {

app/jobs/account/contacts_export_job.rb

@@ -32,6 +32,7 @@ class Account::ContactsExportJob < ApplicationJob
 
   def value_for_header(contact, header)
     return contact_labels_by_id.fetch(contact.id, []).join(LABELS_DELIMITER) if header == LABELS_COLUMN
+    return contact.canonical_country_code if header == 'country_code'
 
     contact.send(header)
   end

app/models/concerns/contact_country_helpers.rb

@@ -0,0 +1,26 @@
+module ContactCountryHelpers
+  extend ActiveSupport::Concern
+
+  def canonical_country_code
+    attributes = additional_attributes || {}
+
+    CountryCodeNormalizer.normalize(self[:country_code]) ||
+      CountryCodeNormalizer.normalize(attributes['country_code']) ||
+      CountryCodeNormalizer.normalize(attributes['country'])
+  end
+
+  def canonical_country_name
+    CountryCodeNormalizer.name_for(canonical_country_code)
+  end
+
+  def additional_attributes_with_canonical_country
+    attributes = additional_attributes.deep_dup || {}
+    code = canonical_country_code
+    return attributes if code.blank?
+
+    attributes.merge(
+      'country_code' => code,
+      'country' => canonical_country_name || attributes['country']
+    )
+  end
+end

app/models/contact.rb

@@ -44,6 +44,7 @@
 class Contact < ApplicationRecord
   include Avatarable
   include AvailabilityStatusable
+  include ContactCountryHelpers
   include Labelable
   include LlmFormattable
 

app/services/country_code_normalizer.rb

@@ -0,0 +1,42 @@
+require 'tzinfo'
+
+class CountryCodeNormalizer
+  COUNTRY_ALIASES = {
+    'united states of america' => 'US',
+    'usa' => 'US',
+    'uk' => 'GB',
+    'united kingdom' => 'GB'
+  }.freeze
+
+  class << self
+    def normalize(value)
+      return if value.blank?
+
+      value = value.to_s.strip
+      code = value.upcase
+      return code if country_by_code.key?(code)
+
+      country_by_name[normalized_name(value)] || COUNTRY_ALIASES[normalized_name(value)]
+    end
+
+    def name_for(code)
+      country_by_code[normalize(code)]&.name
+    end
+
+    private
+
+    def country_by_code
+      @country_by_code ||= TZInfo::Country.all_codes.index_with { |code| TZInfo::Country.get(code) }
+    end
+
+    def country_by_name
+      @country_by_name ||= country_by_code.each_with_object({}) do |(code, country), result|
+        result[normalized_name(country.name)] = code
+      end
+    end
+
+    def normalized_name(value)
+      value.to_s.strip.downcase
+    end
+  end
+end

app/services/llm_formatter/contact_llm_formatter.rb

@@ -26,7 +26,7 @@ class LlmFormatter::ContactLlmFormatter < LlmFormatter::DefaultLlmFormatter
     attributes << "Email: #{@record.email}"
     attributes << "Phone: #{@record.phone_number}"
     attributes << "Location: #{@record.location}"
-    attributes << "Country Code: #{@record.country_code}"
+    attributes << "Country Code: #{@record.canonical_country_code}"
     @record.account.custom_attribute_definitions.with_attribute_model('contact_attribute').each do |attribute|
       attributes << "#{attribute.attribute_display_name}: #{@record.custom_attributes[attribute.attribute_key]}"
     end

app/views/api/v1/accounts/search/_contact.json.jbuilder

@@ -3,5 +3,6 @@ json.id contact.id
 json.name contact.name
 json.phone_number contact.phone_number
 json.identifier contact.identifier
-json.additional_attributes contact.additional_attributes
+json.country_code contact.canonical_country_code
+json.additional_attributes contact.additional_attributes_with_canonical_country
 json.last_activity_at contact.last_activity_at&.to_i

app/views/api/v1/models/_contact.json.jbuilder

@@ -1,5 +1,6 @@
-json.additional_attributes resource.additional_attributes
+json.additional_attributes resource.additional_attributes_with_canonical_country
 json.availability_status resource.availability_status
+json.country_code resource.canonical_country_code
 json.email resource.email
 json.id resource.id
 json.name resource.name

enterprise/config/initializers/omniauth_saml.rb

@@ -9,7 +9,6 @@ SAML_SETUP_PROC = proc do |env|
   account_id = request.params['account_id'] ||
                env['omniauth.params']&.dig('account_id')
   relay_state = request.params['RelayState'] || ''
-  for_mobile = relay_state.casecmp('mobile').zero?
 
   if account_id
     # Keep SAML request context in OmniAuth env so the callback can be processed
@@ -22,17 +21,9 @@ SAML_SETUP_PROC = proc do |env|
     settings = AccountSamlSettings.find_by(account_id: account_id)
 
     if settings
-      # Carry the relay state in the ACS URL (like account_id) only for mobile,
-      # so the mobile signal survives the cross-site callback POST without
-      # relying on the session cookie or the IdP echoing RelayState back. Web
-      # logins keep the registered ACS URL untouched so strict IdPs that
-      # validate it exactly are unaffected.
-      acs_url = "#{ENV.fetch('FRONTEND_URL', 'http://localhost:3000')}/omniauth/saml/callback?account_id=#{account_id}"
-      acs_url += "&RelayState=#{ERB::Util.url_encode(relay_state)}" if for_mobile
-
       # Configure the strategy options dynamically
       env['omniauth.strategy'].options[:idp_sso_service_url_runtime_params] = { RelayState: :RelayState }
-      env['omniauth.strategy'].options[:assertion_consumer_service_url] = acs_url
+      env['omniauth.strategy'].options[:assertion_consumer_service_url] = "#{ENV.fetch('FRONTEND_URL', 'http://localhost:3000')}/omniauth/saml/callback?account_id=#{account_id}"
       env['omniauth.strategy'].options[:sp_entity_id] = settings.sp_entity_id
       env['omniauth.strategy'].options[:idp_entity_id] = settings.idp_entity_id
       env['omniauth.strategy'].options[:idp_sso_service_url] = settings.sso_url

spec/controllers/api/v1/accounts/contacts_controller_spec.rb

@@ -54,6 +54,23 @@ RSpec.describe 'Contacts API', type: :request do
         expect(contact_inboxes_source_ids).to include(contact_inbox.source_id)
       end
 
+      it 'returns canonical country attributes for contact display' do
+        contact.update!(additional_attributes: { country: 'United States' })
+
+        get "/api/v1/accounts/#{account.id}/contacts",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        response_body = response.parsed_body
+        response_contact = response_body['payload'].find { |item| item['id'] == contact.id }
+
+        expect(response_contact['additional_attributes']).to include(
+          'country_code' => 'US',
+          'country' => 'United States'
+        )
+        expect(response_contact['country_code']).to eq('US')
+      end
+
       it 'returns all contacts without contact inboxes' do
         get "/api/v1/accounts/#{account.id}/contacts?include_contact_inboxes=false",
             headers: admin.create_new_auth_token,

spec/controllers/google/callbacks_controller_spec.rb

@@ -8,12 +8,12 @@ RSpec.describe 'Google::CallbacksController', type: :request do
 
   describe 'GET /google/callback' do
     let(:response_body_success) do
-      { id_token: JWT.encode({ email: email, name: 'test' }, nil, 'none'), access_token: SecureRandom.hex(10), token_type: 'Bearer',
+      { id_token: JWT.encode({ email: email, name: 'test' }, false), access_token: SecureRandom.hex(10), token_type: 'Bearer',
         refresh_token: SecureRandom.hex(10) }
     end
 
     let(:response_body_success_without_name) do
-      { id_token: JWT.encode({ email: email }, nil, 'none'), access_token: SecureRandom.hex(10), token_type: 'Bearer',
+      { id_token: JWT.encode({ email: email }, false), access_token: SecureRandom.hex(10), token_type: 'Bearer',
         refresh_token: SecureRandom.hex(10) }
     end
 

spec/controllers/microsoft/callbacks_controller_spec.rb

@@ -8,12 +8,12 @@ RSpec.describe 'Microsoft::CallbacksController', type: :request do
 
   describe 'GET /microsoft/callback' do
     let(:response_body_success) do
-      { id_token: JWT.encode({ email: email, name: 'test' }, nil, 'none'), access_token: SecureRandom.hex(10), token_type: 'Bearer',
+      { id_token: JWT.encode({ email: email, name: 'test' }, false), access_token: SecureRandom.hex(10), token_type: 'Bearer',
         refresh_token: SecureRandom.hex(10) }
     end
 
     let(:response_body_success_without_name) do
-      { id_token: JWT.encode({ email: email }, nil, 'none'), access_token: SecureRandom.hex(10), token_type: 'Bearer',
+      { id_token: JWT.encode({ email: email }, false), access_token: SecureRandom.hex(10), token_type: 'Bearer',
         refresh_token: SecureRandom.hex(10) }
     end
 

spec/helpers/instagram/integration_helper_spec.rb

@@ -82,7 +82,6 @@ RSpec.describe Instagram::IntegrationHelper do
 
     context 'when client secret is not configured' do
       let(:client_secret) { nil }
-      let(:valid_token) { 'any-token' }
 
       it 'returns nil' do
         expect(verify_instagram_token(valid_token)).to be_nil

spec/helpers/linear/integration_helper_spec.rb

@@ -65,7 +65,6 @@ RSpec.describe Linear::IntegrationHelper do
 
     context 'when client secret is not configured' do
       let(:client_secret) { nil }
-      let(:valid_token) { 'any-token' }
 
       it 'returns nil' do
         expect(verify_linear_token(valid_token)).to be_nil

spec/helpers/shopify/integration_helper_spec.rb

@@ -65,7 +65,6 @@ RSpec.describe Shopify::IntegrationHelper do
 
     context 'when client secret is not configured' do
       let(:client_secret) { nil }
-      let(:valid_token) { 'any-token' }
 
       it 'returns nil' do
         expect(verify_shopify_token(valid_token)).to be_nil

spec/jobs/account/contacts_export_job_spec.rb

@@ -99,6 +99,19 @@ RSpec.describe Account::ContactsExportJob do
       expect(row['labels']).to eq('vip')
     end
 
+    it 'exports canonical country codes from legacy country data' do
+      legacy_country_contact = create(:contact, account: account, email: 'legacy-country@example.com',
+                                                additional_attributes: { country: 'United States' })
+
+      described_class.perform_now(account.id, user.id, %w[email country_code], {})
+
+      csv_content = account.contacts_export.download.force_encoding('UTF-8').delete_prefix("\xEF\xBB\xBF")
+      csv_data = CSV.parse(csv_content, headers: true)
+      row = csv_data.find { |record| record['email'] == legacy_country_contact.email }
+
+      expect(row['country_code']).to eq('US')
+    end
+
     it 'bulk loads labels while exporting contacts' do
       create(:label, account: account, title: 'vip')
       create(:label, account: account, title: 'support')

spec/models/contact_spec.rb

@@ -93,6 +93,42 @@ RSpec.describe Contact do
     end
   end
 
+  describe '#canonical_country_code' do
+    it 'prefers the contact country_code column when it has a valid country code' do
+      contact = create(:contact, additional_attributes: { country_code: 'IN', country: 'India' })
+      contact[:country_code] = 'US'
+
+      expect(contact.canonical_country_code).to eq('US')
+      expect(contact.canonical_country_name).to eq('United States')
+    end
+
+    it 'falls back to additional_attributes country_code' do
+      contact = create(:contact, additional_attributes: { country_code: 'in' })
+
+      expect(contact.canonical_country_code).to eq('IN')
+      expect(contact.canonical_country_name).to eq('India')
+    end
+
+    it 'normalizes legacy country names from additional_attributes country' do
+      contact = create(:contact, additional_attributes: { country: 'United States' })
+
+      expect(contact.canonical_country_code).to eq('US')
+      expect(contact.canonical_country_name).to eq('United States')
+    end
+  end
+
+  describe '#additional_attributes_with_canonical_country' do
+    it 'returns additional attributes with normalized country values without persisting them' do
+      contact = create(:contact, additional_attributes: { country: 'United States' })
+
+      expect(contact.additional_attributes_with_canonical_country).to include(
+        'country_code' => 'US',
+        'country' => 'United States'
+      )
+      expect(contact.reload.additional_attributes).not_to include('country_code')
+    end
+  end
+
   context 'when a contact is created' do
     it 'has contact type "visitor" by default' do
       contact = create(:contact)

spec/services/llm_formatter/contact_llm_formatter_spec.rb

@@ -48,6 +48,16 @@ RSpec.describe LlmFormatter::ContactLlmFormatter do
       end
     end
 
+    context 'when contact has legacy country data' do
+      before do
+        contact.update!(additional_attributes: { country: 'United States' })
+      end
+
+      it 'uses the canonical country code' do
+        expect(formatter.format).to include('Country Code: US')
+      end
+    end
+
     context 'when contact has custom attributes' do
       let!(:custom_attribute) do
         create(:custom_attribute_definition, account: account, attribute_model: 'contact_attribute', attribute_display_name: 'Company')

swagger/definitions/resource/contact.yml

@@ -11,6 +11,9 @@ properties:
         availability_status:
           type: string
           description: The availability status of the contact
+        country_code:
+          type: string
+          description: The normalized ISO country code of the contact
         email:
           type: string
           description: The email address of the contact