Beautiful Open-Source Form Builder
Refactor Google OAuth integration to streamline UTM data handling
Julien Nahum615572b370a0
diff --git a/client/components/pages/auth/components/RegisterForm.vue b/client/components/pages/auth/components/RegisterForm.vueindex 474261380..e210f809c 100644--- a/client/components/pages/auth/components/RegisterForm.vue+++ b/client/components/pages/auth/components/RegisterForm.vue@@ -319,11 +319,9 @@ const showOAuthError = (error) => {const signInwithGoogle = () => {try {- // Pass invite token if available through guestConnect- const { $utm } = useNuxtApp()+ // guestConnect now always captures and sends utm_dataconst additionalData = {- ...(form.invite_token ? { invite_token: form.invite_token } : {}),- ...(Object.keys($utm?.value || {}).length ? { utm_data: $utm.value } : {})+ ...(form.invite_token ? { invite_token: form.invite_token } : {})}oAuth.guestConnect('google', true, additionalData)} catch (error) {diff --git a/client/components/vendor/GoogleOneTap.vue b/client/components/vendor/GoogleOneTap.vueindex d6536318d..e143a0f5f 100644--- a/client/components/vendor/GoogleOneTap.vue+++ b/client/components/vendor/GoogleOneTap.vue@@ -143,7 +143,8 @@ const handleCredentialResponse = (response) => {const { $utm } = useNuxtApp()const requestData = {credential: response.credential,- intent: 'auth'+ intent: 'auth',+ utm_data: $utm.value}// Add invite token if present@@ -151,11 +152,6 @@ const handleCredentialResponse = (response) => {requestData.invite_token = inviteToken}- // Add UTM data if available- if ($utm?.value) {- requestData.utm_data = $utm.value- }-// Send JWT to backend widget callbackwidgetCallbackMutation.mutateAsync({service: 'google_one_tap',diff --git a/client/composables/query/useOAuth.js b/client/composables/query/useOAuth.jsindex 35b9b93bb..5b881ff1f 100644--- a/client/composables/query/useOAuth.js+++ b/client/composables/query/useOAuth.js@@ -141,13 +141,15 @@ export function useOAuth() {// Guest connect methodconst guestConnect = (service, redirect = false, additionalData = {}) => {const intention = new URL(window.location.href).pathname+ const { $utm } = useNuxtApp()// Open synchronously to avoid popup blockersconst popupWindow = preOpenPopupIfNeeded(true, service)return oauthApi.redirect(service, {...redirect ? { intention } : {},- ...additionalData+ ...additionalData,+ utm_data: $utm.value}).then((data) => {// If we have invite_token in additionalData store it in localStoragediff --git a/client/pages/oauth/[provider]/callback.vue b/client/pages/oauth/[provider]/callback.vueindex 427ed22cf..28da4ae4c 100644--- a/client/pages/oauth/[provider]/callback.vue+++ b/client/pages/oauth/[provider]/callback.vue@@ -45,8 +45,7 @@ const handleCallback = async () => {try {let payloadData = {- code: route.query.code,- utm_data: $utm.value+ code: route.query.code}// Get state token from URL query parameters (OAuth provider includes it)