akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/whatsapp-embedded-signup' into test-pdf-support-captain

Browse Source
This commit is contained in:
Tanmay Deep Sharma
2025-07-10 16:59:14 +07:00
parent 46dba4998b f8ad34a0b0
commit 0eedac48be
8 changed files with 115 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/auto-assign-pr.yml
+28
View File
@@ -0,0 +1,28 @@
name: Auto-assign PR to Author
on:
pull_request:
types: [opened]
jobs:
auto-assign:
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Auto-assign PR to author
uses: actions/github-script@v7
with:
script: |
const { owner, repo } = context.repo;
const pull_number = context.payload.pull_request.number;
const author = context.payload.pull_request.user.login;
await github.rest.issues.addAssignees({
owner,
repo,
issue_number: pull_number,
assignees: [author]
});
console.log(`Assigned PR #${pull_number} to ${author}`);
app/controllers/whatsapp/embedded_controller.rb
+1 -2
View File
@@ -10,8 +10,7 @@ class Whatsapp::EmbeddedController < ApplicationController
render json: {
status: 'ready',
app_id: GlobalConfigService.load('WHATSAPP_APP_ID', ''),
config_id: GlobalConfigService.load('WHATSAPP_CONFIGURATION_ID', ''),
app_secret: GlobalConfigService.load('WHATSAPP_APP_SECRET', '')
config_id: GlobalConfigService.load('WHATSAPP_CONFIGURATION_ID', '')
}
end
app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue
+28
View File
@@ -0,0 +1,28 @@
<script setup>
import SettingsHeader from './SettingsHeader.vue';
</script>
<template>
<Story
title="Captain/PageComponents/SettingsHeader"
:layout="{ type: 'grid', width: '800px' }"
>
<Variant title="Default">
<div class="px-6 py-4 bg-n-background">
<SettingsHeader
heading="General Settings"
description="Configure general preferences for your workspace."
/>
</div>
</Variant>
<Variant title="Long Description">
<div class="px-6 py-4 bg-n-background">
<SettingsHeader
heading="Integrations"
description="Manage and configure third-party integrations such as Slack, Zapier, and Webhooks to enhance your workflow."
/>
</div>
</Variant>
</Story>
</template>
app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue
+19
View File
@@ -0,0 +1,19 @@
<script setup>
defineProps({
heading: {
type: String,
required: true,
},
description: {
type: String,
default: '',
},
});
</script>
<template>
<header class="flex flex-col items-start gap-2">
<h2 class="text-n-slate-12 text-base font-medium">{{ heading }}</h2>
<p class="text-n-slate-11 text-sm">{{ description }}</p>
</header>
</template>
app/javascript/shared/components/ResizableTextArea.vue
+1 -1
View File
@@ -69,7 +69,7 @@ export default {
},
},
watch: {
value() {
modelValue() {
this.resizeTextarea();
// 🚨 watch triggers every time the value is changed, we cannot set this to focus then
// when this runs, it sets the cursor to the end of the body, ignoring the signature
app/services/whatsapp/embedded_signup_service.rb
+13
View File
@@ -89,6 +89,19 @@ class Whatsapp::EmbeddedSignupService
end
end
def register_phone_number(phone_number_id, access_token)
# Generate a random 6-digit PIN
pin = SecureRandom.random_number(900_000) + 100_000
HTTParty.post(
"https://graph.facebook.com/#{whatsapp_api_version}/#{phone_number_id}/register",
{
headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' },
body: { messaging_product: 'whatsapp', pin: pin.to_s }.to_json
}
)
end
def find_existing_channel(phone_number)
Channel::Whatsapp.find_by(account: @account, phone_number: phone_number)
end
spec/controllers/whatsapp/embedded_controller_spec.rb
+1 -2
View File
@@ -23,8 +23,7 @@ RSpec.describe 'WhatsApp Embedded API', type: :request do
expect(json_response).to include(
'status' => 'ready',
'app_id' => 'test_app_id',
'config_id' => 'test_config_id',
'app_secret' => 'test_app_secret'
'config_id' => 'test_config_id'
)
end
end
spec/services/whatsapp/embedded_signup_service_spec.rb
+24 -21
View File
@@ -2,15 +2,6 @@ require 'rails_helper'
describe Whatsapp::EmbeddedSignupService do
let(:account) { create(:account) }
let(:code) { 'test_authorization_code' }
let(:business_id) { 'test_business_id' }
let(:waba_id) { 'test_waba_id' }
let(:phone_number_id) { 'test_phone_number_id' }
let(:access_token) { 'test_access_token' }
let(:app_id) { 'test_app_id' }
let(:app_secret) { 'test_app_secret' }
let(:api_version) { 'v22.0' }
let(:service) do
described_class.new(
account: account,
@@ -20,9 +11,19 @@ describe Whatsapp::EmbeddedSignupService do
phone_number_id: phone_number_id
)
end
let(:code) { 'test_authorization_code' }
let(:business_id) { 'test_business_id' }
let(:waba_id) { 'test_waba_id' }
let(:phone_number_id) { 'test_phone_number_id' }
let(:access_token) { 'test_access_token' }
let(:app_id) { 'test_app_id' }
let(:app_secret) { 'test_app_secret' }
let(:api_version) { 'v22.0' }
let(:unique_phone_number) { "+123456789#{SecureRandom.hex(4)}" }
before do
# Mock global configuration
# Clean up any existing WhatsApp channels before each test
Channel::Whatsapp.destroy_all
allow(GlobalConfigService).to receive(:load).with('WHATSAPP_APP_ID', '').and_return(app_id)
allow(GlobalConfigService).to receive(:load).with('WHATSAPP_APP_SECRET', '').and_return(app_secret)
allow(GlobalConfigService).to receive(:load).with('WHATSAPP_API_VERSION', 'v22.0').and_return(api_version)
@@ -64,7 +65,7 @@ describe Whatsapp::EmbeddedSignupService do
data: [
{
id: phone_number_id,
display_phone_number: '1234567890',
display_phone_number: unique_phone_number.delete('+'),
verified_name: 'Test Business',
code_verification_status: 'VERIFIED'
}
@@ -123,7 +124,7 @@ describe Whatsapp::EmbeddedSignupService do
it 'successfully creates a new WhatsApp channel' do
expect { service.perform }.not_to raise_error
channel = Channel::Whatsapp.find_by(account: account, phone_number: '+1234567890')
channel = Channel::Whatsapp.find_by(account: account, phone_number: unique_phone_number)
expect(channel).not_to be_nil
expect(channel.provider).to eq('whatsapp_cloud')
expect(channel.provider_config['api_key']).to eq(access_token)
@@ -135,20 +136,22 @@ describe Whatsapp::EmbeddedSignupService do
it 'creates an inbox for the channel' do
service.perform
channel = Channel::Whatsapp.find_by(account: account, phone_number: '+1234567890')
channel = Channel::Whatsapp.find_by(account: account, phone_number: unique_phone_number)
inbox = Inbox.find_by(account: account, channel: channel)
expect(inbox).not_to be_nil
expect(inbox.name).to eq('Test Business WhatsApp')
end
it 'registers the phone number' do
# Mock SecureRandom to return a predictable value
allow(SecureRandom).to receive(:random_number).with(900_000).and_return(140_214)
service.perform
expect(WebMock).to have_requested(:post, "https://graph.facebook.com/#{api_version}/#{phone_number_id}/register")
.with(
body: {
messaging_product: 'whatsapp',
pin: '212834'
pin: '240214'
}.to_json
)
end
@@ -156,7 +159,7 @@ describe Whatsapp::EmbeddedSignupService do
it 'sets up webhook subscription' do
service.perform
channel = Channel::Whatsapp.find_by(account: account, phone_number: '+1234567890')
channel = Channel::Whatsapp.find_by(account: account, phone_number: unique_phone_number)
callback_url = "https://app.chatwoot.com/webhooks/whatsapp/#{channel.phone_number}"
expect(WebMock).to have_requested(:post, "https://graph.facebook.com/#{api_version}/#{waba_id}/subscribed_apps")
@@ -242,7 +245,7 @@ describe Whatsapp::EmbeddedSignupService do
data: [
{
id: phone_number_id,
display_phone_number: '1234567890',
display_phone_number: unique_phone_number.delete('+'),
verified_name: 'Test Business',
code_verification_status: 'VERIFIED'
}
@@ -287,7 +290,7 @@ describe Whatsapp::EmbeddedSignupService do
)
# Create existing channel
create(:channel_whatsapp, account: account, phone_number: '+1234567890')
create(:channel_whatsapp, account: account, phone_number: unique_phone_number)
end
it 'raises an error' do
@@ -333,7 +336,7 @@ describe Whatsapp::EmbeddedSignupService do
data: [
{
id: phone_number_id,
display_phone_number: '1234567890',
display_phone_number: unique_phone_number.delete('+'),
verified_name: 'Test Business',
code_verification_status: 'VERIFIED'
}
@@ -415,7 +418,7 @@ describe Whatsapp::EmbeddedSignupService do
data: [
{
id: phone_number_id,
display_phone_number: '1234567890',
display_phone_number: unique_phone_number.delete('+'),
verified_name: 'Test Business',
code_verification_status: 'VERIFIED'
}
@@ -524,7 +527,7 @@ describe Whatsapp::EmbeddedSignupService do
data: [
{
id: phone_number_id,
display_phone_number: '1234567890',
display_phone_number: unique_phone_number.delete('+'),
verified_name: 'Test Business',
code_verification_status: 'VERIFIED'
}
@@ -538,7 +541,7 @@ describe Whatsapp::EmbeddedSignupService do
result = service.send(:fetch_phone_info_via_waba, waba_id, phone_number_id, access_token)
expect(result).to eq({
phone_number_id: phone_number_id,
phone_number: '+1234567890',
phone_number: unique_phone_number,
verified: true,
business_name: 'Test Business'
})