From b0d8eb3a2b1e7effea9cbb104d94b17267754c5e Mon Sep 17 00:00:00 2001 From: Paul Atreides Date: Sun, 24 Aug 2025 09:59:22 +0530 Subject: [PATCH] feat: Roll out WhatsApp Embedded Signup for all users --- .../whatsapp/authorizations_controller.rb | 10 --- .../dashboard/i18n/locale/en/inboxMgmt.json | 9 ++- .../settings/inbox/channels/Whatsapp.vue | 79 +++++++++++-------- .../authorizations_controller_spec.rb | 39 +-------- 4 files changed, 51 insertions(+), 86 deletions(-) diff --git a/app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb b/app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb index 3e7d876c3..d52f396fc 100644 --- a/app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb +++ b/app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb @@ -1,5 +1,4 @@ class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts::BaseController - before_action :validate_feature_enabled! before_action :fetch_and_validate_inbox, if: -> { params[:inbox_id].present? } # POST /api/v1/accounts/:account_id/whatsapp/authorization @@ -65,15 +64,6 @@ class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts: }, status: :unprocessable_entity end - def validate_feature_enabled! - return if Current.account.feature_whatsapp_embedded_signup? - - render json: { - success: false, - error: 'WhatsApp embedded signup is not enabled for this account' - }, status: :forbidden - end - def validate_embedded_signup_params! missing_params = [] missing_params << 'code' if params[:code].blank? diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json index 6f44ec046..dafce28e2 100644 --- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json +++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json @@ -272,8 +272,8 @@ }, "SUBMIT_BUTTON": "Create WhatsApp Channel", "EMBEDDED_SIGNUP": { - "TITLE": "Quick Setup with Meta", - "DESC": "You will be redirected to Meta to log into your WhatsApp Business account. Having admin access will help make the setup smooth and easy.", + "TITLE": "Quick setup with Meta", + "DESC": "Use the WhatsApp Embedded Signup flow to quickly connect new numbers. You will be redirected to Meta to log into your WhatsApp Business account. Having admin access will help make the setup smooth and easy.", "BENEFITS": { "TITLE": "Benefits of Embedded Signup:", "EASY_SETUP": "No manual configuration required", @@ -296,7 +296,10 @@ "INVALID_BUSINESS_DATA": "Invalid business data received from Facebook. Please try again.", "SIGNUP_ERROR": "Signup error occurred", "AUTH_NOT_COMPLETED": "Authentication not completed. Please restart the process.", - "SUCCESS_FALLBACK": "WhatsApp Business Account has been successfully configured" + "SUCCESS_FALLBACK": "WhatsApp Business Account has been successfully configured", + "MANUAL_FALLBACK": "If your number is already linked to an Embedded Signup, or if you're a tech provider onboarding your own number, please use the", + "MANUAL_SETUP_LINK": "manual setup flow", + "MANUAL_FALLBACK_INSTEAD": "instead" }, "API": { "ERROR_MESSAGE": "We were not able to save the WhatsApp channel" diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue index 318882b08..f0ecb99ed 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue @@ -2,23 +2,22 @@ import { computed } from 'vue'; import { useRoute, useRouter } from 'vue-router'; import { useI18n } from 'vue-i18n'; -import { useStore } from 'vuex'; import Twilio from './Twilio.vue'; import ThreeSixtyDialogWhatsapp from './360DialogWhatsapp.vue'; import CloudWhatsapp from './CloudWhatsapp.vue'; import WhatsappEmbeddedSignup from './WhatsappEmbeddedSignup.vue'; -import { FEATURE_FLAGS } from 'dashboard/featureFlags'; +import Button from 'dashboard/components-next/button/Button.vue'; const route = useRoute(); const router = useRouter(); const { t } = useI18n(); -const store = useStore(); const PROVIDER_TYPES = { WHATSAPP: 'whatsapp', TWILIO: 'twilio', WHATSAPP_CLOUD: 'whatsapp_cloud', WHATSAPP_EMBEDDED: 'whatsapp_embedded', + WHATSAPP_MANUAL: 'whatsapp_manual', THREE_SIXTY_DIALOG: '360dialog', }; @@ -29,14 +28,6 @@ const hasWhatsappAppId = computed(() => { ); }); -const isWhatsappEmbeddedSignupEnabled = computed(() => { - const accountId = route.params.accountId; - return store.getters['accounts/isFeatureEnabledonAccount']( - accountId, - FEATURE_FLAGS.WHATSAPP_EMBEDDED_SIGNUP - ); -}); - const selectedProvider = computed(() => route.query.provider); const showProviderSelection = computed(() => !selectedProvider.value); @@ -66,28 +57,11 @@ const selectProvider = providerValue => { }); }; -const shouldShowEmbeddedSignup = provider => { - // Check if the feature is enabled for the account - if (!isWhatsappEmbeddedSignupEnabled.value) { - return false; - } - - return ( - (provider === PROVIDER_TYPES.WHATSAPP && hasWhatsappAppId.value) || - provider === PROVIDER_TYPES.WHATSAPP_EMBEDDED - ); -}; - const shouldShowCloudWhatsapp = provider => { - // If embedded signup feature is enabled and app ID is configured, don't show cloud whatsapp - if (isWhatsappEmbeddedSignupEnabled.value && hasWhatsappAppId.value) { - return false; - } - - // Show cloud whatsapp when: - // 1. Provider is whatsapp AND - // 2. Either no app ID is configured OR embedded signup feature is disabled - return provider === PROVIDER_TYPES.WHATSAPP; + return ( + provider === PROVIDER_TYPES.WHATSAPP_MANUAL || + (provider === PROVIDER_TYPES.WHATSAPP && !hasWhatsappAppId.value) + ); }; @@ -138,10 +112,45 @@ const shouldShowCloudWhatsapp = provider => {
- + +
+ + + +
+

+ {{ + $t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.MANUAL_FALLBACK') + }} + + {{ + $t( + 'INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.MANUAL_FALLBACK_INSTEAD' + ) + }} +

+
+
+ + + +